CLI upload preannotations

Author: hovnatan

docs/source/cli.rst

@@ -96,7 +96,8 @@ To upload preannotations from folder to project use:
 .. code-block:: bash
 
    superannotate upload-preannotations --project <project_name> --folder <folder_path> 
-                                       [--format "COCO" or "SA"]
+                                       [--format "COCO" or "SA"] [--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.
@@ -113,12 +114,12 @@ To upload annotations from folder to project use:
 
 .. code-block:: bash
 
-   superannotate upload-preannotations --project <project_name> --folder <folder_path> 
-                                       [--recursive]
-
-If optional argument *recursive* is given then subfolders of :file:`<folder_path>` are also recursively
-scanned for available preannotations.
+   superannotate upload-annotations --project <project_name> --folder <folder_path> 
+                                    [--format "COCO" or "SA"] [--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.
 
 ----------
 

superannotate/__main__.py

@@ -12,7 +12,7 @@
 logger = logging.getLogger("superannotate-python-sdk")
 
 
-def ask_token(args):
+def ask_token():
     config_dir = Path.home() / ".superannotate"
     config_filename = "config.json"
     config_file = config_dir / config_filename
@@ -50,8 +50,10 @@ def main():
         video_upload(further_args)
     elif command == "upload-preannotations":
         preannotations_upload(further_args)
+    elif command == "upload-annotations":
+        preannotations_upload(further_args, annotations=True)
     elif command == "init":
-        ask_token(further_args)
+        ask_token()
     elif command == "export-project":
         export_project(further_args)
     elif command == "version":
@@ -64,7 +66,7 @@ def _list_str(values):
     return values.split(',')
 
 
-def preannotations_upload(args):
+def preannotations_upload(args, annotations=False):
     parser = argparse.ArgumentParser()
     parser.add_argument(
         '--project', required=True, help='Project name to upload'
@@ -84,7 +86,7 @@ def preannotations_upload(args):
     parser.add_argument(
         '--dataset-name',
         required=False,
-        help='Input preannotations dataset name for COCO projects'
+        help='Input annotations dataset name for COCO projects'
     )
     parser.add_argument(
         '--task',
@@ -97,7 +99,7 @@ def preannotations_upload(args):
     if args.format != "SuperAnnotate":
         if args.format != "COCO":
             raise sa.SABaseException(
-                0, "Not supported preannotations format " + args.format
+                0, "Not supported annotations format " + args.format
             )
         if args.dataset_name is None:
             raise sa.SABaseException(
@@ -107,7 +109,7 @@ def preannotations_upload(args):
             raise sa.SABaseException(
                 0, "Task name should be present for COCO format upload."
             )
-        logger.info("Preannotations in format %s.", args.format)
+        logger.info("Annotations in format %s.", args.format)
         project_type = sa.project_type_int_to_str(
             sa.get_project_metadata(args.project)["type"]
         )
@@ -123,9 +125,14 @@ def preannotations_upload(args):
         )
         args.folder = tempdir_path
 
-    sa.upload_preannotations_from_folder_to_project(
-        project=args.project, folder_path=args.folder
-    )
+    if annotations:
+        sa.upload_annotations_from_folder_to_project(
+            project=args.project, folder_path=args.folder
+        )
+    else:
+        sa.upload_preannotations_from_folder_to_project(
+            project=args.project, folder_path=args.folder
+        )
 
 
 def video_upload(args):

superannotate/db/project_images.py

@@ -100,7 +100,7 @@ def upload_image_to_project(
     s3_resource = s3_session.resource('s3')
     bucket = s3_resource.Bucket(res["bucket"])
     orig_image, lores_image, huge_image, thumbnail_image = get_image_array_to_upload(
-        img, project["type"], image_quality_in_editor
+        img, image_quality_in_editor
     )
     key = prefix + f'{img_name}'
     try:

superannotate/db/projects.py

@@ -81,6 +81,7 @@ def create_project(project_name, project_description, project_type):
     )
     return res
 
+
 def create_project_like_project(
     project_name,
     from_project,
@@ -93,9 +94,12 @@ def create_project_like_project(
     """Deprecated. Function name changed to clone_project.
     """
     logger.warning("Deprecated. Function name changed to clone_project.")
-    clone_project(project_name, from_project, project_description,
-                  copy_annotation_classes, copy_settings,
-                  copy_workflow, copy_project_contributors)
+    clone_project(
+        project_name, from_project, project_description,
+        copy_annotation_classes, copy_settings, copy_workflow,
+        copy_project_contributors
+    )
+
 
 def clone_project(
     project_name,
@@ -584,25 +588,30 @@ def upload_images_from_folder_to_project(
     )
 
 
-def get_image_array_to_upload(
-    byte_io_orig, project_type, image_quality_in_editor
-):
+def get_image_array_to_upload(byte_io_orig, image_quality_in_editor):
     Image.MAX_IMAGE_PIXELS = None
     im = Image.open(byte_io_orig)
     im_format = im.format
-    im = im.convert("RGB")
     width, height = im.size
 
-    if not image_quality_in_editor == 100 or im_format != "JPEG":
-        byte_io_lores = io.BytesIO()
-        im.save(
-            byte_io_lores,
-            'JPEG',
-            subsampling=0 if image_quality_in_editor > 60 else 2,
-            quality=image_quality_in_editor
-        )
-    else:
+    if image_quality_in_editor == 100 and im_format in ['JPEG', 'JPG']:
         byte_io_lores = io.BytesIO(byte_io_orig.getbuffer())
+    else:
+        byte_io_lores = io.BytesIO()
+        bg = Image.new('RGBA', im.size, (255, 255, 255))
+        im = im.convert("RGBA")
+        bg.paste(im, mask=im)
+        bg = bg.convert('RGB')
+        if image_quality_in_editor == 100:
+            bg.save(
+                byte_io_lores,
+                'JPEG',
+                quality=image_quality_in_editor,
+                subsampling=0
+            )
+        else:
+            bg.save(byte_io_lores, 'JPEG', quality=image_quality_in_editor)
+        im = bg
 
     byte_io_huge = io.BytesIO()
     hsize = int(height * 600.0 / width)
@@ -611,7 +620,7 @@ def get_image_array_to_upload(
     byte_io_thumbs = io.BytesIO()
     thumbnail_size = (128, 96)
     background = Image.new('RGB', thumbnail_size, "black")
-    im.thumbnail(thumbnail_size)
+    im.thumbnail(thumbnail_size, Image.ANTIALIAS)
     (w, h) = im.size
     background.paste(
         im, ((thumbnail_size[0] - w) // 2, (thumbnail_size[1] - h) // 2)
@@ -672,7 +681,7 @@ def __upload_images_to_aws_thread(
                 file = io.BytesIO(f.read())
         try:
             orig_image, lores_image, huge_image, thumbnail_image = get_image_array_to_upload(
-                file, project_type, image_quality_in_editor
+                file, image_quality_in_editor
             )
             bucket.put_object(Body=orig_image, Key=key)
             bucket.put_object(Body=lores_image, Key=key + '___lores.jpg')

superannotate/version.py

@@ -1 +1 @@
-__version__ = "2.3.0"
+__version__ = "2.3.1"

tests/test_preannotation_upload_cli.py

@@ -10,11 +10,11 @@
 @pytest.mark.parametrize(
     "project_type,name,description,from_folder", [
         (
-            "Vector", "Example Project test vector preannotation cli upload",
+            "Vector", "Example Project test0 vector preannotation cli upload",
             "test vector", Path("./tests/sample_project_vector")
         ),
         (
-            "Pixel", "Example Project test pixel preannotation cli upload",
+            "Pixel", "Example Project test0 pixel preannotation cli upload",
             "test pixel", Path("./tests/sample_project_pixel")
         )
     ]
@@ -54,7 +54,7 @@ def test_preannotation_folder_upload_download_cli(
 
 def test_preannotation_folder_upload_download_cli_vector_COCO(tmpdir):
     project_type = "Vector"
-    name = "Example Project test vector preannotation cli upload coco vector"
+    name = "Example Project test vector2 preannotation cli upload coco vector"
     description = "test"
     from_folder = "./tests/converter_test/COCO/input/toSuperAnnotate/keypoint_detection"
     task = "keypoint_detection"
@@ -92,7 +92,7 @@ def test_preannotation_folder_upload_download_cli_vector_COCO(tmpdir):
 
 def test_preannotation_folder_upload_download_cli_vector_object_COCO(tmpdir):
     project_type = "Vector"
-    name = "Example Project test vector preannotation cli upload coco object vector"
+    name = "Example Project test vector1 preannotation cli upload coco object vector"
     description = "test"
     from_folder = "./tests/converter_test/COCO/input/toSuperAnnotate/instance_segmentation"
     task = "instance_segmentation"
@@ -120,7 +120,7 @@ def test_preannotation_folder_upload_download_cli_vector_object_COCO(tmpdir):
 
 def test_preannotation_folder_upload_download_cli_pixel_object_COCO(tmpdir):
     project_type = "Pixel"
-    name = "Example Project test pixel preannotation cli upload coco object pixel"
+    name = "Example Project test pixel1 preannotation cli upload coco object pixel"
     description = "test"
     from_folder = "./tests/converter_test/COCO/input/toSuperAnnotate/panoptic_segmentation"
     task = "panoptic_segmentation"