Update version.py

Author: VaghinakDev

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

@@ -26,7 +26,11 @@ def __init__(self, token: str = None, config_path: str = None):
         version = os.environ.get("SA_VERSION", "v1")
         _token, _config_path = None, None
         _host = os.environ.get("SA_URL", constants.BACKEND_URL)
-        _ssl_verify = not os.environ.get("SA_SSL", "True").lower() in ("false", "f", "0")
+        _ssl_verify = not os.environ.get("SA_SSL", "True").lower() in (
+            "false",
+            "f",
+            "0",
+        )
         if token:
             _token = Controller.validate_token(token=token)
         elif config_path:

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

@@ -1943,7 +1943,7 @@ def search_models(
         task: Optional[NotEmptyStr] = None,
         include_global: Optional[StrictBool] = True,
     ):
-        """Search for ML models.
+        r"""Search for ML models.
 
         :param name: search string
         :type name: str
@@ -2708,7 +2708,7 @@ def create_custom_fields(self, project: NotEmptyStr, fields: dict):
         """
         project_name, _ = extract_project_folder(project)
         response = self.controller.create_custom_schema(
-            project_name=project, schema=fields
+            project_name=project_name, schema=fields
         )
         if response.errors:
             raise AppException(response.errors)
@@ -2753,7 +2753,7 @@ def get_custom_fields(self, project: NotEmptyStr):
             }
         """
         project_name, _ = extract_project_folder(project)
-        response = self.controller.get_custom_schema(project_name=project)
+        response = self.controller.get_custom_schema(project_name=project_name)
         if response.errors:
             raise AppException(response.errors)
         return response.data
