Merge pull request #404 from superannotateai/friday

VaghinakDev · web-flow · commit 745b9485ec61 · 2022-02-18T17:22:42.000+04:00
Friday
diff --git a/pytest.ini b/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
diff --git a/requirements.txt b/requirements.txt
@@ -16,7 +16,6 @@ ffmpeg-python>=0.2.0
 fire==0.4.0
 mixpanel==4.8.3
 pydantic>=1.8.2
-pydantic[email]
 setuptools~=57.4.0
 aiohttp==3.8.1
 
diff --git a/src/superannotate/lib/app/interface/cli_interface.py b/src/superannotate/lib/app/interface/cli_interface.py
@@ -123,7 +123,7 @@ def export_project(
         folders = None
         if folder_name:
             folders = [folder_name]
-        export_res = self.controller.prepare_export(
+        export_res = controller.prepare_export(
             project_name, folders, include_fuse, False, annotation_statuses
         )
         export_name = export_res.data["name"]
@@ -187,7 +187,7 @@ def _upload_annotations(
         self, project, folder, format, dataset_name, task, pre=True
     ):
         project_name, folder_name = split_project_path(project)
-        project = self.controller.get_project_metadata(project_name=project_name).data
+        project = controller.get_project_metadata(project_name=project_name).data
         if not format:
             format = "SuperAnnotate"
         if not dataset_name and format == "COCO":
diff --git a/src/superannotate/lib/app/interface/sdk_interface.py b/src/superannotate/lib/app/interface/sdk_interface.py
@@ -181,7 +181,7 @@ def create_project(
 def create_project_from_metadata(project_metadata: Project):
     """Create a new project in the team using project metadata object dict.
     Mandatory keys in project_metadata are "name", "description" and "type" (Vector or Pixel)
-    Non-mandatory keys: "workflow", "contributors", "settings" and "annotation_classes".
+    Non-mandatory keys: "workflow", "settings" and "annotation_classes".
 
     :return: dict object metadata the new project
     :rtype: dict
@@ -191,7 +191,6 @@ def create_project_from_metadata(project_metadata: Project):
         name=project_metadata["name"],
         description=project_metadata["description"],
         project_type=project_metadata["type"],
-        contributors=project_metadata.get("contributors", []),
         settings=project_metadata.get("settings", []),
         annotation_classes=project_metadata.get("classes", []),
         workflows=project_metadata.get("workflows", []),
@@ -2788,7 +2787,7 @@ def validate_annotations(
         """
     with open(annotations_json) as file:
         annotation_data = json.loads(file.read())
-        response = Controller.get_default().validate_annotations(
+        response = Controller.validate_annotations(
             project_type, annotation_data, allow_extra=False
         )
         if response.errors:
diff --git a/src/superannotate/lib/core/plugin.py b/src/superannotate/lib/core/plugin.py
@@ -95,7 +95,7 @@ def generate_thumb(self):
         return buffer, width, height
 
     def generate_huge(self, base_width: int = 600) -> Tuple[io.BytesIO, float, float]:
-        im = self._image
+        im = self._get_image()
         width, height = im.size
         buffer = io.BytesIO()
         h_size = int(height * base_width / width)
@@ -107,7 +107,7 @@ def generate_huge(self, base_width: int = 600) -> Tuple[io.BytesIO, float, float
         return buffer, width, height
 
     def generate_low_resolution(self, quality: int = 60, subsampling: int = -1):
-        im = self._image
+        im = self._get_image()
         buffer = io.BytesIO()
         bg = Image.new("RGBA", im.size, (255, 255, 255))
         im = im.convert("RGBA")
diff --git a/src/superannotate/lib/core/usecases/projects.py b/src/superannotate/lib/core/usecases/projects.py
@@ -125,15 +125,18 @@ def execute(self):
         )
         data["project"] = project
         if self._include_complete_image_count:
-            projects = self._projects.get_all(
-                condition=(
-                    Condition("completeImagesCount", "true", EQ)
-                    & Condition("name", self._project.name, EQ)
-                    & Condition("team_id", self._project.team_id, EQ)
-                )
+            completed_images_data = self._service.bulk_get_folders(
+                self._project.team_id, [project.uuid]
             )
-            if projects:
-                data["project"] = projects[0]
+            root_completed_count = 0
+            total_completed_count = 0
+            for i in completed_images_data['data']:
+                total_completed_count += i['completedCount']
+                if i['is_root']:
+                    root_completed_count = i['completedCount']
+
+            project.root_folder_completed_images_count = root_completed_count
+            project.completed_images_count = total_completed_count
 
         if self._include_annotation_classes:
             self.annotation_classes_use_case.execute()
@@ -168,7 +171,6 @@ def __init__(
         settings: List[ProjectSettingEntity] = None,
         workflows: List[WorkflowEntity] = None,
         annotation_classes: List[AnnotationClassEntity] = None,
-        contributors: Iterable[dict] = None,
     ):
 
         super().__init__()
@@ -180,7 +182,6 @@ def __init__(
         self._workflows_repo = workflows_repo
         self._workflows = workflows
         self._annotation_classes = annotation_classes
-        self._contributors = contributors
         self._backend_service = backend_service_provider
 
     def validate_project_name(self):
@@ -258,22 +259,6 @@ def execute(self):
                     self._response.errors = set_workflow_response.errors
                 data["workflows"] = self._workflows
 
-            if self._contributors:
-                for contributor in self._contributors:
-                    self._backend_service.share_project_bulk(
-                        team_id=entity.team_id,
-                        project_id=entity.uuid,
-                        users=[
-                            {
-                                "user_id": contributor["user_id"],
-                                "user_role": constances.UserRole.get_value(
-                                    contributor["user_role"]
-                                ),
-                            }
-                        ],
-                    )
-                data["contributors"] = self._contributors
-
             logger.info(
                 "Created project %s (ID %s) with type %s",
                 self._response.data.name,
@@ -701,8 +686,9 @@ def execute(self):
                 if self._fill_classes:
                     annotation_classes = self._annotation_classes.get_all()
                     for annotation_class in annotation_classes:
-                        annotation_class.uuid = workflow.class_id
-                        workflow_data["className"] = annotation_class.name
+                        if annotation_class.id == workflow.class_id:
+                            workflow_data["className"] = annotation_class.name
+                            break
                 data.append(workflow_data)
             self._response.data = data
         return self._response
diff --git a/src/superannotate/lib/infrastructure/controller.py b/src/superannotate/lib/infrastructure/controller.py
@@ -292,7 +292,6 @@ def create_project(
         name: str,
         description: str,
         project_type: str,
-        contributors: Iterable = tuple(),
         settings: Iterable = tuple(),
         annotation_classes: Iterable = tuple(),
         workflows: Iterable = tuple(),
@@ -324,8 +323,7 @@ def create_project(
             annotation_classes=[
                 AnnotationClassEntity(**annotation_class)
                 for annotation_class in annotation_classes
-            ],
-            contributors=contributors,
+            ]
         )
         return use_case.execute()
 
@@ -1546,13 +1544,14 @@ def delete_annotations(
         )
         return use_case.execute()
 
+    @staticmethod
     def validate_annotations(
-        self, project_type: str, annotation: dict, allow_extra: bool = False
+        project_type: str, annotation: dict, allow_extra: bool = False
     ):
         use_case = usecases.ValidateAnnotationUseCase(
             project_type,
             annotation,
-            validators=self.annotation_validators,
+            validators=AnnotationValidators(),
             allow_extra=allow_extra,
         )
         return use_case.execute()
diff --git a/src/superannotate/lib/infrastructure/stream_data_handler.py b/src/superannotate/lib/infrastructure/stream_data_handler.py
@@ -13,7 +13,7 @@ def map_image_names_to_fetch_streamed_data(data: List[str]):
 
 
 class StreamedAnnotations:
-    DELIMITER = b'\n:)\n'
+    DELIMITER = b"\\n;)\\n"
 
     def __init__(self, headers: dict):
         self._headers = headers
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -0,0 +1,7 @@
+import os
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def tests_setup():
+    os.environ.update({"SA_TESTING": "True"})
diff --git a/tests/integration/annotations/test_annotations_pre_processing.py b/tests/integration/annotations/test_annotations_pre_processing.py
@@ -14,7 +14,7 @@
 
 
 class TestAnnotationUploadVector(BaseTestCase):
-    PROJECT_NAME = "TestAnnotationUploadVector"
+    PROJECT_NAME = "TestAnnotationUploadVectorPreProcessing"
     PROJECT_DESCRIPTION = "Desc"
     PROJECT_TYPE = "Vector"
     S3_FOLDER_PATH = "sample_project_pixel"
diff --git a/tests/integration/annotations/test_get_annotations.py b/tests/integration/annotations/test_get_annotations.py
@@ -23,6 +23,7 @@ def folder_path(self):
 
     @pytest.mark.flaky(reruns=3)
     def test_get_annotations(self):
+        sa.init()
         sa.upload_images_from_folder_to_project(
             self.PROJECT_NAME, self.folder_path, annotation_status="InProgress"
         )
diff --git a/tests/integration/annotations/test_get_annotations_per_frame.py b/tests/integration/annotations/test_get_annotations_per_frame.py
@@ -35,6 +35,7 @@ def annotations_path(self):
         return os.path.join(self.folder_path, self.ANNOTATIONS_PATH)
 
     def test_video_annotation_upload(self):
+        sa.init()
         sa.create_annotation_classes_from_classes_json(self.PROJECT_NAME, self.classes_path)
 
         _, _, _ = sa.attach_video_urls_to_project(
diff --git a/tests/integration/projects/test_basic_project.py b/tests/integration/projects/test_basic_project.py
@@ -9,6 +9,93 @@
 from tests.integration.base import BaseTestCase
 
 
+class TestWorkflowGet(BaseTestCase):
+    PROJECT_NAME = "TestWorkflowGet"
+    PROJECT_TYPE = "Vector"
+    PROJECT_DESCRIPTION = "DESCRIPTION"
+
+    def test_workflow_get(self):
+        sa.create_annotation_class(
+            self.PROJECT_NAME,
+            "class1",
+            "#FFAAFF",
+            [
+                {
+                    "name": "tall",
+                    "is_multiselect": 0,
+                    "attributes": [{"name": "yes"}, {"name": "no"}],
+                },
+                {
+                    "name": "age",
+                    "is_multiselect": 0,
+                    "attributes": [{"name": "young"}, {"name": "old"}],
+                },
+            ],
+        )
+        sa.create_annotation_class(
+            self.PROJECT_NAME,
+            "class2",
+            "#FFAAFF",
+            [
+                {
+                    "name": "tall",
+                    "is_multiselect": 0,
+                    "attributes": [{"name": "yes"}, {"name": "no"}],
+                },
+                {
+                    "name": "age",
+                    "is_multiselect": 0,
+                    "attributes": [{"name": "young"}, {"name": "old"}],
+                },
+            ],
+        )
+        sa.set_project_workflow(
+            self.PROJECT_NAME,
+            [
+                {
+                    "step": 1,
+                    "className": "class1",
+                    "tool": 3,
+                    "attribute": [
+                        {
+                            "attribute": {
+                                "name": "young",
+                                "attribute_group": {"name": "age"},
+                            }
+                        },
+                        {
+                            "attribute": {
+                                "name": "yes",
+                                "attribute_group": {"name": "tall"},
+                            }
+                        },
+                    ],
+                },
+                {
+                    "step": 2,
+                    "className": "class2",
+                    "tool": 3,
+                    "attribute": [
+                        {
+                            "attribute": {
+                                "name": "young",
+                                "attribute_group": {"name": "age"},
+                            }
+                        },
+                        {
+                            "attribute": {
+                                "name": "yes",
+                                "attribute_group": {"name": "tall"},
+                            }
+                        },
+                    ],
+                }
+            ],
+        )
+        workflows = sa.get_project_workflow(self.PROJECT_NAME)
+        self.assertEqual(workflows[0]['className'], "class1")
+        self.assertEqual(workflows[1]['className'], "class2")
+
 
 class TestProjectCreateMetadata(BaseTestCase):
     PROJECT_NAME = "sample_basic_project"
@@ -93,7 +180,6 @@ def test_create_project_from_metadata(self):
                                 include_annotation_classes=True
                                 )
         self.assertEqual(len(created["classes"]), 1)
-        self.assertEqual(len(created["contributors"]), 1)
         self.assertEqual([f"{i['attribute']}_{i['value']}" for i in meta["settings"]],
                          [f"{i['attribute']}_{i['value']}" for i in created["settings"]])
         self.assertEqual(len(created['workflows']), 1)
diff --git a/tests/integration/projects/test_clone_project.py b/tests/integration/projects/test_clone_project.py
@@ -150,7 +150,7 @@ def test_create_like_project(self):
                     "attributes": [{"name": "young"}, {"name": "old"}],
                 },
             ],
-            "tag"
+            "object"
         )
 
         new_project = sa.clone_project(
diff --git a/tests/integration/test_folders.py b/tests/integration/test_folders.py
@@ -444,6 +444,19 @@ def test_folder_export(self):
             )
             self.assertEqual(len(list((temp_dir).glob("*.*"))), 4)
 
+    def test_project_completed_count(self):
+        sa.upload_images_from_folder_to_project(
+            self.PROJECT_NAME, self.folder_path, annotation_status="Completed"
+        )
+        sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)
+        project = f"{self.PROJECT_NAME}/{self.TEST_FOLDER_NAME_1}"
+        sa.upload_images_from_folder_to_project(
+            project, self.folder_path, annotation_status="Completed"
+        )
+        project_metadata = sa.get_project_metadata(self.PROJECT_NAME, include_complete_image_count=True)
+        self.assertEqual(project_metadata['completed_images_count'], 8)
+        self.assertEqual(project_metadata['rootFolderCompletedImagesCount'], 4)
+
     def test_folder_image_annotation_status(self):
         sa.upload_images_from_folder_to_project(
             self.PROJECT_NAME, self.folder_path, annotation_status="InProgress"
