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

Author: agyurjin

docs/source/cli.rst

@@ -52,6 +52,38 @@ scanned for available images.
 
 Optional argument *extensions* accepts comma separated list of image extensions to look for. If the argument is not given then value *jpg,png* is assumed.
 
+----------
+
+.. _ref_upload_videos:
+
+Uploading videos
+~~~~~~~~~~~~~~~~
+
+To upload videos from folder to project use:
+
+.. code-block:: bash
+
+   superannotate upload-videos --project <project_name> --folder <folder_path> 
+                               [--recursive] [--extensions mp4,avi,mov,webm,flv,mpg,ogg]
+                               [--target-fps <float>] [--start-time <float>]
+                               [--end-time <float>]
+
+If optional argument *recursive* is given then subfolders of :file:`<folder_path>` are also recursively
+scanned for available images.
+
+Optional argument *extensions* accepts comma separated list of image extensions
+to look for. If the argument is not given then value *mp4,avi,mov,webm,flv,mpg,ogg* is assumed.
+
+*target-fps* specifies how many frames per second need to extract from the videos (approximate).
+If not specified all frames will be uploaded.
+
+*start-time* specifies time (in seconds) from which to start extracting frames,
+default is 0.0.
+
+*end-time* specifies time (in seconds) up to which to extract frames. 
+If it is not specified, then up to end is assumed.
+
+
 ----------
 
 .. _ref_cli_version:

docs/source/superannotate.sdk.rst

@@ -42,6 +42,8 @@ ________
 .. autofunction:: superannotate.unshare_project
 .. autofunction:: superannotate.get_project_settings
 .. autofunction:: superannotate.set_project_settings
+.. autofunction:: superannotate.get_project_default_image_quality_in_editor
+.. autofunction:: superannotate.set_project_default_image_quality_in_editor
 .. autofunction:: superannotate.get_project_workflow
 .. autofunction:: superannotate.set_project_workflow
 
@@ -74,6 +76,8 @@ ______
 .. autofunction:: superannotate.upload_annotations_from_json_to_image
 .. autofunction:: superannotate.copy_image
 .. autofunction:: superannotate.move_image
+.. autofunction:: superannotate.pin_image
+.. autofunction:: superannotate.assign_images
 .. autofunction:: superannotate.delete_image
 .. autofunction:: superannotate.add_annotation_bbox_to_image
 .. autofunction:: superannotate.add_annotation_polygon_to_image

docs/source/tutorial.sdk.rst

@@ -502,8 +502,8 @@ Grassroots DICOM library <http://gdcm.sourceforge.net/wiki/index.php/Main_Page>`
 ----------
 
 
-Computing consensus scores for instancec between several projects
-_______________________________________________________
+Computing consensus scores for instances between several projects
+_________________________________________________________________
 
 
 Consensus is a tool to compare the quallity of the annotations of the same image that is present in several projects.

install.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-PYTHON_VER="3.6"
+PYTHON_VER="3.7"
 
 # ubuntu install dependencies
-# sudo add-apt-repository ppa:deadsnakes/ppa
-# sudo apt update
-# sudo apt install python${PYTHON_VER} python${PYTHON_VER}-venv python${PYTHON_VER}-dev
+sudo add-apt-repository ppa:deadsnakes/ppa
+sudo apt update
+sudo apt install python${PYTHON_VER} python${PYTHON_VER}-venv python${PYTHON_VER}-dev
 
 rm -rf venv_sa_conv
 python${PYTHON_VER} -m venv venv_sa_conv
@@ -16,3 +16,12 @@ pip install 'git+https://github.com/cocodataset/panopticapi.git'
 pip install 'git+https://github.com/philferriere/cocoapi.git#egg=pycocotools&subdirectory=PythonAPI'
 
 pip install -e .
+
+# for testing
+pip install pytest pytest-xdist
+
+# for docs
+pip install sphinx sphinx_rtd_theme
+
+# for pip
+pip install twine

superannotate/__init__.py

@@ -21,6 +21,7 @@
     image_path_to_annotation_paths, project_type_int_to_str,
     project_type_str_to_int, user_role_str_to_int
 )
