updated project creation

Author: VaghinakDev

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.0
 log_cli=true
 python_files = test_*.py
-;addopts = -n auto --dist=loadscope
+addopts = -n auto --dist=loadscope

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

@@ -31,6 +31,7 @@
 from lib.app.interface.types import NotEmptyStr
 from lib.app.interface.types import ProjectStatusEnum
 from lib.app.interface.types import ProjectTypes
+from lib.app.interface.types import Setting
 from lib.app.interface.types import validate_arguments
 from lib.app.mixp.decorators import Trackable
 from lib.app.serializers import BaseSerializer
@@ -41,6 +42,7 @@
 from lib.app.serializers import TeamSerializer
 from lib.core import LIMITED_FUNCTIONS
 from lib.core.entities import AttachmentEntity
+from lib.core.entities import SettingEntity
 from lib.core.entities.integrations import IntegrationEntity
 from lib.core.entities.project_entities import AnnotationClassEntity
 from lib.core.enums import ImageQuality
@@ -181,21 +183,31 @@ def create_project(
         project_name: NotEmptyStr,
         project_description: NotEmptyStr,
         project_type: NotEmptyStr,
+        settings: List[Setting] = None
 ):
     """Create a new project in the team.
 
     :param project_name: the new project's name
     :type project_name: str
+
     :param project_description: the new project's description
     :type project_description: str
+
     :param project_type: the new project type, Vector or Pixel.
     :type project_type: str
 
+    :param settings: list of settings objects
+    :type settings: list of dicts
+
     :return: dict object metadata the new project
     :rtype: dict
     """
+    if settings:
+        settings = parse_obj_as(List[SettingEntity], settings)
+    else:
+        settings = []
     response = Controller.get_default().create_project(
-        name=project_name, description=project_description, project_type=project_type
+        name=project_name, description=project_description, project_type=project_type, settings=settings
     )
     if response.errors:
         raise AppException(response.errors)
@@ -218,7 +230,7 @@ def create_project_from_metadata(project_metadata: Project):
         name=project_metadata["name"],
         description=project_metadata.get("description"),
         project_type=project_metadata["type"],
-        settings=project_metadata.get("settings", []),
+        settings=parse_obj_as(List[SettingEntity], project_metadata.get("settings", [])),
         annotation_classes=project_metadata.get("classes", []),
         workflows=project_metadata.get("workflows", []),
         instructions_link=project_metadata.get("instructions_link"),

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

@@ -107,6 +107,14 @@ def __eq__(self, other):
 AttachmentArgType = Union[NotEmptyStr, Path, conlist(AttachmentDict, min_items=1)]
 
 
+class Setting(BaseModel):
+    attribute:  NotEmptyStr
+    value: Union[NotEmptyStr, float, int]
+
+    class Config:
+        extra = Extra.ignore
+
+
 class AttachmentArg(BaseModel):
     __root__: AttachmentArgType
 

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

@@ -1,5 +1,6 @@
 from lib.core.entities.base import AttachmentEntity
 from lib.core.entities.base import BaseEntity as TmpBaseEntity
+from lib.core.entities.base import SettingEntity
 from lib.core.entities.integrations import IntegrationEntity
 from lib.core.entities.items import DocumentEntity
 from lib.core.entities.items import Entity
@@ -13,7 +14,6 @@
 from lib.core.entities.project_entities import ImageInfoEntity
 from lib.core.entities.project_entities import MLModelEntity
 from lib.core.entities.project_entities import ProjectEntity
-from lib.core.entities.project_entities import ProjectSettingEntity
 from lib.core.entities.project_entities import S3FileEntity
 from lib.core.entities.project_entities import TeamEntity
 from lib.core.entities.project_entities import UserEntity
