Fix after release (#12)

Author: rm1113

cap_client/client/__init__.py

@@ -115,6 +115,7 @@
     LookupLabelsFilters,
     PostHeatmapInput,
     PostSaveEmbeddingSessionInput,
+    ResolveDatasetLabelsetOrder,
     SearchByMetadataArgs,
     SearchLabelByMetadataArgs,
 )
@@ -227,6 +228,7 @@
     "ProjectAuthorsProjectPermissionsUser",
     "RefineContentExplanationData",
     "RefineContentExplanationDataChanges",
+    "ResolveDatasetLabelsetOrder",
     "SearchByMetadataArgs",
     "SearchDatasets",
     "SearchDatasetsResults",

cap_client/client/client.py

@@ -29,6 +29,7 @@
     LookupLabelsFilters,
     PostHeatmapInput,
     PostSaveEmbeddingSessionInput,
+    ResolveDatasetLabelsetOrder,
 )
 from .lookup_cells import LookupCells
 from .md_commons_query import MDCommonsQuery
@@ -151,11 +152,14 @@ def download_urls(self, dataset_id: str, **kwargs: Any) -> DownloadUrls:
         return DownloadUrls.model_validate(data)
 
     def dataset_initial_state_query(
-        self, dataset_id: str, **kwargs: Any
+        self,
+        dataset_id: str,
+        labelset_order: Union[Optional[ResolveDatasetLabelsetOrder], UnsetType] = UNSET,
+        **kwargs: Any
     ) -> DatasetInitialStateQuery:
         query = gql(
             """
-            query DatasetInitialStateQuery($datasetId: ID!) {
+            query DatasetInitialStateQuery($datasetId: ID!, $labelsetOrder: ResolveDatasetLabelsetOrder) {
               dataset(datasetId: $datasetId) {
                 id
                 name
@@ -180,10 +184,12 @@ def dataset_initial_state_query(
               datasetType
               defaultEmbedding
               cellCount
-              labelsets {
+              inReview
+              labelsets(order: $labelsetOrder) {
                 id
                 name
                 mode
+                order
                 description
                 annotationMethod
                 algorithmName
@@ -263,7 +269,6 @@ def dataset_initial_state_query(
               createdAt
               user {
                 uid
-                tempDisplayName
                 displayName
                 avatarUrl
                 __typename
@@ -334,7 +339,10 @@ def dataset_initial_state_query(
             }
             """
         )
-        variables: Dict[str, object] = {"datasetId": dataset_id}
+        variables: Dict[str, object] = {
+            "datasetId": dataset_id,
+            "labelsetOrder": labelset_order,
+        }
         response = self.execute(
             query=query,
             operation_name="DatasetInitialStateQuery",

cap_client/client/fragments.py

@@ -57,6 +57,18 @@ class SplitContentExplanationDataGroups(BaseModel):
     )
 
 
+class MergeContentExplanationData(BaseModel):
+    comment: Optional[str]
+    labels: List["MergeContentExplanationDataLabels"]
+    typename__: str = Field(alias="__typename")
+
+
+class MergeContentExplanationDataLabels(BaseModel):
+    id: str
+    name: str
+    typename__: Literal["Label"] = Field(alias="__typename")
+
+
 class RefineContentExplanationData(BaseModel):
     changes: List["RefineContentExplanationDataChanges"]
     typename__: str = Field(alias="__typename")
@@ -71,18 +83,6 @@ class RefineContentExplanationDataChanges(BaseModel):
     )
 
 
-class MergeContentExplanationData(BaseModel):
-    comment: Optional[str]
-    labels: List["MergeContentExplanationDataLabels"]
-    typename__: str = Field(alias="__typename")
-
-
-class MergeContentExplanationDataLabels(BaseModel):
-    id: str
-    name: str
-    typename__: Literal["Label"] = Field(alias="__typename")
-
-
 class FeedbackCardFeedback(BaseModel):
     created_at: Any = Field(alias="createdAt")
     user: Optional["FeedbackCardFeedbackUser"]
@@ -92,7 +92,6 @@ class FeedbackCardFeedback(BaseModel):
 
 class FeedbackCardFeedbackUser(BaseModel):
     uid: str
-    temp_display_name: str = Field(alias="tempDisplayName")
     display_name: str = Field(alias="displayName")
     avatar_url: str = Field(alias="avatarUrl")
     typename__: Literal["CapUser"] = Field(alias="__typename")
@@ -164,6 +163,7 @@ class DatasetInitialState(BaseModel):
     dataset_type: str = Field(alias="datasetType")
     default_embedding: Optional[str] = Field(alias="defaultEmbedding")
     cell_count: float = Field(alias="cellCount")
