Merge branch 'bug-fix' into re-design-sdk

Author: dshabin

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

@@ -1073,6 +1073,12 @@ def get_image_metadata(project: Union[str, dict], image_name: str, *_, **__):
     res_data["annotation_status"] = constances.AnnotationStatus.get_name(
         res_data["annotation_status"]
     )
+    res_data["prediction_status"] = constances.SegmentationStatus.get_name(
+        res_data["prediction_status"]
+    )
+    res_data["segmentation_status"] = constances.SegmentationStatus.get_name(
+        res_data["segmentation_status"]
+    )
     return res_data
 
 
@@ -1101,6 +1107,7 @@ def set_images_annotation_statuses(
     )
     if response.errors:
         raise AppValidationException(response.errors)
+    logger.info("Annotations status of images changed")
 
 
 @Trackable
@@ -1143,13 +1150,9 @@ def assign_images(project: Union[str, dict], image_names: List[str], user: str):
     project_name, folder_name = extract_project_folder(project)
     if not folder_name:
         folder_name = "root"
-    response = controller.assign_images(project_name, folder_name, image_names, user)
-    if response.errors:
-        raise AppValidationException(response.errors)
-
     contributors = controller.get_project_metadata(
         project_name=project_name, include_contributors=True
-    ).data["contributors"]
+    ).data["project"].users
     contributor = None
     for c in contributors:
         if c["user_id"] == user:

src/superannotate/lib/core/usecases.py

@@ -1754,9 +1754,10 @@ def execute(self):
             user_id=self._user_id,
             user_role=self.user_role,
         )
-        logger.info(
-            f"Shared project {self._project_entity.name} with user {self._user_id} and role {self.user_role}"
-        )
+        if not self._response.errors:
+            logger.info(
+                f"Shared project {self._project_entity.name} with user {self._user_id} and role {self.user_role}"
+            )
         return self._response
 
 
@@ -1938,7 +1939,7 @@ def work_flow_use_case(self):
         )
 
     def execute(self):
-        data = {"project": self._project}
+        data = {"project": self._projects.get_one(uuid=self._project.uuid,team_id=self._project.team_id) }
 
         if self._include_annotation_classes:
             self.annotation_classes_use_case.execute()
@@ -3908,6 +3909,7 @@ def execute(self):
             model_name=self._ml_model_name,
             image_ids=image_ids,
         )
+
         succeded_imgs = []
         failed_imgs = []
         while len(succeded_imgs) + len(failed_imgs) != len(image_ids):
@@ -3921,7 +3923,7 @@ def execute(self):
             succeded_imgs = [
                 img["name"]
                 for img in images_metadata
-                if img["segmentation_status"] == 2
+                if img["segmentation_status"] == 3
             ]
             failed_imgs = [
                 img["name"]
@@ -3931,7 +3933,7 @@ def execute(self):
 
             complete_images = succeded_imgs + failed_imgs
             logger.info(
-                f"prediction complete on {len(complete_images)} / {len(image_ids)} images"
+                f"segmentation complete on {len(complete_images)} / {len(image_ids)} images"
             )
             time.sleep(5)
 
@@ -4000,7 +4002,7 @@ def execute(self):
             )
 
             success_images = [
-                img["name"] for img in images_metadata if img["prediction_status"] == 2
+                img["name"] for img in images_metadata if img["prediction_status"] == 3
             ]
             failed_images = [
                 img["name"] for img in images_metadata if img["prediction_status"] == 4

src/superannotate/lib/infrastructure/controller.py

@@ -208,7 +208,6 @@ def update_project(self, name: str, project_data: dict) -> Response:
         if entities and len(entities) == 1:
             project.name = project_data["name"]
             use_case = usecases.UpdateProjectUseCase(project, self.projects)
-            use_case.execute()
             return use_case.execute()
         raise AppException("There are duplicated names.")