Merge pull request #700 from superannotateai/develop

Develop

Author: VaghinakDev

CHANGELOG.rst

@@ -6,14 +6,26 @@ History
 
 All release highlights of this project will be documented in this file.
 
+4.4.23 - July 4, 2024
+_______________________
+
+
+**Updated**
+
+    - ``SAClient.prepare_export`` added the ability to export GenAI project data to a CSV file..
+
+**Fiexed**
+
+    - ``SAClient.upload_priority_scores`` fixed an issue arising from empty arguments
+
 4.4.22 - Jun 13, 2024
 _______________________
 
 
 **Updated**
 
     - Dependencies, updated ``packaging``, ``superannotate-schemas``.
-    - ``search_folders`` by multiple statuses.
+    - ``SAClient.search_folders`` by multiple statuses.
 
 
 4.4.21 - May 23, 2024
@@ -22,8 +34,8 @@ _______________________
 
 **Updated**
 
-    - Dependencies, removed ``email-validator``.
-    - ``add_items_to_subset`` added GenAI projects support.
+    - Dependencies, removed ``SAClientemail-validator``.
+    - ``SAClient.add_items_to_subset`` added GenAI projects support.
 
 
 

pytest.ini

@@ -3,5 +3,5 @@ minversion = 3.7
 log_cli=true
 python_files = test_*.py
 ;pytest_plugins = ['pytest_profiling']
-addopts = -n auto --dist=loadscope
+;addopts = -n auto --dist=loadscope
 

src/superannotate/__init__.py

@@ -3,7 +3,7 @@
 import sys
 
 
-__version__ = "4.4.22"
+__version__ = "4.4.23"
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 

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

@@ -1187,8 +1187,22 @@ def prepare_export(
         :param only_pinned: enable only pinned output in export. This option disables all other types of output.
         :type only_pinned: bool
 
-        :param kwargs: Arbitrary kwarg ``integration_name``
-            can be provided which will be used as a storage to store export file
+        :param kwargs:
+            Arbitrary kwargs:
+                 * integration_name: can be provided which will be used as a storage to store export file
+                 * format: can be CSV for the Gen AI projects
+
+        Request Example:
+        ::
+            client = SAClient()
+
+            export = client.prepare_export(
+                project = "Project Name",
+                folder_names = ["Folder 1", "Folder 2"],
+                annotation_statuses = ["Completed","QualityCheck"],
+                export_type = "CSV")
+
+            client.download_export("Project Name", export, "path_to_download")
 
         :return: metadata object of the prepared export
         :rtype: dict
@@ -1216,13 +1230,20 @@ def prepare_export(
                     break
             else:
                 raise AppException("Integration not found.")
+        _export_type = None
+        export_type = kwargs.get("format")
+        if export_type:
+            export_type = export_type.lower()
+            if export_type == "csv":
+                _export_type = 3
         response = self.controller.prepare_export(
             project_name=project_name,
             folder_names=folders,
             include_fuse=include_fuse,
             only_pinned=only_pinned,
             annotation_statuses=annotation_statuses,
             integration_id=integration_id,
+            export_type=_export_type,
         )
         if response.errors:
             raise AppException(response.errors)

src/superannotate/lib/core/serviceproviders.py

@@ -571,6 +571,7 @@ def prepare_export(
         include_fuse: bool,
         only_pinned: bool,
         integration_id: int,
+        export_type: int = None,
     ) -> ServiceResponse:
         raise NotImplementedError
 

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

@@ -1223,7 +1223,7 @@ def execute(self):
                 )
                 self._response.data = (uploaded_score_names, skipped_score_names)
             else:
-                self.reporter.warning_messages("Empty scores.")
+                self.reporter.warning_messages.append("Empty scores.")
         return self._response
 
 

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

@@ -46,6 +46,7 @@ def __init__(
         only_pinned: bool,
         annotation_statuses: List[str] = None,
         integration_id: int = None,
+        export_type: int = None,
     ):
         super().__init__(),
         self._project = project
@@ -55,6 +56,7 @@ def __init__(
         self._include_fuse = include_fuse
         self._only_pinned = only_pinned
         self._integration_id = integration_id
+        self._export_type = export_type
 
     def validate_only_pinned(self):
         if (
@@ -75,6 +77,20 @@ def validate_fuse(self):
                 f"{ProjectType.get_name(self._project.type)} attached with URLs"
             )
 
+    def validate_export_type(self):
+        if self._export_type == 2:
+            if (
+                self._project.type != ProjectType.VECTOR.value
+                or self._project.upload_state != constances.UploadState.EXTERNAL.value
+            ):
+                raise AppValidationException(
+                    "COCO format is not supported for this project."
+                )
+        elif self._export_type == 3 and self._project.type != ProjectType.GEN_AI.value:
+            raise AppValidationException(
+                "CSV format is not supported for this project."
+            )
+
     def validate_folder_names(self):
         if self._folder_names:
             condition = Condition("project_id", self._project.id, EQ)
@@ -102,15 +118,17 @@ def execute(self):
                     constances.AnnotationStatus.NOT_STARTED.name,
                     constances.AnnotationStatus.SKIPPED.name,
                 ]
-
-            response = self._service_provider.prepare_export(
+            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._export_type:
+                kwargs["export_type"] = self._export_type
+            response = self._service_provider.prepare_export(**kwargs)
             if not response.ok:
                 raise AppException(response.error)
 

src/superannotate/lib/infrastructure/controller.py

@@ -1013,6 +1013,7 @@ def prepare_export(
         only_pinned: bool,
         annotation_statuses: List[str] = None,
         integration_id: int = None,
+        export_type: int = None,
     ):
         project = self.get_project(project_name)
         use_case = usecases.PrepareExportUseCase(
@@ -1023,6 +1024,7 @@ def prepare_export(
             only_pinned=only_pinned,
             annotation_statuses=annotation_statuses,
             integration_id=integration_id,
+            export_type=export_type,
         )
         return use_case.execute()
 

src/superannotate/lib/infrastructure/serviceprovider.py

@@ -152,6 +152,7 @@ def prepare_export(
         include_fuse: bool,
         only_pinned: bool,
         integration_id: int = None,
+        export_type: int = None,
     ):
         annotation_statuses = ",".join(
             [str(constants.AnnotationStatus.get_value(i)) for i in annotation_statuses]
@@ -164,6 +165,8 @@ def prepare_export(
             "coco": 0,
             "time": datetime.datetime.now().strftime("%b %d %Y %H:%M"),
         }
+        if export_type:
+            data["export_format"] = export_type
         if folders:
             data["folder_names"] = folders
         if integration_id is not None:

tests/integration/test_upload_priority_scores.py

@@ -17,6 +17,14 @@ class TestUploadPriorityScores(BaseTestCase):
     def folder_path(self):
         return os.path.join(Path(__file__).parent.parent, self.TEST_FOLDER_PATH)
 
+    def test_upload_empty_list(self):
+        with self.assertLogs("sa", level="INFO") as cm:
+            sa.upload_priority_scores(self.PROJECT_NAME, scores=[])
+            assert (
+                cm.output[0]
+                == "INFO:sa:Uploading  priority scores for 0 item(s) to TestUploadPriorityScores."
+            )
+
     def test_upload_priority_scores(self):
 
         self._attach_items(count=4)