settings

Author: hovnatan

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,6 @@ 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

superannotate/__main__.py

@@ -89,10 +89,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/project_images.py

@@ -14,7 +14,7 @@
     set_image_annotation_status, upload_annotations_from_json_to_image
 )
 from .projects import (
-    __create_image, _get_project_default_image_quality_in_editor,
+    __create_image, _get_project_image_quality_in_editor,
     get_image_array_to_upload, get_project_metadata
 )
 
@@ -44,16 +44,16 @@ def upload_image_to_project(
     :type annotation_status: str
     :param from_s3_bucket: AWS S3 bucket to use. If None then folder_path is in local filesystem
     :type from_s3_bucket: str
-    :param image_quality_in_editor: image quality (in percents) that will be seen in SuperAnnotate web annotation editor. If None default value will be used.
-    :type image_quality_in_editor: int
+    :param image_quality_in_editor: image quality be seen in SuperAnnotate web annotation editor.
+           Can be either "compressed" or "original".  If None then the default value in project settings will be used.
+    :type image_quality_in_editor: str
     """
     if not isinstance(project, dict):
         project = get_project_metadata(project)
     annotation_status = annotation_status_str_to_int(annotation_status)
-    if image_quality_in_editor is None:
-        image_quality_in_editor = _get_project_default_image_quality_in_editor(
-            project
-        )
+    image_quality_in_editor = _get_project_image_quality_in_editor(
+        project, image_quality_in_editor
+    )
 
     img_name = None
     if not isinstance(img, io.BytesIO):

superannotate/db/projects.py

@@ -272,10 +272,9 @@ def upload_video_to_project(
     :param annotation_status: value to set the annotation statuses of the uploaded
                               video frames NotStarted InProgress QualityCheck Returned Completed Skipped
     :type annotation_status: str
-    :param image_quality_in_editor: image quality (in percents) that will be
-                                    seen in SuperAnnotate web annotation editor.
-                                    If None default value will be used
-    :type image_quality_in_editor: int
+    :param image_quality_in_editor: image quality be seen in SuperAnnotate web annotation editor.
+           Can be either "compressed" or "original".  If None then the default value in project settings will be used.
+    :type image_quality_in_editor: str
 
     :return: filenames of uploaded images
     :rtype: list of strs
@@ -502,8 +501,9 @@ def upload_images_from_folder_to_project(
     :type exclude_file_patterns: list of strs
     :param recursive_subfolders: enable recursive subfolder parsing
     :type recursive_subfolders: bool
-    :param image_quality_in_editor: image quality (in percents) that will be seen in SuperAnnotate web annotation editor. If None default value will be used.
-    :type image_quality_in_editor: int
+    :param image_quality_in_editor: image quality be seen in SuperAnnotate web annotation editor.
+           Can be either "compressed" or "original".  If None then the default value in project settings will be used.
+    :type image_quality_in_editor: str
 
     :return: uploaded and not-uploaded images' filepaths
     :rtype: tuple of list of strs
@@ -727,19 +727,19 @@ def upload_images_to_project(
     :type annotation_status: str
     :param from_s3_bucket: AWS S3 bucket to use. If None then folder_path is in local filesystem
     :type from_s3_bucket: str
-    :param image_quality_in_editor: image quality (in percents) that will be seen in SuperAnnotate web annotation editor. If None default value will be used.
-    :type image_quality_in_editor: int
+    :param image_quality_in_editor: image quality be seen in SuperAnnotate web annotation editor.
+           Can be either "compressed" or "original".  If None then the default value in project settings will be used.
+    :type image_quality_in_editor: str
 
     :return: uploaded and not-uploaded images' filepaths
     :rtype: tuple of list of strs
     """
     if not isinstance(project, dict):
         project = get_project_metadata(project)
     annotation_status = annotation_status_str_to_int(annotation_status)
-    if image_quality_in_editor is None:
-        image_quality_in_editor = _get_project_default_image_quality_in_editor(
-            project
-        )
+    image_quality_in_editor = _get_project_image_quality_in_editor(
+        project, image_quality_in_editor
+    )
     team_id, project_id = project["team_id"], project["id"]
     len_img_paths = len(img_paths)
     logger.info(
@@ -1371,15 +1371,19 @@ def upload_images_from_s3_bucket_to_project(
     :type bucket_name: str
     :param folder_path: from which folder to upload the images
     :type folder_path: str
-    :param image_quality_in_editor: image quality (in percents) that will be seen in SuperAnnotate web annotation editor, if None default value will be used
-    :type image_quality_in_editor: int
+    :param image_quality_in_editor: image quality be seen in SuperAnnotate web annotation editor.
+           Can be either "compressed" or "original".  If None then the default value in project settings will be used.
+    :type image_quality_in_editor: str
     """
     if not isinstance(project, dict):
         project = get_project_metadata(project)
     if image_quality_in_editor is not None:
-        old_quality = _get_project_default_image_quality_in_editor(project)
+        old_quality = _get_project_image_quality_in_editor(project, None)
         _set_project_default_image_quality_in_editor(
-            project, image_quality_in_editor
+            project,
+            _get_project_image_quality_in_editor(
+                project, image_quality_in_editor
+            )
         )
     team_id, project_id = project["team_id"], project["id"]
     params = {
@@ -1624,15 +1628,20 @@ def set_project_settings(project, new_settings):
     return response.json()
 
 
-def _get_project_default_image_quality_in_editor(project):
-    for setting in get_project_settings(project):
-        if "attribute" in setting and setting["attribute"] == "ImageQuality":
-            return setting["value"]
-    return 60
-    # raise SABaseException(
-    #     response.status_code,
-    #     "Couldn't get project default image quality " + response.text
-    # )
+def _get_project_image_quality_in_editor(project, image_quality_in_editor):
+    if image_quality_in_editor is None:
+        for setting in get_project_settings(project):
+            if "attribute" in setting and setting["attribute"] == "ImageQuality":
+                return setting["value"]
+    elif image_quality_in_editor == "compressed":
+        image_quality_in_editor = 60
+    elif image_quality_in_editor == "original":
+        image_quality_in_editor = 100
+    else:
+        raise SABaseException(
+            0,
+            "Image quality in editor should be 'compressed', 'original' or None for project settings value"
+        )
 
 
 def _set_project_default_image_quality_in_editor(project, quality):

tests/test_project_settings.py

@@ -16,6 +16,7 @@ def test_get_set_settings(tmpdir):
     sa.create_project(PROJECT_NAME, "tt", "Vector")
 
     old_settings = sa.get_project_settings(PROJECT_NAME)
+    print(old_settings)
     for setting in old_settings:
         if "attribute" in setting and setting["attribute"] == "Brightness":
             brightness_value = setting["value"]