Merge pull request #241 from superannotateai/fix-upload-annotations

Fix upload annotations

Author: VaghinakDev

src/superannotate/lib/app/helpers.py

@@ -42,22 +42,29 @@ def get_annotation_paths(folder_path, s3_bucket=None, recursive=False):
         return get_s3_annotation_paths(
             folder_path, s3_bucket, annotation_paths, recursive
         )
-    return get_local_annotation_paths(folder_path, annotation_paths, recursive)
+    return get_local_annotation_paths(folder_path, set(annotation_paths), recursive)
 
 
 def get_local_annotation_paths(
-    folder_path: Union[str, Path], annotation_paths: List, recursive: bool
+    folder_path: Union[str, Path], annotation_paths: set, recursive: bool
 ) -> List[str]:
-    for path in Path(folder_path).glob("*"):
-        if recursive and path.is_dir():
-            get_local_annotation_paths(path, annotation_paths, recursive)
-        for annotation_path in Path(folder_path).glob("*.json"):
-            if (
-                annotation_path.name.endswith(VECTOR_ANNOTATION_POSTFIX)
-                or annotation_path.name.endswith(PIXEL_ANNOTATION_POSTFIX)
-            ) and str(annotation_path) not in annotation_paths:
-                annotation_paths.append(str(annotation_path))
-    return annotation_paths
+    all_items = [*Path(folder_path).glob("*")]
+    all_folders = [i for i in all_items if i.is_dir()]
+    annotation_paths.update(
+        [
+            str(i)
+            for i in all_items
+            if i.name.endswith((VECTOR_ANNOTATION_POSTFIX, PIXEL_ANNOTATION_POSTFIX))
+        ]
+    )
+    if recursive:
+        for folder in all_folders:
+            get_local_annotation_paths(
+                folder_path=folder,
+                annotation_paths=annotation_paths,
+                recursive=recursive,
+            )
+    return list(annotation_paths)
 
 
 def get_s3_annotation_paths(folder_path, s3_bucket, annotation_paths, recursive):

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

@@ -2027,9 +2027,7 @@ def validate_limitations(self):
         if response.data.folder_limit.remaining_image_count < 1:
             raise AppValidationException(constances.COPY_FOLDER_LIMIT_ERROR_MESSAGE)
         if response.data.project_limit.remaining_image_count < 1:
-            raise AppValidationException(
-                constances.COPY_PROJECT_LIMIT_ERROR_MESSAGE
-            )
+            raise AppValidationException(constances.COPY_PROJECT_LIMIT_ERROR_MESSAGE)
         if (
             response.data.user_limit
             and response.data.user_limit.remaining_image_count < 1
@@ -2736,20 +2734,16 @@ def execute(self):
                             failed_annotations.append(annotation)
                         yield
 
-                uploaded_annotations = [
-                    annotation.path for annotation in uploaded_annotations
-                ]
-                missing_annotations.extend(
-                    [annotation.path for annotation in self._missing_annotations]
-                )
-                failed_annotations = [
-                    annotation.path for annotation in failed_annotations
-                ]
-            self._response.data = (
-                uploaded_annotations,
-                failed_annotations,
-                missing_annotations,
-            )
+        uploaded_annotations = [annotation.path for annotation in uploaded_annotations]
+        missing_annotations.extend(
+            [annotation.path for annotation in self._missing_annotations]
+        )
+        failed_annotations = [annotation.path for annotation in failed_annotations]
+        self._response.data = (
+            uploaded_annotations,
+            failed_annotations,
+            missing_annotations,
+        )
         self.report_missing_data()
         return self._response