Merge pull request #207 from superannotateai/friday_292

SDK | Added createdAt, updatedAt for classes in classes.json

Author: VaghinakDev

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

@@ -44,8 +44,8 @@
 from lib.core.enums import ImageQuality
 from lib.core.exceptions import AppException
 from lib.core.exceptions import AppValidationException
-from lib.core.types import ClassesJson
 from lib.core.types import AttributeGroup
+from lib.core.types import ClassesJson
 from lib.core.types import Project
 from lib.infrastructure.controller import Controller
 from plotly.subplots import make_subplots
@@ -1884,7 +1884,9 @@ def create_annotation_class(
     """
     if isinstance(project, Project):
         project = project.dict()
-    attribute_groups = list(map(lambda x: x.dict(), attribute_groups)) if attribute_groups else None
+    attribute_groups = (
+        list(map(lambda x: x.dict(), attribute_groups)) if attribute_groups else None
+    )
     response = controller.create_annotation_class(
         project_name=project, name=name, color=color, attribute_groups=attribute_groups
     )
@@ -1941,6 +1943,8 @@ def download_annotation_classes_json(project: str, folder: Union[str, Path]):
     response = controller.download_annotation_classes(
         project_name=project, download_path=folder
     )
+    if response.errors:
+        raise AppException(response.errors)
     return response.data
 
 

src/superannotate/lib/core/entities.py

@@ -24,6 +24,22 @@ def to_dict(self):
         raise NotImplementedError
 
 
+class BaseTimedEntity(BaseEntity):
+    def __init__(
+        self, uuid: Any = None, createdAt: str = None, updatedAt: str = None,
+    ):
+        super().__init__(uuid)
+        self.createdAt = createdAt
+        self.updatedAt = updatedAt
+
+    def to_dict(self):
+        return {
+            "id": self.uuid,
+            "createdAt": self.createdAt,
+            "updatedAt": self.updatedAt,
+        }
+
+
 class ConfigEntity(BaseEntity):
     def __init__(self, uuid: str, value: str):
         super().__init__(uuid)
@@ -41,10 +57,12 @@ def to_dict(self):
         return {"key": self.uuid, "value": self.value}
 
 
-class ProjectEntity(BaseEntity):
+class ProjectEntity(BaseTimedEntity):
     def __init__(
         self,
         uuid: int = None,
+        createdAt: str = None,
+        updatedAt: str = None,
         team_id: int = None,
         name: str = None,
         project_type: int = None,
@@ -65,7 +83,7 @@ def __init__(
         completed_images_count: int = None,
         root_folder_completed_images_count: int = None,
     ):
-        super().__init__(uuid)
+        super().__init__(uuid, createdAt, updatedAt)
         self.team_id = team_id
         self.name = name
         self.project_type = project_type
@@ -100,7 +118,7 @@ def __copy__(self):
 
     def to_dict(self):
         return {
-            "id": self.uuid,
+            **super().to_dict(),
             "team_id": self.team_id,
             "name": self.name,
             "type": self.project_type,
@@ -175,17 +193,19 @@ def to_dict(self):
         }
 
 
-class FolderEntity(BaseEntity):
+class FolderEntity(BaseTimedEntity):
     def __init__(
         self,
         uuid: int = None,
+        createdAt: str = None,
+        updatedAt: str = None,
         project_id: int = None,
         parent_id: int = None,
         team_id: int = None,
         name: str = None,
         folder_users: List[dict] = None,
     ):
-        super().__init__(uuid)
+        super().__init__(uuid, createdAt, updatedAt)
         self.team_id = team_id
         self.project_id = project_id
         self.name = name
@@ -194,6 +214,7 @@ def __init__(
 
     def to_dict(self):
         return {
+            **super().to_dict(),
             "id": self.uuid,
             "team_id": self.team_id,
             "name": self.name,
@@ -301,22 +322,26 @@ def to_dict(self):
         return {"uuid": self.uuid, "bytes": self.data, "metadata": self.metadata}
 
 
-class AnnotationClassEntity(BaseEntity):
+class AnnotationClassEntity(BaseTimedEntity):
     def __init__(
         self,
         uuid: int = None,
+        createdAt: str = None,
+        updatedAt: str = None,
         color: str = None,
         count: int = None,
         name: str = None,
         project_id: int = None,
         attribute_groups: Iterable = None,
     ):
-        super().__init__(uuid)
+        super().__init__(uuid, createdAt, updatedAt)
         self.color = color
         self.count = count
         self.name = name
         self.project_id = project_id
         self.attribute_groups = attribute_groups
+        self.createdAt = createdAt
+        self.updatedAt = updatedAt
 
     def __copy__(self):
         return AnnotationClassEntity(
@@ -328,7 +353,7 @@ def __copy__(self):
 
     def to_dict(self):
         return {
-            "id": self.uuid,
+            **super().to_dict(),
             "color": self.color,
             "count": self.count,
             "name": self.name,
@@ -402,12 +427,14 @@ def to_dict(self):
         }
 
 
-class MLModelEntity(BaseEntity):
+class MLModelEntity(BaseTimedEntity):
     def __init__(
         self,
         uuid: int = None,
         team_id: int = None,
         name: str = None,
+        createdAt: str = None,
+        updatedAt: str = None,
         path: str = None,
         config_path: str = None,
         model_type: int = None,
@@ -423,7 +450,7 @@ def __init__(
         is_global: bool = None,
         hyper_parameters: dict = {},
     ):
-        super().__init__(uuid=uuid)
+        super().__init__(uuid, createdAt, updatedAt)
         self.name = name
         self.path = path
         self.team_id = team_id
@@ -443,7 +470,7 @@ def __init__(
 
     def to_dict(self):
         return {
-            "id": self.uuid,
+            **super().to_dict(),
             "name": self.name,
             "team_id": self.team_id,
             "description": self.description,

src/superannotate/lib/core/types.py

@@ -4,8 +4,8 @@
 
 from pydantic import BaseModel
 from pydantic import constr
-from pydantic import StrictStr
 from pydantic import Extra
+from pydantic import StrictStr
 
 
 NotEmptyStr = constr(strict=True, min_length=1)

src/superannotate/lib/core/usecases.py

@@ -628,12 +628,12 @@ def validate_folder(self):
         if not self._folder.name:
             raise AppValidationException("Folder name cannot be empty.")
         if (
-                len(
-                    set(self._folder.name).intersection(
-                        constances.SPECIAL_CHARACTERS_IN_PROJECT_FOLDER_NAMES
-                    )
+            len(
+                set(self._folder.name).intersection(
+                    constances.SPECIAL_CHARACTERS_IN_PROJECT_FOLDER_NAMES
                 )
-                > 0
+            )
+            > 0
         ):
             self._folder.name = "".join(
                 "_"
@@ -644,6 +644,7 @@ def validate_folder(self):
             logger.warning(
                 "New folder name has special characters. Special characters will be replaced by underscores."
             )
+
     def execute(self):
         if self.is_valid():
             self._folder.project_id = self._project.uuid
@@ -968,12 +969,12 @@ def validate_folder(self):
         if not self._folder.name:
             raise AppValidationException("Folder name cannot be empty.")
         if (
-                len(
-                    set(self._folder.name).intersection(
-                        constances.SPECIAL_CHARACTERS_IN_PROJECT_FOLDER_NAMES
-                    )
+            len(
+                set(self._folder.name).intersection(
+                    constances.SPECIAL_CHARACTERS_IN_PROJECT_FOLDER_NAMES
                 )
-                > 0
+            )
+            > 0
         ):
             self._folder.name = "".join(
                 "_"
@@ -2657,10 +2658,9 @@ def execute(self):
         )
         classes = self._annotation_classes_repo.get_all()
         classes = [entity.to_dict() for entity in classes]
-        json.dump(
-            classes, open(Path(self._download_path) / "classes.json", "w"), indent=4
-        )
-        self._response.data = self._download_path
+        json_path = Path(self._download_path) / "classes.json"
+        json.dump(classes, open(json_path, "w"), indent=4)
+        self._response.data = json_path
         return self._response
 
 

src/superannotate/lib/infrastructure/repositories.py

@@ -336,6 +336,8 @@ def dict2entity(data: dict):
             name=data["name"],
             count=data["count"],
             color=data["color"],
+            createdAt=data["createdAt"],
+            updatedAt=data["updatedAt"],
             attribute_groups=data["attribute_groups"],
         )
 

src/superannotate/lib/infrastructure/services.py

@@ -161,7 +161,6 @@ class SuperannotateBackendService(BaseBackendService):
     URL_GET_FOLDER_BY_NAME = "folder/getFolderByName"
     URL_CREATE_FOLDER = "folder"
     URL_UPDATE_FOLDER = "folder/{}"
-    URL_FOLDERS = "folder"
     URL_GET_IMAGE = "image/{}"
     URL_GET_IMAGES = "images"
     URL_BULK_GET_IMAGES = "images/getBulk"