Merge pull request #439 from superannotateai/develop

Develop

Author: VaghinakDev

docs/source/superannotate.sdk.rst

@@ -34,20 +34,16 @@ ________
 .. autofunction:: superannotate.create_folder
 .. autofunction:: superannotate.delete_folders
 .. autofunction:: superannotate.upload_images_to_project
-.. autofunction:: superannotate.attach_image_urls_to_project
-.. autofunction:: superannotate.attach_document_urls_to_project
 .. autofunction:: superannotate.attach_items_from_integrated_storage
 .. autofunction:: superannotate.upload_image_to_project
 .. autofunction:: superannotate.delete_annotations
 .. _ref_upload_images_from_folder_to_project:
 .. autofunction:: superannotate.upload_images_from_folder_to_project
 .. autofunction:: superannotate.upload_video_to_project
 .. autofunction:: superannotate.upload_videos_from_folder_to_project
-.. autofunction:: superannotate.attach_video_urls_to_project
 .. _ref_upload_annotations_from_folder_to_project:
 .. autofunction:: superannotate.upload_annotations_from_folder_to_project
 .. autofunction:: superannotate.upload_preannotations_from_folder_to_project
-.. autofunction:: superannotate.share_project
 .. autofunction:: superannotate.add_contributors_to_project
 .. autofunction:: superannotate.get_project_settings
 .. autofunction:: superannotate.set_project_default_image_quality_in_editor
@@ -73,6 +69,7 @@ ______
 
 .. autofunction:: superannotate.query
 .. autofunction:: superannotate.search_items
+.. autofunction:: superannotate.download_annotations
 .. autofunction:: superannotate.attach_items
 .. autofunction:: superannotate.copy_items
 .. autofunction:: superannotate.move_items
@@ -92,8 +89,6 @@ ______
 .. autofunction:: superannotate.download_image_annotations
 .. autofunction:: superannotate.upload_image_annotations
 .. autofunction:: superannotate.copy_image
-.. autofunction:: superannotate.copy_images
-.. autofunction:: superannotate.move_images
 .. autofunction:: superannotate.pin_image
 .. autofunction:: superannotate.assign_images
 .. autofunction:: superannotate.delete_images
@@ -159,11 +154,26 @@ Project metadata example:
      "attachment_name": None,
      "attachment_path": None,
      "entropy_status": 1,
-     "status": 0,
+     "status": "NotStarted",
      "...": "..."
    }
 
 
+----------
+
+Setting metadata
+_________________
+
+Setting metadata example:
+
+.. code-block:: python
+
+   {
+    "attribute": "FrameRate",
+    "value": 3
+   }
+
+
 ----------
 
 Export metadata
@@ -250,6 +260,38 @@ Image metadata example:
    }
 
 
+----------
+
+Priority score
+_______________
+
+
+Priority score example:
+
+.. code-block:: python
+
+   {
+        "name" : "image1.png",
+        "priority": 0.567
+    }
+
+
+----------
+
+Attachment
+_______________
+
+
+Attachment example:
+
+.. code-block:: python
+
+   {
+      "url": "https://sa-public-files.s3.../text_file_example_1.jpeg",
+      "name": "example.jpeg"
+   }
+
+
 ----------
 
 .. _ref_class:

docs/source/tutorial.sdk.rst

@@ -390,16 +390,6 @@ A team contributor can be invited to the team with:
 
    sa.invite_contributors_to_team(emails=["admin@superannotate.com"], admin=False)
 
-
-This invitation should be accepted by the contributor. After which, to share the 
-project with the found contributor as an QA:
-
-.. code-block:: python
-
-   sa.share_project(project, "admin@superannotate.com", user_role="QA")
-
-
-
 ----------
 
 

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.7
 log_cli=true
 python_files = test_*.py
-addopts = -n auto --dist=loadscope
+addopts = -n auto --dist=loadscope

requirements_dev.txt

@@ -1,2 +1,2 @@
-superannotate_schemas>=v1.0.42dev2
+superannotate_schemas>=v1.0.43dev5
 

requirements_extra.txt

@@ -5,4 +5,5 @@ pytest==6.2.4
 pytest-xdist==2.3.0
 pytest-parallel==0.1.0
 pytest-rerunfailures==10.2
-sphinx_rtd_theme==1.0.0
+sphinx_rtd_theme==1.0.0
+pytest-cov

src/superannotate/__init__.py

@@ -3,8 +3,8 @@
 import sys
 
 import requests
-import superannotate.lib.core as constances
 from packaging.version import parse
+from superannotate.lib import core as constances
 from superannotate.lib import get_default_controller
 from superannotate.lib.app.analytics.class_analytics import class_distribution
 from superannotate.lib.app.exceptions import AppException
