Merge pull request #2041 from kili-technology/lab-4339-step-filter

feat(LAB-4339): add step_name_and_status_in / not_in filters

Author: josselinbuils

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

@@ -68,4 +68,20 @@ def asset_where_mapper(filters: AssetFilters):
         "stepIdNotIn": filters.step_id_not_in,
         "stepStatusIn": filters.step_status_in,
         "stepStatusNotIn": filters.step_status_not_in,
+        "stepIdAndStatusIn": (
+            [
+                {"stepId": step_id, "status": step_status}
+                for step_id, step_status in filters.step_id_and_status_in
+            ]
+            if filters.step_id_and_status_in is not None
+            else None
+        ),
+        "stepIdAndStatusNotIn": (
+            [
+                {"stepId": step_id, "status": step_status}
+                for step_id, step_status in filters.step_id_and_status_not_in
+            ]
+            if filters.step_id_and_status_not_in is not None
+            else None
+        ),
     }

src/kili/domain/asset/asset.py

@@ -62,6 +62,8 @@ class AssetFilters:
     issue_status: Optional["IssueStatus"] = None
     skipped: Optional[bool] = None
     status_in: Optional[ListOrTuple[AssetStatus]] = None
+    step_id_and_status_in: Optional[list[tuple[str, StatusInStep]]] = None
+    step_id_and_status_not_in: Optional[list[tuple[str, StatusInStep]]] = None
     step_id_in: Optional[ListOrTuple[str]] = None
     step_id_not_in: Optional[ListOrTuple[str]] = None
     step_status_in: Optional[ListOrTuple[StatusInStep]] = None
@@ -73,6 +75,8 @@ class AssetWorkflowFilters(TypedDict, total=False):
 
     skipped: Optional[bool]
     status_in: Optional[ListOrTuple[AssetStatus]]
+    step_name_and_status_in: Optional[list[tuple[str, StatusInStep]]]
+    step_name_and_status_not_in: Optional[list[tuple[str, StatusInStep]]]
     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

@@ -33,6 +33,8 @@ def check_asset_workflow_arguments(
     project_workflow_version: WorkflowVersion, asset_workflow_filters: AssetWorkflowFilters
 ) -> None:
     """Check asset workflow parameters relative to the project workflow version."""
+    step_name_and_status_in = asset_workflow_filters.get("step_name_and_status_in")
+    step_name_and_status_not_in = asset_workflow_filters.get("step_name_and_status_not_in")
     step_name_in = asset_workflow_filters.get("step_name_in")
     step_status_in = asset_workflow_filters.get("step_status_in")
     status_in = asset_workflow_filters.get("status_in")
@@ -64,3 +66,8 @@ 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_and_status_in is not None or step_name_and_status_not_in is not None:
+        raise ValueError(
+            "Filters step_name_and_status_in and/or step_name_and_status_not_in given : use filter "
+            "status_in for this project."
+        )

src/kili/domain_api/assets.py

@@ -1,5 +1,5 @@
 """Assets domain namespace for the Kili Python SDK."""
-# pylint: disable=too-many-lines,too-many-public-methods
+# pylint: disable=too-many-lines
 
 import warnings
 from collections.abc import Generator
@@ -87,6 +87,8 @@ class AssetFilter(TypedDict, total=False):
     metadata_where: Optional[dict[str, Any]]
     skipped: Optional[bool]
     status_in: Optional[list[AssetStatus]]
+    step_name_and_status_in: Optional[list[tuple[str, StatusInStep]]]
+    step_name_and_status_not_in: Optional[list[tuple[str, StatusInStep]]]
     step_name_in: Optional[list[str]]
     step_name_not_in: Optional[list[str]]
     step_status_in: Optional[list[StatusInStep]]

src/kili/domain_api/issues.py

@@ -3,7 +3,6 @@
 This module provides a comprehensive interface for issue-related operations
 including creation, querying, status management, and lifecycle operations.
 """
-# pylint: disable=too-many-public-methods
 
 from collections.abc import Generator
 from itertools import repeat

src/kili/domain_api/labels.py

@@ -1,4 +1,4 @@
-# pylint: disable=too-many-lines,too-many-public-methods
+# pylint: disable=too-many-lines
 """Labels domain namespace for the Kili Python SDK.
 
 This module provides a comprehensive interface for label-related operations

src/kili/domain_api/organizations.py

@@ -1,5 +1,4 @@
 """Organizations domain namespace for the Kili Python SDK."""
-# pylint: disable=too-many-public-methods
 
 from collections.abc import Generator
 from datetime import datetime

src/kili/domain_api/plugins.py

@@ -1,5 +1,4 @@
 """Plugins domain namespace for the Kili Python SDK."""
-# pylint: disable=too-many-public-methods
 
 from datetime import datetime
 from typing import List, Optional

src/kili/domain_api/projects.py

@@ -3,7 +3,6 @@
 This module provides a comprehensive interface for project-related operations
 including lifecycle management, user management, workflow configuration, and versioning.
 """
-# pylint: disable=too-many-public-methods
 
 from collections.abc import Generator, Iterable, Sequence
 from functools import cached_property

src/kili/domain_api/questions.py

@@ -3,7 +3,6 @@
 This module provides a comprehensive interface for question-related operations
 including creation, querying, status management, and lifecycle operations.
 """
-# pylint: disable=too-many-public-methods
 
 from collections.abc import Generator
 from itertools import repeat