Cahgned items serialization.

Author: VaghinakDev

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

@@ -799,22 +799,22 @@ def get_project_workflow(project: Union[str, dict]):
 @Trackable
 @validate_arguments
 def search_annotation_classes(
-    project: Union[NotEmptyStr, dict], name_prefix: Optional[str] = None
+    project: Union[NotEmptyStr, dict], name_contains: Optional[str] = None
 ):
     """Searches annotation classes by name_prefix (case-insensitive)
 
     :param project: project name
     :type project: str
-    :param name_prefix: name prefix for search. If None all annotation classes
-     will be returned
+    :param name_contains:  search string. Returns those classes,
+     where the given string is found anywhere within its name. If None, all annotation classes will be returned.
     :type name_prefix: str
 
     :return: annotation classes of the project
     :rtype: list of dicts
     """
     project_name, folder_name = extract_project_folder(project)
     classes = Controller.get_default().search_annotation_classes(
-        project_name, name_prefix
+        project_name, name_contains
     )
     classes = [BaseSerializer(attribute).serialize() for attribute in classes.data]
     return classes

src/superannotate/lib/app/mixp/decorators.py

@@ -2,11 +2,11 @@
 import sys
 from inspect import signature
 
-from mixpanel import Mixpanel
-
 from lib import get_default_controller
+from mixpanel import Mixpanel
 from superannotate.logger import get_default_logger
 from version import __version__
+
 from .utils import parsers
 
 logger = get_default_logger()

src/superannotate/lib/app/mixp/utils/parsers.py

@@ -372,7 +372,7 @@ def upload_image_annotations(**kwargs):
         "event_name": "upload_image_annotations",
         "properties": {
             "project_name": get_project_name(project),
-            "Pixel": bool(("mask" in kwargs)),
+            "Pixel": bool("mask" in kwargs),
         },
     }
 
@@ -478,7 +478,7 @@ def move_images(**kwargs):
         "properties": {
             "project_name": project_name,
             "Image Count": len(image_names),
-            "Copy Annotations": bool(("include_annotations" in kwargs)),
+            "Copy Annotations": bool("include_annotations" in kwargs),
             "Copy Annotation Status": bool("copy_annotation_status" in kwargs),
             "Copy Pin": bool("copy_pin" in kwargs),
         },

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

@@ -13,23 +13,15 @@ class TimedBaseModel(BaseModel):
 
 
 class BaseEntity(TimedBaseModel):
-    id: int
     name: str
-    path: Optional[str] = Field(
-        None, description="Item’s path in SuperAnnotate project"
-    )
-    url: Optional[str] = Field(None, description="Publicly available HTTP address")
+    path: Optional[str] = Field(None, description="Item’s path in SuperAnnotate project")
+    url: Optional[str] = Field(description="Publicly available HTTP address")
+    annotator_email: Optional[str] = Field(description="Annotator email")
+    qa_email: Optional[str] = Field(description="QA email")
     annotation_status: AnnotationStatus = Field(description="Item annotation status")
-    annotator_name: Optional[str] = Field(description="Annotator email")
-    qa_name: Optional[str] = Field(description="QA email")
-    entropy_value: Optional[str] = Field(description="Priority score of given item")
+    entropy_value: Optional[float] = Field(description="Priority score of given item")
     createdAt: str = Field(description="Date of creation")
     updatedAt: str = Field(description="Update date")
 
     class Config:
         extra = Extra.allow
-
-    def add_path(self, project_name: str, folder_name: str):
-        path = f"{project_name}{f'/{folder_name}' if folder_name != 'root' else ''}/{self.name}"
-        self.path = path
-        return self

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

@@ -7,9 +7,14 @@
 
 
 class Entity(BaseEntity):
+
     class Config:
         extra = Extra.allow
 
