Fixed query fields

Author: VaghinakDev

src/superannotate/lib/core/entities/base.py

@@ -279,13 +279,12 @@ def add_path(self, project_name: str, folder_name: str):
         return self
 
     @staticmethod
-    def map_fields(entity: dict, drop_path: bool = True) -> dict:
+    def map_fields(entity: dict) -> dict:
         if "metadata" in entity:
             entity["url"] = entity["metadata"]["path"]
         else:
             entity["url"] = entity["path"]
-        if drop_path:
-            entity["path"] = None
+        entity["path"] = None
         return entity
 
 

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

@@ -5,6 +5,7 @@
 from concurrent.futures import ThreadPoolExecutor
 from typing import Dict
 from typing import List
+from typing import Union
 
 import lib.core as constants
 from lib.core.conditions import Condition
@@ -37,11 +38,13 @@
 
 
 def serialize_item_entity(
-    entity: BaseItemEntity, project: ProjectEntity, drop_path: bool = True
+    entity: Union[BaseItemEntity, dict], project: ProjectEntity, map_fields: bool = True
 ) -> BaseItemEntity:
-    entity = BaseItemEntity(
-        **BaseItemEntity.map_fields(entity.dict(), drop_path=drop_path)
-    )
+    if isinstance(entity, BaseItemEntity):
+        entity = entity.dict()
+    if map_fields:
+        entity = BaseItemEntity.map_fields(entity)
+    entity = BaseItemEntity(**entity)
     if project.upload_state != constants.UploadState.EXTERNAL.value:
         entity.url = None
     if project.type in constants.ProjectType.images:
@@ -142,14 +145,14 @@ def execute(self) -> Response:
                 data = []
                 for i, item in enumerate(service_response.data):
                     #  tmp wrapper
-                    if hasattr(item, "assignment"):
-                        item.assignments = item.assignment
-                    tmp_item = serialize_item_entity(
-                        BaseItemEntity(**item), self._project
+                    if "assignment" in item:
+                        item["assignments"] = item.pop("assignment")
+                    item["url"] = item["path"]
+                    item["path"] = (
+                        f"{self._project.name}"
+                        f"{'/' + item['folder_name'] if not item['is_root_folder'] else ''}"
                     )
-                    folder_path = f"{'/' + item['folder_name'] if not item['is_root_folder'] else ''}"
-                    tmp_item.path = f"{self._project.name}" + folder_path
-                    data.append(tmp_item)
+                    data.append(item)
                 self._response.data = data
             else:
                 self._response.errors = service_response.data

src/superannotate/lib/infrastructure/controller.py

@@ -452,16 +452,16 @@ def process_response(
         items: List[BaseItemEntity],
         project: ProjectEntity,
         folder: FolderEntity,
-        replace_path: bool = True,
+        map_fields: bool = True,
     ) -> List[BaseItemEntity]:
         """Process the response data and return a list of serialized items."""
         data = []
         for item in items:
-            if replace_path:
+            if map_fields:
                 item = usecases.serialize_item_entity(item, project)
                 item = usecases.add_item_path(project, folder, item)
             else:
-                item = usecases.serialize_item_entity(item, project, drop_path=False)
+                item = usecases.serialize_item_entity(item, project, map_fields=False)
             item.annotation_status = service_provider.get_annotation_status_name(
                 project, item.annotation_status
             )
@@ -1359,5 +1359,5 @@ def query_entities(
             raise AppException(response.errors)
         items = response.data
         return ItemManager.process_response(
-            self.service_provider, items, project, folder, replace_path=False
+            self.service_provider, items, project, folder, map_fields=False
         )

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

@@ -43,13 +43,4 @@ def list(self, project_id: int, folder_id: Optional[int], query: Query):
                 ).decode()
             },
         )
-        # headers={
-        #     "x-sa-entity-context": base64.b64encode(
-        #         f'{{"team_id":{self.client.team_id},' +
-        #         f'"project_id":{project_id},"folder_id":{folder_id}}}'.encode(
-        #             "utf-8"
-        #         )
-        #     ).decode()
-        # },
-        # )
         return result

tests/integration/items/test_saqul_query.py

@@ -85,4 +85,4 @@ def test_query(self):
         try:
             sa.query(self.PROJECT_NAME, self.TEST_QUERY)
         except Exception as e:
-            self.assertEqual(str(e), "Incorrect query.")
+            self.assertEqual(str(e), "Unsupported project type.")