Update __init__.py

Author: VaghinakDev

src/superannotate/__init__.py

@@ -1,7 +1,7 @@
 import os
 import sys
 
-__version__ = "4.4.2dev3"
+__version__ = "4.4.2dev5"
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 

src/superannotate/lib/core/service_types.py

@@ -99,7 +99,7 @@ class Config:
         extra = Extra.allow
 
     def __init__(self, response=None, content_type=None, dispatcher: Callable = None):
-        if not response:
+        if response is None:
             super().__init__()
             return
         data = {

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

@@ -5,9 +5,7 @@
 import json
 import os
 import platform
-import queue
 import sys
-import threading
 import time
 from dataclasses import dataclass
 from datetime import datetime
@@ -68,6 +66,7 @@ class Report:
 class UploadAnnotationsUseCase(BaseReportableUseCase):
     MAX_WORKERS = 16
     CHUNK_SIZE = 100
+    CHUNK_SIZE_MB = 10 * 1024 * 1024
     STATUS_CHANGE_CHUNK_SIZE = 100
     AUTH_DATA_CHUNK_SIZE = 500
     THREADS_COUNT = 4
@@ -325,7 +324,7 @@ async def upload_small_annotations(self):
                 self._small_files_queue.put_nowait(None)
                 break
             chunk.append(item)
-            if len(chunk) >= self.CHUNK_SIZE:
+            if sys.getsizeof(chunk) >= self.CHUNK_SIZE_MB:
                 report = await self._upload_small_annotations(chunk)
                 self._report.failed_annotations.extend(report.failed_annotations)
                 self._report.missing_classes.extend(report.missing_classes)
@@ -1159,6 +1158,8 @@ def iter_errors(self, instance, _schema=None):
                 try:
                     for error in errors:
                         # set details if not already set by the called fn
+                        if isinstance(error, StopIteration):
+                            return
                         error._set(
                             validator=k,
                             validator_value=v,
@@ -1168,7 +1169,7 @@ def iter_errors(self, instance, _schema=None):
                         if k != "$ref":
                             error.schema_path.appendleft(k)
                         yield error
-                except StopIteration:
+                except RuntimeError:
                     pass
         finally:
             if scope:
@@ -1219,6 +1220,8 @@ def execute(self) -> Response:
         errors_report: List[Tuple[str, str]] = []
         if errors:
             for error in errors:
+                if not error:
+                    continue
                 real_path = extract_path(error.path)
                 if not error.context:
                     errors_report.append(("".join(real_path), error.message))

src/superannotate/lib/infrastructure/controller.py

@@ -1052,7 +1052,7 @@ def upload_annotations_from_folder(
             templates=self._backend_client.get_templates(team_id=self.team_id).get(
                 "data", []
             ),
-            reporter=self.get_default_reporter(log_info=False, log_warning=False),
+            reporter=self.get_default_reporter(),
             folder_path=folder_path,
             folders=self.folders,
         )

src/superannotate/lib/infrastructure/services.py

@@ -289,9 +289,7 @@ class SuperannotateBackendService(BaseBackendService):
     URL_DELETE_ANNOTATIONS = "annotations/remove"
     URL_DELETE_ANNOTATIONS_PROGRESS = "annotations/getRemoveStatus"
     URL_GET_LIMITS = "project/{}/limitationDetails"
-    URL_GET_ANNOTATIONS = (
-        "https://assets-provider.devsuperannotate.com/api/v1/annotations/stream"
-    )
+    URL_GET_ANNOTATIONS = "items/annotations/download"
     URL_UPLOAD_PRIORITY_SCORES = "images/updateEntropy"
     URL_GET_INTEGRATIONS = "integrations"
     URL_ATTACH_INTEGRATIONS = "image/integration/create"
@@ -556,7 +554,6 @@ def create_annotation_classes(
             params=params,
             data={"classes": data},
             content_type=List[AnnotationClassEntity],
-            # dispatcher=lambda x: x.pop("data")
         )
 
     def get_project_workflows(self, project_id: int, team_id: int):
@@ -1156,7 +1153,7 @@ def get_annotations(
 
         return loop.run_until_complete(
             handler.get_data(
-                url=self.URL_GET_ANNOTATIONS,
+                url=urljoin(self.assets_provider_url, self.URL_GET_ANNOTATIONS),
                 data=items,
                 params=query_params,
                 chunk_size=self.DEFAULT_CHUNK_SIZE,
@@ -1194,7 +1191,7 @@ async def download_annotations(
             )
 
             return await handler.download_data(
-                url=self.URL_GET_ANNOTATIONS,
+                url=urljoin(self.assets_provider_url, self.URL_GET_ANNOTATIONS),
                 data=items,
                 params=query_params,
                 chunk_size=self.DEFAULT_CHUNK_SIZE,

tests/integration/annotations/test_annotations_upload_status_change.py

@@ -1,15 +1,17 @@
-from pathlib import Path
 import os
 from os.path import join
-import pytest
-from unittest.mock import patch
+from pathlib import Path
 from unittest.mock import MagicMock
+from unittest.mock import patch
+
+import pytest
 
-from src.superannotate import SAClient
-sa = SAClient()
 import src.superannotate.lib.core as constances
+from src.superannotate import SAClient
 from tests.integration.base import BaseTestCase
 
+sa = SAClient()
+
 
 class TestAnnotationUploadStatusChangeVector(BaseTestCase):
     PROJECT_NAME = "TestAnnotationUploadStatusChangeVector"

tests/integration/annotations/test_missing_annotation_upload.py

@@ -65,43 +65,3 @@ def test_missing_pre_annotation_upload(self):
         self.assertEqual(len(could_not_upload), 0)
         self.assertEqual(len(missing_images), 1)
 
-        self.assertTrue(
-            any(
-                [
-                    True
-                    for path in uploaded
-                    if "sample_project_vector_for_checks/example_image_1.jpg___objects.json"
-                    in path
-                ]
-            )
-        )
-        self.assertTrue(
-            any(
-                [
-                    True
-                    for path in uploaded
-                    if "sample_project_vector_for_checks/example_image_2.jpg___objects.json"
-                    in path
-                ]
-            )
-        )
-        self.assertTrue(
-            any(
-                [
-                    True
-                    for path in uploaded
-                    if "sample_project_vector_for_checks/example_image_4.jpg___objects.json"
-                    in path
-                ]
-            )
-        )
-        self.assertTrue(
-            any(
-                [
-                    True
-                    for path in missing_images
-                    if "sample_project_vector_for_checks/example_image_5.jpg___objects.json"
-                    in path
-                ]
-            )
-        )

tests/integration/annotations/test_upload_annotations_from_folder_to_project.py

@@ -12,9 +12,14 @@ class TestAnnotationUploadVector(BaseTestCase):
     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 = "data_set/sample_big_json_vector"
     IMAGE_NAME = "example_image_1.jpg"
 
+    @property
+    def data_set(self):
+        return Path(__file__).parent.parent.parent
+
     @property
     def folder_path(self):
         return os.path.join(Path(__file__).parent.parent.parent, self.TEST_FOLDER_PATH)
@@ -40,16 +45,27 @@ def test_annotation_folder_upload_download(self):
         # assert annotation["instances"][-1]["attributes"] == []
         # assert annotation["instances"][-2]["attributes"] == []
 
+    def test_4_annotation_folder_upload_download(self):
+        self._attach_items()
+        sa.create_annotation_classes_from_classes_json(
+            self.PROJECT_NAME, f"{self.folder_path}/classes/classes.json"
+        )
+        uploaded, _, _ = sa.upload_annotations_from_folder_to_project(
+            self.PROJECT_NAME, os.path.join(self.data_set, self.TEST_4_FOLDER_PATH)
+        )
+        assert len(uploaded) == 4
+
     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, 2)]  # noqa
+            [{"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"
         )
-        _, _, _ = sa.upload_annotations_from_folder_to_project(
+        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(annotations) == 5
+        print([len(annotation["instances"]) > 1 for annotation in annotations])

tests/integration/annotations/test_video_annotation_upload.py

@@ -1,16 +1,14 @@
-import json
 import os
 import tempfile
 from pathlib import Path
 
 import pytest
 
 from src.superannotate import SAClient
-from src.superannotate.lib.core.reporter import Reporter
+from tests.integration.base import BaseTestCase
 
-sa = SAClient()
 
-from tests.integration.base import BaseTestCase
+sa = SAClient()
 
 
 class TestUploadVideoAnnotation(BaseTestCase):