Merge pull request #190 from superannotateai/fix_bulk

Fix bulk

Author: VaghinakDev

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

@@ -619,9 +619,15 @@ def _upload_image(image_url, image_name=None) -> ProcessedImage:
         if not download_response.errors:
             content, content_name = download_response.data
             image_name = image_name if image_name else content_name
-            if image_name not in controller.get_duplicated_images(
-                project_name=project_name, folder_name=folder_name, images=[image_name]
-            ):
+            duplicated_images = [
+                image.name
+                for image in controller.get_duplicated_images(
+                    project_name=project_name,
+                    folder_name=folder_name,
+                    images=[image_name],
+                )
+            ]
+            if image_name not in duplicated_images:
                 upload_response = controller.upload_image_to_s3(
                     project_name=project_name,
                     image_path=image_name,
@@ -2876,6 +2882,9 @@ def run_segmentation(project, images_list, model):
         model_name=model_name,
         folder_name=folder_name,
     )
+    if response.errors:
+        raise Exception(response.errors)
+
     return response.data
 
 

src/superannotate/lib/core/entities.py

@@ -4,6 +4,8 @@
 from typing import Iterable
 from typing import List
 
+from lib.core.enums import SegmentationStatus
+
 
 class BaseEntity(ABC):
     def __init__(self, uuid: Any = None):
@@ -233,6 +235,8 @@ def __init__(
         entropy_value: int = None,
         approval_status: bool = None,
         is_pinned: bool = None,
+        segmentation_status: int = SegmentationStatus.NOT_STARTED.value,
+        prediction_status: int = SegmentationStatus.NOT_STARTED.value,
         meta: ImageInfoEntity = ImageInfoEntity(),
     ):
         super().__init__(uuid)
@@ -250,6 +254,8 @@ def __init__(
         self.approval_status = approval_status
         self.annotator_name = annotator_name
         self.is_pinned = is_pinned
+        self.segmentation_status = segmentation_status
+        self.prediction_status = prediction_status
         self.meta = meta
 
     def to_dict(self):
@@ -268,6 +274,8 @@ def to_dict(self):
             "annotator_id": self.annotator_id,
             "annotator_name": self.annotator_name,
             "is_pinned": self.is_pinned,
+            "segmentation_status": self.segmentation_status,
+            "prediction_status": self.prediction_status,
             "meta": self.meta.to_dict(),
         }
 

src/superannotate/lib/core/usecases.py

@@ -53,7 +53,7 @@
 from lib.core.serviceproviders import SuerannotateServiceProvider
 from PIL import UnidentifiedImageError
 
-logger = logging.getLogger()
+logger = logging.getLogger("root")
 
 
 class BaseUseCase(ABC):
@@ -4528,7 +4528,7 @@ def execute(self) -> Response:
         return self._response
 
 
-class GetDuplicateImages(BaseUseCase):
+class GetBulkImages(BaseUseCase):
     def __init__(
         self,
         service: SuerannotateServiceProvider,
@@ -4546,13 +4546,32 @@ def __init__(
         self._chunk_size = 500
 
     def execute(self):
-        duplicates = []
+        res = []
         for i in range(0, len(self._images), self._chunk_size):
-            duplications = self._service.get_bulk_images(
+            images = 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],
             )
-            duplicates += [image["name"] for image in duplications]
-        return duplicates
+            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
+            ]
+        self._response.data = res
+        return self._response

src/superannotate/lib/infrastructure/controller.py

@@ -1478,11 +1478,11 @@ def get_duplicated_images(
     ):
         project = self._get_project(project_name)
         folder = self._get_folder(project, folder_name)
-        use_case = usecases.GetDuplicateImages(
+        use_case = usecases.GetBulkImages(
             service=self._backend_client,
             project_id=project.uuid,
             team_id=project.team_id,
             folder_id=folder.uuid,
             images=images,
         )
-        return use_case.execute()
+        return use_case.execute().data