Start export

Author: hovnatan

superannotate/__main__.py

@@ -316,8 +316,19 @@ def export_project(command_name, args):
     )
     args = parser.parse_args(args)
 
+    parts = args.project.split('/')
+    if len(parts) == 1:
+        project, folder = parts[0], None
+    elif len(parts) == 2:
+        project, folder = parts
+    else:
+        raise SABaseException(
+            0, "Project should be in format <project>[/<folder>]"
+        )
     export = sa.prepare_export(
-        args.project, args.annotation_statuses, args.include_fuse
+        project, [folder],
+        annotation_statuses=args.annotation_statuses,
+        include_fuse=args.include_fuse
     )
     sa.download_export(
         args.project, export, args.folder, not args.disable_extract_zip_contents

superannotate/analytics/common.py

@@ -304,12 +304,15 @@ def __get_user_metadata(annotation):
         logger.warning(
             "No annotations found in project export root %s", project_root
         )
-    type_postfix = "___objects.json" if annotations_paths[0].match(
-        "*___objects.json"
-    ) else "___pixel.json"
+    type_postfix = "___objects.json" if len(
+        list(Path(project_root).rglob("*___objects.json"))
+    ) > 0 else "___pixel.json"
     for annotation_path in annotations_paths:
         annotation_json = json.load(open(annotation_path))
-        image_name = annotation_path.name.split(type_postfix)[0]
+        parts = annotation_path.name.split(type_postfix)
+        if len(parts) != 2:
+            continue
+        image_name = parts[0]
         image_metadata = __get_image_metadata(image_name, annotation_json)
         annotation_instance_id = 0
         if include_comments:

superannotate/db/exports.py

@@ -17,7 +17,7 @@
     SABaseException, SAExistingExportNameException,
     SANonExistingExportNameException
 )
-from .project_api import get_project_metadata_bare
+from .project_api import get_project_and_folder_metadata, get_project_metadata_bare
 
 logger = logging.getLogger("superannotate-python-sdk")
 
@@ -97,7 +97,11 @@ def _get_export(export):
 
 
 def prepare_export(
-    project, annotation_statuses=None, include_fuse=False, only_pinned=False
+    project,
+    folder_names=None,
+    annotation_statuses=None,
+    include_fuse=False,
+    only_pinned=False
 ):
     """Prepare annotations and classes.json for export. Original and fused images for images with
     annotations can be included with include_fuse flag.
@@ -133,6 +137,8 @@ def prepare_export(
         "coco": 0,
         "time": current_time
     }
+    if folder_names is not None:
+        json_req["folder_names"] = folder_names
     params = {'team_id': team_id, 'project_id': project_id}
     response = _api.send_request(
         req_type='POST', path='/export', params=params, json_req=json_req
@@ -142,9 +148,10 @@ def prepare_export(
             response.status_code, "Couldn't create_export." + response.text
         )
     res = response.json()
+    folder_str = "" if folder_names is None else ("/" + str(folder_names))
     logger.info(
-        "Prepared export %s for project %s (ID %s).", res['name'],
-        project["name"], project["id"]
+        "Prepared export %s for project %s%s (project ID %s).", res['name'],
+        project["name"], folder_str, project["id"]
     )
     return res
 

tests/test_annotation_adding.py

@@ -89,6 +89,8 @@ def test_add_bbox(tmpdir):
     sa.download_export(project, export, tmpdir)
 
     df = sa.aggregate_annotations_as_df(tmpdir)
+    print(df)
+    print(image_name)
 
     num = len(df[df["imageName"] == image_name]["instanceId"].dropna().unique())
 

tests/test_folders.py

@@ -255,15 +255,25 @@ def test_copy_images(tmpdir):
     num_images = sa.get_project_image_count(project)
     assert num_images == 4
 
+    im1 = sa.get_image_metadata(project, "example_image_2.jpg")
+    assert im1["annotation_status"] == "InProgress"
+
     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"]
+        project,
+        project2, ["example_image_2.jpg", "example_image_3.jpg"],
+        include_annotations=False,
+        copy_annotation_status=False,
+        copy_pin=False
     )
 
+    im1_copied = sa.get_image_metadata(project2, "example_image_2.jpg")
+    assert im1_copied["annotation_status"] == "NotStarted"
+
     num_images = sa.get_project_image_count(project2)
     assert num_images == 2
 
@@ -364,18 +374,84 @@ def test_copy_images2(tmpdir):
     num_images = sa.get_project_image_count(project2)
     assert num_images == 0
 
+    sa.pin_image(project, "example_image_2.jpg")
+
+    im1 = sa.get_image_metadata(project, "example_image_2.jpg")
+    assert im1["is_pinned"] == 1
+    assert im1["annotation_status"] == "InProgress"
+
     sa.copy_images(
-        project,
-        project2, ["example_image_2.jpg", "example_image_3.jpg"],
-        include_annotations=False,
-        copy_annotation_status=False,
-        copy_pin=False
+        project, project2, ["example_image_2.jpg", "example_image_3.jpg"]
     )
 
     num_images = sa.get_project_image_count(project2)
     assert num_images == 2
 
     ann1 = sa.get_image_annotations(project, "example_image_2.jpg")
     ann2 = sa.get_image_annotations(project2, "example_image_2.jpg")
+    assert ann1 == ann2
+
+    im1_copied = sa.get_image_metadata(project2, "example_image_2.jpg")
+    assert im1_copied["is_pinned"] == 1
+    assert im1_copied["annotation_status"] == "InProgress"
+
+    im2_copied = sa.get_image_metadata(project2, "example_image_3.jpg")
+    assert im2_copied["is_pinned"] == 0
+    assert im2_copied["annotation_status"] == "InProgress"
+
+
+def test_folder_export(tmpdir):
+    PROJECT_NAME = "test folder export"
+    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_annotation_classes_from_classes_json(
+        project, FROM_FOLDER / "classes" / "classes.json"
+    )
+    sa.upload_images_from_folder_to_project(
+        project, FROM_FOLDER, annotation_status="InProgress"
+    )
+    sa.create_folder(project, "folder1")
+    project = PROJECT_NAME + "/folder1"
+    sa.upload_images_from_folder_to_project(
+        project, FROM_FOLDER, annotation_status="InProgress"
+    )
+
+    sa.upload_annotations_from_folder_to_project(project, FROM_FOLDER)
+    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"]
+    )
+
+    export = sa.prepare_export(PROJECT_NAME, ["folder1", "folder2"])
+    sa.download_export(project, export, tmpdir)
+
+    assert len(list((tmpdir / "classes").rglob("*"))) == 1
+
+    assert len(list((tmpdir / "folder1").rglob("*"))) == 4
+
+    assert len(list((tmpdir / "folder2").rglob("*"))) == 2
+
+    assert len(list((tmpdir).glob("*.*"))) == 0
+
+    export = sa.prepare_export(PROJECT_NAME)
+    sa.download_export(project, export, tmpdir)
+
+    assert len(list((tmpdir / "classes").rglob("*"))) == 1
+
+    assert len(list((tmpdir / "folder1").rglob("*"))) == 4
+
+    assert len(list((tmpdir / "folder2").rglob("*"))) == 2
 
-    assert ann1 == ann2
+    assert len(list((tmpdir).glob("*.*"))) == 4