test fix

Author: VaghinakDev

pytest.ini

@@ -3,5 +3,5 @@ minversion = 3.7
 log_cli=true
 python_files = test_*.py
 ;pytest_plugins = ['pytest_profiling']
-;addopts = -n auto --dist=loadscope
+addopts = -n auto --dist=loadscope
 

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

@@ -161,13 +161,22 @@ class Config:
         extra = Extra.ignore
 
 
+class UserEntity(BaseModel):
+    id: Optional[str]
+    first_name: Optional[str]
+    last_name: Optional[str]
+    email: Optional[str]
+    picture: Optional[str]
+    user_role: Optional[int]
+
+
 class TeamEntity(BaseModel):
     id: Optional[int]
     name: Optional[str]
     description: Optional[str]
     type: Optional[str]
     user_role: Optional[str]
     is_default: Optional[bool]
-    users: Optional[List[Any]]
+    users: Optional[List[UserEntity]]
     pending_invitations: Optional[List[Any]]
     creator_id: Optional[str]

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

@@ -1037,7 +1037,6 @@ def validate_project_type(self):
 
     def execute(self):
         if self.is_valid():
-            self.reporter.disable_info()
             response = GetAnnotations(
                 config=self._config,
                 reporter=Reporter(log_info=False),
@@ -1046,10 +1045,9 @@ def execute(self):
                 item_names=[self._video_name],
                 service_provider=self._service_provider,
             ).execute()
-            self.reporter.enable_info()
             if response.data:
                 generator = VideoFrameGenerator(response.data[0], fps=self._fps)
-                self.reporter.log_info(
+                logger.info(
                     f"Getting annotations for {generator.frames_count} frames from {self._video_name}."
                 )
                 if response.errors:
@@ -1412,21 +1410,10 @@ def validate_item_names(self):
             self._item_names = [
                 i for i in self._item_names if not (i in seen or seen.add(i))
             ]
-        elif self._item_names is None:
-            self._item_names_provided = False
-            condition = Condition("project_id", self._project.id, EQ) & Condition(
-                "folder_id", self._folder.id, EQ
-            )
-
-            self._item_names = [
-                item.name for item in self._service_provider.items.list(condition).data
-            ]
-        else:
-            self._item_names = []
 
     def _prettify_annotations(self, annotations: List[dict]):
         re_struct = {}
-        if self._item_names_provided:
+        if self._item_names:
             for annotation in annotations:
                 re_struct[annotation["metadata"]["name"]] = annotation
             try:
@@ -1528,19 +1515,23 @@ def execute(self):
                         self._project, self._folder, self._item_names
                     )
                 )
+                len_items, len_provided_items = len(items), len(self._item_names)
+                if len_items != len_provided_items:
+                    self.reporter.log_warning(
+                        f"Could not find annotations for {len_provided_items - len_items}/{len_provided_items} items."
+                    )
             else:
                 condition = Condition("project_id", self._project.id, EQ) & Condition(
                     "folder_id", self._folder.id, EQ
                 )
                 items = get_or_raise(self._service_provider.items.list(condition))
             id_item_map = {i.id: i for i in items}
-
             if not items:
                 logger.info("No annotations to download.")
                 self._response.data = []
                 return self._response
             items_count = len(items)
