Fix copy-move

Author: dshabin

superannotate/db/project_images.py

@@ -237,12 +237,14 @@ def copy_images(
     if image_names == None:
         image_names = search_images(source_project_inp)
 
-    done_count, skipped_count, total_skipped_list = __copy_images(
+    done_count, total_skipped_list, logs = __copy_images(
         source_project, source_folder_id, destination_folder_id, image_names,
         include_annotations, copy_pin
     )
+    for log in logs:
+        logger.info(log)
 
-    if done_count > 1:
+    if done_count > 1 or done_count == 0:
         message = f"Copied {done_count}/{len(image_names)} images from {get_project_folder_string(source_project_inp)} to {get_project_folder_string(destination_project_inp)}."
         logger.info(message)
 
@@ -349,14 +351,16 @@ def move_images(
     if image_names == None:
         image_names = search_images(source_project_inp)
 
-    moved, skipped = __move_images(
+    moved, skipped, logs = __move_images(
         source_project, source_folder_id, destination_folder_id, image_names
     )
 
-    if len(moved) > 1:
+    for log in logs:
+        logger.info(log)
+
+    if len(moved) > 1 or len(moved) == 0:
         message = f"Moved {len(moved)}/{len(image_names)} images from {get_project_folder_string(source_project_inp)} to {get_project_folder_string(destination_project_inp)}."
         logger.info(message)
-
     elif len(moved) == 1:
         message = f"Moved an image from {get_project_folder_string(source_project_inp)} to {get_project_folder_string(destination_project_inp)}."
         logger.info(message)

superannotate/db/utils.py

@@ -60,6 +60,7 @@ def __move_images(
     image_names_lists = divide_chunks(image_names, 1000)
     total_skipped = []
     total_moved = []
+    logs = []
 
     for image_names in image_names_lists:
         response = _api.send_request(
@@ -77,14 +78,70 @@ def __move_images(
         )
 
         if not response.ok:
-            raise SABaseException(
-                response.status_code, "Couldn't move images " + response.text
-            )
+            logs.append("Couldn't move images " + response.text)
+            total_skipped += image_names
+            continue
         res = response.json()
         total_moved += res['done']
 
     total_skipped = list(set(image_names) - set(total_moved))
-    return (total_moved, total_skipped)
+    return (total_moved, total_skipped, logs)
+
+
+def _copy_images_request(
+    team_id, project_id, image_names, destination_folder_id, source_folder_id,
+    include_annotations, copy_pin
+):
+    response = _api.send_request(
+        req_type='POST',
+        path='/images/copy-image-or-folders',
+        params={
+            "team_id": team_id,
+            "project_id": project_id
+        },
+        json_req={
+            "is_folder_copy": False,
+            "image_names": image_names,
+            "destination_folder_id": destination_folder_id,
+            "source_folder_id": source_folder_id,
+            "include_annotations": include_annotations,
+            "keep_pin_status": copy_pin
+        }
+    )
+    return response
+
+
+def copy_polling(image_names, source_project, poll_id):
+    done_count = 0
+    skipped_count = 0
+    now_timestamp = datetime.datetime.now().timestamp()
+    delta_seconds = len(image_names) * 0.3
+    max_timestamp = now_timestamp + delta_seconds
+    logs = []
+    while True:
+        time.sleep(4)
+        now_timestamp = datetime.datetime.now().timestamp()
+        if (now_timestamp > max_timestamp):
+            break
+        response = _api.send_request(
+            req_type='GET',
+            path='/images/copy-image-progress',
+            params={
+                "team_id": source_project["team_id"],
+                "project_id": source_project["id"],
+                "poll_id": poll_id
+            }
+        )
+        if not response.ok:
+            logs.append("Couldn't copy images " + response.text)
+            continue
+        res = response.json()
+        done_count = int(res['done'])
+        skipped_count = int(res['skipped'])
+        total_count = int(res['total_count'])
+        if (skipped_count + done_count == total_count):
+            break
+    return (skipped_count, done_count, logs)
 
 
 def __copy_images(
@@ -115,78 +172,38 @@ def __copy_images(
     total_done_count = 0
     total_skipped_list = []
 
-    for image_names in image_names_lists:
+    logs = []
 
+    for image_names in image_names_lists:
         duplicates = get_duplicate_image_names(
             project_id=project_id,
             team_id=team_id,
             folder_id=destination_folder_id,
             image_paths=image_names
         )
-
         total_skipped_list += duplicates
-
         image_names = list(set(image_names) - set(duplicates))
-
         if not image_names:
-            total_skipped_count = len(total_skipped_list)
-            return (total_done_count, total_skipped_count, total_skipped_list)
+            continue
 
-        response = _api.send_request(
-            req_type='POST',
-            path='/images/copy-image-or-folders',
-            params={
-                "team_id": team_id,
-                "project_id": project_id
-            },
-            json_req={
-                "is_folder_copy": False,
-                "image_names": image_names,
-                "destination_folder_id": destination_folder_id,
-                "source_folder_id": source_folder_id,
-                "include_annotations": include_annotations,
-                "keep_pin_status": copy_pin
-            }
+        response = _copy_images_request(
+            team_id, project_id, image_names, destination_folder_id,
+            source_folder_id, include_annotations, copy_pin
         )
-
         if not response.ok:
-            raise SABaseException(
-                response.status_code, "Couldn't copy images " + response.text
-            )
+            logs.append("Couldn't copy images " + response.text)
+            total_skipped_list += image_names
+            continue
+
         res = response.json()
         poll_id = res['poll_id']
-        done_count = 0
-        skipped_count = 0
-        now_timestamp = datetime.datetime.now().timestamp()
-        delta_seconds = len(image_names) * 0.3
-        max_timestamp = now_timestamp + delta_seconds
-        while True:
-            time.sleep(4)
-            response = _api.send_request(
-                req_type='GET',
-                path='/images/copy-image-progress',
-                params={
-                    "team_id": source_project["team_id"],
-                    "project_id": source_project["id"],
-                    "poll_id": poll_id
-                }
-            )
-            if not response.ok:
-                raise SABaseException(
-                    response.status_code,
-                    "Couldn't copy images " + response.text
-                )
-            res = response.json()
-            done_count = int(res['done'])
-            skipped_count = int(res['skipped'])
-            total_count = int(res['total_count'])
-            now_timestamp = datetime.datetime.now().timestamp()
-            if (skipped_count + done_count
-                == total_count) or (now_timestamp > max_timestamp):
-                break
+        skipped_count, done_count, polling_logs = copy_polling(
+            image_names, source_project, poll_id
+        )
+        logs += polling_logs
         total_skipped_count += skipped_count
         total_done_count += done_count
-    return (total_done_count, total_skipped_count, total_skipped_list)
+    return (total_done_count, total_skipped_list, logs)
 
 
 def create_empty_annotation(size, image_name):