Fix copy images from or to root folder

Author: hovnatan

superannotate/db/images.py

@@ -31,7 +31,7 @@
 _api = API.get_instance()
 
 
-def _get_project_root_folder_id(project):
+def get_project_root_folder_id(project):
     """Get root folder ID
     Returns
     -------
@@ -82,7 +82,7 @@ def search_images(
     if project_folder is not None:
         project_folder_id = project_folder["id"]
     else:
-        project_folder_id = _get_project_root_folder_id(project)
+        project_folder_id = get_project_root_folder_id(project)
 
     result_list = []
     params = {
@@ -164,7 +164,7 @@ def search_images_all_folders(
             annotation_status
         )
 
-    project_folder_id = _get_project_root_folder_id(project)
+    project_folder_id = get_project_root_folder_id(project)
 
     result_list = []
     params = {

superannotate/db/project_images.py

@@ -11,7 +11,8 @@
 from ..exceptions import SABaseException, SAImageSizeTooLarge
 from .images import (
     delete_image, get_image_annotations, get_image_bytes, get_image_metadata,
-    search_images, set_image_annotation_status, upload_image_annotations
+    get_project_root_folder_id, search_images, set_image_annotation_status,
+    upload_image_annotations
 )
 from .project_api import get_project_and_folder_metadata
 from .projects import (
@@ -149,10 +150,16 @@ def _copy_images(
         "team_id": source_project["team_id"],
         "project_id": source_project["id"]
     }
-    json_req = {
-        "destination_folder_id": destination_project_folder["id"],
-        "source_folder_name": source_project_folder["name"]
-    }
+    if source_project_folder is not None:
+        source_folder_name = source_project_folder["name"]
+    else:
+        source_folder_name = 'root'
+    json_req = {"source_folder_name": source_folder_name}
+    if destination_project_folder is not None:
+        destination_folder_id = destination_project_folder["id"]
+    else:
+        destination_folder_id = get_project_root_folder_id(destination_project)
+    json_req["destination_folder_id"] = destination_folder_id
     res = {}
     res['skipped'] = 0
     for start_index in range(0, len(image_names), NUM_TO_SEND):

superannotate/version.py

@@ -1 +1 @@
-__version__ = "4.1.0b14"
+__version__ = "4.1.0b15"

tests/test_folders.py

@@ -244,6 +244,36 @@ def test_delete_images(tmpdir):
     assert num_images == 0
 
 
+def test_copy_images3(tmpdir):
+    PROJECT_NAME = "test copy3 folder images"
+    tmpdir = Path(tmpdir)
+
+    projects_found = sa.search_projects(PROJECT_NAME, return_metadata=True)
+    for pr in projects_found:
+        sa.delete_project(pr)
+
+    project = sa.create_project(PROJECT_NAME, 'test', 'Vector')
+    sa.upload_images_from_folder_to_project(
+        project, FROM_FOLDER, annotation_status="InProgress"
+    )
+    sa.create_folder(project, "folder1")
+    project = PROJECT_NAME + "/folder1"
+
+    sa.copy_images(
+        PROJECT_NAME, ["example_image_2.jpg", "example_image_3.jpg"],
+        project,
+        include_annotations=False,
+        copy_annotation_status=False,
+        copy_pin=False
+    )
+
+    num_images = sa.get_project_image_count(project)
+    assert num_images == 2
+
+    num_images = sa.get_project_image_count(PROJECT_NAME)
+    assert num_images == 4
+
+
 def test_copy_images(tmpdir):
     PROJECT_NAME = "test copy folder images"
     tmpdir = Path(tmpdir)
@@ -294,6 +324,16 @@ def test_copy_images(tmpdir):
 
     assert res == 2
 
+    sa.copy_images(
+        project, ["example_image_2.jpg", "example_image_3.jpg"],
+        PROJECT_NAME,
+        include_annotations=False,
+        copy_annotation_status=False,
+        copy_pin=False
+    )
+    num_images = sa.get_project_image_count(PROJECT_NAME)
+    assert num_images == 2
+
 
 def test_move_images(tmpdir):
     PROJECT_NAME = "test move folder images1"