in progress changes

Author: VahagnTKA

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

@@ -650,28 +650,62 @@ def set_images_annotation_statuses(
         logger.info("Annotations status of images changed")
 
     def delete_images(
-        self, project: Union[NotEmptyStr, dict], image_names: Optional[List[str]] = None
+        self, project: Union[NotEmptyStr, dict], image_names: Optional[list[str]] = None
     ):
-        """Delete images in project.
+        """delete images in project.
 
         :param project: project name or folder path (e.g., "project1/folder1")
         :type project: str
-        :param image_names: to be deleted images' names. If None, all the images will be deleted
+        :param image_names: to be deleted images' names. if none, all the images will be deleted
         :type image_names: list of strs
         """
+
+        warning_msg = (
+            "We're deprecating the delete_images function. Please use delete_items instead."
+            "Learn more. \n"
+            "https://superannotate.readthedocs.io/en/stable/superannotate.sdk.html#superannotate.assign_items"
+        )
+        logger.warning(warning_msg)
+        warnings.warn(warning_msg, DeprecationWarning)
         project_name, folder_name = extract_project_folder(project)
 
-        if not isinstance(image_names, list) and image_names is not None:
-            raise AppException("Image_names should be a list of str or None.")
+        if not isinstance(image_names, list) and image_names is not none:
+            raise appexception("image_names should be a list of str or none.")
 
         response = self.controller.delete_images(
             project_name=project_name, folder_name=folder_name, image_names=image_names
         )
+        if response.errors:
+            raise appexception(response.errors)
+
+        logger.info(
+            f"images deleted in project {project_name}{'/' + folder_name if folder_name else ''}"
+        )
+
+    def delete_items(
+        self, project: str, items: Optional[List[str]] = None
+    ):
+        """Delete items in a given project.
+
+        :param project: project name or folder path (e.g., "project1/folder1")
+        :type project: str
+        :param items: to be deleted items' names. If None, all the items will be deleted
+        :type items: list of str
+        """
+        project_name, folder_name = extract_project_folder(project)
+
+        ## Type checking should be done in controller or by PyDantic?
+        # if not isinstance(image_names, list) and image_names is not None:
+        #     raise AppException("Image_names should be a list of str or None.")
+
+        response = self.controller.delete_items(
+            project_name=project_name, folder_name=folder_name, items=items
+        )
         if response.errors:
             raise AppException(response.errors)
 
         logger.info(
-            f"Images deleted in project {project_name}{'/' + folder_name if folder_name else ''}"
+            f"Items deleted in project {project_name}{'/' + folder_name if folder_name else ''}"
         )
 
     def assign_items(

src/superannotate/lib/core/service_types.py

@@ -80,7 +80,7 @@ def __init__(self, response, content_type=None):
             "content": response.content,
         }
         if response.ok:
-            if content_type:
+            if content_type and content_type is not self.__class__:
                 data["data"] = content_type(**response.json())
             else:
                 data["data"] = response.json()
@@ -92,4 +92,5 @@ def ok(self):
 
     @property
     def error(self):
-        return getattr(self.data, "error", "Unknown error.")
+        default_message = self.data["reason"] if self.data["reason"] else "Unknown error"
+        return getattr(self.data, "error", default_message)

src/superannotate/lib/infrastructure/controller.py

@@ -835,6 +835,23 @@ def delete_images(
         )
         return use_case.execute()
 
+    def delete_items(
+        self,
+        project_name: str,
+        folder_name: str,
+        items: List[str] = None,
+    ):
+        project = self._get_project(project_name)
+        folder = self._get_folder(project, folder_name)
+
+        use_case = usecases.DeleteItemsUseCase(
+            project=project,
+            folder=folder,
+            items=items,
+            backend_service_provider=self._backend_client,
+        )
+        return use_case.execute()
+
     def assign_items(
         self, project_name: str, folder_name: str, item_names: list, user: str
     ):

src/superannotate/lib/infrastructure/services.py

@@ -202,6 +202,7 @@ class SuperannotateBackendService(BaseBackendService):
     URL_GET_ITEMS = "items"
     URL_BULK_GET_IMAGES = "images/getBulk"
     URL_DELETE_FOLDERS = "image/delete/images"
+    URL_DELETE_ITEMS = "image/delete/images"
     URL_CREATE_IMAGE = "image/ext-create"
     URL_PROJECT_SETTINGS = "project/{}/settings"
     URL_PROJECT_WORKFLOW = "project/{}/workflow"
@@ -717,6 +718,17 @@ def delete_images(self, project_id: int, team_id: int, image_ids: List[int]):
         )
         return res.json()
 
+    def delete_items(self, project_id: int, team_id: int, item_ids: List[int]):
+        delete_items_url = urljoin(self.api_url, self.URL_DELETE_ITEMS)
+        res = self._request(
+            delete_items_url,
+            "put",
+            params={"team_id": team_id, "project_id": project_id},
+            data={"image_ids": item_ids},
+        )
+
+        return ServiceResponse(res, ServiceResponse)
+
     def assign_images(
         self,
         team_id: int,