Fix folder_id

Author: hovnatan

superannotate/db/images.py

@@ -65,17 +65,15 @@ def search_images(
 
     if folder is not None:
         folder = get_folder_metadata(project, folder)
-        folder_id = folder["id"]
-    else:
-        folder_id = None
+        folder = folder["id"]
 
     result_list = []
     params = {
         'team_id': team_id,
         'project_id': project_id,
         'annotation_status': annotation_status,
         'offset': 0,
-        'folder_id': folder_id
+        'folder_id': folder
     }
     if image_name_prefix is not None:
         params['name'] = image_name_prefix
@@ -120,7 +118,9 @@ def process_result(x):
 
 
 @project_metadata
-def get_image_metadata(project, image_names, return_dict_on_single_output=True):
+def get_image_metadata(
+    project, image_names, return_dict_on_single_output=True, folder=None
+):
     """Returns image metadata
 
     :param project: project name or metadata of the project
@@ -556,15 +556,15 @@ def download_image(
     return (str(filepath_save), annotations_filepaths, fuse_path)
 
 
-def delete_image(project, image_name):
+def delete_image(project, image_name, folder=None):
     """Deletes image
 
     :param project: project name or metadata of the project
     :type project: str or dict
     :param image_name: image name
     :type image: str
     """
-    image = get_image_metadata(project, image_name)
+    image = get_image_metadata(project, image_name, folder)
     team_id, project_id, image_id = image["team_id"], image["project_id"
                                                            ], image["id"]
     params = {"team_id": team_id, "project_id": project_id}

superannotate/db/projects.py

@@ -753,7 +753,6 @@ def __create_image(
     response = _api.send_request(
         req_type='POST', path='/image/ext-create', json_req=data
     )
-    print(data)
     if not response.ok:
         raise SABaseException(
             response.status_code, "Couldn't ext-create image " + response.text
@@ -841,11 +840,8 @@ def upload_images_to_project(
         )
     if folder is not None:
         if not isinstance(folder, dict):
-            folder_id = get_folder_metadata(project, folder)
-        else:
-            folder_id = folder["id"]
-    else:
-        folder_id = None
+            folder = get_folder_metadata(project, folder)
+        folder = folder["id"]
     res = response.json()
     prefix = res['filePath']
     tqdm_thread = threading.Thread(
@@ -862,7 +858,7 @@ def upload_images_to_project(
             args=(
                 res, img_paths, project, annotation_status, prefix, thread_id,
                 chunksize, couldnt_upload, uploaded, tried_upload,
-                image_quality_in_editor, from_s3_bucket, folder_id
+                image_quality_in_editor, from_s3_bucket, folder
             ),
             daemon=True
         )

tests/test_folders.py

@@ -55,4 +55,7 @@ def test_basic_folders(tmpdir):
         project, FROM_FOLDER, annotation_status="InProgress", folder="folder1"
     )
     images = sa.search_images(project, "example_image_1", folder="folder1")
-    assert len(images) == 1
+    assert len(images) == 1
+
+    print(sa.search_images(project))
+    print(sa.search_images(project, folder="folder1"))