+    def add_path(self, project_name: str, folder_name: str):
+        self.path = f"{project_name}{f'/{folder_name}' if folder_name != 'root' else ''}/{self.name}"
+        return self
+
 
 class TmpImageEntity(Entity):
     prediction_status: Optional[SegmentationStatus] = Field(

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

@@ -222,6 +222,7 @@ def __init__(
         project_id: int = None,
         parent_id: int = None,
         team_id: int = None,
+        is_root: bool = False,
         name: str = None,
         folder_users: List[dict] = None,
     ):
@@ -230,13 +231,15 @@ def __init__(
         self.project_id = project_id
         self.name = name
         self.parent_id = parent_id
+        self.is_root = is_root
         self.folder_users = folder_users
 
     def to_dict(self):
         return {
             **super().to_dict(),
             "id": self.uuid,
             "team_id": self.team_id,
+            "is_root": self.is_root,
             "name": self.name,
             "parent_id": self.parent_id,
             "project_id": self.project_id,

src/superannotate/lib/core/repositories.py

@@ -8,6 +8,7 @@
 import boto3
 from lib.core.conditions import Condition
 from lib.core.entities import BaseEntity
+from lib.core.entities import Entity
 from lib.core.entities import ProjectEntity
 from lib.core.entities import TmpBaseEntity
 from lib.core.serviceproviders import SuperannotateServiceProvider
@@ -17,18 +18,18 @@ class BaseReadOnlyRepository(ABC):
     @abstractmethod
     def get_one(
         self, uuid: Union[Condition, int]
-    ) -> Optional[Union[BaseEntity, TmpBaseEntity]]:
+    ) -> Optional[Union[BaseEntity, Entity]]:
         raise NotImplementedError
 
     @abstractmethod
     def get_all(
         self, condition: Optional[Condition] = None
-    ) -> List[Union[BaseEntity, TmpBaseEntity]]:
+    ) -> List[Union[BaseEntity, Entity]]:
         raise NotImplementedError
 
     @staticmethod
-    def dict2entity(data: dict) -> BaseEntity:
-        return BaseEntity(**data)
+    def dict2entity(data: dict) -> Entity:
+        return Entity(**TmpBaseEntity(**data).dict())
 
 
 class BaseManageableRepository(BaseReadOnlyRepository):

src/superannotate/lib/core/serviceproviders.py

@@ -75,10 +75,6 @@ def get_project_workflows(self, project_id: int, team_id: int):
     def list_images(self, query_string):
         raise NotImplementedError
 
-    @abstractmethod
-    def list_images(self, query_string):
-        raise NotImplementedError
-
     @abstractmethod
     def get_project(self, uuid: int, team_id: int):
         raise NotImplementedError

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

@@ -1,3 +1,4 @@
+import copy
 from typing import List
 
 import superannotate.lib.core as constances
@@ -36,6 +37,8 @@ def __init__(
 
     @staticmethod
     def serialize_entity(entity: Entity, project: ProjectEntity):
+        if project.upload_state != constances.UploadState.EXTERNAL.value:
+            entity.url = None
         if project.project_type in (
             constances.ProjectType.VECTOR.value,
             constances.ProjectType.PIXEL.value,
@@ -92,12 +95,6 @@ def validate_query(self):
         if self._project.sync_status != constances.ProjectState.SYNCED.value:
             raise AppException("Data is not synced.")
 
-    @staticmethod
-    def _drop_paths(items: List[Entity]):
-        for item in items:
-            item.path = None
-        return items
-
     def execute(self) -> Response:
         if self.is_valid():
             service_response = self._backend_client.saqul_query(
@@ -107,14 +104,7 @@ def execute(self) -> Response:
                 folder_id=None if self._folder.name == "root" else self._folder.uuid,
             )
             if service_response.ok:
-                if self._project.project_type == constances.ProjectType.VECTOR.value:
-                    data = self._drop_paths(
-                        parse_obj_as(List[TmpBaseEntity], service_response.data)
-                    )
-                else:
-                    data = self._drop_paths(
-                        parse_obj_as(List[TmpBaseEntity], service_response.data)
-                    )
+                data = parse_obj_as(List[TmpBaseEntity], service_response.data)
                 for i, item in enumerate(data):
                     data[i] = GetItem.serialize_entity(item, self._project)
                 self._response.data = data
@@ -143,7 +133,7 @@ def __init__(
         self._recursive = recursive
 
     def validate_recursive_case(self):
-        if self._folder.name != "root" and self._recursive:
+        if not self._folder.is_root and self._recursive:
             self._recursive = False
 
     def execute(self) -> Response:
@@ -169,7 +159,7 @@ def execute(self) -> Response:
                 folders.append(self._folder)
                 for folder in folders:
                     tmp = self._items.get_all(
-                        self._search_condition & Condition("folder_id", folder.uuid, EQ)
+                        copy.deepcopy(self._search_condition) & Condition("folder_id", folder.uuid, EQ)
                     )
                     items.extend(
                         [

src/superannotate/lib/infrastructure/controller.py

@@ -821,11 +821,11 @@ def get_project_workflow(self, project_name: str):
         )
         return use_case.execute()
 
-    def search_annotation_classes(self, project_name: str, name_prefix: str = None):
+    def search_annotation_classes(self, project_name: str, name_contains: str = None):
         project_entity = self._get_project(project_name)
         condition = None
-        if name_prefix:
-            condition = Condition("name", name_prefix, EQ) & Condition("pattern", True, EQ)
+        if name_contains:
+            condition = Condition("name", name_contains, EQ) & Condition("pattern", True, EQ)
         use_case = usecases.GetAnnotationClassesUseCase(
             classes=AnnotationClassRepository(
                 service=self._backend_client, project=project_entity
@@ -1602,7 +1602,7 @@ def list_items(
         if qa_email:
             search_condition &= Condition("qa_id", qa_email, EQ)
         if annotator_email:
-            search_condition &= Condition("annotator_id", qa_email, EQ)
+            search_condition &= Condition("annotator_id", annotator_email, EQ)
         for key, value in kwargs.items():
             search_condition &= Condition(key, value, EQ)
         use_case = usecases.ListItems(