Added tags handeling, tests adjuted

Author: VaghinakDev

requirements_dev.txt

@@ -1 +1 @@
-superannotate_schemas>=1.0.38.b1
+superannotate_schemas==1.0.40b2

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

@@ -124,7 +124,7 @@ def __copy__(self):
             team_id=self.team_id,
             name=self.name,
             project_type=self.project_type,
-            description=self.description,
+            description=self.description if self.description else f"Copy of {self.name}.",
             status=self.status,
             folder_id=self.folder_id,
             users=self.users,

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

@@ -165,8 +165,8 @@ def __init__(
         projects: BaseManageableRepository,
         backend_service_provider: SuperannotateServiceProvider,
         settings_repo: Type[BaseManageableRepository],
-        annotation_classes_repo: BaseManageableRepository,
-        workflows_repo: BaseManageableRepository,
+        annotation_classes_repo: Type[BaseManageableRepository],
+        workflows_repo: Type[BaseManageableRepository],
         settings: List[ProjectSettingEntity] = None,
         workflows: List[WorkflowEntity] = None,
         annotation_classes: List[AnnotationClassEntity] = None,

src/superannotate/lib/infrastructure/controller.py

@@ -482,9 +482,6 @@ def clone_project(
         project_to_create.name = name
         if project_description:
             project_to_create.description = project_description
-        elif not project.description:
-            project.description = f"Copy of {from_name}."
-
         use_case = usecases.CloneProjectUseCase(
             reporter=self.default_reporter,
             project=project,

src/superannotate/lib/infrastructure/repositories.py

@@ -99,6 +99,8 @@ def get_all(self, condition: Condition = None) -> List[ProjectEntity]:
 
     def insert(self, entity: ProjectEntity) -> ProjectEntity:
         project_data = self._drop_nones(entity.to_dict())
+        if not project_data.get("status"):
+            project_data["status"] = constance.ProjectStatus.NotStarted.value
         result = self._service.create_project(project_data)
         return self.dict2entity(result)
 
@@ -118,21 +120,21 @@ def delete(self, entity: ProjectEntity):
         )
 
     @staticmethod
-    def dict2entity(data: dict):
+    def dict2entity(data: dict) -> ProjectEntity:
         try:
             return ProjectEntity(
                 uuid=data["id"],
                 team_id=data["team_id"],
                 name=data["name"],
                 project_type=data["type"],
-                status=data["status"],
-                attachment_name=data["attachment_name"],
-                attachment_path=data["attachment_path"],
-                entropy_status=data["entropy_status"],
+                status=data.get("status"),
+                attachment_name=data.get("attachment_name"),
+                attachment_path=data.get("attachment_path"),
+                entropy_status=data.get("entropy_status"),
                 sharing_status=data.get("sharing_status"),
                 creator_id=data["creator_id"],
                 upload_state=data["upload_state"],
-                description=data["description"],
+                description=data.get("description"),
                 folder_id=data.get("folder_id"),
                 users=data.get("users", ()),
                 unverified_users=data.get("unverified_users", ()),
@@ -148,6 +150,7 @@ def dict2entity(data: dict):
 
 
 class S3Repository(BaseS3Repository):
+
     def get_one(self, uuid: str) -> S3FileEntity:
         file = io.BytesIO()
         self._resource.Object(self._bucket, uuid).download_fileobj(file)
@@ -242,7 +245,7 @@ def update(self, entity: WorkflowEntity):
         raise NotImplementedError
 
     @staticmethod
-    def dict2entity(data: dict):
+    def dict2entity(data: dict) -> WorkflowEntity:
         return WorkflowEntity(
             uuid=data["id"],
             project_id=data["project_id"],
@@ -294,7 +297,7 @@ def bulk_delete(self, entities: List[FolderEntity]):
         return self._service.delete_folders(entity.project_id, entity.team_id, ids)
 
     @staticmethod
-    def dict2entity(data: dict):
+    def dict2entity(data: dict) -> FolderEntity:
         try:
             return FolderEntity(
                 uuid=data["id"],
@@ -397,7 +400,7 @@ def update(self, entity: ImageEntity):
         return entity
 
     @staticmethod
-    def dict2entity(data: dict):
+    def dict2entity(data: dict) -> ImageEntity:
         return ImageEntity(
             uuid=data["id"],
             name=data["name"],
@@ -416,7 +419,7 @@ def dict2entity(data: dict):
 
 class UserRepository(BaseReadOnlyRepository):
     @staticmethod
-    def dict2entity(data: dict):
+    def dict2entity(data: dict) -> UserEntity:
         return UserEntity(
             uuid=data["id"],
             first_name=data["first_name"],
@@ -480,7 +483,7 @@ def update(self, entity: MLModelEntity):
         return self.dict2entity(data)
 
     @staticmethod
-    def dict2entity(data: dict):
+    def dict2entity(data: dict) -> MLModelEntity:
         return MLModelEntity(
             uuid=data["id"],
             name=data["name"],

src/superannotate/lib/infrastructure/services.py

@@ -318,7 +318,7 @@ def delete_project(self, uuid: int, query_string: str = None) -> bool:
         res = self._request(url, "delete")
         return res.ok
 
-    def update_project(self, data: dict, query_string: str = None) -> bool:
+    def update_project(self, data: dict, query_string: str = None) -> dict:
         url = urljoin(self.api_url, self.URL_GET_PROJECT.format(data["id"]))
         if query_string:
             url = f"{url}?{query_string}"
@@ -689,8 +689,6 @@ def get_bulk_images(
         self, project_id: int, team_id: int, folder_id: int, images: List[str]
     ) -> List[dict]:
         bulk_get_images_url = urljoin(self.api_url, self.URL_BULK_GET_IMAGES)
-        time.sleep(1)
-
         res = self._request(
             bulk_get_images_url,
             "post",

tests/data_set/document_annotation/text_file_example_1.json

@@ -13,6 +13,7 @@
   },
   "instances": [
     {
+      "type": "entity",
       "start": 253,
       "end": 593,
       "classId": 873208,

tests/data_set/document_annotation_without_class_data/text_file_example_1.json

@@ -13,6 +13,7 @@
   },
   "instances": [
     {
+      "type": "entity",
       "start": 253,
       "end": 593,
       "classId": 873208,

tests/integration/classes/test_create_annotation_class.py

@@ -8,7 +8,7 @@
 
 
 class TestCreateAnnotationClass(BaseTestCase):
-    PROJECT_NAME = "test_create_annotation_class"
+    PROJECT_NAME = "TestCreateAnnotationClass"
     PROJECT_TYPE = "Vector"
     PROJECT_DESCRIPTION = "Example "
     TEST_LARGE_CLASSES_JSON = "large_classes_json.json"
@@ -29,7 +29,7 @@ def test_create_annotations_classes_from_class_json(self):
 
 
 class TestCreateAnnotationClassNonVectorWithError(BaseTestCase):
-    PROJECT_NAME = "test_create_annotation_class"
+    PROJECT_NAME = "TestCreateAnnotationClassNonVectorWithError"
     PROJECT_TYPE = "Video"
     PROJECT_DESCRIPTION = "Example Project test pixel basic images"
 
@@ -43,7 +43,7 @@ def test_create_annotation_class(self):
 
 
 class TestCreateAnnotationClassesNonVectorWithError(BaseTestCase):
-    PROJECT_NAME = "test_create_annotation_class"
+    PROJECT_NAME = "TestCreateAnnotationClassesNonVectorWithError"
     PROJECT_TYPE = "Video"
     PROJECT_DESCRIPTION = "Example Project test pixel basic images"
 

tests/integration/projects/test_basic_project.py

@@ -98,7 +98,7 @@ def test_workflow_get(self):
 
 
 class TestProjectCreateMetadata(BaseTestCase):
-    PROJECT_NAME = "sample_basic_project"
+    PROJECT_NAME = "TestProjectCreateMetadata"
     PROJECT_TYPE = "Vector"
     OTHER_PROJECT_NAME = "other_project"
     PROJECT_DESCRIPTION = "DESCRIPTION"