Merge pull request #625 from superannotateai/github_issue_623

fix get_item_by_id

Author: nareksa

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

@@ -156,8 +156,8 @@ def get_folder_by_id(self, project_id: int, folder_id: int):
         response = self.controller.get_folder_by_id(
             folder_id=folder_id, project_id=project_id
         )
-
-        return FolderSerializer(response).serialize(
+        response.raise_for_status()
+        return FolderSerializer(response.data).serialize(
             exclude={"completedCount", "is_root"}
         )
 
@@ -173,12 +173,13 @@ def get_item_by_id(self, project_id: int, item_id: int):
         :return: item metadata
         :rtype: dict
         """
-
+        project_response = self.controller.get_project_by_id(project_id=project_id)
+        project_response.raise_for_status()
         response = self.controller.get_item_by_id(
-            item_id=item_id, project_id=project_id
+            item_id=item_id, project=project_response.data
         )
 
-        return ItemSerializer(response).serialize(exclude={"url", "meta"})
+        return ItemSerializer(response.data).serialize(exclude={"url", "meta"})
 
     def get_team_metadata(self):
         """Returns team metadata

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

@@ -29,14 +29,12 @@ def execute(self):
                 project_id=self._project_id,
                 team_id=self._team_id,
             )
+            if not response.ok:
+                self._response.errors = AppException(response.error)
         except AppException as e:
             self._response.errors = e
         else:
             self._response.data = response.data
-
-        if not response.ok:
-            self._response.errors = AppException(response.error)
-
         return self._response
 
 

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

@@ -45,21 +45,18 @@ def __init__(self, item_id, project, service_provider):
     def execute(
         self,
     ):
-
         try:
             response = self._service_provider.items.get_by_id(
                 item_id=self._item_id,
                 project_id=self._project.id,
                 project_type=self._project.type,
             )
+            if not response.ok:
+                self._response.errors = response.error
         except AppException as e:
             self._response.errors = e
         else:
             self._response.data = response.data
-
-        if not response.ok:
-            self._response.errors = response.error
-
         return self._response
 
 

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

@@ -32,12 +32,12 @@ def execute(self):
 
             self._response.data = self._service_provider.projects.get_by_id(
                 project_id=self._project_id
-            )
+            ).data
 
         except AppException as e:
             self._response.errors = e
         else:
-            if not self._response.data.data:
+            if not self._response.data:
                 self._response.errors = AppException(
                     "Either the specified project does not exist or you do not have permission to view it"
                 )

src/superannotate/lib/infrastructure/controller.py

@@ -298,8 +298,7 @@ def get_by_id(self, folder_id, project_id, team_id):
             team_id=team_id,
             service_provider=self.service_provider,
         )
-        result = use_case.execute()
-        return result
+        return use_case.execute()
 
     def list(self, project: ProjectEntity, condition: Condition = None):
         use_case = usecases.SearchFoldersUseCase(
@@ -868,31 +867,26 @@ def set_default(cls, obj):
         cls.DEFAULT = obj
         return cls.DEFAULT
 
-    def get_folder_by_id(self, folder_id: int, project_id: int) -> FolderEntity:
+    def get_folder_by_id(self, folder_id: int, project_id: int):
         response = self.folders.get_by_id(
             folder_id=folder_id, project_id=project_id, team_id=self.team_id
         )
+        return response
 
-        if response.errors:
-            raise AppException(response.errors)
-
-        return response.data
-
-    def get_project_by_id(self, project_id: int) -> ProjectEntity:
+    def get_project_by_id(self, project_id: int):
         response = self.projects.get_by_id(project_id=project_id)
         if response.errors:
             raise AppException(response.errors)
 
-        return response.data
+        return response
 
-    def get_item_by_id(self, item_id: int, project_id: int):
-        project = self.get_project_by_id(project_id=project_id)
+    def get_item_by_id(self, item_id: int, project: ProjectEntity):
         response = self.items.get_by_id(item_id=item_id, project=project)
 
         if response.errors:
             raise AppException(response.errors)
 
-        return response.data
+        return response
 
     def get_project_folder_by_path(
         self, path: Union[str, Path]

src/superannotate/lib/infrastructure/services/folder.py

@@ -15,7 +15,7 @@ class FolderService(BaseFolderService):
     URL_ASSIGN_FOLDER = "folder/editAssignment"
     URL_GET_BY_ID = "folder/getFolderById"
 
-    def get_by_id(self, folder_id, project_id, team_id):
+    def get_by_id(self, folder_id, project_id, team_id) -> FolderResponse:
         params = {"team_id": team_id, "folder_id": folder_id, "project_id": project_id}
         response = self.client.request(
             self.URL_GET_BY_ID, "get", params=params, content_type=FolderResponse

src/superannotate/lib/infrastructure/services/item.py

@@ -50,6 +50,7 @@ def get_by_id(self, item_id, project_id, project_type):
 
         response = self.client.request(
             url=self.URL_GET_BY_ID.format(image_id=item_id),
+            method="get",
             params=params,
             content_type=content_type,
         )

tests/integration/items/test_get_item_metadata.py

@@ -49,6 +49,15 @@ def test_get_item_metadata(self):
             item_metadata, self.EXPECTED_ITEM_METADATA, self.IGNORE_KEYS
         )
 
+    def test_get_item_by_id(self):
+        project_metadata = sa.get_project_metadata(self.PROJECT_NAME)
+        sa.upload_images_from_folder_to_project(
+            self.PROJECT_NAME, self.folder_path, annotation_status="InProgress"
+        )
+        item_metadata = sa.get_item_metadata(self.PROJECT_NAME, self.IMAGE_NAME)
+        item_by_id = sa.get_item_by_id(project_metadata["id"], item_metadata["id"])
+        assert item_by_id["name"] == self.IMAGE_NAME
+
 
 class TestGetEntityMetadataPixel(BaseTestCase):
     PROJECT_NAME = "TestGetEntityMetadataPixel"

tests/integration/projects/test_get_project_metadata.py

@@ -42,3 +42,8 @@ def test_metadata_payload(self):
         assert compare_result(
             projects[0], self.EXPECTED_PROJECT_METADATA, self.IGNORE_KEYS
         )
+
+    def test_get_project_by_id(self):
+        project_metadata = sa.get_project_metadata(self.PROJECT_NAME)
+        project_by_id = sa.get_project_by_id(project_metadata["id"])
+        assert project_by_id["name"] == self.PROJECT_NAME