@@ -27,6 +27,8 @@
 )
 
 __all__ = [
+    # base
+    "SettingEntity",
     # items
     "TmpImageEntity",
     "BaseEntity",
@@ -38,7 +40,6 @@
     "AttachmentEntity",
     # project
     "ProjectEntity",
-    "ProjectSettingEntity",
     "ConfigEntity",
     "WorkflowEntity",
     "FolderEntity",

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

@@ -1,11 +1,15 @@
 import uuid
 from datetime import datetime
 from typing import Optional
+from typing import Union
 
 from lib.core.enums import AnnotationStatus
 from pydantic import BaseModel
 from pydantic import Extra
 from pydantic import Field
+from pydantic import StrictFloat
+from pydantic import StrictInt
+from pydantic import StrictStr
 
 
 class TimedBaseModel(BaseModel):
@@ -34,3 +38,16 @@ class AttachmentEntity(BaseModel):
 
     class Config:
         extra = Extra.ignore
+
+
+class SettingEntity(BaseModel):
+    id: Optional[int]
+    project_id: Optional[int]
+    attribute: str
+    value: Union[StrictStr, StrictInt, StrictFloat]
+
+    class Config:
+        extra = Extra.ignore
+
+    def __copy__(self):
+        return SettingEntity(attribute=self.attribute, value=self.value)

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

@@ -155,31 +155,6 @@ def to_dict(self):
         }
 
 
-class ProjectSettingEntity(BaseEntity):
-    def __init__(
-        self,
-        uuid: int = None,
-        project_id: int = None,
-        attribute: str = None,
-        value: Any = None,
-    ):
-        super().__init__(uuid)
-        self.project_id = project_id
-        self.attribute = attribute
-        self.value = value
-
-    def __copy__(self):
-        return ProjectSettingEntity(attribute=self.attribute, value=self.value)
-
-    def to_dict(self):
-        return {
-            "id": self.uuid,
-            "project_id": self.project_id,
-            "attribute": self.attribute,
-            "value": self.value,
-        }
-
-
 class WorkflowEntity(BaseEntity):
     def __init__(
         self,

src/superannotate/lib/core/repositories.py

@@ -1,4 +1,5 @@
 from abc import ABC
+from abc import ABCMeta
 from abc import abstractmethod
 from typing import Any
 from typing import List
@@ -42,7 +43,7 @@ def update(self, entity: BaseEntity) -> BaseEntity:
         raise NotImplementedError
 
     @abstractmethod
-    def delete(self, uuid: Any, *args):
+    def delete(self, uuid: Any):
         raise NotImplementedError
 
     def bulk_delete(self, entities: List[BaseEntity]) -> bool:
@@ -56,7 +57,7 @@ def _drop_nones(data: dict):
         return data
 
 
-class BaseProjectRelatedManageableRepository(BaseManageableRepository):
+class BaseProjectRelatedManageableRepository(BaseManageableRepository, metaclass=ABCMeta):
     def __init__(self, service: SuperannotateServiceProvider, project: ProjectEntity):
         self._service = service
         self._project = project

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

@@ -26,8 +26,8 @@
 from lib.core.entities import ImageEntity
 from lib.core.entities import ImageInfoEntity
 from lib.core.entities import ProjectEntity
-from lib.core.entities import ProjectSettingEntity
 from lib.core.entities import S3FileEntity
+from lib.core.entities import SettingEntity
 from lib.core.enums import ImageQuality
 from lib.core.enums import ProjectType
 from lib.core.exceptions import AppException
@@ -1514,7 +1514,7 @@ class UploadImageS3UseCase(BaseUseCase):
     def __init__(
         self,
         project: ProjectEntity,
-        project_settings: List[ProjectSettingEntity],
+        project_settings: List[SettingEntity],
         image_path: str,
         image: io.BytesIO,
         s3_repo: BaseManageableRepository,
@@ -1714,7 +1714,7 @@ def __init__(
         backend_service: SuperannotateServiceProvider,
         images: BaseManageableRepository,
         s3_repo,
-        project_settings: List[ProjectSettingEntity],
+        project_settings: List[SettingEntity],
         include_annotations: Optional[bool] = True,
         copy_annotation_status: Optional[bool] = True,
         copy_pin: Optional[bool] = True,