fix(LAB-4081): remove status_not_in filter on workflow V1 legacy projects

Author: paulruelle

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

@@ -28,7 +28,6 @@ def asset_where_mapper(filters: AssetFilters):
         "externalIdStrictlyIn": filters.external_id_strictly_in,
         "externalIdIn": filters.external_id_in,
         "statusIn": filters.status_in,
-        "statusNotIn": filters.status_not_in,
         "consensusMarkGte": filters.consensus_mark_gte,
         "consensusMarkLte": filters.consensus_mark_lte,
         "honeypotMarkGte": filters.honeypot_mark_gte,

src/kili/domain/asset/asset.py

@@ -62,7 +62,6 @@ class AssetFilters:
     issue_status: Optional["IssueStatus"] = None
     skipped: Optional[bool] = None
     status_in: Optional[ListOrTuple[AssetStatus]] = None
-    status_not_in: Optional[ListOrTuple[AssetStatus]] = None
     step_id_in: Optional[ListOrTuple[str]] = None
     step_id_not_in: Optional[ListOrTuple[str]] = None
     step_status_in: Optional[ListOrTuple[StatusInStep]] = None
@@ -74,7 +73,6 @@ class AssetWorkflowFilters(TypedDict, total=False):
 
     skipped: Optional[bool]
     status_in: Optional[ListOrTuple[AssetStatus]]
-    status_not_in: Optional[ListOrTuple[AssetStatus]]
     step_name_in: Optional[ListOrTuple[str]]
     step_name_not_in: Optional[ListOrTuple[str]]
     step_status_in: Optional[ListOrTuple[StatusInStep]]

src/kili/domain/asset/helpers.py

@@ -34,42 +34,24 @@ def check_asset_workflow_arguments(
 ) -> None:
     """Check asset workflow parameters relative to the project workflow version."""
     step_name_in = asset_workflow_filters.get("step_name_in")
-    step_name_not_in = asset_workflow_filters.get("step_name_not_in")
     step_status_in = asset_workflow_filters.get("step_status_in")
-    step_status_not_in = asset_workflow_filters.get("step_status_not_in")
     status_in = asset_workflow_filters.get("status_in")
-    status_not_in = asset_workflow_filters.get("status_not_in")
     skipped = asset_workflow_filters.get("skipped")
 
     if project_workflow_version == "V2":
         if step_status_in is not None and status_in is not None:
             raise ValueError(
                 "Filters step_status_in and status_in both given : only use filter step_status_in for this project."
             )
-        if step_status_not_in is not None and status_not_in is not None:
-            raise ValueError(
-                "Filters step_status_not_in and status_not_in both given : "
-                "only use filter step_status_not_in for this project."
-            )
         if step_name_in is not None and status_in is not None:
             raise ValueError(
                 "Filters step_name_in and status_in both given : use filter step_status_in instead of status_in for this project."  # pylint: disable=line-too-long
             )
-        if step_name_not_in is not None and status_not_in is not None:
-            raise ValueError(
-                "Filters step_name_not_in and status_not_in both given : use filter step_status_not_in instead of status_not_in for this project."  # pylint: disable=line-too-long
-            )
         if status_in is not None:
             warnings.warn(
                 "Filter status_in given : use filters step_status_in and step_name_in instead for this project.",
                 stacklevel=1,
             )