@@ -21,20 +21,14 @@
 from superannotate.lib.app.interface.sdk_interface import aggregate_annotations_as_df
 from superannotate.lib.app.interface.sdk_interface import assign_folder
 from superannotate.lib.app.interface.sdk_interface import assign_images
-from superannotate.lib.app.interface.sdk_interface import (
-    attach_document_urls_to_project,
-)
-from superannotate.lib.app.interface.sdk_interface import attach_image_urls_to_project
 from superannotate.lib.app.interface.sdk_interface import attach_items
 from superannotate.lib.app.interface.sdk_interface import (
     attach_items_from_integrated_storage,
 )
-from superannotate.lib.app.interface.sdk_interface import attach_video_urls_to_project
 from superannotate.lib.app.interface.sdk_interface import benchmark
 from superannotate.lib.app.interface.sdk_interface import clone_project
 from superannotate.lib.app.interface.sdk_interface import consensus
 from superannotate.lib.app.interface.sdk_interface import copy_image
-from superannotate.lib.app.interface.sdk_interface import copy_images
 from superannotate.lib.app.interface.sdk_interface import copy_items
 from superannotate.lib.app.interface.sdk_interface import create_annotation_class
 from superannotate.lib.app.interface.sdk_interface import (
@@ -68,7 +62,6 @@
 from superannotate.lib.app.interface.sdk_interface import get_team_metadata
 from superannotate.lib.app.interface.sdk_interface import init
 from superannotate.lib.app.interface.sdk_interface import invite_contributors_to_team
-from superannotate.lib.app.interface.sdk_interface import move_images
 from superannotate.lib.app.interface.sdk_interface import move_items
 from superannotate.lib.app.interface.sdk_interface import pin_image
 from superannotate.lib.app.interface.sdk_interface import prepare_export
@@ -89,7 +82,6 @@
     set_project_default_image_quality_in_editor,
 )
 from superannotate.lib.app.interface.sdk_interface import set_project_workflow