@@ -2827,7 +2827,7 @@ def upload_custom_values(
              The values for the corresponding keys will be added to an item or will be overridden.
         :type items: list of dicts
 
-        :return: the count of succeeded items and the list of failed item names.
+        :return: dictionary with succeeded and failed item names.
         :rtype: dict
 
         Request Example:

src/superannotate/lib/core/data_handlers.py

@@ -8,15 +8,13 @@
 from typing import Callable
 from typing import Dict
 from typing import List
-from operator import itemgetter
-
-from superannotate_schemas.schemas.classes import AnnotationClass
-from superannotate_schemas.schemas.classes import Attribute
-from superannotate_schemas.schemas.classes import AttributeGroup
 
 import lib.core as constances
 from lib.core.enums import AnnotationTypes
 from lib.core.reporter import Reporter
+from superannotate_schemas.schemas.classes import AnnotationClass
+from superannotate_schemas.schemas.classes import Attribute
+from superannotate_schemas.schemas.classes import AttributeGroup
 
 
 class BaseDataHandler(metaclass=ABCMeta):
@@ -49,7 +47,7 @@ def get_annotation_class(self, name: str) -> AnnotationClass:
 
     @lru_cache()
     def get_attribute_group(
-            self, annotation_class: AnnotationClass, attr_group_name: str
+        self, annotation_class: AnnotationClass, attr_group_name: str
     ) -> AttributeGroup:
         for attr_group in annotation_class.attribute_groups:
             if attr_group.name == attr_group_name:
@@ -116,10 +114,10 @@ def handle(self, annotation: dict):
 
 class MissingIDsHandler(BaseAnnotationDateHandler):
     def __init__(
-            self,
-            annotation_classes: List[AnnotationClass],
-            templates: List[dict],
-            reporter: Reporter,
+        self,
+        annotation_classes: List[AnnotationClass],
+        templates: List[dict],
+        reporter: Reporter,
     ):
         super().__init__(annotation_classes)
         self.validate_existing_classes(annotation_classes)
@@ -189,7 +187,7 @@ def handle(self, annotation: dict):
             template["name"]: template["id"] for template in self._templates
         }
         for annotation_instance in (
-                i for i in annotation["instances"] if i.get("type", None) == "template"
+            i for i in annotation["instances"] if i.get("type", None) == "template"
         ):
             annotation_instance["templateId"] = template_name_id_map.get(
                 annotation_instance.get("templateName", ""), -1
@@ -239,7 +237,13 @@ def handle(self, annotation: dict):
 
 
 class VideoFormatHandler(BaseAnnotationDateHandler):
-    INSTANCE_FIELDS = {"pointLabels", "createdBy", "createdAt", "updatedBy", "updatedAt"}
+    INSTANCE_FIELDS = {
+        "pointLabels",
+        "createdBy",
+        "createdAt",
+        "updatedBy",
+        "updatedAt",
+    }
 
     @staticmethod
     def _point_handler(time_stamp):
@@ -270,7 +274,7 @@ def safe_time(timestamp):
             return "0" if str(timestamp) == "0.0" else timestamp
 
         def convert_timestamp(timestamp):
-            return timestamp / 10 ** 6 if timestamp else "0"
+            return timestamp / 10**6 if timestamp else "0"
 
         editor_data = {
             "instances": [],
@@ -368,10 +372,10 @@ def convert_timestamp(timestamp):
                                 (group_name, attr_name)
                             )
                     attributes_to_add = (
-                            existing_attributes_in_current_instance - active_attributes
+                        existing_attributes_in_current_instance - active_attributes
                     )
                     attributes_to_delete = (
-                            active_attributes - existing_attributes_in_current_instance
+                        active_attributes - existing_attributes_in_current_instance
                     )
                     if attributes_to_add or attributes_to_delete:
                         editor_instance["timeline"][timestamp][

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

@@ -11,11 +11,11 @@
 
 class CreateCustomSchemaUseCase(BaseReportableUseCase):
     def __init__(
-            self,
-            reporter: Reporter,
-            project: ProjectEntity,
-            schema: dict,
-            backend_client: SuperannotateServiceProvider,
+        self,
+        reporter: Reporter,
+        project: ProjectEntity,
+        schema: dict,
+        backend_client: SuperannotateServiceProvider,
     ):
         super().__init__(reporter)
         self._project = project
@@ -43,10 +43,10 @@ def execute(self) -> Response:
 
 class GetCustomSchemaUseCase(BaseReportableUseCase):
     def __init__(
-            self,
-            reporter: Reporter,
-            project: ProjectEntity,
-            backend_client: SuperannotateServiceProvider,
+        self,
+        reporter: Reporter,
+        project: ProjectEntity,
+        backend_client: SuperannotateServiceProvider,
     ):
         super().__init__(reporter)
         self._project = project
@@ -66,25 +66,35 @@ def execute(self) -> Response:
 
 class DeleteCustomSchemaUseCase(BaseReportableUseCase):
     def __init__(
-            self,
-            reporter: Reporter,
-            project: ProjectEntity,
-            fields: List[str],
-            backend_client: SuperannotateServiceProvider,
+        self,
+        reporter: Reporter,
+        project: ProjectEntity,
+        fields: List[str],
+        backend_client: SuperannotateServiceProvider,
     ):
         super().__init__(reporter)
         self._project = project
         self._fields = fields
         self._backend_client = backend_client
 
     def execute(self) -> Response:
+        if self._fields:
+            self.reporter.log_info("Matched fields deleted from schema.")
         response = self._backend_client.delete_custom_schema(
             team_id=self._project.team_id,
             project_id=self._project.id,
             fields=self._fields,
         )
         if response.ok:
-            self._response.data = response.data
+            use_case_response = GetCustomSchemaUseCase(
+                reporter=self.reporter,
+                project=self._project,
+                backend_client=self._backend_client,
+            ).execute()
+            if use_case_response.errors:
+                self._response.errors = use_case_response.errors
+            else:
+                self._response.data = use_case_response.data
         else:
             self._response.errors = response.error
         return self._response
@@ -94,12 +104,12 @@ class UploadCustomValuesUseCase(BaseReportableUseCase):
     CHUNK_SIZE = 5000
 
     def __init__(
-            self,
-            reporter: Reporter,
-            project: ProjectEntity,
-            folder: FolderEntity,
-            items: List[Dict[str, str]],
-            backend_client: SuperannotateServiceProvider,
+        self,
+        reporter: Reporter,
+        project: ProjectEntity,
+        folder: FolderEntity,
+        items: List[Dict[str, str]],
+        backend_client: SuperannotateServiceProvider,
     ):
         super().__init__(reporter)
         self._project = project
@@ -119,7 +129,7 @@ def execute(self) -> Response:
                     project_id=self._project.id,
                     team_id=self._project.team_id,
                     folder_id=self._folder.uuid,
-                    items=self._items[idx: idx + self.CHUNK_SIZE],  # noqa: E203
+                    items=self._items[idx : idx + self.CHUNK_SIZE],  # noqa: E203
                 )
                 if not response.ok:
                     self._response.errors = response.error
@@ -132,7 +142,7 @@ def execute(self) -> Response:
                  the schema of the custom fields defined for the "{self._project.name}" project."""
             )
         self._response.data = {
-            "succeeded": {list(item)[0] for item in self._items} ^ set(failed_items),
+            "succeeded": list({list(item)[0] for item in self._items} ^ set(failed_items)),
             "failed": failed_items,
         }
         return self._response
@@ -142,12 +152,12 @@ class DeleteCustomValuesUseCase(BaseReportableUseCase):
     CHUNK_SIZE = 5000
 
     def __init__(
-            self,
-            reporter: Reporter,
-            project: ProjectEntity,
-            folder: FolderEntity,
-            items: List[Dict[str, List[str]]],
-            backend_client: SuperannotateServiceProvider,
+        self,
+        reporter: Reporter,
+        project: ProjectEntity,
+        folder: FolderEntity,
+        items: List[Dict[str, List[str]]],
+        backend_client: SuperannotateServiceProvider,
     ):
         super().__init__(reporter)
         self._project = project
@@ -161,7 +171,7 @@ def execute(self) -> Response:
                 project_id=self._project.id,
                 team_id=self._project.team_id,
                 folder_id=self._folder.uuid,
-                items=self._items[idx: idx + self.CHUNK_SIZE],  # noqa: E203
+                items=self._items[idx : idx + self.CHUNK_SIZE],  # noqa: E203
             )
             if not response.ok:
                 self._response.errors = response.error

src/superannotate/lib/infrastructure/services.py

@@ -385,7 +385,7 @@ def get_folder(self, query_string: str):
             query_items = query_string.split("&")
             params = {}
             for item in query_items:
-                tmp = item.split('=')
+                tmp = item.split("=")
                 params[tmp[0]] = tmp[1]
 
         response = self._request(get_folder_url, "get", params=params)

src/superannotate/version.py

@@ -1 +1 @@
-__version__ = "4.4.1dev2"
+__version__ = "4.4.1dev6"

tests/integration/base.py

@@ -1,7 +1,7 @@
 from unittest import TestCase
 
 from src.superannotate import SAClient
-
+from tests import DATA_SET_PATH
 
 sa = SAClient()
 

tests/integration/custom_fields/test_custom_schema.py

@@ -23,16 +23,6 @@ def test_create_schema(self):
         data = sa.create_custom_fields(self.PROJECT_NAME, self.PAYLOAD)
         self.assertEqual(self.PAYLOAD, data)
 
-    def test_(self):
-        data = sa.create_custom_fields(self.PROJECT_NAME, {
-        "test": {
-            "type": "numbaaer"
-        },
-        "tester": {
-            "type": "numbsser"
-        }}
-                                       )
-
     def test_create_limit_25(self):
         payload = {i: {"type": "number"} for i in range(26)}
         with self.assertRaisesRegexp(
@@ -56,16 +46,18 @@ def test_delete_schema(self):
         payload = copy.copy(self.PAYLOAD)
         sa.create_custom_fields(self.PROJECT_NAME, payload)
         to_delete_field = list(payload.keys())[0]
-        sa.delete_custom_fields(self.PROJECT_NAME, [to_delete_field])
+        response = sa.delete_custom_fields(self.PROJECT_NAME, [to_delete_field])
         del payload[to_delete_field]
+        assert response == payload
         self.assertEqual(sa.get_custom_fields(self.PROJECT_NAME), payload)
 
     def test_upload_delete_custom_values(self):
         sa.create_custom_fields(self.PROJECT_NAME, self.PAYLOAD)
         item_name = "test"
         payload = {"test": 12}
         sa.attach_items(self.PROJECT_NAME, [{"name": item_name, "url": item_name}])
-        sa.upload_custom_values(self.PROJECT_NAME, [{item_name: payload}] * 10000)
+        response = sa.upload_custom_values(self.PROJECT_NAME, [{item_name: payload}] * 10000)
+        assert response == {'failed': [], 'succeeded': {item_name}}
         data = sa.query(self.PROJECT_NAME, "metadata(status = NotStarted)")
         assert data[0]["custom_metadata"] == payload
         sa.delete_custom_values(self.PROJECT_NAME, [{item_name: ["test"]}])

tests/integration/items/test_saqul_query.py

@@ -2,8 +2,8 @@
 from pathlib import Path
 
 from src.superannotate import SAClient
-from tests.integration.base import BaseTestCase
 from tests import DATA_SET_PATH
+from tests.integration.base import BaseTestCase
 
 sa = SAClient()
 
@@ -13,14 +13,13 @@ class TestEntitiesSearchVector(BaseTestCase):
     PROJECT_DESCRIPTION = "TestEntitiesSearchVector"
     PROJECT_TYPE = "Vector"
     FOLDER_NAME = "test_folder"
-    TEST_FOLDER_PATH = "data_set/sample_project_vector"
+    TEST_FOLDER_PATH = "sample_project_vector"
     TEST_QUERY = "instance(type =bbox )"
     TEST_INVALID_QUERY = "!instance(type =bbox )!"
 
-
     @property
     def folder_path(self):
-        return os.path.join(Path(__file__).parent.parent, self.TEST_FOLDER_PATH)
+        return os.path.join(DATA_SET_PATH, self.TEST_FOLDER_PATH)
 
     def test_query(self):
         sa.create_folder(self.PROJECT_NAME, self.FOLDER_NAME)
@@ -40,7 +39,7 @@ def test_query(self):
 
         try:
             self.assertRaises(
-                Exception, sa.query(f"{self.PROJECT_NAME}/{self.FOLDER_NAME}", self.TEST_QUERY, subset="something")
+                Exception, sa.query(f"{self.PROJECT_NAME}", self.TEST_QUERY, subset="something")
             )
         except Exception as e:
             self.assertEqual(