merge friday

Author: dshabin

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=loads cope

src/superannotate/lib/app/analytics/aggregators.py

@@ -1,13 +1,13 @@
 import copy
 import json
-from dataclasses import dataclass
 from pathlib import Path
 from typing import List
 from typing import Optional
 from typing import Union
 
 import lib.core as constances
 import pandas as pd
+from dataclasses import dataclass
 from lib.app.exceptions import AppException
 from lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
 from lib.core import PIXEL_ANNOTATION_POSTFIX

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

@@ -2334,6 +2334,8 @@ def add_annotation_bbox_to_image(
     response = controller.get_image_annotations(
         project_name=project_name, folder_name=folder_name, image_name=image_name
     )
+    if response.errors:
+        raise AppException(response.errors)
     annotations = response.data["annotation_json"]
     annotations = add_annotation_bbox_to_json(
         annotations,
@@ -2380,6 +2382,8 @@ def add_annotation_point_to_image(
     response = controller.get_image_annotations(
         project_name=project_name, folder_name=folder_name, image_name=image_name
     )
+    if response.errors:
+        raise AppException(response.errors)
     annotations = response.data["annotation_json"]
     annotations = add_annotation_point_to_json(
         annotations,
@@ -2423,6 +2427,8 @@ def add_annotation_comment_to_image(
     response = controller.get_image_annotations(
         project_name=project_name, folder_name=folder_name, image_name=image_name
     )
+    if response.errors:
+        raise AppException(response.errors)
     annotations = response.data["annotation_json"]
     annotations = add_annotation_comment_to_json(
         annotations,

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

@@ -40,6 +40,7 @@
 from lib.core.repositories import BaseManageableRepository
 from lib.core.repositories import BaseReadOnlyRepository
 from lib.core.response import Response
+from lib.core.reporter import Progress
 from lib.core.serviceproviders import SuerannotateServiceProvider
 from lib.core.usecases.base import BaseInteractiveUseCase
 from lib.core.usecases.base import BaseReportableUseCae
@@ -3208,7 +3209,9 @@ def execute(self) -> Response:
                         image_quality_in_editor=self._image_quality_in_editor,
                     )
                     if not frames_generator_use_case.is_valid():
-                        self._response.errors = frames_generator_use_case.response.errors
+                        self._response.errors = (
+                            frames_generator_use_case.response.errors
+                        )
                         return self._response
 
                     frames_generator = frames_generator_use_case.execute()

tests/integration/aggregations/test_video_annotation_to_df.py

@@ -7,6 +7,7 @@
 from unittest import TestCase
 
 import src.superannotate as sa
+from src.superannotate.logger import get_default_logger
 
 
 class TestAggregateVideoAnnotation(TestCase):
@@ -41,7 +42,7 @@ def test_nested_folder_data_filling(self):
     def test_empty_folder_log(self):
         with tempfile.TemporaryDirectory() as temp_dir:
             copy_tree(f"{self.folder_path}/classes", f"{temp_dir}/classes")
-            logger = logging.getLogger('root')
+            logger = get_default_logger()
             with mock.patch.object(logger, 'warning') as mock_log:
                 _ = sa.aggregate_annotations_as_df(temp_dir, self.PROJECT_TYPE)
                 mock_log.assert_called_with(f"Could not find annotations in {temp_dir}.")

tests/integration/test_assign_images.py

@@ -1,4 +1,5 @@
 import os
+import pytest
 from os.path import dirname
 
 import src.superannotate as sa
@@ -55,6 +56,7 @@ def test_assign_images_folder(self):
         self.assertIsNotNone(im1_metadata["qa_name"])
         self.assertIsNotNone(im2_metadata["qa_name"])
 
+    @pytest.mark.flaky(reruns=2)
     def test_un_assign_images(self):
 
         email = sa.get_team_metadata()["users"][0]["email"]

tests/integration/test_attach_image_urls.py

@@ -1,4 +1,5 @@
 import os
+import pytest
 from os.path import dirname
 
 import src.superannotate as sa
@@ -14,6 +15,7 @@ class TestImageUrls(BaseTestCase):
     PROJECT_DESCRIPTION = "desc"
     PROJECT_TYPE = "Vector"
 
+    @pytest.mark.flaky(reruns=2)
     def test_attach_image_urls(self):
         uploaded, could_not_upload, existing_images = sa.attach_image_urls_to_project(
             self.PROJECT_NAME,

tests/integration/test_cli.py

@@ -169,8 +169,8 @@ def test_vector_pre_annotation_folder_upload_download_cli(self):
         )
         # tod add test
 
-    # @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
-    #                     reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
+    @pytest.mark.skipif(CLI_VERSION and CLI_VERSION != sa.__version__,
+                        reason=f"Updated package version from {CLI_VERSION} to {sa.__version__}")
     def test_vector_annotation_folder_upload_download_cli(self):
         self._create_project()
         sa.create_annotation_classes_from_classes_json(

tests/integration/test_depricated_functions_document.py

@@ -1,5 +1,6 @@
 import os
 from os.path import dirname
+import pytest
 from unittest import TestCase
 
 import src.superannotate as sa
@@ -61,6 +62,7 @@ def annotation_path(self):
     def image_path(self):
         return f'{self.folder_path}/example_image_1.jpg'
 
+    @pytest.mark.flaky(reruns=2)
     def test_deprecated_functions(self):
         _, _, _ = sa.attach_document_urls_to_project(
             self.PROJECT_NAME,

tests/integration/test_recursive_folder.py

@@ -125,6 +125,7 @@ def test_annotations_recursive_s3_folder(self):
 
             self.assertEqual(len(list(Path(tmp_dir).glob(self.JSON_POSTFIX))), 2)
 
+    @pytest.mark.flaky(reruns=2)
     def test_annotations_non_recursive_s3_folder(self):
         sa.upload_images_from_folder_to_project(
             self.PROJECT_NAME,