-from superannotate.lib.app.interface.sdk_interface import share_project
 from superannotate.lib.app.interface.sdk_interface import unassign_folder
 from superannotate.lib.app.interface.sdk_interface import unassign_images
 from superannotate.lib.app.interface.sdk_interface import (
@@ -154,7 +146,6 @@
     "search_projects",
     "create_project",
     "clone_project",
-    "share_project",
     "delete_project",
     "rename_project",
     "upload_priority_scores",
@@ -176,8 +167,6 @@
     "move_items",
     "set_annotation_statuses",
     # Image Section
-    "copy_images",
-    "move_images",
     "delete_images",
     "download_image",
     "pin_image",
@@ -189,9 +178,6 @@
     "upload_image_to_project",
     "upload_image_annotations",
     "upload_images_from_folder_to_project",
-    "attach_image_urls_to_project",
-    "attach_video_urls_to_project",
-    "attach_document_urls_to_project",
     # Video Section
     "upload_videos_from_folder_to_project",
     # Annotation Section
@@ -223,8 +209,7 @@
 
 __author__ = "Superannotate"
 
-WORKING_DIR = os.path.split(os.path.realpath(__file__))[0]
-sys.path.append(WORKING_DIR)
+sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 logging.getLogger("botocore").setLevel(logging.CRITICAL)
 logger = get_default_logger()
 

src/superannotate/lib/app/analytics/aggregators.py

@@ -85,6 +85,22 @@ class DocumentRawData:
 
 
 class DataAggregator:
+    MAPPERS = {
+        "event": lambda annotation: None,
+        "bbox": lambda annotation: annotation["points"],
+        "polygon": lambda annotation: annotation["points"],
+        "polyline": lambda annotation: annotation["points"],
+        "cuboid": lambda annotation: annotation["points"],
+        "point": lambda annotation: {"x": annotation["x"], "y": annotation["y"]},
+        "annotation_type": lambda annotation: dict(
+            cx=annotation["cx"],
+            cy=annotation["cy"],
+            rx=annotation["rx"],
+            ry=annotation["ry"],
+            angle=annotation["angle"],
+        ),
+    }
+
     def __init__(
         self,
         project_type: str,
@@ -186,11 +202,12 @@ def aggregate_video_annotations_as_df(self, annotation_paths: List[str]):
             # append instances
             instances = annotation_data.get("instances", [])
             for idx, instance in enumerate(instances):
+                instance_type = instance["meta"].get("type", "event")
                 instance_raw = copy.copy(raw_data)
                 instance_raw.instanceId = int(idx)
                 instance_raw.instanceStart = instance["meta"].get("start")
                 instance_raw.instanceEnd = instance["meta"].get("end")
-                instance_raw.type = instance["meta"].get("type")
+                instance_raw.type = instance_type
                 instance_raw.className = instance["meta"].get("className")
                 instance_raw.createdAt = instance["meta"].get("createdAt")
                 instance_raw.createdBy = (
@@ -217,7 +234,7 @@ def aggregate_video_annotations_as_df(self, annotation_paths: List[str]):
                     for timestamp_id, timestamp in enumerate(timestamps):
                         timestamp_raw = copy.copy(parameter_raw)
                         timestamp_raw.timestampId = timestamp_id
-                        timestamp_raw.meta = timestamp.get("points")
+                        timestamp_raw.meta = self.MAPPERS[instance_type](timestamp)
                         attributes = timestamp.get("attributes", [])
                         for attribute_id, attribute in enumerate(attributes):
                             attribute_raw = copy.copy(timestamp_raw)
@@ -467,8 +484,7 @@ def __append_annotation(annotation_dict):
                             ]
                         ):
                             logger.warning(
-                                "Annotation class group value %s not in classes json. Skipping.",
-                                attribute_name,
+                                f"Annotation class group value {attribute_name} not in classes json. Skipping."
                             )
                             continue
                         annotation_dict = {

src/superannotate/lib/app/common.py

@@ -1,26 +1,11 @@
 import json
-import os
-import sys
-import time
 
 import numpy as np
-from PIL import Image
 from superannotate.logger import get_default_logger
 from tqdm import tqdm
 
 logger = get_default_logger()
 
-_PROJECT_TYPES = {"Vector": 1, "Pixel": 2}
-
-_ANNOTATION_STATUSES = {
-    "NotStarted": 1,
-    "InProgress": 2,
-    "QualityCheck": 3,
-    "Returned": 4,
-    "Completed": 5,
-    "Skipped": 6,
-}
-
 
 def hex_to_rgb(hex_string):
     """Converts HEX values to RGB values
@@ -68,73 +53,6 @@ def id2rgb(id_map):
     return color
 
 
-def save_desktop_format(output_dir, classes, files_dict):
-    cat_id_map = {}
-    new_classes = []
-    for idx, class_ in enumerate(classes):
-        cat_id_map[class_["name"]] = idx + 2
-        class_["id"] = idx + 2
-        new_classes.append(class_)
-    with open(output_dir.joinpath("classes.json"), "w") as fw:
-        json.dump(new_classes, fw)
-
-    meta = {
-        "type": "meta",
-        "name": "lastAction",
-        "timestamp": int(round(time.time() * 1000)),
-    }
-    new_json = {}
-    files_path = []
-    (output_dir / "images" / "thumb").mkdir()
-    for file_name, json_data in files_dict.items():
-        file_name = file_name.replace("___objects.json", "")
-        if not (output_dir / "images" / file_name).exists():
-            continue
-
-        for js_data in json_data:
-            if "className" in js_data:
-                js_data["classId"] = cat_id_map[js_data["className"]]
-        json_data.append(meta)
-        new_json[file_name] = json_data
-
-        files_path.append(
-            {
-                "srcPath": str(output_dir.resolve() / file_name),
-                "name": file_name,
-                "imagePath": str(output_dir.resolve() / file_name),
-                "thumbPath": str(
-                    output_dir.resolve()
-                    / "images"
-                    / "thumb"
-                    / ("thmb_" + file_name + ".jpg")
-                ),
-                "valid": True,
-            }
-        )
-
-        img = Image.open(output_dir / "images" / file_name)
-        img.thumbnail((168, 120), Image.ANTIALIAS)
-        img.save(output_dir / "images" / "thumb" / ("thmb_" + file_name + ".jpg"))
-
-    with open(output_dir / "images" / "images.sa", "w") as fw:
-        fw.write(json.dumps(files_path))
-
-    with open(output_dir.joinpath("annotations.json"), "w") as fw:
-        json.dump(new_json, fw)
-
-    with open(output_dir / "config.json", "w") as fw:
-        json.dump({"pathSeparator": os.sep, "os": sys.platform}, fw)
-
-
-def save_web_format(output_dir, classes, files_dict):
-    for key, value in files_dict.items():
-        with open(output_dir.joinpath(key), "w") as fw:
-            json.dump(value, fw, indent=2)
-
-    with open(output_dir.joinpath("classes", "classes.json"), "w") as fw:
-        json.dump(classes, fw)
-
-
 def write_to_json(output_path, json_data):
     with open(output_path, "w") as fw:
         json.dump(json_data, fw, indent=2)