Merge branch 'friday' into 1209_fix_folder_metadata

Author: VahagnTKA

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

@@ -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/usecases/custom_fields.py

@@ -78,13 +78,23 @@ def __init__(
         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
@@ -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

src/superannotate/version.py

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

tests/integration/custom_fields/test_custom_schema.py

@@ -46,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"]}])