Fix tests.

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=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/entities/__init__.py

@@ -15,7 +15,9 @@
 from superannotate_schemas.schemas.internal.pixel import PixelAnnotation
 from superannotate_schemas.schemas.internal.vector import VectorAnnotation
 from superannotate_schemas.schemas.internal.video import VideoAnnotation
-from superannotate_schemas.schemas.internal.video import VideoAnnotation as VideoExportAnnotation
+from superannotate_schemas.schemas.internal.video import (
+    VideoAnnotation as VideoExportAnnotation,
+)
 
 __all__ = [
     "BaseEntity",

src/superannotate/lib/core/reporter.py

@@ -46,16 +46,12 @@ def start_progress(
 
     @staticmethod
     def get_progress_bar(
-            iterations: Union[int, range], description: str = "Processing", disable=False
+        iterations: Union[int, range], description: str = "Processing", disable=False
     ):
         if isinstance(iterations, range):
-            return tqdm.tqdm(
-                iterations, desc=description, disable=disable
-            )
+            return tqdm.tqdm(iterations, desc=description, disable=disable)
         else:
-            return tqdm.tqdm(
-                total=iterations, desc=description, disable=disable
-            )
+            return tqdm.tqdm(total=iterations, desc=description, disable=disable)
 
     def finish_progress(self):
         self.progress_bar.close()
@@ -80,7 +76,7 @@ def messages(self):
             yield f"{key} [{', '.join(values)}]"
 
 
-class Progress(object):
+class Progress:
     def __init__(self, iterations: Union[int, range], description: str = "Processing"):
         self._iterations = iterations
         self._description = description
@@ -95,5 +91,7 @@ def __exit__(self, type, value, traceback):
 
     def update(self, value=1):
         if not self._progress_bar:
-            self._progress_bar = Reporter.get_progress_bar(self._iterations, self._description)
-        self._progress_bar.update(value)
+            self._progress_bar = Reporter.get_progress_bar(
+                self._iterations, self._description
+            )
+        self._progress_bar.update(value)

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

@@ -25,8 +25,8 @@
 from lib.core.usecases.base import BaseReportableUseCae
 from lib.core.usecases.images import GetBulkImages
 from lib.core.usecases.images import ValidateAnnotationUseCase
-from superannotate_schemas.validators import AnnotationValidators
 from superannotate.logger import get_default_logger
+from superannotate_schemas.validators import AnnotationValidators
 
 logger = get_default_logger()
 

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

@@ -35,11 +35,11 @@
 from lib.core.exceptions import ImageProcessingException
 from lib.core.plugin import ImagePlugin
 from lib.core.plugin import VideoPlugin
+from lib.core.reporter import Progress
 from lib.core.reporter import Reporter
 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 +3208,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 = use_case.response.errors
+                        self._response.errors = (
+                            frames_generator_use_case.response.errors
+                        )
                         return self._response
 
                     frames_generator = frames_generator_use_case.execute()
@@ -3230,7 +3232,9 @@ def execute(self) -> Response:
                     if set(duplicate_images) == set(frame_names):
                         continue
                     uploaded_paths = []
-                    with Progress(total_frames_count, f"Uploading {Path(path).name}") as progress:
+                    with Progress(
+                        total_frames_count, f"Uploading {Path(path).name}"
+                    ) as progress:
                         for _ in frames_generator:
                             use_case = UploadImagesFromFolderToProject(
                                 project=self._project,

src/superannotate/lib/infrastructure/controller.py

@@ -32,8 +32,9 @@
 from lib.infrastructure.repositories import TeamRepository
 from lib.infrastructure.repositories import WorkflowRepository
 from lib.infrastructure.services import SuperannotateBackendService
-from superannotate_schemas.validators import AnnotationValidators
 from superannotate.logger import get_default_logger
+from superannotate_schemas.validators import AnnotationValidators
+
 
 class SingleInstanceMetaClass(type):
     _instances = {}

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"]