-        if status_not_in is not None:
-            warnings.warn(
-                "Filter status_not_in given : use filters step_status_not_in and "
-                "step_name_not_in instead for this project.",
-                stacklevel=1,
-            )
         if skipped is not None:
             warnings.warn(
                 "Filter skipped given : only use filter step_status_in with the SKIPPED step status instead for this project",  # pylint: disable=line-too-long
@@ -82,7 +64,3 @@ def check_asset_workflow_arguments(
         raise ValueError(
             "Filters step_name_in and/or step_status_in given : use filter status_in for this project."
         )
-    if step_name_not_in is not None or step_status_not_in is not None:
-        raise ValueError(
-            "Filters step_name_not_in and/or step_status_not_in given : use filter status_not_in for this project."
-        )

src/kili/domain_api/assets.py

@@ -87,7 +87,6 @@ class AssetFilter(TypedDict, total=False):
     metadata_where: Optional[dict[str, Any]]
     skipped: Optional[bool]
     status_in: Optional[list[AssetStatus]]
-    status_not_in: Optional[list[AssetStatus]]
     step_name_in: Optional[list[str]]
     step_name_not_in: Optional[list[str]]
     step_status_in: Optional[list[StatusInStep]]

src/kili/presentation/client/asset.py

@@ -156,7 +156,6 @@ def assets(
         label_output_format: Literal["dict", "parsed_label"] = "dict",
         skipped: Optional[bool] = None,
         status_in: Optional[list[AssetStatus]] = None,
-        status_not_in: Optional[list[AssetStatus]] = None,
         step_name_in: Optional[list[str]] = None,
         step_name_not_in: Optional[list[str]] = None,
         step_status_in: Optional[list[StatusInStep]] = None,
@@ -225,7 +224,6 @@ def assets(
         label_output_format: Literal["dict", "parsed_label"] = "dict",
         skipped: Optional[bool] = None,
         status_in: Optional[list[AssetStatus]] = None,
-        status_not_in: Optional[list[AssetStatus]] = None,
         step_name_in: Optional[list[str]] = None,
         step_name_not_in: Optional[list[str]] = None,
         step_status_in: Optional[list[StatusInStep]] = None,
@@ -294,7 +292,6 @@ def assets(
         label_output_format: Literal["dict", "parsed_label"] = "dict",
         skipped: Optional[bool] = None,
         status_in: Optional[list[AssetStatus]] = None,
-        status_not_in: Optional[list[AssetStatus]] = None,
         step_name_in: Optional[list[str]] = None,
         step_name_not_in: Optional[list[str]] = None,
         step_status_in: Optional[list[StatusInStep]] = None,
@@ -368,9 +365,6 @@ def assets(
             status_in: Returned assets should have a status that belongs to that list, if given.
                 Possible choices: `TODO`, `ONGOING`, `LABELED`, `TO_REVIEW` or `REVIEWED`.
                 Only applicable if the project is in the WorkflowV1 (legacy).
-            status_not_in: Returned assets should have a status that does not belong to that list, if given.
-                Possible choices: `TODO`, `ONGOING`, `LABELED`, `TO_REVIEW` or `REVIEWED`.
-                Only applicable if the project is in the WorkflowV1 (legacy).
             step_name_in: Returned assets are in the step whose name belong to that list, if given.
                 Only applicable if the project is in WorkflowV2.
             step_name_not_in: Returned assets are in the step whose name does not belong to that list, if given.
@@ -480,7 +474,6 @@ def assets(
             step_status_in is not None
             or step_status_not_in is not None
             or status_in is not None
-            or status_not_in is not None
             or skipped is not None
         )
         if has_step_filters or has_status_filters:
@@ -489,7 +482,6 @@ def assets(
                 asset_workflow_filters={
                     "skipped": skipped,
                     "status_in": status_in,
-                    "status_not_in": status_not_in,
                     "step_name_in": step_name_in,
                     "step_name_not_in": step_name_not_in,
                     "step_status_in": step_status_in,
@@ -554,7 +546,6 @@ def assets(
             step_id_not_in=step_id_not_in,
             step_status_in=step_status_in,
             step_status_not_in=step_status_not_in,
-            status_not_in=status_not_in,
         )
         assets_gen = asset_use_cases.list_assets(
             filters,
@@ -630,7 +621,6 @@ def count_assets(
         step_name_not_in: Optional[list[str]] = None,
         step_status_in: Optional[list[StatusInStep]] = None,
         step_status_not_in: Optional[list[StatusInStep]] = None,
-        status_not_in: Optional[list[AssetStatus]] = None,
     ) -> int:
         # pylint: disable=line-too-long
         """Count and return the number of assets with the given constraints.
@@ -697,9 +687,6 @@ def count_assets(
             step_status_not_in: Returned assets have the status of their step that does not belong to that list, if given.
                 Possible choices: `TO_DO`, `DOING`, `PARTIALLY_DONE`, `REDO`, `DONE`, `SKIPPED`.
                 Only applicable if the project is in WorkflowV2.
-            status_not_in: Returned assets should have a status that does not belong to that list, if given.
-                Possible choices: `TODO`, `ONGOING`, `LABELED`, `TO_REVIEW` or `REVIEWED`.
-                Only applicable if the project is in WorkflowV1 (legacy).
 
         !!! info "Dates format"
             Date strings should have format: "YYYY-MM-DD"
@@ -745,10 +732,7 @@ def count_assets(
         step_id_not_in = None
         has_step_filters = step_name_in is not None or step_name_not_in is not None
         has_status_filters = (
-            status_in is not None
-            or status_not_in is not None
-            or step_status_in is not None
-            or step_status_not_in is not None
+            status_in is not None or step_status_in is not None or step_status_not_in is not None
         )
         if has_step_filters or has_status_filters:
             project_use_cases = ProjectUseCases(self.kili_api_gateway)
@@ -765,7 +749,6 @@ def count_assets(
                     "step_status_in": step_status_in,
                     "step_status_not_in": step_status_not_in,
                     "status_in": status_in,
-                    "status_not_in": status_not_in,
                 },
             )
 
@@ -826,7 +809,6 @@ def count_assets(
             step_id_not_in=step_id_not_in,
             step_status_in=step_status_in,
             step_status_not_in=step_status_not_in,
-            status_not_in=status_not_in,
         )
         asset_use_cases = AssetUseCases(self.kili_api_gateway)
         return asset_use_cases.count_assets(filters)

tests/unit/domain_api/test_assets.py

@@ -109,22 +109,6 @@ def test_list_assets_as_list(self, assets_namespace):
         assert call_kwargs["project_id"] == "project_123"
         assert call_kwargs["as_generator"] is False
 
-    def test_list_assets_with_status_not_in_filter(self, assets_namespace):
-        """Test list method with status_not_in filter."""
-        # Mock the legacy client method
-        assets_namespace._client.assets.return_value = [
-            {"id": "asset1", "externalId": "ext1", "status": "LABELED"},
-        ]
-
-        result = assets_namespace.list(
-            project_id="project_123", filter={"status_not_in": ["TODO", "ONGOING"]}
-        )
-
-        # Verify the legacy method was called with the filter
-        assets_namespace._client.assets.assert_called_once()
-        call_kwargs = assets_namespace._client.assets.call_args[1]
-        assert call_kwargs["status_not_in"] == ["TODO", "ONGOING"]
-
     def test_list_assets_with_step_status_not_in_filter(self, assets_namespace):
         """Test list method with step_status_not_in filter."""
         # Mock the legacy client method
@@ -157,23 +141,6 @@ def test_list_assets_with_step_name_not_in_filter(self, assets_namespace):
         call_kwargs = assets_namespace._client.assets.call_args[1]
         assert call_kwargs["step_name_not_in"] == ["Review", "QA"]
 
-    def test_count_assets_with_status_not_in_filter(self, assets_namespace):
-        """Test count method with status_not_in filter."""
-        # Mock the legacy client method
-        assets_namespace._client.count_assets.return_value = 42
-
-        result = assets_namespace.count(
-            project_id="project_123", filter={"status_not_in": ["REVIEWED"]}
-        )
-
-        # Verify the result
-        assert result == 42
-
-        # Verify the legacy method was called with the filter
-        assets_namespace._client.count_assets.assert_called_once()
-        call_kwargs = assets_namespace._client.count_assets.call_args[1]
-        assert call_kwargs["status_not_in"] == ["REVIEWED"]
-
     def test_count_assets_with_step_filters_not_in(self, assets_namespace):
         """Test count method with step_status_not_in and step_name_not_in filters."""
         # Mock the legacy client method