Add mixp version - fix copy

Author: dshabin

superannotate/db/utils.py

@@ -119,7 +119,6 @@ def copy_polling(image_names, source_project, poll_id):
     max_timestamp = now_timestamp + delta_seconds
     logs = []
     while True:
-        time.sleep(4)
         now_timestamp = datetime.datetime.now().timestamp()
         if (now_timestamp > max_timestamp):
             break
@@ -141,6 +140,22 @@ def copy_polling(image_names, source_project, poll_id):
         total_count = int(res['total_count'])
         if (skipped_count + done_count == total_count):
             break
+        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:
+        logs.append("Couldn't copy images " + response.text)
+    else:
+        res = response.json()
+        done_count = int(res['done'])
+        skipped_count = int(res['skipped'])
     return (skipped_count, done_count, logs)
 
 

superannotate/mixp/app.py

@@ -1,5 +1,6 @@
 from mixpanel import Mixpanel
 from .config import TOKEN
+from ..version import __version__
 
 mp = Mixpanel(TOKEN)
 
@@ -12,4 +13,5 @@ def get_default(team_name, user_id, project_name=None):
         "Team Owner": user_id,
         "Project Name": project_name,
         "Project Role": "Admin",
+        "Version": __version__
     }

tests/test_folders.py

@@ -244,7 +244,7 @@ def test_delete_images(tmpdir):
     assert num_images == 0
 
 
-def test_copy_images3(tmpdir):
+def test_copy_images3(tmpdir, caplog):
     PROJECT_NAME = "test copy3 folder images"
     tmpdir = Path(tmpdir)
 
@@ -266,6 +266,7 @@ def test_copy_images3(tmpdir):
         copy_annotation_status=False,
         copy_pin=False
     )
+    assert "Copied 2/2 images from test copy3 folder images to test copy3 folder images/folder1" in caplog.text
 
     num_images = sa.get_project_image_count(project)
     assert num_images == 2