Merge pull request #233 from superannotateai/sdk_351

Fixed friday-351

Author: VaghinakDev

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

@@ -1350,6 +1350,8 @@ def upload_images_from_folder_to_project(
         raise AppException(
             "extensions should be a list or a tuple in upload_images_from_folder_to_project"
         )
+    elif len(extensions) < 1:
+        return [], [], []
 
     if exclude_file_patterns:
         exclude_file_patterns = list(exclude_file_patterns) + list(

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

@@ -70,16 +70,17 @@ def wrapped(*args, **kwargs):
         except ValidationError as e:
             error_messages = defaultdict(list)
             for error in e.errors():
-                error_messages[error["loc"][0]].append(
-                    f"{''.join([f'  {i[0]} -> {i[1]}' for i in to_chunks(error['loc'])])}  {error['loc'][-1]} {error['msg']}"
-                )
+                errors_list = list(error["loc"])
+                errors_list[1::2] = [f"[{i}]" for i in errors_list[1::2]]
+                errors_list[2::2] = [f".{i}" for i in errors_list[2::2]]
+                error_messages["".join(errors_list)].append(error["msg"])
             texts = ["\n"]
-            for error, text in error_messages.items():
+            for field, text in error_messages.items():
                 texts.append(
                     "{} {}{}".format(
-                        error, " " * (21 - len(error)), f"\n {' ' * 21}".join(text)
+                        field, " " * (48 - len(field)), f"\n {' ' * 48}".join(text)
                     )
                 )
-            raise AppException("\n".join(texts))
+            raise Exception("\n".join(texts))
 
     return wrapped

tests/integration/test_annotation_classes.py

@@ -2,11 +2,9 @@
 import os
 from os.path import dirname
 import src.superannotate as sa
-from src.superannotate import AppException
 from tests.integration.base import BaseTestCase
 
 
-
 class TestAnnotationClasses(BaseTestCase):
     PROJECT_NAME_ = "TestAnnotationClasses"
     PROJECT_DESCRIPTION = "desc"
@@ -20,8 +18,8 @@ def classes_path(self):
     def test_invalid_json(self):
         try:
             sa.create_annotation_classes_from_classes_json(self.PROJECT_NAME, self.classes_path)
-        except AppException as e:
-            self.assertIn("name field required", str(e))
+        except Exception as e:
+            self.assertIn("field required", str(e))
 
     def test_annotation_classes(self):
         annotation_classes = sa.search_annotation_classes(self.PROJECT_NAME)

tests/integration/test_folders.py

@@ -66,10 +66,8 @@ def test_basic_folders(self):
         self.assertIsInstance(folder, dict)
         self.assertEqual(folder["name"], self.TEST_FOLDER_NAME_1)
 
-        # todo fix
-        # with pytest.raises(EmptyOutputError) as exc_info:
-        #     sa.get_folder_metadata(self.PROJECT_NAME, self.TEST_FOLDER_NAME_2)
-        # self.assertTrue("Folder not found" in str(exc_info))
+        with self.assertRaisesRegexp(Exception, "Folder not found"):
+            sa.get_folder_metadata(self.PROJECT_NAME, self.TEST_FOLDER_NAME_2)
 
         sa.upload_images_from_folder_to_project(
             f"{self.PROJECT_NAME}/{self.TEST_FOLDER_NAME_1}",
@@ -89,15 +87,6 @@ def test_basic_folders(self):
         images = sa.search_images(f"{self.PROJECT_NAME}/{self.TEST_FOLDER_NAME_1}")
         self.assertEqual(len(images), 4)
 
-        # todo fix
-        # with pytest.raises(AppException) as e:
-        #     sa.upload_images_from_folder_to_project(
-        #         f"{self.PROJECT_NAME}/{self.TEST_FOLDER_NAME_1}",
-        #         self.folder_path,
-        #         annotation_status="InProgress",
-        #     )
-        # self.assertTrue("Folder not found" in str(e))
-
         folder_metadata = sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_2)
         self.assertEqual(folder_metadata["name"], self.TEST_FOLDER_NAME_2)
 

tests/integration/test_interface.py

@@ -158,7 +158,7 @@ def test_upload_images_to_project_returned_data(self):
 
     def test_upload_images_to_project_image_quality_in_editor(self):
         self.assertRaises(
-            AppException,
+            Exception,
             sa.upload_images_to_project,
             self.PROJECT_NAME,
             [self.EXAMPLE_IMAGE_1],

tests/integration/test_single_annotation_download.py

@@ -55,7 +55,12 @@ def test_annotation_download_upload_vector(self):
             for j in i["attributes"]:
                 j.pop("groupId", None)
                 j.pop("id", None)
-        # TODO check teplateId -1 when
+        self.assertTrue(
+            all(
+                [instance["templateId"] == -1 for instance in downloaded_json["instances"] if
+                 instance.get("templateId")]
+            )
+        )
         assert downloaded_json == uploaded_json
 
 

tests/integration/test_upload_images.py

@@ -0,0 +1,30 @@
+import os
+from os.path import dirname
+
+import src.superannotate as sa
+from src.superannotate import AppException
+from src.superannotate.lib.core import ATTACHING_UPLOAD_STATE_ERROR
+from src.superannotate.lib.core import UPLOADING_UPLOAD_STATE_ERROR
+from tests.integration.base import BaseTestCase
+
+
+class TestUploadImages(BaseTestCase):
+    PROJECT_NAME = "TestUploadImages"
+    PROJECT_DESCRIPTION = "Desc"
+    PROJECT_TYPE = "Vector"
+    TEST_FOLDER_PATH = "data_set"
+    TEST_IMAGES_PATH = "sample_project_vector"
+    PATH_TO_VIDEOS = "sample_videos"
+    IMAGE_NAME = "example_image_1.jpg"
+
+    @property
+    def folder_path(self):
+        return os.path.join(dirname(dirname(__file__)), self.TEST_FOLDER_PATH)
+
+    def test_upload_images_with_empty_extensions_list(self):
+        result = sa.upload_images_from_folder_to_project(
+            self.PROJECT_NAME,
+            os.path.join(self.folder_path, self.TEST_IMAGES_PATH),
+            extensions=[]
+            )
+        self.assertEqual(([], [], []), result)