Fix argument order copy_images

Author: hovnatan

superannotate/db/project_images.py

@@ -137,6 +137,7 @@ def _copy_images(
     source_project, destination_project, image_names, include_annotations,
     copy_annotation_status, copy_pin
 ):
+    NUM_TO_SEND = 500
     source_project, source_project_folder = source_project
     destination_project, destination_project_folder = destination_project
     if source_project["id"] != destination_project["id"]:
@@ -149,18 +150,27 @@ def _copy_images(
         "project_id": source_project["id"]
     }
     json_req = {
-        "image_names": image_names,
         "destination_folder_id": destination_project_folder["id"],
         "source_folder_name": source_project_folder["name"]
     }
-    response = _api.send_request(
-        req_type='POST', path='/image/copy', params=params, json_req=json_req
-    )
-    if not response.ok:
-        raise SABaseException(
-            response.status_code, "Couldn't copy images " + response.text
+    res = {}
+    res['skipped'] = 0
+    for start_index in range(0, len(image_names), NUM_TO_SEND):
+        json_req["image_names"] = image_names[start_index:start_index +
+                                              NUM_TO_SEND]
+        response = _api.send_request(
+            req_type='POST',
+            path='/image/copy',
+            params=params,
+            json_req=json_req
         )
 
+        if not response.ok:
+            raise SABaseException(
+                response.status_code, "Couldn't copy images " + response.text
+            )
+        res['skipped'] += response.json()['skipped']
+
     for image_name in image_names:
         if include_annotations:
             annotations = get_image_annotations(
@@ -192,13 +202,13 @@ def _copy_images(
                     (destination_project, destination_project_folder),
                     image_name, img_metadata["is_pinned"]
                 )
-    return response.json()
+    return res
 
 
 def copy_images(
     source_project,
+    image_names,
     destination_project,
-    image_names=None,
     include_annotations=True,
     copy_annotation_status=True,
     copy_pin=True
@@ -207,10 +217,10 @@ def copy_images(
 
     :param source_project: project name or folder path (e.g., "project1/folder1")
     :type source_project: str
-    :param destination_project: project name or folder path (e.g., "project1/folder2")
-    :type destination_project: str
     :param image_names: image names. If None, all images from source project will be copied
     :type image: list of str
+    :param destination_project: project name or folder path (e.g., "project1/folder2")
+    :type destination_project: str
     :param include_annotations: enables annotations copy
     :type include_annotations: bool
     :param copy_annotation_status: enables annotations status copy
@@ -279,8 +289,8 @@ def delete_images(project, image_names):
 
 def move_images(
     source_project,
+    image_names,
     destination_project,
-    image_names=None,
     include_annotations=True,
     copy_annotation_status=True,
     copy_pin=True,
@@ -289,10 +299,10 @@ def move_images(
 
     :param source_project: project name or folder path (e.g., "project1/folder1")
     :type source_project: str
-    :param destination_project: project name or folder path (e.g., "project1/folder2")
-    :type destination_project: str
     :param image_names: image names. If None, all images from source project will be moved
     :type image: list of str
+    :param destination_project: project name or folder path (e.g., "project1/folder2")
+    :type destination_project: str
     :param include_annotations: enables annotations copy
     :type include_annotations: bool
     :param copy_annotation_status: enables annotations status copy

superannotate/version.py

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

tests/test_folders.py

@@ -270,8 +270,8 @@ def test_copy_images(tmpdir):
     assert num_images == 0
 
     sa.copy_images(
-        project,
-        project2, ["example_image_2.jpg", "example_image_3.jpg"],
+        project, ["example_image_2.jpg", "example_image_3.jpg"],
+        project2,
         include_annotations=False,
         copy_annotation_status=False,
         copy_pin=False
@@ -287,7 +287,7 @@ def test_copy_images(tmpdir):
     num_images = sa.get_project_image_count(project2)
     assert num_images == 2
 
-    res = sa.copy_images(project, project2, None)
+    res = sa.copy_images(project, None, project2)
 
     num_images = sa.get_project_image_count(project2)
     assert num_images == 4
@@ -317,7 +317,7 @@ def test_move_images(tmpdir):
     num_images = sa.get_project_image_count(project2)
     assert num_images == 0
 
-    sa.move_images(project, project2, ["example_image_2.jpg"])
+    sa.move_images(project, ["example_image_2.jpg"], project2)
 
     num_images = sa.get_project_image_count(project2)
     assert num_images == 1
@@ -359,7 +359,7 @@ def test_move_images2(tmpdir):
     num_images = sa.get_project_image_count(project2)
     assert num_images == 0
 
-    sa.move_images(project, project2)
+    sa.move_images(project, None, project2)
 
     num_images = sa.get_project_image_count(project2)
     assert num_images == 4
@@ -402,7 +402,7 @@ def test_copy_images2(tmpdir):
     assert im1["annotation_status"] == "InProgress"
 
     sa.copy_images(
-        project, project2, ["example_image_2.jpg", "example_image_3.jpg"]
+        project, ["example_image_2.jpg", "example_image_3.jpg"], project2
     )
 
     num_images = sa.get_project_image_count(project2)
@@ -452,7 +452,7 @@ def test_folder_export(tmpdir):
     assert num_images == 0
 
     sa.copy_images(
-        project, project2, ["example_image_2.jpg", "example_image_3.jpg"]
+        project, ["example_image_2.jpg", "example_image_3.jpg"], project2
     )
 
     export = sa.prepare_export(PROJECT_NAME, ["folder1", "folder2"])