Merge branch 'master' of https://github.com/superannotateai/superannotate-python-sdk

Author: agyurjin

Makefile

@@ -24,7 +24,7 @@ clean:
 coverage: test_coverage
 
 test_coverage:
-	$(PYTESTS) --cov=superannotate -n 8
+	-$(PYTESTS) --cov=superannotate -n 8
 	$(COVERAGE) html
 	@echo "\033[95m\n\nCoverage successful! View the output at file://htmlcov/index.html.\n\033[0m"
 

docs/source/cli.rst

@@ -96,12 +96,22 @@ To upload preannotations from folder to project use:
 .. code-block:: bash
 
    superannotate upload-preannotations --project <project_name> --folder <folder_path> 
-                                       [--format "COCO" or "SA"] [--dataset-name "<dataset_name_for_COCO_projects>"]
+                                       [--format "COCO" or "SuperAnnotate"] 
+                                       [--dataset-name "<dataset_name_for_COCO_projects>"]
                                        [--task "<task_type_for_COCO_projects>]
 
 
-Optional argument *format* accepts input preannotation format. It can have COCO or SuperAnnotate values.
-If the argument is not given then SuperAnnotate (the native preannotation format) assumed.
+Optional argument *format* accepts input annotation format. It can have COCO or SuperAnnotate values.
+If the argument is not given then SuperAnnotate (the native annotation format) is assumed.
+
+Only when COCO format is specified *dataset-name* and *task* arguments are required.
+
+*dataset-name* specifies JSON filename (without extension) in <folder_path>.
+
+*task* specifies the COCO task for conversion. Please see 
+:ref:`import_annotation_format <ref_import_annotation_format>` for more details.
+
+The annotation classes will be created during the execution of this command.
 
 ----------
 
@@ -115,11 +125,22 @@ To upload annotations from folder to project use:
 .. code-block:: bash
 
    superannotate upload-annotations --project <project_name> --folder <folder_path> 
-                                    [--format "COCO" or "SA"] [--dataset-name "<dataset_name_for_COCO_projects>"]
+                                    [--format "COCO" or "SuperAnnotate"] 
+                                    [--dataset-name "<dataset_name_for_COCO_projects>"]
                                     [--task "<task_type_for_COCO_projects>]
 
-Optional argument *format* accepts input preannotation format. It can have COCO or SuperAnnotate values.
-If the argument is not given then SuperAnnotate (the native preannotation format) assumed.
+Optional argument *format* accepts input annotation format. It can have COCO or SuperAnnotate values.
+If the argument is not given then SuperAnnotate (the native annotation format) is assumed.
+
+Only when COCO format is specified *dataset-name* and *task* arguments are required.
+
+*dataset-name* specifies JSON filename (without extension) in <folder_path>.
+
+*task* specifies the COCO task for conversion. Please see 
+:ref:`import_annotation_format <ref_import_annotation_format>` for more details.
+
+The annotation classes will be created during the execution of this command.
+
 
 ----------
 

docs/source/conf.py

@@ -20,10 +20,10 @@
 
 project = 'SuperAnnotate Python SDK'
 copyright = '2020, SuperAnnotate AI'
-author = 'Hovnatan Karapetyan, Vahagn Tumanyan, Armen Gyurjinyan, Shabin Dilanchian'
+author = 'Hovnatan Karapetyan, Vahagn Tumanyan, Armen Gyurjinyan, Shabin Dilanchian, Erik Harutyunyan, Arsine Mangasaryan'
 
 # The full version, including alpha/beta/rc tags
-release = '1.0'
+release = superannotate.__version__
 
 # -- General configuration ---------------------------------------------------
 master_doc = 'index'

docs/source/superannotate.sdk.rst

@@ -282,6 +282,7 @@ Converting annotation format to and from SuperAnnotate format
 _____________________________________________________________
 
 
+.. _ref_import_annotation_format:
 .. autofunction:: superannotate.import_annotation_format
 .. autofunction:: superannotate.export_annotation_format
 .. autofunction:: superannotate.convert_project_type
@@ -302,7 +303,6 @@ ________________________
 .. autofunction:: superannotate.add_annotation_cuboid_to_json
 .. autofunction:: superannotate.add_annotation_comment_to_json
 .. autofunction:: superannotate.aggregate_annotations_as_df
-.. autofunction:: superannotate.consensus
 .. autofunction:: superannotate.df_to_annotations
 .. _ref_filter_annotation_instances:
 .. autofunction:: superannotate.filter_annotation_instances

superannotate/version.py

@@ -1 +1 @@
-__version__ = "2.3.2"
+__version__ = "2.3.5"

tests/sample_project_vector/example_image_1.jpg___objects.json

@@ -1,6 +1,5 @@
 from pathlib import Path
 import json
-import time
 
 import pytest
 
@@ -133,3 +132,39 @@ def test_add_bbox_noinit(tmpdir):
     export = sa.prepare_export(project, include_fuse=True)
     sa.download_export(project, export, tmpdir)
     assert len(list(Path(tmpdir).rglob("*.*"))) == 4
+
+
+def test_add_bbox_json(tmpdir):
+    tmpdir = Path(tmpdir)
+
+    dest = tmpdir / "test.json"
+    src = Path(
+        "./tests/sample_project_vector/example_image_1.jpg___objects.json"
+    )
+    dest.write_text(src.read_text())
+    annotations = json.load(open(dest))
+    sa.add_annotation_bbox_to_json(dest, [10, 10, 500, 100], "test_add")
+    sa.add_annotation_polyline_to_json(
+        dest, [110, 110, 510, 510, 600, 510], "test_add"
+    )
+    sa.add_annotation_polygon_to_json(
+        dest, [100, 100, 500, 500, 200, 300], "test_add",
+        [{
+            "name": "tall",
+            "groupName": "height"
+        }]
+    )
+    sa.add_annotation_point_to_json(dest, [250, 250], "test_add")
+    sa.add_annotation_ellipse_to_json(dest, [405, 405, 20, 70, 15], "test_add")
+    sa.add_annotation_template_to_json(
+        dest, [600, 30, 630, 30, 615, 60], [1, 3, 2, 3], "test_add"
+    )
+    sa.add_annotation_cuboid_to_json(
+        dest, [800, 500, 900, 600, 850, 450, 950, 700], "test_add"
+    )
+    sa.add_annotation_comment_to_json(
+        dest, "hey", [100, 100], "hovnatan@superannotate.com", True
+    )
+    annotations_new = json.load(open(dest))
+
+    assert len(annotations_new) == len(annotations) + 8

tests/test_annotation_adding.py

@@ -52,6 +52,44 @@ def test_preannotation_folder_upload_download_cli(
     assert count_in == count_out
 
 
+def test_annotation_folder_upload_download_cli_vector_COCO(tmpdir):
+    project_type = "Vector"
+    name = "Example Project test vector2 annotation cli upload coco vector"
+    description = "test"
+    from_folder = "./tests/converter_test/COCO/input/toSuperAnnotate/keypoint_detection"
+    task = "keypoint_detection"
+    dataset_name = "person_keypoints_test"
+
+    projects_found = sa.search_projects(name, return_metadata=True)
+    for pr in projects_found:
+        sa.delete_project(pr)
+
+    project = sa.create_project(name, description, project_type)
+    sa.upload_images_from_folder_to_project(
+        project, from_folder, annotation_status="InProgress"
+    )
+    # sa.create_annotation_classes_from_classes_json(
+    #     project, from_folder / "classes" / "classes.json"
+    # )
+    subprocess.run(
+        [
+            f"superannotate upload-annotations --project '{name}' --folder '{from_folder}' --format COCO --task {task} --dataset-name {dataset_name}"
+        ],
+        check=True,
+        shell=True
+    )
+    # time.sleep(5)
+    # count_in = len(list(from_folder.glob("*.json")))
+
+    # images = sa.search_images(project)
+    # for image_name in images:
+    #     sa.download_image_preannotations(project, image_name, tmpdir)
+
+    # count_out = len(list(Path(tmpdir).glob("*.json")))
+
+    # assert count_in == count_out
+
+
 def test_preannotation_folder_upload_download_cli_vector_COCO(tmpdir):
     project_type = "Vector"
     name = "Example Project test vector2 preannotation cli upload coco vector"