-            logger.info(
+            self.reporter.log_info(
                 f"Getting {items_count} annotations from "
                 f"{self._project.name}{f'/{self._folder.name}' if self._folder.name != 'root' else ''}."
             )
@@ -1563,12 +1554,8 @@ def execute(self):
                 logger.error(e)
                 self._response.errors = AppException("Can't get annotations.")
                 return self._response
-            received_items_count = len(annotations)
             self.reporter.finish_progress()
-            if items_count > received_items_count:
-                self.reporter.log_warning(
-                    f"Could not find annotations for {items_count - received_items_count}/{items_count} items."
-                )
+
             self._response.data = self._prettify_annotations(annotations)
         return self._response
 

tests/integration/annotations/test_get_annotations.py

@@ -24,9 +24,8 @@ def folder_path(self):
 
     # @pytest.mark.flaky(reruns=3)
     def test_get_annotations(self):
-        sa.upload_images_from_folder_to_project(
-            self.PROJECT_NAME, self.folder_path, annotation_status="InProgress"
-        )
+        self._attach_items(count=4)
+
         sa.create_annotation_classes_from_classes_json(
             self.PROJECT_NAME, f"{self.folder_path}/classes/classes.json"
         )
@@ -126,24 +125,23 @@ def test_get_annotations10000(self):
         a = sa.get_annotations(self.PROJECT_NAME)
         assert len(a) == count
 
-    def test_get_annotation(self):  # to_delete
-        count = 2
-        sa.attach_items(
-            self.PROJECT_NAME,
-            [
-                {"name": f"example_image_{i}.jpg", "url": f"url_{i}"}
-                for i in range(count)
-            ],  # noqa
-        )
-        assert len(sa.search_items(self.PROJECT_NAME)) == count
-        a = sa.get_annotations(self.PROJECT_NAME)
-        assert len(a) == count
-
-    def test_get_annotations_duplicated_names(self):
+    def test_get_annotations_logs(self):
         self._attach_items(count=4)
+        items_names = [self.IMAGE_NAME] * 4
+        items_names.append("Non-existent item")
         with self.assertLogs("sa", level="INFO") as cm:
-            sa.get_annotations(self.PROJECT_NAME, [self.IMAGE_NAME] * 4)
-            assert "INFO:sa:Dropping duplicates. Found 1/4 unique items." in cm.output
+            assert len(sa.get_annotations(self.PROJECT_NAME, items_names)) == 4
+            assert (
+                "INFO:sa:Dropping duplicates. Found 2/5 unique items." == cm.output[0]
+            )
+            assert (
+                "WARNING:sa:Could not find annotations for 1/2 items." == cm.output[1]
+            )
+            assert (
+                f"INFO:sa:Getting 1 annotations from {self.PROJECT_NAME}."
+                == cm.output[2]
+            )
+            assert len(cm.output) == 3
 
 
 class TestGetAnnotationsVideo(BaseTestCase):
@@ -172,7 +170,7 @@ def folder_path(self):
     def annotations_path(self):
         return os.path.join(self.folder_path, self.ANNOTATIONS_PATH)
 
-    def test_video_annotation_upload_root(self):
+    def test_video_get_annotations_root(self):
         sa.create_annotation_classes_from_classes_json(
             self.PROJECT_NAME, self.classes_path
         )
@@ -187,7 +185,7 @@ def test_video_annotation_upload_root(self):
         annotations = sa.get_annotations(self.PROJECT_NAME)
         self.assertEqual(len(annotations), 2)
 
-    def test_video_annotation_upload_folder(self):
+    def test_video_get_annotations_from_folder(self):
         sa.create_annotation_classes_from_classes_json(
             self.PROJECT_NAME, self.classes_path
         )

tests/integration/annotations/test_large_annotations.py

@@ -0,0 +1,90 @@
+import json
+import os
+import tempfile
+from pathlib import Path
+
+from src.superannotate import SAClient
+from src.superannotate.lib.app.helpers import get_annotation_paths
+from tests import DATA_SET_PATH
+from tests.integration.base import BaseTestCase
+
+sa = SAClient()
+
+
+class TestAnnotationUploadVector(BaseTestCase):
+    PROJECT_NAME = "Test-upload_annotations"
+    PROJECT_DESCRIPTION = "Desc"
+    PROJECT_TYPE = "Vector"
+    TEST_FOLDER_PATH = "data_set/sample_vector_annotations_with_tag_classes"
+    TEST_4_FOLDER_PATH = "data_set/sample_project_vector"
+    TEST_BIG_FOLDER_PATH = "sample_big_json_vector"
+
+    IMAGE_NAME = "example_image_1.jpg"
+
+    @property
+    def data_set(self):
+        return Path(__file__).parent.parent.parent
+
+    @property
+    def big_annotations_folder_path(self):
+        return os.path.join(DATA_SET_PATH, self.TEST_BIG_FOLDER_PATH)
+
+    @staticmethod
+    def _get_annotations_from_folder(path):
+        paths = get_annotation_paths(path)
+        annotations = []
+        for i in paths:
+            annotations.append(json.load(open(i)))
+        return annotations
+
+    def test_large_annotations_upload_get_download(self):
+        items_to_attach = [
+            {"name": f"aearth_mov_00{i}.jpg", "url": f"url_{i}"} for i in range(1, 6)
+        ]
+        sa.attach_items(
+            self.PROJECT_NAME,
+            items_to_attach,
+        )
+        sa.create_annotation_classes_from_classes_json(
+            self.PROJECT_NAME,
+            f"{self.big_annotations_folder_path}/classes/classes.json",
+        )
+        annotations = self._get_annotations_from_folder(
+            self.big_annotations_folder_path
+        )
+        with self.assertLogs("sa", level="INFO") as cm:
+            uploaded, _, _ = sa.upload_annotations(
+                self.PROJECT_NAME, annotations
+            ).values()
+            assert (
+                "INFO:sa:Uploading 5/5 annotations to the project Test-upload_annotations."
+                == cm.output[0]
+            )
+            assert len(uploaded) == 5
+
+        with self.assertLogs("sa", level="INFO") as cm:
+            annotations = sa.get_annotations(self.PROJECT_NAME)
+            assert (
+                "INFO:sa:Getting 5 annotations from Test-upload_annotations."
+                == cm.output[0]
+            )
+            assert len(annotations) == 5
+            assert [
+                len(annotation["instances"]) > 1 for annotation in annotations
+            ].count(True) == 4
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            with self.assertLogs("sa", level="INFO") as cm:
+                sa.download_annotations(self.PROJECT_NAME, tmpdir)
+                assert cm.output[0].startswith(
+                    "INFO:sa:Downloading the annotations of the requested items to /var/"
+                )
+                assert cm.output[0].endswith("This might take a while…")
+
+            for item_name in items_to_attach:
+                annotation = self._get_annotations_from_folder(
+                    f"{tmpdir}/{os.listdir(tmpdir)[0]}/{items_to_attach[0]['name']}___objects.json"
+                )
+                for i in annotations:
+                    if i["metadata"]["name"] == item_name:
+                        assert i == annotation

tests/integration/annotations/test_upload_annotations.py

@@ -16,7 +16,6 @@ class TestAnnotationUploadVector(BaseTestCase):
     PROJECT_TYPE = "Vector"
     TEST_FOLDER_PATH = "data_set/sample_vector_annotations_with_tag_classes"
     TEST_4_FOLDER_PATH = "data_set/sample_project_vector"
-    TEST_BIG_FOLDER_PATH = "sample_big_json_vector"
     TEST_LARGE_FOLDER_PATH = "sample_large_json_vector"
     IMAGE_NAME = "example_image_1.jpg"
 
@@ -28,10 +27,6 @@ def data_set(self):
     def folder_path(self):
         return os.path.join(Path(__file__).parent.parent.parent, self.TEST_FOLDER_PATH)
 
-    @property
-    def big_annotations_folder_path(self):
-        return os.path.join(DATA_SET_PATH, self.TEST_BIG_FOLDER_PATH)
-
     @property
     def large_annotations_folder_path(self):
         return os.path.join(DATA_SET_PATH, self.TEST_LARGE_FOLDER_PATH)
@@ -115,25 +110,3 @@ def test_upload_large_annotations(self):
         assert [len(annotation["instances"]) > 1 for annotation in annotations].count(
             True
         ) == 5
-
-    def test_upload_big_annotations(self):
-        sa.attach_items(
-            self.PROJECT_NAME,
-            [
-                {"name": f"aearth_mov_00{i}.jpg", "url": f"url_{i}"}
-                for i in range(1, 6)
-            ],  # noqa
-        )
-        sa.create_annotation_classes_from_classes_json(
-            self.PROJECT_NAME,
-            f"{self.big_annotations_folder_path}/classes/classes.json",
-        )
-        annotations = self._get_annotations_from_folder(
-            self.big_annotations_folder_path
-        )
-        uploaded, _, _ = sa.upload_annotations(self.PROJECT_NAME, annotations).values()
-        assert len(uploaded) == 5
-        annotations = sa.get_annotations(self.PROJECT_NAME)
-        assert [len(annotation["instances"]) > 1 for annotation in annotations].count(
-            True
-        ) == 4

tests/integration/annotations/test_upload_annotations_from_folder_to_project.py

@@ -14,7 +14,6 @@ class TestAnnotationUploadVector(BaseTestCase):
     PROJECT_TYPE = "Vector"
     TEST_FOLDER_PATH = "data_set/sample_vector_annotations_with_tag_classes"
     TEST_4_FOLDER_PATH = "data_set/sample_project_vector"
-    TEST_BIG_FOLDER_PATH = "sample_big_json_vector"
     TEST_LARGE_FOLDER_PATH = "sample_large_json_vector"
     IMAGE_NAME = "example_image_1.jpg"
 
@@ -26,10 +25,6 @@ def data_set(self):
     def folder_path(self):
         return os.path.join(Path(__file__).parent.parent.parent, self.TEST_FOLDER_PATH)
 
-    @property
-    def big_annotations_folder_path(self):
-        return os.path.join(DATA_SET_PATH, self.TEST_BIG_FOLDER_PATH)
-
     @property
     def large_annotations_folder_path(self):
         return os.path.join(DATA_SET_PATH, self.TEST_LARGE_FOLDER_PATH)
@@ -100,27 +95,6 @@ def test_upload_large_annotations(self):
             True
         ) == 5
 
-    def test_upload_big_annotations(self):
-        sa.attach_items(
-            self.PROJECT_NAME,
-            [
-                {"name": f"aearth_mov_00{i}.jpg", "url": f"url_{i}"}
-                for i in range(1, 6)
-            ],  # noqa
-        )
-        sa.create_annotation_classes_from_classes_json(
-            self.PROJECT_NAME,
-            f"{self.big_annotations_folder_path}/classes/classes.json",
-        )
-        uploaded, _, _ = sa.upload_annotations_from_folder_to_project(
-            self.PROJECT_NAME, self.big_annotations_folder_path
-        )
-        assert len(uploaded) == 5
-        annotations = sa.get_annotations(self.PROJECT_NAME)
-        assert [len(annotation["instances"]) > 1 for annotation in annotations].count(
-            True
-        ) == 4
-
 
 class TestExportUploadVector(BaseTestCase):
     PROJECT_NAME = "Test-TestExporeExportUploadVector"