Fixed recurive upload issue

Author: Vaghinak Basentsyan

pytest.ini

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

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

@@ -149,7 +149,8 @@ def search_projects(
     :type name: str
     :param return_metadata: return metadata of projects instead of names
     :type return_metadata: bool
-    :param include_complete_image_count: include complete image count in response
+    :param include_complete_image_count: return projects that have completed images and
+    include the number of completed images in response.
     :type include_complete_image_count: bool
 
     :return: project names or metadatas
@@ -1075,7 +1076,9 @@ def get_image_metadata(project: Union[str, dict], image_name: str, *_, **__):
 @Trackable
 @typechecked
 def set_images_annotation_statuses(
-    project: Union[str, dict], image_names: Optional[List[str]], annotation_status: str,
+    project: Union[str, dict],
+    annotation_status: str,
+    image_names: Optional[List[str]] = None,
 ):
     """Sets annotation statuses of images
 
@@ -1092,7 +1095,7 @@ def set_images_annotation_statuses(
         project_name, folder_name, image_names, annotation_status
     )
     if response.errors:
-        raise AppException(response.errors)
+        raise AppException("Failed to change status.")
     logger.info("Annotations status of images changed")
 
 
@@ -1109,7 +1112,7 @@ def delete_images(project: Union[str, dict], image_names: Optional[List[str]] =
     project_name, folder_name = extract_project_folder(project)
 
     if not isinstance(image_names, list) and image_names is not None:
-        raise AppException("Image_names should be a list of strs or None.")
+        raise AppException("Image_names should be a list of str or None.")
 
     response = controller.delete_images(
         project_name=project_name, folder_name=folder_name, image_names=image_names
@@ -1118,7 +1121,7 @@ def delete_images(project: Union[str, dict], image_names: Optional[List[str]] =
         raise AppException(response.errors)
 
     logger.info(
-        f"Images deleted in project {project_name}{'' if folder_name else '/' + folder_name}"
+        f"Images deleted in project {project_name}{'/' + folder_name if folder_name else ''}"
     )
 
 

src/superannotate/lib/core/entities.py

@@ -238,6 +238,7 @@ def __init__(
         segmentation_status: int = SegmentationStatus.NOT_STARTED.value,
         prediction_status: int = SegmentationStatus.NOT_STARTED.value,
         meta: ImageInfoEntity = ImageInfoEntity(),
+        **_
     ):
         super().__init__(uuid)
         self.team_id = team_id
@@ -258,6 +259,16 @@ def __init__(
         self.prediction_status = prediction_status
         self.meta = meta
 
+    @staticmethod
+    def from_dict(**kwargs):
+        if "id" in kwargs:
+            kwargs["uuid"] = kwargs["id"]
+            del kwargs["id"]
+        if "annotation_status" in kwargs:
+            kwargs["annotation_status_code"] = kwargs["annotation_status"]
+            del kwargs["annotation_status"]
+        return ImageEntity(**kwargs)
+
     def to_dict(self):
         return {
             "id": self.uuid,

src/superannotate/lib/core/usecases.py

@@ -515,21 +515,27 @@ def __init__(
         folder: FolderEntity,
         image_name: str,
         images: BaseReadOnlyRepository,
+        service: SuerannotateServiceProvider,
     ):
         super().__init__()
         self._project = project
         self._folder = folder
         self._images = images
         self._image_name = image_name
+        self._service = service
 
     def execute(self):
-        condition = (
-            Condition("team_id", self._project.team_id, EQ)
-            & Condition("project_id", self._project.uuid, EQ)
-            & Condition("folder_id", self._folder.uuid, EQ)
-            & Condition("name", self._image_name, EQ)
+        images = (
+            GetBulkImages(
+                service=self._service,
+                project_id=self._project.uuid,
+                team_id=self._project.team_id,
+                folder_id=self._folder.uuid,
+                images=[self._image_name],
+            )
+            .execute()
+            .data
         )
-        images = self._images.get_all(condition)
         if images:
             self._response.data = images[0]
         else:
@@ -731,7 +737,7 @@ def execute(self):
                     "height": image.meta.height,
                 }
 
-        uploaded = self._backend_service.attach_files(
+        backend_response = self._backend_service.attach_files(
             project_id=self._project.uuid,
             folder_id=self._folder.uuid,
             team_id=self._project.team_id,
@@ -740,8 +746,10 @@ def execute(self):
             upload_state_code=self.upload_state_code,
             meta=meta,
         )
-
-        self._response.data = uploaded, duplications
+        if isinstance(backend_response, dict) and "error" in backend_response:
+            self._response.errors = AppException(backend_response["error"])
+        else:
+            self._response.data = backend_response, duplications
         return self._response
 
 
@@ -1634,13 +1642,17 @@ def execute(self):
                     image.name for image in self._images_repo.get_all(condition)
                 ]
             for i in range(0, len(self._image_names), self.CHUNK_SIZE):
-                self._response.data = self._service.set_images_statuses_bulk(
-                    image_names=self._image_names,
+                status_changed = self._service.set_images_statuses_bulk(
+                    image_names=self._image_names[
+                        i : i + self.CHUNK_SIZE
+                    ],  # noqa: E203
                     team_id=self._team_id,
                     project_id=self._project_id,
                     folder_id=self._folder_id,
                     annotation_status=self._annotation_status,
                 )
+                if not status_changed:
+                    self._response.errors = AppException("Failed to change status.")
         return self._response
 
 
@@ -1994,6 +2006,7 @@ def image_use_case(self):
             folder=self._folder,
             image_name=self._image_name,
             images=self._images,
+            service=self._service,
         )
         return use_case
 
@@ -2092,6 +2105,7 @@ def image_use_case(self):
             folder=self._folder,
             image_name=self._image_name,
             images=self._images,
+            service=self._service,
         )
 
     def validate_project_type(self):
@@ -2162,6 +2176,7 @@ def __init__(
     @property
     def image_use_case(self):
         return GetImageUseCase(
+            service=self._service,
             project=self._project,
             folder=self._folder,
             image_name=self._image_name,
@@ -2254,6 +2269,7 @@ def image_use_case(self):
             folder=self._folder,
             image_name=self._image_name,
             images=self._images,
+            service=self._service,
         )
 
     def execute(self):
@@ -4406,9 +4422,18 @@ def images_to_upload(self):
                     x not in Path(path).name for x in self.exclude_file_patterns
                 ]
                 non_in_service_list = [x not in Path(path).name for x in image_names]
-                if all(not_in_exclude_list) and all(non_in_service_list):
+                if (
+                    all(not_in_exclude_list)
+                    and all(non_in_service_list)
+                    and not any(
+                        Path(path).name in filtered_path
+                        for filtered_path in filtered_paths
+                    )
+                ):
                     filtered_paths.append(path)
-                if not all(non_in_service_list):
+                elif not all(non_in_service_list) or any(
+                    Path(path).name in filtered_path for filtered_path in filtered_paths
+                ):
                     duplicated_paths.append(path)
 
             self._images_to_upload = list(set(filtered_paths)), duplicated_paths
@@ -4447,7 +4472,9 @@ def execute(self):
                     ],
                     annotation_status=self._annotation_status,
                 ).execute()
-
+                if response.errors:
+                    logger.error(response.errors)
+                    continue
                 attachments, attach_duplications = response.data
                 uploaded.extend(attachments)
                 duplications.extend(attach_duplications)
@@ -4554,24 +4581,6 @@ def execute(self):
                 folder_id=self._folder_id,
                 images=self._images[i : i + self._chunk_size],
             )
-            res += [
-                ImageEntity(
-                    uuid=image["id"],
-                    name=image["name"],
-                    path=image["name"],
-                    project_id=image["project_id"],
-                    team_id=image["team_id"],
-                    annotation_status_code=image["annotation_status"],
-                    folder_id=image["folder_id"],
-                    annotator_id=image["annotator_id"],
-                    annotator_name=image["annotator_name"],
-                    qa_id=image["qa_id"],
-                    qa_name=image["qa_name"],
-                    entropy_value=image["entropy_value"],
-                    approval_status=image["approval_status"],
-                    is_pinned=image["is_pinned"],
-                )
-                for image in images
-            ]
+            res += [ImageEntity.from_dict(**image) for image in images]
         self._response.data = res
         return self._response

src/superannotate/lib/infrastructure/controller.py

@@ -542,7 +542,11 @@ def _get_image(
     ) -> ImageEntity:
         folder = self._get_folder(project, folder_path)
         use_case = usecases.GetImageUseCase(
-            project=project, folder=folder, image_name=image_name, images=self.images,
+            service=self._backend_client,
+            project=project,
+            folder=folder,
+            image_name=image_name,
+            images=self.images,
         )
         return use_case.execute().data
 

src/superannotate/lib/infrastructure/services.py

@@ -632,7 +632,7 @@ def set_images_statuses_bulk(
                 "image_names": image_names,
             },
         )
-        return res
+        return res.ok
 
     def get_bulk_images(
         self, project_id: int, team_id: int, folder_id: int, images: List[str]

tests/data_set/sample_recursive_test_negative_case/classes/classes.json

@@ -0,0 +1 @@
+[{"id":4770,"project_id":1176,"name":"Personal vehicle","color":"#ecb65f","count":0,"createdAt":"2020-03-26T11:11:51.000Z","updatedAt":"2020-03-26T11:11:51.000Z","attribute_groups":[]},{"id":4771,"project_id":1176,"name":"Large vehicle","color":"#737b28","count":0,"createdAt":"2020-03-26T11:11:51.000Z","updatedAt":"2020-03-26T11:11:51.000Z","attribute_groups":[]},{"id":4772,"project_id":1176,"name":"Human","color":"#e4542b","count":0,"createdAt":"2020-03-26T11:11:51.000Z","updatedAt":"2020-03-26T11:11:51.000Z","attribute_groups":[]}]