merge

Author: dshabin

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

@@ -712,8 +712,8 @@ def move_images(
     source_project: Union[NotEmptyStr, dict],
     image_names: Optional[List[NotEmptyStr]],
     destination_project: Union[NotEmptyStr, dict],
-    *_,
-    **__,
+    *args,
+    **kwargs,
 ):
     """Move images in bulk between folders in a project
 
@@ -994,7 +994,9 @@ def delete_image(project: Union[NotEmptyStr, dict], image_name: str):
 
 @Trackable
 @validate_arguments
-def get_image_metadata(project: Union[NotEmptyStr, dict], image_name: str, *_, **__):
+def get_image_metadata(
+    project: Union[NotEmptyStr, dict], image_name: str, *args, **kwargs
+):
     """Returns image metadata
 
     :param project: project name or folder path (e.g., "project1/folder1")
@@ -2258,8 +2260,8 @@ def attach_image_urls_to_project(
         with tqdm(
             total=use_case.attachments_count, desc="Attaching urls"
         ) as progress_bar:
-            for _ in use_case.execute():
-                progress_bar.update(1)
+            for attached in use_case.execute():
+                progress_bar.update(attached)
         uploaded, duplications = use_case.data
         uploaded = [i["name"] for i in uploaded]
         duplications.extend(duplicate_images)
@@ -2311,8 +2313,8 @@ def attach_video_urls_to_project(
         with tqdm(
             total=use_case.attachments_count, desc="Attaching urls"
         ) as progress_bar:
-            for _ in use_case.execute():
-                progress_bar.update(1)
+            for attached in use_case.execute():
+                progress_bar.update(attached)
         uploaded, duplications = use_case.data
         uploaded = [i["name"] for i in uploaded]
         duplications.extend(duplicate_images)
@@ -3522,8 +3524,8 @@ def attach_document_urls_to_project(
         with tqdm(
             total=use_case.attachments_count, desc="Attaching urls"
         ) as progress_bar:
-            for _ in use_case.execute():
-                progress_bar.update(1)
+            for attached in use_case.execute():
+                progress_bar.update(attached)
         uploaded, duplications = use_case.data
         uploaded = [i["name"] for i in uploaded]
         duplications.extend(duplicate_images)

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

@@ -829,6 +829,8 @@ def execute(self):
 
                 outline_color = 4 * (255,)
                 for instance in self.annotations["instances"]:
+                    if (not instance.get("className")) or (not class_color_map.get(instance["className"])):
+                        continue
                     color = class_color_map.get(instance["className"])
                     if not color:
                         class_color_map[instance["className"]] = self.generate_color()
@@ -904,9 +906,7 @@ def execute(self):
                 weight, height = image.get_size()
                 empty_image_arr = np.full((height, weight, 4), [0, 0, 0, 255], np.uint8)
                 for annotation in self.annotations["instances"]:
-                    if annotation.get("className") and not class_color_map.get(
-                        annotation["className"]
-                    ):
+                    if (not annotation.get("className")) or (not class_color_map.get(annotation["className"])):
                         continue
                     fill_color = *class_color_map[annotation["className"]], 255
                     for part in annotation["parts"]:
@@ -1866,6 +1866,10 @@ def __init__(
     def attachments_count(self):
         return len(self._attachments)
 
+    @property
+    def chunks_count(self):
+        return int(self.attachments_count / self.CHUNK_SIZE)
+
     def validate_limitations(self):
         attachments_count = self.attachments_count
         response = self._backend_service.get_limitations(
@@ -1915,7 +1919,7 @@ def execute(self):
                 uploaded, duplicated = response.data
                 uploaded_files.extend(uploaded)
                 duplicated_files.extend(duplicated)
-                yield
+                yield len(uploaded) + len(duplicated)
             self._response.data = uploaded_files, duplicated_files
         return self._response
 

src/superannotate/version.py

@@ -1 +1 @@
-__version__ = "5.0.0b31"
+__version__ = "5.0.0b32"

tests/integration/test_fuse_gen.py

@@ -192,3 +192,27 @@ def test_fuse_image_create_pixel(self):
             self.assertEqual(im1_array.shape, im2_array.shape)
             self.assertEqual(im1_array.dtype, im2_array.dtype)
             self.assertTrue(np.array_equal(im1_array, im2_array))
+
+    def test_fuse_image_create_pixel_with_no_classes(self):
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_dir = pathlib.Path(temp_dir)
+
+            sa.upload_image_to_project(
+                self.PIXEL_PROJECT_NAME,
+                f"{self.pixel_folder_path}/{self.EXAMPLE_IMAGE_1}",
+                annotation_status="QualityCheck",
+            )
+            sa.upload_image_annotations(
+                project=self.PIXEL_PROJECT_NAME,
+                image_name=self.EXAMPLE_IMAGE_1,
+                annotation_json=f"{self.pixel_folder_path}/{self.EXAMPLE_IMAGE_1}___pixel.json",
+                mask=f"{self.pixel_folder_path}/{self.EXAMPLE_IMAGE_1}___save.png",
+            )
+
+            sa.download_image(
+                self.PIXEL_PROJECT_NAME,
+                self.EXAMPLE_IMAGE_1,
+                temp_dir,
+                include_annotations=True,
+                include_fuse=True,
+            )