Fix cli export

Author: hovnatan

install.sh

@@ -17,7 +17,7 @@ pip install -e .
 # pip install superannotate
 
 # for testing
-pip install pytest pytest-xdist
+pip install pytest pytest-xdist pytest-timeout
 
 # for coverage
 pip install coverage pytest-cov

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+timeout = 300
+timeout_method=thread

superannotate/__main__.py

@@ -318,15 +318,16 @@ def export_project(command_name, args):
 
     parts = args.project.split('/')
     if len(parts) == 1:
-        project, folder = parts[0], None
+        project, project_folder = parts[0], None
     elif len(parts) == 2:
-        project, folder = parts
+        project, project_folder = parts
     else:
         raise SABaseException(
             0, "Project should be in format <project>[/<folder>]"
         )
     export = sa.prepare_export(
-        project, [folder],
+        project,
+        None if project_folder is None else [project_folder],
         annotation_statuses=args.annotation_statuses,
         include_fuse=args.include_fuse
     )

superannotate/annotation_helpers.py

@@ -5,8 +5,12 @@
 from .exceptions import SABaseException
 
 
-def _create_empty_annotation_json():
-    return {"instances": [], "metadata": {}, "comments": [], "tags": []}
+def fill_in_missing(annotation_json):
+    for field in ["instances", "comments", "tags"]:
+        if field not in annotation_json:
+            annotation_json[field] = []
+    if "metadata" not in annotation_json:
+        annotation_json["metadata"] = {}
 
 
 def _preprocess_annotation_json(annotation_json):
@@ -15,7 +19,10 @@ def _preprocess_annotation_json(annotation_json):
         path = annotation_json
         annotation_json = json.load(open(annotation_json))
     elif annotation_json is None:
-        annotation_json = _create_empty_annotation_json()
+        annotation_json = {}
+
+    fill_in_missing(annotation_json)
+
     return (annotation_json, path)
 
 

superannotate/db/annotation_classes.py

@@ -296,6 +296,8 @@ def download_annotation_classes_json(project, folder):
 
 
 def fill_class_and_attribute_names(annotations_json, annotation_classes_dict):
+    if "instances" not in annotations_json:
+        return
     for r in annotations_json["instances"]:
         if "classId" not in r or r["classId"] not in annotation_classes_dict:
             continue
@@ -319,6 +321,8 @@ def fill_class_and_attribute_names(annotations_json, annotation_classes_dict):
 
 
 def fill_class_and_attribute_ids(annotation_json, annotation_classes_dict):
+    if "instances" not in annotation_json:
+        return
     for ann in annotation_json["instances"]:
         if "className" not in ann:
             logger.warning("No className in annotation instance")

superannotate/db/images.py

@@ -14,7 +14,8 @@
     add_annotation_bbox_to_json, add_annotation_comment_to_json,
     add_annotation_cuboid_to_json, add_annotation_ellipse_to_json,
     add_annotation_point_to_json, add_annotation_polygon_to_json,
-    add_annotation_polyline_to_json, add_annotation_template_to_json
+    add_annotation_polyline_to_json, add_annotation_template_to_json,
+    fill_in_missing
 )
 from ..api import API
 from ..exceptions import SABaseException
@@ -748,6 +749,8 @@ def _get_image_pre_or_annotations(project, image_name, pre):
                     f"{pre}annotation_mask_filename": None
                 }
             )
+
+    fill_in_missing(result[f"{pre}annotation_json"])
     return result
 
 

tests/test_cli.py

@@ -22,6 +22,11 @@ def test_cli_image_upload_project_export(tmpdir):
         shell=True
     )
     project = PROJECT_NAME
+    subprocess.run(
+        f'superannotatecli create-folder --project "{PROJECT_NAME}" --name folder1',
+        check=True,
+        shell=True
+    )
     sa.create_annotation_classes_from_classes_json(
         PROJECT_NAME, "./tests/sample_recursive_test/classes/classes.json"
     )
@@ -40,25 +45,49 @@ def test_cli_image_upload_project_export(tmpdir):
     time.sleep(1)
     assert len(sa.search_images(project)) == 2
 
+    subprocess.run(
+        f'superannotatecli upload-images --project "{PROJECT_NAME}/folder1" --folder ./tests/sample_recursive_test --extensions=jpg --set-annotation-status QualityCheck',
+        check=True,
+        shell=True
+    )
+    time.sleep(1)
+    assert len(sa.search_images(f"{PROJECT_NAME}/folder1")) == 1
+
     sa.upload_annotations_from_folder_to_project(
         project, "./tests/sample_recursive_test"
     )
+    test_dir1 = tmpdir / "test1"
+    test_dir1.mkdir()
+    subprocess.run(
+        f'superannotatecli export-project --project "{PROJECT_NAME}" --folder {test_dir1}',
+        check=True,
+        shell=True
+    )
+
+    assert len(list(test_dir1.glob("*.json"))) == 1
+    assert len(list(test_dir1.glob("*.jpg"))) == 0
+    assert len(list(test_dir1.glob("*.png"))) == 0
+
+    test_dir2 = tmpdir / "test2"
+    test_dir2.mkdir()
     subprocess.run(
-        f'superannotatecli export-project --project "{PROJECT_NAME}" --folder {tmpdir}',
+        f'superannotatecli export-project --project "{PROJECT_NAME}" --folder {test_dir2} --include-fuse',
         check=True,
         shell=True
     )
 
-    assert len(list(tmpdir.glob("*.json"))) == 1
-    assert len(list(tmpdir.glob("*.jpg"))) == 0
-    assert len(list(tmpdir.glob("*.png"))) == 0
+    assert len(list(test_dir2.glob("*.json"))) == 1
+    assert len(list(test_dir2.glob("*.jpg"))) == 1
+    assert len(list(test_dir2.glob("*.png"))) == 1
 
+    test_dir3 = tmpdir / "test3"
+    test_dir3.mkdir()
     subprocess.run(
-        f'superannotatecli export-project --project "{PROJECT_NAME}" --folder {tmpdir} --include-fuse',
+        f'superannotatecli export-project --project "{PROJECT_NAME}/folder1" --folder {test_dir3}',
         check=True,
         shell=True
     )
 
-    assert len(list(tmpdir.glob("*.json"))) == 1
-    assert len(list(tmpdir.glob("*.jpg"))) == 1
-    assert len(list(tmpdir.glob("*.png"))) == 1
+    assert len(list(test_dir3.glob("*.json"))) == 1
+    assert len(list(test_dir3.glob("*.jpg"))) == 0
+    assert len(list(test_dir3.glob("*.png"))) == 0

tests/test_folders.py

@@ -276,7 +276,7 @@ def test_copy_images(tmpdir):
 
     ann2 = sa.get_image_annotations(project2, "example_image_2.jpg")
 
-    assert "instances" not in ann2["annotation_json"]
+    assert len(ann2["annotation_json"]["instances"]) == 0
 
     num_images = sa.get_project_image_count(project2)
     assert num_images == 2