+from .consensus_benchmark.consensus import consensus
 from .dataframe_filtering import (
     filter_annotation_instances, filter_images_by_comments,
     filter_images_by_tags
@@ -44,12 +45,16 @@
     set_image_annotation_status, upload_annotations_from_json_to_image
 )
 from .db.project import get_project_metadata, search_projects
-from .db.project_images import copy_image, move_image, upload_image_to_project
+from .db.project_images import (
+    assign_images, copy_image, move_image, pin_image, upload_image_to_project
+)
 from .db.projects import (
     create_project, create_project_like_project, delete_project,
-    get_project_image_count, get_project_settings, get_project_workflow,
-    rename_project, set_project_settings, set_project_workflow, share_project,
-    unshare_project, upload_annotations_from_folder_to_project,
+    get_project_default_image_quality_in_editor, get_project_image_count,
+    get_project_settings, get_project_workflow, rename_project,
+    set_project_default_image_quality_in_editor, set_project_settings,
+    set_project_workflow, share_project, unshare_project,
+    upload_annotations_from_folder_to_project,
     upload_images_from_folder_to_project,
     upload_images_from_s3_bucket_to_project, upload_images_to_project,
     upload_preannotations_from_folder_to_project, upload_video_to_project,
@@ -63,7 +68,6 @@
     SAExistingProjectNameException, SANonExistingAnnotationClassNameException,
     SANonExistingProjectNameException
 )
