Merge pull request #216 from superannotateai/sdk_fix_330_311_331

Fixed issues 311, 330, 331

Author: VaghinakDev

pytest.ini

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

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

@@ -607,7 +607,8 @@ def copy_image(
             is_pinned=1,
         )
     logger.info(
-        f"Copied image {source_project}" f" to {destination_project}/{image_name}."
+        f"Copied image {source_project}/{image_name}"
+        f" to {destination_project}/{destination_folder}."
     )
 
 
@@ -1782,7 +1783,7 @@ def upload_videos_from_folder_to_project(
         project_name,
         exclude_file_patterns,
     )
-
+    uploaded_paths = []
     for path in video_paths:
         with tempfile.TemporaryDirectory() as temp_path:
             res = controller.extract_video_frames(
@@ -1807,28 +1808,34 @@ def upload_videos_from_folder_to_project(
             )
             images_to_upload, duplicates = use_case.images_to_upload
             logger.info(
-                "Extracted %s frames from video. Now uploading to platform.",
-                len(res.data),
+                f"Extracted {len(res.data)} frames from video. Now uploading to platform.",
             )
             logger.info(
-                "Uploading %s images to project %s.",
-                len(images_to_upload),
-                str(project_folder_name),
+                f"Uploading {len(images_to_upload)} images to project {str(project_folder_name)}."
             )
+
             if len(duplicates):
                 logger.warning(
-                    "%s already existing images found that won't be uploaded.",
-                    len(duplicates),
+                    f"{len(duplicates)} already existing images found that won't be uploaded."
                 )
+
             if use_case.is_valid():
                 with tqdm(
                     total=len(images_to_upload), desc="Uploading images"
                 ) as progress_bar:
                     for _ in use_case.execute():
-                        progress_bar.update(1)
+                        progress_bar.update()
+                uploaded, failed_images, duplicated = use_case.response.data
+                uploaded_paths.extend(uploaded)
+                if failed_images:
+                    logger.warning(f"Failed {len(uploaded)}.")
+                if duplicated:
+                    logger.warning(
+                        f"{len(duplicated)} already existing images found that won't be uploaded."
+                    )
             else:
                 raise AppException(use_case.response.errors)
-
+        return uploaded_paths
     return
 
 

src/superannotate/lib/core/plugin.py

@@ -224,6 +224,8 @@ def extract_frames(
         logger.info("Video frame count is %s.", frames_count)
 
         fps = video.get(cv2.CAP_PROP_FPS)
+        if not target_fps:
+            target_fps = fps
         if target_fps > fps:
             logger.warning(
                 "Video frame rate %s smaller than target frame rate %s. Cannot change frame rate.",

src/superannotate/lib/core/types.py

@@ -17,7 +17,7 @@ class Attribute(BaseModel):
 
 class AttributeGroup(BaseModel):
     name: StrictStr
-    is_multiselect: Optional[int]
+    is_multiselect: Optional[int] = False
     attributes: List[Attribute]
 
 

src/superannotate/lib/core/usecases.py

@@ -1795,7 +1795,6 @@ def execute(self):
 
 
 class AssignImagesUseCase(BaseUseCase):
-
     CHUNK_SIZE = 500
 
     def __init__(
@@ -1840,7 +1839,6 @@ def execute(self):
 
 
 class UnAssignImagesUseCase(BaseUseCase):
-
     CHUNK_SIZE = 500
 
     def __init__(
@@ -1867,7 +1865,7 @@ def execute(self):
             )
             if not is_un_assigned:
                 self._response.errors = AppException(
-                    f"Cant un assign {', '.join(self._image_names[i : i + self.CHUNK_SIZE])}"
+                    f"Cant un assign {', '.join(self._image_names[i: i + self.CHUNK_SIZE])}"
                 )
 
         return self._response
@@ -2834,7 +2832,6 @@ def execute(self):
 
 
 class CreateAnnotationClassesUseCase(BaseUseCase):
-
     CHUNK_SIZE = 500
 
     def __init__(
@@ -3120,6 +3117,8 @@ 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 not class_color_map.get(annotation["className"]):
+                        continue
                     fill_color = *class_color_map[annotation["className"]], 255
                     for part in annotation["parts"]:
                         part_color = *self.generate_color(part["color"]), 255
@@ -3308,13 +3307,32 @@ def annotation_classes_name_map(self) -> dict:
                 for attribute_group in annotation_class.attribute_groups:
                     attribute_group_data = defaultdict(dict)
                     for attribute in attribute_group["attributes"]:
+                        if attribute["name"] in attribute_group_data.keys():
+                            logger.warning(
+                                f"Duplicate annotation class attribute name {attribute['name']}"
+                                f" in attribute group {attribute_group['name']}. "
+                                "Only one of the annotation class attributes will be used. "
+                                "This will result in errors in annotation upload."
+                            )
                         attribute_group_data[attribute["name"]] = attribute["id"]
+                    if attribute_group["name"] in class_info.keys():
+                        logger.warning(
+                            f"Duplicate annotation class attribute group name {attribute_group['name']}."
+                            " Only one of the annotation class attribute groups will be used."
+                            " This will result in errors in annotation upload."
+                        )
                     class_info["attribute_groups"] = {
                         attribute_group["name"]: {
                             "id": attribute_group["id"],
                             "attributes": attribute_group_data,
                         }
                     }
+            if annotation_class.name in classes_data.keys():
+                logger.warning(
+                    f"Duplicate annotation class name {annotation_class.name}."
+                    f" Only one of the annotation classes will be used."
+                    " This will result in errors in annotation upload.",
+                )
             classes_data[annotation_class.name] = class_info
         return classes_data
 

src/superannotate/lib/infrastructure/repositories.py

@@ -320,6 +320,8 @@ def insert(self, entity: AnnotationClassEntity):
         res = self._service.set_annotation_classes(
             self.project.uuid, self.project.team_id, [entity.to_dict()]
         )
+        if "error" in res:
+            raise AppException(res["error"])
         return self.dict2entity(res[0])
 
     def delete(self, uuid: int):

tests/integration/test_interface.py

@@ -167,6 +167,21 @@ def test_image_upload_with_set_name_on_platform(self):
         self.assertIn(sa.search_images(self.PROJECT_NAME)[0],self.NEW_IMAGE_NAME)
 
 
+    def test_download_fuse_without_classes(self):
+        sa.upload_image_to_project(self.PROJECT_NAME, f"{self.folder_path}/{self.EXAMPLE_IMAGE_1}")
+        sa.upload_image_annotations(
+            self.PROJECT_NAME, self.EXAMPLE_IMAGE_1, f"{self.folder_path}/{self.EXAMPLE_IMAGE_1}___objects.json"
+        )
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            result = sa.download_image(
+                self.PROJECT_NAME,
+                self.EXAMPLE_IMAGE_1,
+                tmp_dir,
+                include_annotations=True,
+                include_fuse=True
+            )
+            pass
+
 
 class TestPixelInterface(BaseTestCase):
     PROJECT_NAME = "Interface test"