Fixed OperatorEnum ends

tod

Author: VaghinakDev

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

@@ -2464,7 +2464,7 @@ def query(
         """Return items that satisfy the given query.
         Query syntax should be in SuperAnnotate query language(https://doc.superannotate.com/docs/explore-overview).
 
-        :param project: project name or folder path (e.g., “project1/folder1”)
+        :param project: project name or folder path (e.g., "project1/folder1")
         :type project: str
 
         :param query: SAQuL query string.
@@ -2474,7 +2474,7 @@ def query(
             To return all the items in the specified subset, set the value of query param to None.
         :type subset: str
 
-        :return: queried items’ metadata list
+        :return: queried items' metadata list
         :rtype: list of dicts
         """
         project_name, folder_name = extract_project_folder(project)
@@ -2483,7 +2483,15 @@ def query(
         )
         if response.errors:
             raise AppException(response.errors)
-        return BaseSerializer.serialize_iterable(response.data, exclude={"meta"})
+        project = self.controller.get_project(project_name)
+        items = BaseSerializer.serialize_iterable(response.data, exclude={"meta"})
+        for i in items:
+            i[
+                "annotation_status"
+            ] = self.controller.service_provider.get_annotation_status_name(
+                project, i["annotation_status"]
+            )
+        return items
 
     def get_item_metadata(
         self,
@@ -2807,7 +2815,7 @@ def list_items(
                 project=project, item_ids=[i.id for i in res]
             )
             for i in res:
-                i["custom_metadata"] = item_custom_fields[i["id"]]
+                i["custom_metadata"] = item_custom_fields[i.id]
         exclude = {"meta", "annotator_email", "qa_email"}
         if include:
             if "custom_metadata" not in include:

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

@@ -280,10 +280,10 @@ def add_path(self, project_name: str, folder_name: str):
 
     @staticmethod
     def map_fields(entity: dict) -> dict:
-        if "path" in entity:
-            entity["url"] = entity["path"]
-        else:
+        if "metadata" in entity:
             entity["url"] = entity["metadata"]["path"]
+        else:
+            entity["url"] = entity["path"]
         entity["path"] = None
         return entity
 

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

@@ -139,6 +139,9 @@ def execute(self) -> Response:
             if service_response.ok:
                 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
                     )

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

@@ -692,8 +692,7 @@ def execute(self):
                     team_users.add(user["email"])
             # collecting pending project users which is not admin
             for user in self._project.unverified_users:
-                if user["user_role"] == constances.UserRole.CONTRIBUTOR.value:
-                    project_users.add(user["email"])
+                project_users.add(user["email"])
 
             role_email_map = defaultdict(list)
             to_skip = []

tests/integration/items/test_get_item_metadata.py

@@ -92,16 +92,21 @@ def folder_path(self):
         return os.path.join(Path(__file__).parent.parent.parent, self.TEST_FOLDER_PATH)
 
     def test_get_item_metadata(self):
+        _url = "https://drive.google.com/uc?export=download&id=1vwfCpTzcjxoEA4hhDxqapPOVvLVeS7ZS"
         sa.attach_items(
             self.PROJECT_NAME,
             [
                 {
-                    "url": "https://drive.google.com/uc?export=download&id=1vwfCpTzcjxoEA4hhDxqapPOVvLVeS7ZS",
+                    "url": _url,
                     "name": self.ITEM_NAME,
                 }
             ],
         )
         item_metadata = sa.get_item_metadata(self.PROJECT_NAME, self.ITEM_NAME)
         assert item_metadata["path"] == f"{self.PROJECT_NAME}"
+        assert item_metadata["url"] == (
+            "https://drive.google.com/uc?ex"
+            "port=download&id=1vwfCpTzcjxoEA4hhDxqapPOVvLVeS7ZS"
+        )
         assert "prediction_status" not in item_metadata
         assert "segmentation_status" not in item_metadata