delete old test

Author: VaghinakDev

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.7
 log_cli=true
 python_files = test_*.py
-addopts = -n auto --dist=loadscope
+;addopts = -n auto --dist=loadscope

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

@@ -580,7 +580,7 @@ def search_annotation_classes(
         """
         project_name, folder_name = extract_project_folder(project)
         classes = self.controller.search_annotation_classes(project_name, name_contains)
-        return BaseSerializer.serialize_iterable(classes.data)
+        return [i.dict(fill_enum_values=True) for i in classes.data]
 
     def set_project_default_image_quality_in_editor(
         self,

src/superannotate/lib/app/serializers.py

@@ -48,6 +48,7 @@ def _serialize(
         by_alias: bool = False,
         flat: bool = False,
         exclude: Set[str] = None,
+        **kwargs
     ):
         if not entity:
             return None
@@ -59,13 +60,15 @@ def _serialize(
                 if len(fields) == 1:
                     if flat:
                         return entity.dict(
-                            include=fields, by_alias=by_alias, exclude=exclude
+                            include=fields, by_alias=by_alias, exclude=exclude, **kwargs
                         )[next(iter(fields))]
                     return entity.dict(
-                        include=fields, by_alias=by_alias, exclude=exclude
+                        include=fields, by_alias=by_alias, exclude=exclude, **kwargs
                     )
-                return entity.dict(include=fields, by_alias=by_alias, exclude=exclude)
-            return entity.dict(by_alias=by_alias, exclude=exclude)
+                return entity.dict(
+                    include=fields, by_alias=by_alias, exclude=exclude, **kwargs
+                )
+            return entity.dict(by_alias=by_alias, exclude=exclude, **kwargs)
         return entity.to_dict()
 
     @classmethod
@@ -76,12 +79,13 @@ def serialize_iterable(
         by_alias: bool = False,
         flat: bool = False,
         exclude: Set = None,
+        **kwargs
     ) -> List[Any]:
         serialized_data = []
         for i in data:
             serialized_data.append(
                 cls._fill_enum_values(
-                    cls._serialize(i, fields, by_alias, flat, exclude=exclude)
+                    cls._serialize(i, fields, by_alias, flat, exclude=exclude, **kwargs)
                 )
             )
         return serialized_data
@@ -152,3 +156,19 @@ def serialize(
         if data["attribute"] == "ImageQuality":
             data["value"] = constance.ImageQuality.get_name(data["value"])
         return data
+
+
+class EntitySerializer:
+    @classmethod
+    def serialize(
+        cls, data: Union[BaseModel, List[BaseModel]], **kwargs
+    ) -> Union[List[dict], dict]:
+        if isinstance(data, (list, set)):
+            for idx, item in enumerate(data):
+                data[idx] = cls.serialize(item, **kwargs)
+        for key, nested_model in data:
+            if isinstance(nested_model, BaseModel) and getattr(
+                nested_model, "fill_enum_values", False
+            ):
+                setattr(data, key, cls.serialize(nested_model, **kwargs))
+        return data.dict(**kwargs)

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

@@ -75,6 +75,9 @@ class AttributeGroup(BaseModel):
     is_multiselect: Optional[bool]
     attributes: Optional[List[Attribute]]
 
+    class Config:
+        use_enum_values = True
+
     def __hash__(self):
         return hash(f"{self.id}{self.class_id}{self.name}")
 
@@ -93,3 +96,4 @@ def __hash__(self):
     class Config:
         validate_assignment = True
         exclude_none = True
+        fill_enum_values = True

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

@@ -1,6 +1,7 @@
 import json
 from typing import List
 
+from lib.core.conditions import Condition
 from lib.core.entities import AnnotationClassEntity
 from lib.core.entities import ProjectEntity
 from lib.core.enums import ProjectType
@@ -10,6 +11,28 @@
 from lib.core.usecases.base import BaseReportableUseCase
 
 
+class GetAnnotationClassesUseCase(BaseReportableUseCase):
+    def __init__(
+        self,
+        reporter: Reporter,
+        project: ProjectEntity,
+        backend_client: SuperannotateServiceProvider,
+        condition: Condition = None,
+    ):
+        super().__init__(reporter)
+        self._project = project
+        self._backend_client = backend_client
+        self._condition = condition
+
+    def execute(self):
+        self._response.data = self._backend_client.list_annotation_classes(
+            project_id=self._project.id,
+            team_id=self._project.team_id,
+            query_string=self._condition.build_query() if self._condition else None,
+        ).data
+        return self._response
+
+
 class CreateAnnotationClassUseCase(BaseReportableUseCase):
     def __init__(
         self,

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

@@ -43,7 +43,7 @@
 from lib.core.usecases.base import BaseInteractiveUseCase
 from lib.core.usecases.base import BaseReportableUseCase
 from lib.core.usecases.base import BaseUseCase
-from lib.core.usecases.projects import GetAnnotationClassesUseCase
+from lib.core.usecases.classes import GetAnnotationClassesUseCase
 from PIL import UnidentifiedImageError
 from superannotate.logger import get_default_logger
 
@@ -738,14 +738,14 @@ def execute(self):
         return self._response
 
 
-class DownloadImageUseCase(BaseUseCase):
+class DownloadImageUseCase(BaseReportableUseCase):
     def __init__(
         self,
+        reporter: Reporter,
         project: ProjectEntity,
         folder: FolderEntity,
         image: ImageEntity,
         images: BaseManageableRepository,
-        classes: BaseManageableRepository,
         backend_service_provider: SuperannotateServiceProvider,
         annotation_classes: BaseReadOnlyRepository,
         download_path: str,
@@ -754,7 +754,7 @@ def __init__(
         include_fuse: bool = False,
         include_overlay: bool = False,
     ):
-        super().__init__()
+        super().__init__(reporter)
         self._project = project
         self._image = image
         self._download_path = download_path
@@ -777,7 +777,9 @@ def __init__(
             annotation_classes=annotation_classes,
         )
         self.get_annotation_classes_ues_case = GetAnnotationClassesUseCase(
-            classes=classes,
+            reporter=self.reporter,
+            project=self._project,
+            backend_client=backend_service_provider
         )
 
     def validate_project_type(self):

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

@@ -24,6 +24,7 @@
 from lib.core.usecases.base import BaseReportableUseCase
 from lib.core.usecases.base import BaseUseCase
 from lib.core.usecases.base import BaseUserBasedUseCase
+from lib.core.usecases.classes import GetAnnotationClassesUseCase
 from requests.exceptions import RequestException
 from superannotate.logger import get_default_logger
 
@@ -80,9 +81,10 @@ def execute(self):
         return self._response
 
 
-class GetProjectMetaDataUseCase(BaseUseCase):
+class GetProjectMetaDataUseCase(BaseReportableUseCase):
     def __init__(
         self,
+        reporter: Reporter,
         project: ProjectEntity,
         service: SuperannotateServiceProvider,
         annotation_classes: BaseManageableRepository,
@@ -95,7 +97,7 @@ def __init__(
         include_contributors: bool,
         include_complete_image_count: bool,
     ):
-        super().__init__()
+        super().__init__(reporter)
         self._project = project
         self._service = service
 
@@ -112,7 +114,9 @@ def __init__(
 
     @property
     def annotation_classes_use_case(self):
-        return GetAnnotationClassesUseCase(classes=self._annotation_classes)
+        return GetAnnotationClassesUseCase(
+            reporter=self.reporter, project=self._project, backend_client=self._service
+        )
 
     @property
     def settings_use_case(self):
@@ -706,21 +710,6 @@ def execute(self):
         return self._response
 
 
-class GetAnnotationClassesUseCase(BaseUseCase):
-    def __init__(
-        self,
-        classes: BaseManageableRepository,
-        condition: Condition = None,
-    ):
-        super().__init__()
-        self._classes = classes
-        self._condition = condition
-
-    def execute(self):
-        self._response.data = self._classes.get_all(condition=self._condition)
-        return self._response
-
-
 class UpdateSettingsUseCase(BaseUseCase):
     def __init__(
         self,

src/superannotate/lib/infrastructure/controller.py

@@ -732,6 +732,7 @@ def get_project_metadata(
         project = self._get_project(project_name)
 
         use_case = usecases.GetProjectMetaDataUseCase(
+            reporter=self.get_default_reporter(),
             project=project,
             service=self._backend_client,
             annotation_classes=AnnotationClassRepository(
@@ -773,16 +774,16 @@ def get_project_workflow(self, project_name: str):
         return use_case.execute()
 
     def search_annotation_classes(self, project_name: str, name_contains: str = None):
-        project_entity = self._get_project(project_name)
+        project = self._get_project(project_name)
         condition = None
         if name_contains:
             condition = Condition("name", name_contains, EQ) & Condition(
                 "pattern", True, EQ
             )
         use_case = usecases.GetAnnotationClassesUseCase(
-            classes=AnnotationClassRepository(
-                service=self._backend_client, project=project_entity
-            ),
+            reporter=self.get_default_reporter(),
+            project=project,
+            backend_client=self.backend_client,
             condition=condition,
         )
         return use_case.execute()
@@ -993,11 +994,11 @@ def download_image(
         image = self._get_image(project, image_name, folder)
 
         use_case = usecases.DownloadImageUseCase(
+            reporter=self.get_default_reporter(),
             project=project,
             folder=folder,
             image=image,
             images=self.images,
-            classes=AnnotationClassRepository(self._backend_client, project),
             backend_service_provider=self._backend_client,
             download_path=download_path,
             image_variant=image_variant,

src/superannotate/lib/infrastructure/stream_data_handler.py

@@ -57,29 +57,22 @@ async def get_data(
         data: list,
         method: str = "post",
         params=None,
-        chunk_size: int = 1000,
+        chunk_size: int = 5000,
         verify_ssl: bool = False,
     ):
         async with aiohttp.ClientSession(
             headers=self._headers,
             connector=aiohttp.TCPConnector(ssl=verify_ssl),
         ) as session:
-            if chunk_size:
-                for i in range(0, len(data), chunk_size):
-                    data_to_process = data[i : i + chunk_size]
-                    async for annotation in self.fetch(
-                        method,
-                        session,
-                        url,
-                        self._process_data(data_to_process),
-                        params=params,
-                    ):
-                        self._annotations.append(
-                            self._callback(annotation) if self._callback else annotation
-                        )
-            else:
+            for i in range(0, len(data), chunk_size):
+                data_to_process = data[i : i + chunk_size]  # noqa
+                params["limit"] = len(data_to_process)
                 async for annotation in self.fetch(
-                    method, session, url, self._process_data(data), params=params
+                    method,
+                    session,
+                    url,
+                    self._process_data(data_to_process),
+                    params=params,
                 ):
                     self._annotations.append(
                         self._callback(annotation) if self._callback else annotation
@@ -115,7 +108,8 @@ async def download_data(
         items_downloaded: int = 0
         if chunk_size and data:
             for i in range(0, len(data), chunk_size):
-                data_to_process = data[i : i + chunk_size]
+                data_to_process = data[i : i + chunk_size]  # noqa
+                params["limit"] = len(data_to_process)
                 async for annotation in self.fetch(
                     method,
                     session,

tests/integration/aggregations/test_df_processing.py

@@ -1,13 +1,13 @@
 import os
-from os.path import dirname
 from pathlib import Path
 
 import pytest
 
 from src.superannotate import SAClient
-sa = SAClient()
 from tests.integration.base import BaseTestCase
 
+sa = SAClient()
+
 
 class TestDF(BaseTestCase):
     PROJECT_NAME = "test df processing"