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

Author: dshabin

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

@@ -3552,6 +3552,8 @@ def _upload_s3_image(image_path: str):
     )
     upload_method = _upload_s3_image if from_s3_bucket else _upload_local_image
 
+    logger.info(f"Uploading {len(images_to_upload)} images to project.")
+
     with concurrent.futures.ThreadPoolExecutor(max_workers=10) as executor:
         results = [
             executor.submit(upload_method, image_path)
@@ -3568,8 +3570,6 @@ def _upload_s3_image(image_path: str):
     uploaded = []
     duplicates = []
 
-    logger.info("Uploading %s images to project.", len(images_to_upload))
-
     for i in range(0, len(uploaded_image_entities), 500):
         response = controller.upload_images(
             project_name=project_name,
@@ -3578,7 +3578,7 @@ def _upload_s3_image(image_path: str):
             annotation_status=annotation_status,
         )
         attachments, duplications = response.data
-        uploaded.extend(attachments)
+        uploaded.extend([attachment["name"] for attachment in attachments])
         duplicates.extend(duplications)
 
     if len(duplicates):

src/superannotate/lib/core/usecases.py

@@ -5294,13 +5294,15 @@ def __init__(
     def execute(self):
         res = []
         for i in range(0, len(self._images), self._chunk_size):
-            images = self._service.get_bulk_images(
+            response = self._service.get_bulk_images(
                 project_id=self._project_id,
                 team_id=self._team_id,
                 folder_id=self._folder_id,
-                images=self._images[i : i + self._chunk_size],
+                images=self._images[i : i + self._chunk_size],  # noqa: E203
             )
-            res += [ImageEntity.from_dict(**image) for image in images]  # noqa: E203
+            if "error" in response:
+                raise AppException(response["error"])
+            res += [ImageEntity.from_dict(**image) for image in response]
         self._response.data = res
         return self._response
 

tests/integration/test_attach_document_urls.py

@@ -44,7 +44,6 @@ def test_attach_image_urls(self):
         self.assertEqual(len(could_not_upload), 0)
         self.assertEqual(len(existing_images), 1)
 
-
         uploaded, could_not_upload, existing_images = sa.attach_image_urls_to_project(
             self.PROJECT_NAME,
             os.path.join(dirname(dirname(__file__)), self.PATH_TO_URLS),
@@ -69,7 +68,6 @@ def test_attach_image_urls(self):
         self.assertEqual(len(could_not_upload), 0)
         self.assertEqual(len(existing_images), 1)
 
-
         uploaded, could_not_upload, existing_images = sa.attach_video_urls_to_project(
             self.PROJECT_NAME,
             os.path.join(dirname(dirname(__file__)), self.PATH_TO_URLS),

tests/integration/test_duplicate_image_upload.py

@@ -27,8 +27,15 @@ def test_single_image_upload(self):
             uploaded,
             could_not_upload,
             existing_images,
-        ) = sa.upload_images_from_folder_to_project(
-            self.PROJECT_NAME, self.folder_path, annotation_status="InProgress",
+        ) = sa.upload_images_to_project(
+            self.PROJECT_NAME,
+            [
+                f"{self.folder_path}/example_image_1.jpg",
+                f"{self.folder_path}/example_image_2.jpg",
+                f"{self.folder_path}/example_image_3.jpg",
+                f"{self.folder_path}/example_image_4.jpg"
+            ],
+            annotation_status="InProgress",
         )
         self.assertEqual(len(uploaded), 4)
         self.assertEqual(len(could_not_upload), 0)
@@ -38,8 +45,14 @@ def test_single_image_upload(self):
             uploaded,
             could_not_upload,
             existing_images,
-        ) = sa.upload_images_from_folder_to_project(
-            self.PROJECT_NAME, self.folder_path, annotation_status="InProgress",
+        ) = sa.upload_images_to_project(
+            self.PROJECT_NAME, [
+                f"{self.folder_path}/example_image_1.jpg",
+                f"{self.folder_path}/example_image_2.jpg",
+                f"{self.folder_path}/example_image_3.jpg",
+                f"{self.folder_path}/example_image_4.jpg"
+            ],
+            annotation_status="InProgress",
         )
         self.assertEqual(len(uploaded), 0)
         self.assertEqual(len(could_not_upload), 0)
@@ -48,7 +61,6 @@ def test_single_image_upload(self):
         uploaded, could_not_upload, existing_images = sa.upload_images_to_project(
             self.PROJECT_NAME, [f"{self.folder_path}/dd.jpg"]
         )
-
         self.assertEqual(len(uploaded), 0)
         self.assertEqual(len(could_not_upload), 1)
         self.assertEqual(len(existing_images), 0)