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

Author: dshabin

pytest.ini

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

requirements.txt

@@ -2,7 +2,7 @@ pydicom>=2.0.0
 boto3>=1.14.53
 requests==2.26.0
 requests-toolbelt>=0.9.1
-tqdm>=4.48.2
+tqdm=4.48.2
 pillow>=7.2.0
 numpy>=1.19.0
 matplotlib>=3.3.1

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

@@ -3679,7 +3679,7 @@ def delete_annotations(project: str, image_names: List[str] = None):
     project_name, folder_name = extract_project_folder(project)
 
     response = controller.delete_annotations(
-        project_name=project, folder_name=folder_name, image_names=image_names
+        project_name=project_name, folder_name=folder_name, image_names=image_names
     )
     if response.errors:
         raise AppException(response.errors)

src/superannotate/lib/core/enums.py

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

src/superannotate/lib/core/usecases.py

@@ -682,6 +682,8 @@ def execute(self):
             folder_id=self._folder.uuid,
             images=[image.name for image in self._attachments],
         )
+        if isinstance(response, dict) and "error" in response:
+            raise AppException(response["error"])
         duplications = [image["name"] for image in response]
         meta = {}
         to_upload = []
@@ -4303,6 +4305,16 @@ def exclude_file_patterns(self):
             return constances.DEFAULT_FILE_EXCLUDE_PATTERNS
         return self._exclude_file_patterns
 
+    def validate_annotation_status(self):
+        if self._annotation_status and self._annotation_status.lower() not in constances.AnnotationStatus.values():
+            raise AppValidationException("Invalid annotations status")
+
+    def validate_extensions(self):
+        if self._extensions and not all(
+                [extension in constances.DEFAULT_IMAGE_EXTENSIONS  for extension in self._extensions]
+        ):
+            raise AppValidationException("")
+
     def validate_project_type(self):
         if self._project.project_type == constances.ProjectType.VIDEO.value:
             raise AppValidationException(
@@ -4511,7 +4523,7 @@ def execute(self) -> Response:
 
         if self._folder.name == "root" and not self._image_names:
             response = self._backend_service.delete_image_annotations(
-                project_id=self._project.uuid, team_id=self._project.team_id,
+                project_id=self._project.uuid, team_id=self._project.team_id, image_names=self._image_names
             )
         else:
             response = self._backend_service.delete_image_annotations(
@@ -4540,7 +4552,7 @@ def execute(self) -> Response:
                     logger.info("Annotations deleted")
                     break
         else:
-            self._response.errors = AppException("Invalid image names.")
+            self._response.errors = AppException("Invalid image names or empty folder.")
         return self._response
 
 

src/superannotate/lib/infrastructure/controller.py

@@ -708,11 +708,12 @@ def get_project_workflow(self, project_name: str):
 
     def search_annotation_classes(self, project_name: str, name_prefix: str = None):
         project_entity = self._get_project(project_name)
+        condition = Condition("name", name_prefix, EQ) if name_prefix else None
         use_case = usecases.GetAnnotationClassesUseCase(
             classes=AnnotationClassRepository(
                 service=self._backend_client, project=project_entity
             ),
-            condition=Condition("name", name_prefix, EQ),
+            condition=condition
         )
         return use_case.execute()
 

tests/integration/test_annotation_delete.py

@@ -10,6 +10,7 @@ class TestAnnotationDelete(BaseTestCase):
     PROJECT_NAME = "TestAnnotationDelete"
     PROJECT_DESCRIPTION = "desc"
     PROJECT_TYPE = "Vector"
+    TEST_FOLDER_NAME = "folder"
     TEST_FOLDER_PATH = "data_set/sample_project_vector_single_image"
     EXAMPLE_IMAGE_1 = "example_image_1.jpg"
     EXAMPLE_IMAGE_2 = "example_image_2.jpg"
@@ -48,7 +49,7 @@ def test_delete_annotations(self):
     @pytest.mark.skip(
         "waiting for deployment to dev",
     )
-    def test_delete_annotations_by_not_exsisting_name(self):
+    def test_delete_annotations_by_not_existing_name(self):
         sa.upload_images_from_folder_to_project(
             self.PROJECT_NAME, self.folder_path, annotation_status="InProgress"
         )
@@ -59,3 +60,4 @@ def test_delete_annotations_by_not_exsisting_name(self):
             self.PROJECT_NAME, f"{self.folder_path}"
         )
         self.assertRaises(Exception, sa.delete_annotations, self.PROJECT_NAME, [self.EXAMPLE_IMAGE_2])
+

tests/profiling/profiling.py

@@ -32,16 +32,19 @@
 # print(results)
 # print(sum(results)/10)
 
-import time
-results = []
-projects = "11", "22", "33", "44", "55", "66", "77", "88", "99"
-
-for project in projects:
-    start = time.time()
-    sa.search_annotation_classes(project)
-    end = time.time()
-    results.append(end-start)
+# import time
+# results = []
+# projects = "11", "22", "33", "44", "55", "66", "77", "88", "99"
+#
+# for project in projects:
+#     start = time.time()
+#     sa.search_annotation_classes(project)
+#     end = time.time()
+#     results.append(end-start)
+#
+# print(results)
+# print(sum(results)/9)
 
-print(results)
-print(sum(results)/9)
+from src.superannotate.lib.core.enums import AnnotationStatus
 
+pass