Merge pull request #449 from superannotateai/1027_fix_logs_assign_items

log fixes

Author: TumanyanV

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

@@ -684,8 +684,10 @@ def assign_items(
 
         :param project: project name or folder path (e.g., "project1/folder1")
         :type project: str
+
         :param items: list of items to assign
-        :type item_names: list of str
+        :type items: list of str
+
         :param user: user email
         :type user: str
         """
@@ -694,9 +696,7 @@ def assign_items(
 
         response = self.controller.assign_items(project_name, folder_name, items, user)
 
-        if not response.errors:
-            logger.info(f"Assign items to user {user}")
-        else:
+        if response.errors:
             raise AppException(response.errors)
 
     def unassign_items(
@@ -709,7 +709,7 @@ def unassign_items(
         :param project: project name or folder path (e.g., "project1/folder1")
         :type project: str
         :param items: list of items to unassign
-        :type item_names: list of str
+        :type items: list of str
         """
         project_name, folder_name = extract_project_folder(project)
 

src/superannotate/lib/core/service_types.py

@@ -79,11 +79,13 @@ def __init__(self, response, content_type=None):
             "reason": response.reason,
             "content": response.content,
         }
-        if response.ok:
-            if content_type:
+        try:
+            if content_type and content_type is not self.__class__:
                 data["data"] = content_type(**response.json())
             else:
                 data["data"] = response.json()
+        except Exception as e:
+            data["data"] = {}
         super().__init__(**data)
 
     @property
@@ -92,4 +94,8 @@ def ok(self):
 
     @property
     def error(self):
-        return getattr(self.data, "error", "Unknown error.")
+        default_message = self.reason if self.reason else "Unknown Error"
+        if isinstance(self.data, dict):
+            return self.data.get("error", default_message)
+        else:
+            return getattr(self.data, "error", default_message)

src/superannotate/lib/core/serviceproviders.py

@@ -182,7 +182,7 @@ def assign_items(
         folder_name: str,
         user: str,
         item_names: list,
-    ):
+    ) -> ServiceResponse:
         raise NotImplementedError
 
     def get_bulk_images(

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

@@ -22,7 +22,6 @@
 from lib.core.usecases.base import BaseUseCase
 from superannotate.logger import get_default_logger
 
-
 logger = get_default_logger()
 
 
@@ -210,33 +209,31 @@ def __init__(
         self._user = user
         self._service = service
 
-    def validate_user(
+    def validate_item_names(
         self,
     ):
-
-        for c in self._project.users:
-            if c["user_id"] == self._user:
-                return True
-
-        raise AppValidationException(
-            f"{self._user} is not a verified contributor for the {self._project.name}"
-        )
+        self._item_names = list(set(self._item_names))
 
     def execute(self):
+        cnt_assigned = 0
+        total_count = len(self._item_names)
         if self.is_valid():
             for i in range(0, len(self._item_names), self.CHUNK_SIZE):
-                is_assigned = self._service.assign_items(
+                response = self._service.assign_items(
                     team_id=self._project.team_id,
                     project_id=self._project.id,
                     folder_name=self._folder.name,
                     user=self._user,
                     item_names=self._item_names[i : i + self.CHUNK_SIZE],  # noqa: E203
                 )
-                if not is_assigned:
-                    self._response.errors = AppException(
-                        f"Cant assign {', '.join(self._item_names[i: i + self.CHUNK_SIZE])}"
-                    )
-                    continue
+                if not response.ok and response.error:  # User not found
+                    self._response.errors += response.error
+                    return self._response
+
+                cnt_assigned += response.data["successCount"]
+            logger.info(
+                f"Assigned {cnt_assigned}/{total_count} items to user {self._user}"
+            )
         return self._response
 
 

src/superannotate/lib/infrastructure/services.py

@@ -134,10 +134,10 @@ def _request(
         if response.status_code == 404 and retried < 3:
             return self._request(
                 url,
-                method="get",
-                data=None,
-                headers=None,
-                params=None,
+                method=method,
+                data=data,
+                headers=headers,
+                params=params,
                 retried=retried + 1,
                 content_type=content_type,
             )
@@ -765,9 +765,9 @@ def assign_items(
         folder_name: str,
         user: str,
         item_names: list,
-    ):
+    ) -> ServiceResponse:
         assign_items_url = urljoin(self.api_url, self.URL_ASSIGN_ITEMS)
-        res = self._request(
+        return self._request(
             assign_items_url,
             "put",
             params={"team_id": team_id, "project_id": project_id},
@@ -776,8 +776,8 @@ def assign_items(
                 "assign_user_id": user,
                 "folder_name": folder_name,
             },
+            content_type=ServiceResponse,
         )
-        return res.ok
 
     def un_assign_items(
         self,