Send 1000 images to delete

Author: hovnatan

superannotate/db/project_images.py

@@ -268,13 +268,29 @@ def delete_images(project, image_names):
     :param image_names: to be deleted images' names. If None, all the images will be deleted
     :type image_names: list of strs
     """
+    NUM_TO_SEND = 1000
     project, project_folder = get_project_and_folder_metadata(project)
     params = {"team_id": project["team_id"], "project_id": project["id"]}
     if image_names is None:
-        if project_folder is not None:
-            data = {"folder_id": project_folder["id"]}
-        else:
-            data = {"folder_id": get_project_root_folder_id(project)}
+        images = search_images((project, project_folder), return_metadata=True)
+    else:
+        if not isinstance(image_names, list):
+            raise SABaseException(
+                0, "image_names should be a list of strs or None"
+            )
+        images = get_image_metadata(
+            (project, project_folder),
+            image_names,
+            return_dict_on_single_output=False
+        )
+    for start_index in range(0, len(images), NUM_TO_SEND):
+        data = {
+            "image_ids":
+                [
+                    image["id"]
+                    for image in images[start_index:start_index + NUM_TO_SEND]
+                ]
+        }
         response = _api.send_request(
             req_type='PUT',
             path='/image/delete/images',
@@ -285,35 +301,6 @@ def delete_images(project, image_names):
             raise SABaseException(
                 response.status_code, "Couldn't delete images " + response.text
             )
-    else:
-        NUM_TO_SEND = 1000
-        if not isinstance(image_names, list):
-            raise SABaseException(
-                0, "image_names should be a list of strs or None"
-            )
-        images = get_image_metadata(
-            project, image_names, return_dict_on_single_output=False
-        )
-        for start_index in range(0, len(image_names), NUM_TO_SEND):
-            data = {
-                "image_ids":
-                    [
-                        image["id"]
-                        for image in images[start_index:start_index +
-                                            NUM_TO_SEND]
-                    ]
-            }
-            response = _api.send_request(
-                req_type='PUT',
-                path='/image/delete/images',
-                params=params,
-                json_req=data
-            )
-            if not response.ok:
-                raise SABaseException(
-                    response.status_code,
-                    "Couldn't delete images " + response.text
-                )
     logger.info(
         "Images deleted in project %s%s", project["name"],
         "" if project_folder is None else "/" + project_folder["name"]