Merge pull request #450 from superannotateai/1027_service_update

1027 service update

Author: TumanyanV

src/superannotate/lib/app/analytics/aggregators.py

@@ -1,13 +1,13 @@
 import copy
 import json
-from dataclasses import dataclass
 from pathlib import Path
 from typing import List
 from typing import Optional
 from typing import Union
 
 import lib.core as constances
 import pandas as pd
+from dataclasses import dataclass
 from lib.app.exceptions import AppException
 from lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
 from lib.core import PIXEL_ANNOTATION_POSTFIX

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

@@ -684,19 +684,19 @@ 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
         """
 
         project_name, folder_name = extract_project_folder(project)
 
-        response, cnt_assigned = self.controller.assign_items(project_name, folder_name, items, user)
+        response = self.controller.assign_items(project_name, folder_name, items, user)
 
-        if not response.errors:
-            logger.info(f"Assigned {cnt_assigned}/{len(items)} 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)
 
@@ -2669,7 +2669,7 @@ def set_annotation_statuses(
         self,
         project: Union[NotEmptyStr, dict],
         annotation_status: AnnotationStatuses,
-        item_names: Optional[List[NotEmptyStr]] = None,
+        items: Optional[List[NotEmptyStr]] = None,
     ):
         """Sets annotation statuses of items
 
@@ -2686,15 +2686,15 @@ def set_annotation_statuses(
         :type annotation_status: str
 
         :param items:  item names to set the mentioned status for. If None, all the items in the project will be used.
-        :type items: str
+        :type items: list of strs
         """
 
         project_name, folder_name = extract_project_folder(project)
         response = self.controller.set_annotation_statuses(
             project_name=project_name,
             folder_name=folder_name,
             annotation_status=annotation_status,
-            item_names=item_names,
+            item_names=items,
         )
         if response.errors:
             raise AppException(response.errors)

src/superannotate/lib/core/config.py

@@ -1,7 +1,8 @@
 import threading
+from typing import Dict
+
 from dataclasses import dataclass
 from dataclasses import field
-from typing import Dict
 
 
 class Session:

src/superannotate/lib/core/service_types.py

@@ -80,7 +80,7 @@ def __init__(self, response, content_type=None):
             "content": response.content,
         }
         if response.ok:
-            if content_type:
+            if content_type and not content_type is not self.__class__:
                 data["data"] = content_type(**response.json())
             else:
                 data["data"] = response.json()
@@ -92,4 +92,5 @@ def ok(self):
 
     @property
     def error(self):
-        return getattr(self.data, "error", "Unknown error.")
+        default_message = self.reason if self.reason else "Unknown Error"
+        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,28 +209,30 @@ def __init__(
         self._user = user
         self._service = service
 
-
-    def validate_item_names(self, ):
+    def validate_item_names(
+        self,
+    ):
         self._item_names = list(set(self._item_names))
 
     def execute(self):
         cnt_assigned = 0
         if self.is_valid():
             for i in range(0, len(self._item_names), self.CHUNK_SIZE):
-                status, response = 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 status == 406 and 'error' in response: # User not found
-                    self._response.errors+=response['error']
-                    return self._response, 0
-                elif 'error' in response:
-                    response['successCount'] = 0
+                if not response.ok and "error" in response:  # User not found
+                    self._response.errors += response.error
+                    break
 
-                cnt_assigned+=response['successCount']
+                cnt_assigned += response.data["successCount"]
+            logger.info(
+                f"Assigned {cnt_assigned}/{len(self._item_names)} items to user {self._user}"
+            )
         return self._response, cnt_assigned
 
 

src/superannotate/lib/infrastructure/services.py

@@ -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.status_code, res.json()
 
     def un_assign_items(
         self,

tests/integration/items/test_set_annotation_statuses.py

@@ -65,7 +65,7 @@ def test_image_annotation_status_via_names(self):
 
     def test_image_annotation_status_via_invalid_names(self):
         sa.attach_items(
-            self.PROJECT_NAME, self.ATTACHMENT_LIST, annotation_status="InProgress"
+            self.PROJECT_NAME, "InProgress", self.ATTACHMENT_LIST
         )
         with self.assertRaisesRegexp(AppException, SetAnnotationStatues.ERROR_MESSAGE):
             sa.set_annotation_statuses(