Update export statuses

Author: VaghinakDev

src/superannotate/lib/app/interface/sdk_interface.py

@@ -82,9 +82,6 @@
     "GenAI",
 ]
 
-ANNOTATION_STATUS = Literal[
-    "NotStarted", "InProgress", "QualityCheck", "Returned", "Completed", "Skipped"
-]
 
 APPROVAL_STATUS = Literal["Approved", "Disapproved", None]
 
@@ -1193,7 +1190,7 @@ def prepare_export(
         self,
         project: Union[NotEmptyStr, dict],
         folder_names: Optional[List[NotEmptyStr]] = None,
-        annotation_statuses: Optional[List[ANNOTATION_STATUS]] = None,
+        annotation_statuses: Optional[List[str]] = None,
         include_fuse: Optional[bool] = False,
         only_pinned=False,
         **kwargs,
@@ -1245,15 +1242,6 @@ def prepare_export(
             folders = [folder_name] if folder_name else []
         else:
             folders = folder_names
-        if not annotation_statuses:
-            annotation_statuses = [
-                constants.AnnotationStatus.NOT_STARTED.name,
-                constants.AnnotationStatus.IN_PROGRESS.name,
-                constants.AnnotationStatus.QUALITY_CHECK.name,
-                constants.AnnotationStatus.RETURNED.name,
-                constants.AnnotationStatus.COMPLETED.name,
-                constants.AnnotationStatus.SKIPPED.name,
-            ]
         integration_name = kwargs.get("integration_name")
         integration_id = None
         if integration_name:
@@ -2125,7 +2113,7 @@ def upload_images_to_project(
         self,
         project: NotEmptyStr,
         img_paths: List[NotEmptyStr],
-        annotation_status: Optional[ANNOTATION_STATUS] = "NotStarted",
+        annotation_status: str = "NotStarted",
         from_s3_bucket=None,
         image_quality_in_editor: Optional[IMAGE_QUALITY] = None,
     ):
@@ -2556,7 +2544,7 @@ def search_items(
         self,
         project: NotEmptyStr,
         name_contains: NotEmptyStr = None,
-        annotation_status: Optional[ANNOTATION_STATUS] = None,
+        annotation_status: str = None,
         annotator_email: Optional[NotEmptyStr] = None,
         qa_email: Optional[NotEmptyStr] = None,
         recursive: bool = False,
@@ -3021,7 +3009,7 @@ def move_items(
     def set_annotation_statuses(
         self,
         project: Union[NotEmptyStr, dict],
-        annotation_status: ANNOTATION_STATUS,
+        annotation_status: NotEmptyStr,
         items: Optional[List[NotEmptyStr]] = None,
     ):
         """Sets annotation statuses of items

src/superannotate/lib/core/__init__.py

@@ -5,7 +5,6 @@
 from os.path import expanduser
 
 from lib.core.config import Config
-from lib.core.enums import AnnotationStatus
 from lib.core.enums import ApprovalStatus
 from lib.core.enums import FolderStatus
 from lib.core.enums import ImageQuality
@@ -189,7 +188,6 @@ def setup_logging(level=DEFAULT_LOGGING_LEVEL, file_path=LOG_FILE_LOCATION):
     UploadState,
     TrainingStatus,
     ImageQuality,
-    AnnotationStatus,
     ApprovalStatus,
     CONFIG_JSON_FILE_LOCATION,
     CONFIG_INI_FILE_LOCATION,

src/superannotate/lib/core/enums.py

@@ -156,15 +156,6 @@ class ExportStatus(BaseTitledEnum):
     ERROR = "error", 4
 
 
-class AnnotationStatus(BaseTitledEnum):
-    NOT_STARTED = "NotStarted", 1
-    IN_PROGRESS = "InProgress", 2
-    QUALITY_CHECK = "QualityCheck", 3
-    RETURNED = "Returned", 4
-    COMPLETED = "Completed", 5
-    SKIPPED = "Skipped", 6
-
-
 class ClassTypeEnum(BaseTitledEnum):
     OBJECT = "object", 1
     TAG = "tag", 2

src/superannotate/lib/core/jsx_conditions.py

@@ -1,3 +1,4 @@
+import urllib.parse
 from abc import abstractmethod
 from enum import Enum
 from typing import Any
@@ -55,9 +56,9 @@ def __init__(self, key: str, value: Any, operator: OperatorEnum):
 
     def _build(self):
         if isinstance(self._value, (list, set, tuple)):
-            return f"{self._key}||{self._operator.value}||{','.join(map(str, self._value))}"
+            return f"{self._key}||{self._operator.value}||{','.join(map(urllib.parse.quote, map(str, self._value)))}"
         else:
-            return f"{self._key}||{self._operator.value}||{self._value}"
+            return f"{self._key}||{self._operator.value}||{urllib.parse.quote(str(self._value))}"
 
     def build(self) -> str:
         return f"filter={self._build()}"

src/superannotate/lib/core/serviceproviders.py

@@ -584,10 +584,10 @@ def prepare_export(
         self,
         project: entities.ProjectEntity,
         folders: List[str],
-        annotation_statuses: List[str],
         include_fuse: bool,
         only_pinned: bool,
         integration_id: int,
+        annotation_statuses: List[str] = None,
         export_type: int = None,
     ) -> ServiceResponse:
         raise NotImplementedError

src/superannotate/lib/core/usecases/items.py

@@ -546,17 +546,15 @@ def __init__(
         reporter: Reporter,
         project: ProjectEntity,
         folder: FolderEntity,
-        annotation_status: str,
+        annotation_status: int,
         service_provider: BaseServiceProvider,
         item_names: List[str] = None,
     ):
         super().__init__(reporter)
         self._project = project
         self._folder = folder
         self._item_names = item_names
-        self._annotation_status_code = constants.AnnotationStatus(
-            annotation_status
-        ).value
+        self._annotation_status_code = annotation_status
         self._service_provider = service_provider
 
     def validate_items(self):

src/superannotate/lib/core/usecases/models.py

@@ -104,24 +104,15 @@ def execute(self):
         if self.is_valid():
             if self._project.upload_state == constances.UploadState.EXTERNAL.value:
                 self._include_fuse = False
-
-            if not self._annotation_statuses:
-                self._annotation_statuses = [
-                    constances.AnnotationStatus.IN_PROGRESS.name,
-                    constances.AnnotationStatus.COMPLETED.name,
-                    constances.AnnotationStatus.QUALITY_CHECK.name,
-                    constances.AnnotationStatus.RETURNED.name,
-                    constances.AnnotationStatus.NOT_STARTED.name,
-                    constances.AnnotationStatus.SKIPPED.name,
-                ]
             kwargs = dict(
                 project=self._project,
                 folders=self._folder_names,
-                annotation_statuses=self._annotation_statuses,
                 include_fuse=self._include_fuse,
                 only_pinned=self._only_pinned,
                 integration_id=self._integration_id,
             )
+            if self._annotation_statuses:
+                kwargs["annotation_statuses"] = (self._annotation_statuses,)
             if self._export_type:
                 kwargs["export_type"] = self._export_type
             response = self._service_provider.prepare_export(**kwargs)

src/superannotate/lib/infrastructure/serviceprovider.py

@@ -190,23 +190,26 @@ def prepare_export(
         self,
         project: entities.ProjectEntity,
         folders: List[str],
-        annotation_statuses: List[str],
         include_fuse: bool,
         only_pinned: bool,
+        annotation_statuses: List[str] = None,
         integration_id: int = None,
         export_type: int = None,
     ):
-        annotation_statuses = ",".join(
-            [str(constants.AnnotationStatus(i).value) for i in annotation_statuses]
-        )
 
         data = {
-            "include": annotation_statuses,
             "fuse": int(include_fuse),
             "is_pinned": int(only_pinned),
             "coco": 0,
             "time": datetime.datetime.now().strftime("%b %d %Y %H:%M"),
         }
+        if annotation_statuses:
+            data["include"] = ",".join(
+                [
+                    str(self.get_annotation_status_value(project, i))
+                    for i in annotation_statuses
+                ]
+            )
         if export_type:
             data["export_format"] = export_type
         if folders:

tests/unit/test_jsx_conditions.py

@@ -17,6 +17,6 @@ def test_multiple_query_build(self):
         )
         query &= Join("metadata") & Join("fields", ["field1", "field2"])
         self.assertEquals(
-            "filter=id||$in||1,2,3&or=id||$eq||2&join=metadata&join=fields||field1,field2",
+            "filter=id||$in||1%2C2%2C3&or=id||$eq||2&join=metadata&join=fields||field1,field2",
             query.build_query(),
         )