Folders test simple

Author: hovnatan

superannotate/db/images.py

@@ -81,7 +81,7 @@ def search_images(
     image_name_prefix=None,
     annotation_status=None,
     return_metadata=False,
-    folder_name=None
+    folder=None
 ):
     """Search images by name_prefix (case-insensitive) and annotation status
 
@@ -107,8 +107,8 @@ def search_images(
             annotation_status
         )
 
-    if folder_name is not None:
-        folder = get_folder_metadata(project, folder_name)
+    if folder is not None:
+        folder = get_folder_metadata(project, folder)
         folder_id = folder["id"]
     else:
         folder_id = None
@@ -124,6 +124,7 @@ def search_images(
     if image_name_prefix is not None:
         params['name'] = image_name_prefix
     total_got = 0
+    total_images = 0
     while True:
         response = _api.send_request(
             req_type='GET', path='/images', params=params
@@ -136,24 +137,18 @@ def search_images(
         images = response["images"]
         folders = response["folders"]
 
-        image_count = images["count"]
-        folder_count = folders["count"]
-
         results_images = images["data"]
-        total_got += len(results_images) + len(folders["data"])
         for r in results_images:
             if return_metadata:
                 result_list.append(r)
             else:
                 result_list.append(r["name"])
 
-        if image_count + folder_count <= total_got:
+        total_images += len(results_images)
+        if images["count"] <= total_images:
             break
+        total_got += len(results_images) + len(folders["data"])
         params["offset"] = total_got
-        # print(
-        #     "Got to ", len(result_list),
-        #     response.json()["count"], len(new_results), params['offset']
-        # )
 
     if return_metadata:
 
@@ -199,7 +194,7 @@ def search_folders(project, folder_name=None, return_metadata=False):
         folders = response["folders"]
 
         results_folders = folders["data"]
-        for r in folders["data"]:
+        for r in results_folders:
             if folder_name is not None and r["name"] != folder_name:
                 continue
             if return_metadata:

superannotate/db/projects.py

@@ -816,9 +816,7 @@ def upload_images_to_project(
     )
     if len_img_paths == 0:
         return ([], [], duplicate_images)
-    params = {
-        'team_id': team_id,
-    }
+    params = {'team_id': team_id}
     uploaded = [[] for _ in range(_NUM_THREADS)]
     tried_upload = [[] for _ in range(_NUM_THREADS)]
     couldnt_upload = [[] for _ in range(_NUM_THREADS)]

tests/test_folders.py

@@ -0,0 +1,43 @@
+from pathlib import Path
+import json
+
+import pytest
+
+import superannotate as sa
+
+PROJECT_NAME1 = "test folder simple"
+FROM_FOLDER = "./tests/sample_project_vector"
+
+
+def test_basic_folders(tmpdir):
+    tmpdir = Path(tmpdir)
+
+    projects_found = sa.search_projects(PROJECT_NAME1, return_metadata=True)
+    for pr in projects_found:
+        sa.delete_project(pr)
+
+    project = sa.create_project(PROJECT_NAME1, 'test', 'Vector')
+    sa.upload_images_from_folder_to_project(
+        project, FROM_FOLDER, annotation_status="InProgress"
+    )
+    images = sa.search_images(project, "example_image_1")
+    assert len(images) == 1
+
+    folders = sa.search_folders(project)
+    assert len(folders) == 0
+
+    folder_metadata = sa.create_folder(project, "folder1")
+    assert folder_metadata["name"] == "folder1"
+
+    folders = sa.search_folders(project, return_metadata=True)
+    assert len(folders) == 1
+
+    assert folders[0]["name"] == "folder1"
+
+    folders = sa.search_folders(project)
+    assert len(folders) == 1
+
+    assert folders[0] == "folder1"
+
+    images = sa.search_images(project, "example_image_1", folder="folder1")
+    assert len(images) == 0