fix(SUP-2586): do not return annotations if not asked

Author: FannyGaudin

src/kili/adapters/kili_api_gateway/asset/operations_mixin.py

@@ -61,7 +61,9 @@ def list_assets(
                 "LLM_STATIC",
                 "GEOSPATIAL",
             }:
-                fetch_annotations = not (has_labels_url or has_latest_label_url)
+                fetch_annotations = ("labels.jsonResponse" in fields and not has_labels_url) or (
+                    "latestLabel.jsonResponse" in fields and not has_latest_label_url
+                )
                 yield from self.list_assets_split(
                     filters, fields, options, project_info, fetch_annotations
                 )
@@ -110,7 +112,11 @@ def list_assets_split(
                     {inner_annotation_fragment}
                 }}
             """
-            static_fragments = {"labels": annotation_fragment, "latestLabel": annotation_fragment}
+            static_fragments = {}
+            if "labels.jsonResponse" in fields and "labels.jsonResponseUrl" not in fields:
+                static_fragments["labels"] = annotation_fragment
+            if "latestLabel.jsonResponse" in fields and "latestLabel.jsonResponseUrl" not in fields:
+                static_fragments["latestLabel"] = annotation_fragment
 
             required_fields = {"content", "jsonContent", "resolution.width", "resolution.height"}
             fields = list(fields)
@@ -133,24 +139,33 @@ def list_assets_split(
                 json_interface=project_info["jsonInterface"],
                 project_input_type=project_info["inputType"],
             )
-            is_requesting_annotations = any("annotations." in element for element in fields)
-            for asset in assets_gen:
-                if "latestLabel.jsonResponse" in fields and asset.get("latestLabel"):
-                    converter.patch_label_json_response(
-                        asset, asset["latestLabel"], asset["latestLabel"]["annotations"]
-                    )
-                    if not is_requesting_annotations:
-                        asset["latestLabel"].pop("annotations")
-
-                if "labels.jsonResponse" in fields:
-                    for label in asset.get("labels", []):
-                        converter.patch_label_json_response(asset, label, label["annotations"])
-                        if not is_requesting_annotations:
-                            label.pop("annotations")
-                yield asset
+            yield from self._reconstruct_json_responses(assets_gen, fields, converter)
         else:
             yield from assets_gen
 
+    def _reconstruct_json_responses(
+        self,
+        assets_gen: Generator[dict, None, None],
+        fields: ListOrTuple[str],
+        converter: AnnotationsToJsonResponseConverter,
+    ) -> Generator[dict, None, None]:
+        """Reconstruct jsonResponse from annotations, then remove annotations from the result."""
+        is_requesting_annotations = any("annotations." in element for element in fields)
+        for asset in assets_gen:
+            if "latestLabel.jsonResponse" in fields and asset.get("latestLabel"):
+                converter.patch_label_json_response(
+                    asset, asset["latestLabel"], asset["latestLabel"]["annotations"]
+                )
+                if not is_requesting_annotations:
+                    asset["latestLabel"].pop("annotations")
+
+            if "labels.jsonResponse" in fields:
+                for label in asset.get("labels", []):
+                    converter.patch_label_json_response(asset, label, label["annotations"])
+                    if not is_requesting_annotations:
+                        label.pop("annotations")
+            yield asset
+
     def count_assets(self, filters: AssetFilters) -> int:
         """Send a GraphQL request calling countIssues resolver."""
         where = asset_where_mapper(filters)

tests/integration/adapters/kili_api_gateway/test_asset.py

@@ -4,11 +4,88 @@
 from kili.adapters.kili_api_gateway.helpers.queries import QueryOptions
 from kili.domain.asset import AssetFilters
 from kili.domain.project import ProjectId
+from tests.unit.adapters.kili_api_gateway.label.test_data import test_case_1
+
+
+def test_given_video_project_only_latest_label_json_response_requested_annotations_not_fetched_for_labels(
+    graphql_client, http_client
+):
+    """For VIDEO projects, when only latestLabel.jsonResponse is requested (not labels.jsonResponse).
+
+    The annotations fragment should only be injected into latestLabel in the GraphQL query,
+    not into labels.
+    """
+    captured_queries = []
+
+    def mock_graphql_execute(query, *_args, **_kwargs) -> dict:
+        captured_queries.append(query)
+
+        if "countAssetAnnotations" in query:
+            return {"data": 1}
+
+        if "query countAssets" in query:
+            return {"data": 1}
+
+        if "projects(" in query:
+            return {
+                "data": [
+                    {
+                        "id": "project_id",
+                        "inputType": "VIDEO",
+                        "jsonInterface": test_case_1.json_interface,
+                    }
+                ]
+            }
+
+        if "query assets" in query:
+            return {
+                "data": [
+                    {
+                        "id": "fake_asset_id",
+                        "labels": [{"id": "label_id"}],
+                        "latestLabel": {
+                            "jsonResponse": "{}",
+                            "annotations": test_case_1.annotations,
+                        },
+                        "content": "",
+                        "jsonContent": "",
+                        "resolution": {"width": 100, "height": 100},
+                    }
+                ]
+            }
+
+        return None
+
+    graphql_client.execute.side_effect = mock_graphql_execute
+
+    asset_operations = AssetOperationMixin()
+    asset_operations.graphql_client = graphql_client
+    asset_operations.http_client = http_client
+    filters = AssetFilters(project_id=ProjectId("project_id"))
+    fields = ["id", "labels.id", "latestLabel.jsonResponse"]
+
+    # when
+    assets = list(
+        asset_operations.list_assets(filters, fields, options=QueryOptions(disable_tqdm=None))
+    )
+
+    # then
+    assert len(assets) == 1
+    assert assets[0]["id"] == "fake_asset_id"
+    assert isinstance(assets[0]["latestLabel"]["jsonResponse"], dict)
+    # annotations were fetched and used to reconstruct jsonResponse, then removed from the result
+    assert "annotations" not in assets[0]["latestLabel"]
+    assert "annotations" not in assets[0]["labels"][0]
+
+    # then: the GraphQL query only fetches annotations for latestLabel, not for labels
+    assets_query = next(q for q in captured_queries if "query assets" in q)
+    assert "annotations" in assets_query  # latestLabel has the annotations fragment
+    assert "labels{ id}" in assets_query  # labels block only has id, no annotations
 
 
 def test_given_a_query_returning_serialized_json_it_parses_json_fields(graphql_client, http_client):
     # mocking
-    def mock_graphql_execute(query, variables, **kwargs):
+    def mock_graphql_execute(query, variables, **kwargs) -> dict | None:
         if "query assets" in query:
             label = {"jsonResponse": "{}"}
             return {