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

Author: Vaghinak Basentsyan

src/superannotate/lib/app/input_converters/conversion.py

@@ -224,7 +224,7 @@ def export_annotation(
 def import_annotation(
     input_dir,
     output_dir,
-    dataset_format,
+    dataset_format = "superannotate",
     dataset_name="",
     project_type="Vector",
     task="object_detection",

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

@@ -91,7 +91,7 @@ def upload_images(
         project: str,
         folder: str,
         extensions: str = constances.DEFAULT_IMAGE_EXTENSIONS,
-        set_annotation_status: str = constances.AnnotationStatus.NOT_STARTED.value,
+        set_annotation_status: str = constances.AnnotationStatus.NOT_STARTED.name,
         exclude_file_patterns=constances.DEFAULT_FILE_EXCLUDE_PATTERNS,
         recursive_subfolders=False,
         image_quality_in_editor=None,
@@ -129,7 +129,11 @@ def upload_image(image_path: str):
                     return ProcessedImage(uploaded=False, path=image_path, entity=None)
 
         paths = []
-        for extension in extensions.strip().split(","):
+
+        if isinstance(extensions,str):
+            extensions = extensions.strip().split(",")
+
+        for extension in extensions:
             if recursive_subfolders:
                 paths += list(Path(folder).rglob(f"*.{extension.lower()}"))
                 if os.name != "nt":
@@ -164,7 +168,7 @@ def upload_image(image_path: str):
                         uploaded_image_entities.append(processed_image.entity)
                     else:
                         failed_images.append(processed_image.path)
-                progress_bar.update(1)
+                    progress_bar.update(1)
 
         for i in range(0, len(uploaded_image_entities), 500):
             self.controller.upload_images(
@@ -258,30 +262,33 @@ def _upload_annotations(
         if not task:
             task = "object_detection"
 
+        annotations_path = folder
         with tempfile.TemporaryDirectory() as temp_dir:
-            import_annotation(
-                input_dir=folder,
-                output_dir=temp_dir,
-                dataset_format=format,
-                dataset_name=data_set_name,
-                project_type=constances.ProjectType.get_name(
-                    project["project"].project_type
-                ),
-                task=task,
-            )
-            classes_path = f"{temp_dir}/classes/classes.json"
+            if format != 'SuperAnnotate':
+                import_annotation(
+                    input_dir=folder,
+                    output_dir=temp_dir,
+                    dataset_format=format,
+                    dataset_name=data_set_name,
+                    project_type=constances.ProjectType.get_name(
+                        project["project"].project_type
+                    ),
+                    task=task,
+                )
+                annotations_path = temp_dir
+            classes_path = f"{folder}/classes/classes.json"
             self.controller.create_annotation_classes(
                 project_name=project_name,
                 annotation_classes=json.load(open(classes_path)),
             )
-            annotation_paths = get_annotation_paths(temp_dir)
+            annotation_paths = get_annotation_paths(annotations_path)
             chunk_size = 10
             with tqdm(total=len(annotation_paths)) as progress_bar:
                 for i in range(0, len(annotation_paths), chunk_size):
                     response = self.controller.upload_annotations_from_folder(
                         project_name=project["project"].name,
                         folder_name=folder_name,
-                        folder_path=temp_dir,
+                        folder_path=annotations_path,
                         annotation_paths=annotation_paths[
                             i : i + chunk_size  # noqa: E203
                         ],

src/superannotate/lib/core/usecases.py

@@ -3593,13 +3593,16 @@ def execute(self):
             if export["name"] == self._export_name:
                 export_id = export["id"]
                 break
+        if not export_id:
+            raise AppException("Export not found.")
 
         while True:
             export = self._service.get_export(
                 team_id=self._project.team_id,
                 project_id=self._project.uuid,
                 export_id=export_id,
             )
+
             if export["status"] == ExportStatus.IN_PROGRESS.value:
                 print("Waiting 5 seconds for export to finish on server.")
                 time.sleep(5)