+    in_review: bool = Field(alias="inReview")
     labelsets: Optional[List["DatasetInitialStateLabelsets"]]
     typename__: str = Field(alias="__typename")
 
@@ -172,6 +172,7 @@ class DatasetInitialStateLabelsets(FeedbackCardOrganismLabelset):
     id: str
     name: str
     mode: str
+    order: float
     description: Optional[str]
     annotation_method: Optional[str] = Field(alias="annotationMethod")
     algorithm_name: Optional[str] = Field(alias="algorithmName")
@@ -310,7 +311,7 @@ class ProjectAuthorsProject(BaseModel):
 
 class ProjectAuthorsProjectOwner(BaseModel):
     uid: str
-    temp_display_name: str = Field(alias="tempDisplayName")
+    display_name: str = Field(alias="displayName")
     display_name: str = Field(alias="displayName")
     avatar_url: str = Field(alias="avatarUrl")
     typename__: Literal["CapUser"] = Field(alias="__typename")
@@ -320,13 +321,13 @@ class ProjectAuthorsProjectPermissions(BaseModel):
     id: str
     is_active: bool = Field(alias="isActive")
     role: Any
-    user: "ProjectAuthorsProjectPermissionsUser"
+    user: Optional["ProjectAuthorsProjectPermissionsUser"]
     typename__: Literal["ProjectPermission"] = Field(alias="__typename")
 
 
 class ProjectAuthorsProjectPermissionsUser(BaseModel):
     uid: str
-    temp_display_name: str = Field(alias="tempDisplayName")
+    display_name: str = Field(alias="displayName")
     display_name: str = Field(alias="displayName")
     avatar_url: str = Field(alias="avatarUrl")
     typename__: Literal["CapUser"] = Field(alias="__typename")
@@ -336,8 +337,8 @@ class ProjectAuthorsProjectPermissionsUser(BaseModel):
 CommentContentExplanationData.model_rebuild()
 CurrentEmbeddingProviderAvailableEmbeddings.model_rebuild()
 SplitContentExplanationData.model_rebuild()
-RefineContentExplanationData.model_rebuild()
 MergeContentExplanationData.model_rebuild()
+RefineContentExplanationData.model_rebuild()
 FeedbackCardFeedback.model_rebuild()
 GeneLinkLabelset.model_rebuild()
 FeedbackCardOrganismLabelset.model_rebuild()

cap_client/client/input_types.py

@@ -8,6 +8,11 @@
 from .base_model import BaseModel, Upload
 
 
+class ResolveDatasetLabelsetOrder(BaseModel):
+    field: str
+    order: str
+
+
 class GetDatasetEmbeddingDataInput(BaseModel):
     embedding: str
     selection_gene: Optional[str] = Field(alias="selectionGene", default=None)
@@ -133,6 +138,7 @@ class LabelsetWithLabelsObjectInput(BaseModel):
     )
     reference_location: Optional[str] = Field(alias="referenceLocation", default=None)
     embedding: Optional[str] = None
+    order: Optional[float] = None
     labels: Optional[List["LabelObjectInput"]] = None
 
 
@@ -171,6 +177,7 @@ class LabelObjectInput(BaseModel):
     marker_genes: Optional[List[str]] = Field(alias="markerGenes", default=None)
     rationale_dois: Optional[List[str]] = Field(alias="rationaleDois", default=None)
     synonyms: Optional[List[str]] = None
+    average_conf_score: Optional[float] = Field(alias="averageConfScore", default=None)
 
 
 CellLabelsSearchOptions.model_rebuild()

queries.graphql

@@ -11,7 +11,7 @@ fragment ProjectAuthors_project on Project {
   version
   owner {
     uid
-    tempDisplayName
+    displayName
     displayName
     avatarUrl
     __typename
@@ -22,7 +22,7 @@ fragment ProjectAuthors_project on Project {
     role
     user {
       uid
-      tempDisplayName
+      displayName
       displayName
       avatarUrl
       __typename
@@ -90,7 +90,7 @@ query DownloadUrls($datasetId: ID!) {
   }
 }
 
-query DatasetInitialStateQuery($datasetId: ID!) {
+query DatasetInitialStateQuery($datasetId: ID!, $labelsetOrder: ResolveDatasetLabelsetOrder) {
   dataset(datasetId: $datasetId) {
     id
     name
@@ -143,7 +143,6 @@ fragment FeedbackCard_feedback on LabelFeedback {
   createdAt
   user {
     uid
-    tempDisplayName
     displayName
     avatarUrl
     __typename
@@ -178,10 +177,12 @@ fragment DatasetInitialState on Dataset {
   datasetType
   defaultEmbedding
   cellCount
-  labelsets {
+  inReview
+  labelsets(order: $labelsetOrder) {
     id
     name
     mode
+    order
     description
     annotationMethod
     algorithmName