Merge pull request #196 from superannotateai/s3_annotations

Fix s3_annotations upload

Author: dshabin

src/superannotate/lib/app/helpers.py

@@ -72,10 +72,13 @@ def get_s3_annotation_paths(folder_path, s3_bucket, annotation_paths, recursive)
     paginator = s3_client.get_paginator("list_objects_v2")
     for data in paginator.paginate(Bucket=s3_bucket, Prefix=folder_path):
         for annotation in data["Contents"]:
-            if annotation["Key"].endswith(VECTOR_ANNOTATION_POSTFIX) or annotation[
-                "Key"
-            ].endswith(PIXEL_ANNOTATION_POSTFIX):
-                annotation_paths.append(annotation["Key"])
+            key = annotation["Key"]
+            if key.endswith(VECTOR_ANNOTATION_POSTFIX) or key.endswith(
+                PIXEL_ANNOTATION_POSTFIX
+            ):
+                if not recursive and "/" in key[len(folder_path) + 1 :]:
+                    continue
+                annotation_paths.append(key)
     return list(set(annotation_paths))
 
 

src/superannotate/lib/core/usecases.py

@@ -184,12 +184,13 @@ def validate_project_name(self):
         condition = Condition("name", self._project.name, EQ) & Condition(
             "team_id", self._project.team_id, EQ
         )
-        if self._projects.get_all(condition):
-            logger.error("There are duplicated names.")
-            raise AppValidationException(
-                f"Project name {self._project.name} is not unique. "
-                f"To use SDK please make project names unique."
-            )
+        for project in self._projects.get_all(condition):
+            if project.name == self._project.name:
+                logger.error("There are duplicated names.")
+                raise AppValidationException(
+                    f"Project name {self._project.name} is not unique. "
+                    f"To use SDK please make project names unique."
+                )
 
     def validate_description(self):
         if not self._project.description:

tests/integration/test_project_rename.py

@@ -10,14 +10,34 @@ class TestProjectRename(BaseTestCase):
     REPLACED_PROJECT_NAME = "_ _ _ _ _ _ _ _ _"
     BAD_PROJECT_NAME = '/ \ : * ? " < > |'
 
+    def setUp(self, *args, **kwargs):
+        self.tearDown()
+
+        self._project = sa.create_project(
+            self.PROJECT_NAME, self.PROJECT_DESCRIPTION, self.PROJECT_TYPE
+        )
+
+    def tearDown(self) -> None:
+        projects = sa.search_projects(self.PROJECT_NAME, return_metadata=True)
+        for project in projects:
+            sa.delete_project(project)
+
+        try:
+            sa.delete_project(self.NEW_PROJECT_NAME)
+        except Exception as _:
+            pass
+
+        try:
+            sa.delete_project(self.REPLACED_PROJECT_NAME)
+        except Exception as _:
+            pass
+
     def test_project_rename(self):
         sa.rename_project(self.PROJECT_NAME, self.NEW_PROJECT_NAME)
         meta = sa.get_project_metadata(self.NEW_PROJECT_NAME)
         assert meta["name"] == self.NEW_PROJECT_NAME
-        sa.delete_project(self.NEW_PROJECT_NAME)
 
     def test_rename_with_special_characters(self):
         sa.rename_project(self.PROJECT_NAME, self.BAD_PROJECT_NAME)
         sa.get_project_metadata(self.REPLACED_PROJECT_NAME)
-        sa.delete_project(self.REPLACED_PROJECT_NAME)
 

tests/integration/test_recursive_folder.py

@@ -279,13 +279,15 @@ def test_images_recursive_s3_122(self):
 
     def test_annotations_recursive_s3_122(self):
         sa.upload_images_from_folder_to_project(self.PROJECT_NAME, '8sep', from_s3_bucket="superannotate-python-sdk-test",recursive_subfolders=True)
-        sa.upload_annotations_from_folder_to_project(self.PROJECT_NAME, '8sep', from_s3_bucket="superannotate-python-sdk-test",recursive_subfolders=True)
-        annotations = sa.get_image_annotations(self.PROJECT_NAME,"e13cb60a2bf31c22d2524518b7444f92e37fe5d404b0144390f8c078a0eabd_640.jpg")[
-            "annotation_json"
-        ]
-        self.assertEqual(len(annotations['instances']),1)
+        uploaded = sa.upload_annotations_from_folder_to_project(self.PROJECT_NAME, '8sep', from_s3_bucket="superannotate-python-sdk-test",recursive_subfolders=True)
+        self.assertEqual(len(uploaded[0]),132)
 
 
+    def test_annotations_recursive_s3_10(self):
+        sa.upload_images_from_folder_to_project(self.PROJECT_NAME, '8sep', from_s3_bucket="superannotate-python-sdk-test",recursive_subfolders=False)
+        uploaded = sa.upload_annotations_from_folder_to_project(self.PROJECT_NAME, '8sep', from_s3_bucket="superannotate-python-sdk-test",recursive_subfolders=False)
+        self.assertEqual(len(uploaded[0]),10)
+
     def test_images_non_recursive(self):
         sa.upload_images_from_folder_to_project(
             self.PROJECT_NAME, self.folder_path, recursive_subfolders=False