Copy images

Author: hovnatan

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "python.formatting.provider": "yapf",
-    "python.linting.pylintPath": "~/miniconda3/bin/pylint",
+    "python.linting.pylintPath": "venv_sa_conv/bin/pylint",
     "python.linting.pylintEnabled": true,
     "python.testing.pytestArgs": [
         "tests"

superannotate/__init__.py

@@ -47,18 +47,18 @@ def consensus(*args, **kwargs):
     add_annotation_cuboid_to_image, add_annotation_ellipse_to_image,
     add_annotation_point_to_image, add_annotation_polygon_to_image,
     add_annotation_polyline_to_image, add_annotation_template_to_image,
-    create_fuse_image, delete_image, delete_images, download_image,
-    download_image_annotations, download_image_preannotations,
-    get_image_annotations, get_image_bytes, get_image_metadata,
-    get_image_preannotations, search_images, set_image_annotation_status,
-    upload_image_annotations
+    create_fuse_image, delete_image, download_image, download_image_annotations,
+    download_image_preannotations, get_image_annotations, get_image_bytes,
+    get_image_metadata, get_image_preannotations, search_images,
+    set_image_annotation_status, upload_image_annotations
 )
 from .db.project_api import (
     create_folder, delete_folders, get_folder_metadata,
     get_project_and_folder_metadata, rename_folder, search_folders
 )
 from .db.project_images import (
-    assign_images, copy_image, move_image, pin_image, upload_image_to_project
+    assign_images, copy_image, copy_images, delete_images, move_image,
+    move_images, pin_image, upload_image_to_project
 )
 from .db.project_metadata import get_project_metadata
 from .db.projects import (

superannotate/db/images.py

@@ -587,34 +587,6 @@ def delete_image(project, image_name):
     logger.info("Successfully deleted image  %s.", image_name)
 
 
-def delete_images(project, image_names):
-    """Delete images in project.
-
-    :param project: project name or metadata of the project to be deleted
-    :type project: str or dict
-    :param folder_names: to be deleted folders' names
-    :type folder_names: str or list of strs
-    """
-    if not isinstance(image_names, list):
-        raise SABaseException(0, "image_names should be a list of strs")
-    images = get_image_metadata(project, image_names)
-    project, _ = get_project_and_folder_metadata(project)
-
-    params = {"team_id": project["team_id"], "project_id": project["id"]}
-    data = {"image_ids": [image["id"] for image in images]}
-    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 %s deleted in project %s", image_names, project["name"])
-
-
 def get_image_bytes(project, image_name, variant='original'):
     """Returns an io.BytesIO() object of the image. Suitable for creating
     PIL.Image out of it.

superannotate/db/project_images.py

@@ -133,20 +133,22 @@ def upload_image_to_project(
             break
 
 
-def copy_images(project, source_folder, destination_folder, image_names):
-    project, source_project_folder = get_project_and_folder_metadata(
-        source_project
-    )
-    destination_project, destination_project_folder = get_project_and_folder_metadata(
-        destination_project
-    )
+def _copy_images(source_project, destination_project, image_names=None):
+    source_project, source_project_folder = source_project
+    destination_project, destination_project_folder = destination_project
+    if source_project["id"] != destination_project["id"]:
+        raise SABaseException(
+            0,
+            "Source and destination projects should be the same for copy_images"
+        )
     params = {
-        "team_id": _api.team_id,
-        "project_id": img_metadatas[0]["project_id"]
+        "team_id": source_project["team_id"],
+        "project_id": source_project["id"]
     }
     json_req = {
-        "image_ids": [x["id"] for x in img_metadatas],
-        "destination_folder_id": destination_project_folder_id
+        "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
@@ -156,6 +158,85 @@ def copy_images(project, source_folder, destination_folder, image_names):
             response.status_code, "Couldn't copy images " + response.text
         )
 
+    return response.json()
+
+
+def copy_images(source_project, destination_project, image_names=None):
+    source_project, source_project_folder = get_project_and_folder_metadata(
+        source_project
+    )
+    destination_project, destination_project_folder = get_project_and_folder_metadata(
+        destination_project
+    )
+    if image_names is None:
+        image_names = search_images((source_project, source_project_folder))
+    res = _copy_images(
+        (source_project, source_project_folder),
+        (destination_project, destination_project_folder), image_names
+    )
+    logger.info(
+        "Copied images %s from %s to %s. Number of skipped images %s",
+        image_names,
+        source_project["name"] + "" if source_project_folder is None else "/" +
+        source_project_folder["name"], destination_project["name"] +
+        "" if destination_project_folder is None else "/" +
+        destination_project_folder["name"], res["skipped"]
+    )
+    return res["skipped"]
+
+
+def delete_images(project, image_names):
+    """Delete images in project.
+
+    :param project: project name or metadata of the project to be deleted
+    :type project: str or dict
+    :param folder_names: to be deleted folders' names
+    :type folder_names: str or list of strs
+    """
+    if not isinstance(image_names, list):
+        raise SABaseException(0, "image_names should be a list of strs")
+    images = get_image_metadata(
+        project, image_names, return_dict_on_single_output=False
+    )
+    project, _ = get_project_and_folder_metadata(project)
+
+    params = {"team_id": project["team_id"], "project_id": project["id"]}
+    data = {"image_ids": [image["id"] for image in images]}
+    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 %s deleted in project %s", image_names, project["name"])
+
+
+def move_images(source_project, destination_project, image_names=None):
+    source_project, source_project_folder = get_project_and_folder_metadata(
+        source_project
+    )
+    destination_project, destination_project_folder = get_project_and_folder_metadata(
+        destination_project
+    )
+    if image_names is None:
+        image_names = search_images((source_project, source_project_folder))
+    _copy_images(
+        (source_project, source_project_folder),
+        (destination_project, destination_project_folder), image_names
+    )
+    delete_images((source_project, source_project_folder), image_names)
+    logger.info(
+        "Moved images %s from project %s to project %s", image_names,
+        source_project["name"] + "" if source_project_folder is None else "/" +
+        source_project_folder["name"], destination_project["name"] +
+        "" if destination_project_folder is None else "/" +
+        destination_project_folder["name"]
+    )
+
 
 def copy_image(
     source_project,

tests/test_folders.py

@@ -231,4 +231,72 @@ def test_delete_images(tmpdir):
     sa.delete_images(project, ["example_image_2.jpg", "example_image_3.jpg"])
 
     num_images = sa.get_project_image_count(project)
-    assert num_images == 2
+    assert num_images == 2
+
+
+def test_copy_images(tmpdir):
+    PROJECT_NAME = "test copy 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.create_folder(project, "folder1")
+    project = PROJECT_NAME + "/folder1"
+    sa.upload_images_from_folder_to_project(
+        project, FROM_FOLDER, annotation_status="InProgress"
+    )
+    num_images = sa.get_project_image_count(project)
+    assert num_images == 4
+
+    sa.create_folder(PROJECT_NAME, "folder2")
+    project2 = PROJECT_NAME + "/folder2"
+    num_images = sa.get_project_image_count(project2)
+    assert num_images == 0
+
+    sa.copy_images(
+        project, project2, ["example_image_2.jpg", "example_image_3.jpg"]
+    )
+
+    num_images = sa.get_project_image_count(project2)
+    assert num_images == 2
+
+    res = sa.copy_images(project, project2, None)
+
+    num_images = sa.get_project_image_count(project2)
+    assert num_images == 4
+
+    assert res == 2
+
+
+def test_move_images(tmpdir):
+    PROJECT_NAME = "test move 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.create_folder(project, "folder1")
+    project = PROJECT_NAME + "/folder1"
+    sa.upload_images_from_folder_to_project(
+        project, FROM_FOLDER, annotation_status="InProgress"
+    )
+    num_images = sa.get_project_image_count(project)
+    assert num_images == 4
+
+    sa.create_folder(PROJECT_NAME, "folder2")
+    project2 = PROJECT_NAME + "/folder2"
+    num_images = sa.get_project_image_count(project2)
+    assert num_images == 0
+
+    sa.move_images(project, project2, ["example_image_2.jpg"])
+
+    num_images = sa.get_project_image_count(project2)
+    assert num_images == 1
+
+    num_images = sa.get_project_image_count(project)
+    assert num_images == 3