using ServiceType, fixing some stuff

Author: VahagnTKA

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 and not content_type is not self.__class__:
+        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
@@ -93,4 +95,7 @@ def ok(self):
     @property
     def error(self):
         default_message = self.reason if self.reason else "Unknown Error"
-        return getattr(self.data, "error", default_message)
+        if isinstance(self.data, dict):
+            return self.data.get("error", default_message)
+        else:
+            return getattr(self.data, "error", default_message)

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

@@ -216,6 +216,7 @@ def validate_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):
                 response = self._service.assign_items(
@@ -225,15 +226,16 @@ def execute(self):
                     user=self._user,
                     item_names=self._item_names[i : i + self.CHUNK_SIZE],  # noqa: E203
                 )
-                if not response.ok and "error" in response:  # User not found
+                if not response.ok and response.error:  # User not found
+                    print(response.error)
                     self._response.errors += response.error
-                    break
+                    return self._response
 
                 cnt_assigned += response.data["successCount"]
             logger.info(
-                f"Assigned {cnt_assigned}/{len(self._item_names)} items to user {self._user}"
+                f"Assigned {cnt_assigned}/{total_count} items to user {self._user}"
             )
-        return self._response, cnt_assigned
+        return self._response
 
 
 class UnAssignItemsUseCase(BaseUseCase):