-from .consensus_benchmark.consensus import consensus
 from .input_converters.conversion import (
     convert_platform, convert_project_type, export_annotation_format,
     import_annotation_format

superannotate/__main__.py

@@ -43,8 +43,10 @@ def main():
     command = sys.argv[1]
     further_args = sys.argv[2:]
 
-    if command == "image-upload":
+    if command == "upload-images":
         image_upload(further_args)
+    elif command == "upload-videos":
+        video_upload(further_args)
     elif command == "init":
         ask_token(further_args)
     elif command == "export-project":
@@ -59,6 +61,70 @@ def _list_str(values):
     return values.split(',')
 
 
+def video_upload(args):
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        '--project', required=True, help='Project name to upload'
+    )
+    parser.add_argument(
+        '--folder', required=True, help='Folder from which to upload'
+    )
+    parser.add_argument(
+        '--recursive',
+        default=False,
+        action='store_true',
+        help='Enables recursive subfolder upload.'
+    )
+    parser.add_argument(
+        '--extensions',
+        required=False,
+        default=None,
+        type=_list_str,
+        help=
+        'List of video extensions to include. Default is mp4,avi,mov,webm,flv,mpg,ogg'
+    )
+    parser.add_argument(
+        '--set-annotation-status',
+        required=False,
+        default="NotStarted",
+        help=
+        'Set images\' annotation statuses after upload. Default is NotStarted'
+    )
+    parser.add_argument(
+        '--target-fps',
+        required=False,
+        default=None,
+        help=
+        'How many frames per second need to extract from the videos (approximate).  If not specified all frames will be uploaded'
+    )
+    parser.add_argument(
+        '--start-time',
+        required=False,
+        default=0.0,
+        help=
+        'Time (in seconds) from which to start extracting frames. Default is 0.0'
+    )
+    parser.add_argument(
+        '--end-time',
+        required=False,
+        default=None,
+        help=
+        'Time (in seconds) up to which to extract frames. If it is not specified, then up to end'
+    )
+    args = parser.parse_args(args)
+
+    sa.upload_videos_from_folder_to_project(
+        project=args.project,
+        folder_path=args.folder,
+        extensions=args.extensions,
+        annotation_status=args.set_annotation_status,
+        recursive_subfolders=args.recursive,
+        target_fps=args.target_fps,
+        start_time=args.start_time,
+        end_time=args.end_time
+    )
+
+
 def image_upload(args):
     parser = argparse.ArgumentParser()
     parser.add_argument(
@@ -89,10 +155,10 @@ def image_upload(args):
     args = parser.parse_args(args)
 
     sa.upload_images_from_folder_to_project(
-        args.project,
-        args.folder,
-        args.extensions,
-        args.set_annotation_status,
+        project=args.project,
+        folder_path=args.folder,
+        extensions=args.extensions,
+        annotation_status=args.set_annotation_status,
         recursive_subfolders=args.recursive
     )
 

superannotate/db/images.py

@@ -903,50 +903,49 @@ def upload_annotations_from_json_to_image(
         path=f'/image/{image_id}/annotation/getAnnotationUploadToken',
         params=params
     )
-    if response.ok:
-        res = response.json()
-        if project_type == 1:  # vector
-            res = res['objects']
-            s3_session = boto3.Session(
-                aws_access_key_id=res['accessKeyId'],
-                aws_secret_access_key=res['secretAccessKey'],
-                aws_session_token=res['sessionToken']
-            )
-            s3_resource = s3_session.resource('s3')
-            bucket = s3_resource.Bucket(res["bucket"])
-            bucket.put_object(
-                Key=res['filePath'], Body=json.dumps(annotation_json)
-            )
-        else:  # pixel
-            if mask is None:
-                raise SABaseException(0, "Pixel annotation should have mask.")
-            if not isinstance(mask, io.BytesIO):
-                with open(mask, "rb") as f:
-                    mask = io.BytesIO(f.read())
-            res_j = res['pixel']
-            s3_session = boto3.Session(
-                aws_access_key_id=res_j['accessKeyId'],
-                aws_secret_access_key=res_j['secretAccessKey'],
-                aws_session_token=res_j['sessionToken']
-            )
-            s3_resource = s3_session.resource('s3')
-            bucket = s3_resource.Bucket(res_j["bucket"])
-            bucket.put_object(
-                Key=res_j['filePath'], Body=json.dumps(annotation_json)
-            )
-            res_m = res['save']
-            s3_session = boto3.Session(
-                aws_access_key_id=res_m['accessKeyId'],
-                aws_secret_access_key=res_m['secretAccessKey'],
-                aws_session_token=res_m['sessionToken']
-            )
-            s3_resource = s3_session.resource('s3')
-            bucket = s3_resource.Bucket(res_m["bucket"])
-            bucket.put_object(Key=res_m['filePath'], Body=mask)
-    else:
+    if not response.ok:
         raise SABaseException(
             response.status_code, "Couldn't upload annotation. " + response.text
         )
+    res = response.json()
+    if project_type == 1:  # vector
+        res = res['objects']
+        s3_session = boto3.Session(
+            aws_access_key_id=res['accessKeyId'],
+            aws_secret_access_key=res['secretAccessKey'],
+            aws_session_token=res['sessionToken']
+        )
+        s3_resource = s3_session.resource('s3')
+        bucket = s3_resource.Bucket(res["bucket"])
+        bucket.put_object(
+            Key=res['filePath'], Body=json.dumps(annotation_json)
+        )
+    else:  # pixel
+        if mask is None:
+            raise SABaseException(0, "Pixel annotation should have mask.")
+        if not isinstance(mask, io.BytesIO):
+            with open(mask, "rb") as f:
+                mask = io.BytesIO(f.read())
+        res_j = res['pixel']
+        s3_session = boto3.Session(
+            aws_access_key_id=res_j['accessKeyId'],
+            aws_secret_access_key=res_j['secretAccessKey'],
+            aws_session_token=res_j['sessionToken']
+        )
+        s3_resource = s3_session.resource('s3')
+        bucket = s3_resource.Bucket(res_j["bucket"])
+        bucket.put_object(
+            Key=res_j['filePath'], Body=json.dumps(annotation_json)
+        )
+        res_m = res['save']
+        s3_session = boto3.Session(
+            aws_access_key_id=res_m['accessKeyId'],
+            aws_secret_access_key=res_m['secretAccessKey'],
+            aws_session_token=res_m['sessionToken']
+        )
+        s3_resource = s3_session.resource('s3')
+        bucket = s3_resource.Bucket(res_m["bucket"])
+        bucket.put_object(Key=res_m['filePath'], Body=mask)
 
 
 def create_fuse_image(