Merge branch 'depricated_functions' of https://github.com/superannotateai/superannotate-python-sdk into develop

Author: dshabin

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.0
 log_cli=true
 python_files = test_*.py
-;addopts = -n 32 --dist=loadscope
+addopts = -n 32 --dist=loadscope

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

@@ -29,6 +29,7 @@
 from lib.app.helpers import get_annotation_paths
 from lib.app.helpers import get_paths_and_duplicated_from_csv
 from lib.app.helpers import reformat_metrics_json
+from lib.app.interface.types import AnnotationStatuses
 from lib.app.interface.types import AnnotationType
 from lib.app.interface.types import NotEmptyStr
 from lib.app.interface.types import Status
@@ -1646,7 +1647,7 @@ def upload_images_from_s3_bucket_to_project(
 def prepare_export(
     project: Union[NotEmptyStr, dict],
     folder_names: Optional[List[NotEmptyStr]] = None,
-    annotation_statuses: Optional[List[NotEmptyStr]] = None,
+    annotation_statuses: Optional[List[AnnotationStatuses]] = None,
     include_fuse: Optional[StrictBool] = False,
     only_pinned=False,
 ):
@@ -2152,38 +2153,50 @@ def download_export(
     """
     project_name, folder_name = extract_project_folder(project)
     export_name = export["name"] if isinstance(export, dict) else export
-    response = controller.download_export(
-        project_name=project_name,
-        export_name=export_name,
-        folder_path=folder_path,
-        extract_zip_contents=extract_zip_contents,
-        to_s3_bucket=to_s3_bucket,
-    )
-    downloaded_folder_path = response.data
 
     if to_s3_bucket:
-        to_s3_bucket = boto3.Session().resource("s3").Bucket(to_s3_bucket)
-
-        files_to_upload = []
-        for file in Path(downloaded_folder_path).rglob("*.*"):
-            files_to_upload.append(file)
-
-        def _upload_file_to_s3(to_s3_bucket, path, s3_key) -> None:
-            controller.upload_file_to_s3(
-                to_s3_bucket=to_s3_bucket, path=path, s3_key=s3_key
+        with tempfile.TemporaryDirectory() as tmp:
+            response = controller.download_export(
+                project_name=project_name,
+                export_name=export_name,
+                folder_path=tmp,
+                extract_zip_contents=extract_zip_contents,
+                to_s3_bucket=to_s3_bucket,
             )
+            downloaded_folder_path = response.data
+            if to_s3_bucket:
+                to_s3_bucket = boto3.Session().resource("s3").Bucket(to_s3_bucket)
+                files_to_upload = []
+                for file in Path(downloaded_folder_path).rglob("*.*"):
+                    files_to_upload.append(file)
+
+                def _upload_file_to_s3(to_s3_bucket, path, s3_key) -> None:
+                    controller.upload_file_to_s3(
+                        to_s3_bucket=to_s3_bucket, path=path, s3_key=s3_key
+                    )
 
-        with concurrent.futures.ThreadPoolExecutor(max_workers=10) as executor:
-            results = []
-            for path in files_to_upload:
-                s3_key = f"{path.as_posix()}"
-                results.append(
-                    executor.submit(_upload_file_to_s3, to_s3_bucket, str(path), s3_key)
+                with concurrent.futures.ThreadPoolExecutor(max_workers=10) as executor:
+                    results = []
+                    for path in files_to_upload:
+                        s3_key = f"{folder_path}/{path.name}"
+                        results.append(
+                            executor.submit(
+                                _upload_file_to_s3, to_s3_bucket, str(path), s3_key
+                            )
+                        )
+                    for future in concurrent.futures.as_completed(results):
+                        future.result()
+                logger.info(
+                    "Exported to AWS %s/%s", to_s3_bucket.name, str(folder_path)
                 )
-
-            for future in concurrent.futures.as_completed(results):
-                future.result()
-        logger.info("Exported to AWS %s/%s", to_s3_bucket, str(path))
+    else:
+        controller.download_export(
+            project_name=project_name,
+            export_name=export_name,
+            folder_path=folder_path,
+            extract_zip_contents=extract_zip_contents,
+            to_s3_bucket=to_s3_bucket,
+        )
 
 
 @Trackable

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

@@ -34,6 +34,16 @@ def validate(cls, value: Union[str]) -> Union[str]:
         return value
 
 
+class AnnotationStatuses(StrictStr):
+    @classmethod
+    def validate(cls, value: Union[str]) -> Union[str]:
+        if value.lower() not in AnnotationStatus.values():
+            raise TypeError(
+                f"Available annotation_statuses are {', '.join(AnnotationStatus.titles())}. "
+            )
+        return value
+
+
 def to_chunks(t, size=2):
     it = iter(t)
     return zip(*[it] * size)

src/superannotate/lib/core/enums.py

@@ -27,6 +27,10 @@ def get_value(cls, name):
     def values(cls):
         return [enum.name.lower() for enum in list(cls)]
 
+    @classmethod
+    def titles(cls):
+        return [enum.name for enum in list(cls)]
+
 
 class ProjectType(BaseTitledEnum):
     VECTOR = "Vector", 1