changed project/settings serializers

Author: VaghinakDev

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

@@ -195,9 +195,7 @@ def _upload_annotations(
                     output_dir=temp_dir,
                     dataset_format=format,
                     dataset_name=dataset_name,
-                    project_type=constances.ProjectType.get_name(
-                        project["project"].type
-                    ),
+                    project_type=project.type.name,
                     task=task,
                 )
                 annotations_path = temp_dir

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

@@ -162,13 +162,7 @@ def search_projects(
         if return_metadata:
             return [
                 ProjectSerializer(project).serialize(
-                    exclude={
-                        "annotation_classes",
-                        "workflows",
-                        "settings",
-                        "contributors",
-                        "classes",
-                    }
+                    exclude={"settings", "workflows", "contributors", "classes"}
                 )
                 for project in result
             ]
@@ -434,16 +428,14 @@ def copy_image(
             destination_project
         ).data
 
-        if destination_project_metadata["project"].type in [
+        if destination_project_metadata.type.value in [
             constants.ProjectType.VIDEO.value,
             constants.ProjectType.DOCUMENT.value,
-        ] or source_project_metadata["project"].type in [
+        ] or source_project_metadata.type.value in [
             constants.ProjectType.VIDEO.value,
             constants.ProjectType.DOCUMENT.value,
         ]:
-            raise AppException(
-                LIMITED_FUNCTIONS[source_project_metadata["project"].type]
-            )
+            raise AppException(LIMITED_FUNCTIONS[source_project_metadata.type])
 
         response = self.controller.copy_image(
             from_project_name=source_project_name,
@@ -521,16 +513,7 @@ def get_project_metadata(
         if response.errors:
             raise AppException(response.errors)
 
-        return response.data.dict()
-        # metadata = ProjectSerializer(response["project"]).serialize()
-        #
-        # for elem in "classes", "workflows", "contributors":
-        #     if response.get(elem):
-        #         metadata[elem] = [
-        #             BaseSerializer(attribute).serialize()
-        #             for attribute in response[elem]
-        #         ]
-        # return metadata
+        return ProjectSerializer(response.data).serialize()
 
     def get_project_settings(self, project: Union[NotEmptyStr, dict]):
         """Gets project's settings.
@@ -546,7 +529,8 @@ def get_project_settings(self, project: Union[NotEmptyStr, dict]):
         project_name, folder_name = extract_project_folder(project)
         settings = self.controller.get_project_settings(project_name=project_name)
         settings = [
-            SettingsSerializer(attribute).serialize() for attribute in settings.data
+            SettingsSerializer(attribute.dict()).serialize()
+            for attribute in settings.data
         ]
         return settings
 
@@ -587,7 +571,10 @@ def search_annotation_classes(
         )
         if response.errors:
             raise AppException(response.errors)
-        return [BaseSerializer(i).serialize(exclude_unset=True) for i in response.data]
+        return [
+            i.dict(exclude={"attribute_groups": {"__all__": {"is_multiselect"}}})
+            for i in response.data
+        ]
 
     def set_project_default_image_quality_in_editor(
         self,
@@ -1519,11 +1506,11 @@ def upload_preannotations_from_folder_to_project(
         project_name, folder_name = extract_project_folder(project)
         project_folder_name = project_name + (f"/{folder_name}" if folder_name else "")
         project = self.controller.get_project_metadata(project_name).data
-        if project["project"].type in [
-            constants.ProjectType.VIDEO.value,
-            constants.ProjectType.DOCUMENT.value,
+        if project.type in [
+            constants.ProjectType.VIDEO,
+            constants.ProjectType.DOCUMENT,
         ]:
-            raise AppException(LIMITED_FUNCTIONS[project["project"].type])
+            raise AppException(LIMITED_FUNCTIONS[project.type])
         if recursive_subfolders:
             logger.info(
                 "When using recursive subfolder parsing same name annotations in different "
@@ -1582,11 +1569,11 @@ def upload_image_annotations(
         project_name, folder_name = extract_project_folder(project)
 
         project = self.controller.get_project_metadata(project_name).data
-        if project["project"].type in [
-            constants.ProjectType.VIDEO.value,
-            constants.ProjectType.DOCUMENT.value,
+        if project.type in [
+            constants.ProjectType.VIDEO,
+            constants.ProjectType.DOCUMENT,
         ]:
-            raise AppException(LIMITED_FUNCTIONS[project["project"].type])
+            raise AppException(LIMITED_FUNCTIONS[project.type])
 
         if not mask:
             if not isinstance(annotation_json, dict):
@@ -1668,11 +1655,11 @@ def benchmark(
             project_name = project["name"]
 
         project = self.controller.get_project_metadata(project_name).data
-        if project["project"].type in [
-            constants.ProjectType.VIDEO.value,
-            constants.ProjectType.DOCUMENT.value,
+        if project.type in [
+            constants.ProjectType.VIDEO,
+            constants.ProjectType.DOCUMENT,
         ]:
-            raise AppException(LIMITED_FUNCTIONS[project["project"].type])
+            raise AppException(LIMITED_FUNCTIONS[project.type])
 
         if not export_root:
             with tempfile.TemporaryDirectory() as temp_dir:
@@ -1820,11 +1807,11 @@ def add_annotation_bbox_to_image(
         """
         project_name, folder_name = extract_project_folder(project)
         project = self.controller.get_project_metadata(project_name).data
-        if project["project"].type in [
-            constants.ProjectType.VIDEO.value,
-            constants.ProjectType.DOCUMENT.value,
+        if project.type in [
+            constants.ProjectType.VIDEO,
+            constants.ProjectType.DOCUMENT,
         ]:
-            raise AppException(LIMITED_FUNCTIONS[project["project"].type])
+            raise AppException(LIMITED_FUNCTIONS[project.type])
         response = self.controller.get_annotations(
             project_name=project_name,
             folder_name=folder_name,
@@ -1878,11 +1865,11 @@ def add_annotation_point_to_image(
         """
         project_name, folder_name = extract_project_folder(project)
         project = self.controller.get_project_metadata(project_name).data
-        if project["project"].type in [
-            constants.ProjectType.VIDEO.value,
-            constants.ProjectType.DOCUMENT.value,
+        if project.type in [
+            constants.ProjectType.VIDEO,
+            constants.ProjectType.DOCUMENT,
         ]:
-            raise AppException(LIMITED_FUNCTIONS[project["project"].type])
+            raise AppException(LIMITED_FUNCTIONS[project.type])
         response = self.controller.get_annotations(
             project_name=project_name,
             folder_name=folder_name,
@@ -1934,11 +1921,11 @@ def add_annotation_comment_to_image(
         """
         project_name, folder_name = extract_project_folder(project)
         project = self.controller.get_project_metadata(project_name).data
-        if project["project"].type in [
-            constants.ProjectType.VIDEO.value,
-            constants.ProjectType.DOCUMENT.value,
+        if project.type in [
+            constants.ProjectType.VIDEO,
+            constants.ProjectType.DOCUMENT,
         ]:
-            raise AppException(LIMITED_FUNCTIONS[project["project"].type])
+            raise AppException(LIMITED_FUNCTIONS[project.type])
         response = self.controller.get_annotations(
             project_name=project_name,
             folder_name=folder_name,

src/superannotate/lib/app/serializers.py

@@ -118,7 +118,7 @@ class ProjectSerializer(BaseSerializer):
     def serialize(
         self,
         fields: List[str] = None,
-        by_alias: bool = False,
+        by_alias: bool = True,
         flat: bool = False,
         exclude: Set[str] = None,
     ):
@@ -130,11 +130,9 @@ def serialize(
             data["settings"] = [
                 SettingsSerializer(setting).serialize() for setting in data["settings"]
             ]
-        data["type"] = constance.ProjectType.get_name(data["type"])
-        if data.get("status"):
-            data["status"] = constance.ProjectStatus.get_name(data["status"])
-        else:
+        if not data.get("status"):
             data["status"] = "Undefined"
+
         if data.get("upload_state"):
             data["upload_state"] = constance.UploadState(data["upload_state"]).name
         if data.get("users"):
@@ -152,18 +150,14 @@ def serialize(self):
         return data
 
 
-class SettingsSerializer(BaseSerializer):
-    def serialize(
-        self,
-        fields: List[str] = None,
-        by_alias: bool = True,
-        flat: bool = False,
-        exclude=None,
-    ):
-        data = super().serialize(fields, by_alias, flat, exclude)
-        if data["attribute"] == "ImageQuality":
-            data["value"] = constance.ImageQuality.get_name(data["value"])
-        return data
+class SettingsSerializer:
+    def __init__(self, data: dict):
+        self.data = data
+
+    def serialize(self):
+        if self.data["attribute"] == "ImageQuality":
+            self.data["value"] = constance.ImageQuality.get_name(self.data["value"])
+        return self.data
 
 
 class EntitySerializer:

src/superannotate/lib/core/__init__.py

@@ -79,8 +79,8 @@
 )
 
 LIMITED_FUNCTIONS = {
-    ProjectType.VIDEO.value: DEPRECATED_VIDEO_PROJECTS_MESSAGE,
-    ProjectType.DOCUMENT.value: DEPRECATED_DOCUMENT_PROJECTS_MESSAGE,
+    ProjectType.VIDEO: DEPRECATED_VIDEO_PROJECTS_MESSAGE,
+    ProjectType.DOCUMENT: DEPRECATED_DOCUMENT_PROJECTS_MESSAGE,
 }
 
 METADATA_DEPRICATED_FOR_PIXEL = (

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

@@ -1,13 +1,13 @@
 from lib.core.entities.base import BaseItemEntity
 from lib.core.entities.base import SubSetEntity
-from lib.core.entities.project import AttachmentEntity
-from lib.core.entities.project import ProjectEntity
-from lib.core.entities.project import SettingEntity
 from lib.core.entities.classes import AnnotationClassEntity
 from lib.core.entities.integrations import IntegrationEntity
 from lib.core.entities.items import DocumentEntity
 from lib.core.entities.items import TmpImageEntity
 from lib.core.entities.items import VideoEntity
+from lib.core.entities.project import AttachmentEntity
+from lib.core.entities.project import ProjectEntity
+from lib.core.entities.project import SettingEntity
 from lib.core.entities.project_entities import BaseEntity
 from lib.core.entities.project_entities import ConfigEntity
 from lib.core.entities.project_entities import FolderEntity
@@ -44,5 +44,5 @@
     "UserEntity",
     "TeamEntity",
     "MLModelEntity",
-    "IntegrationEntity"
+    "IntegrationEntity",
 ]