Merge pull request #427 from superannotateai/friday

Friday

Author: VaghinakDev

.github/workflows/build.yml

@@ -28,24 +28,4 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      -
-        name: Build and push to Docker Hub
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          file: Dockerfile_dev_env
-          tags: superannotate/pythonsdk-dev-env:latest
-
+  

.github/workflows/checks_and_dev_deploy.yml

@@ -24,23 +24,4 @@ jobs:
         uses: pypa/gh-action-pypi-publish@master
         with:
           password: ${{ secrets.pypi_password }}
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      -
-        name: Build and push to Docker Hub
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          tags: superannotate/pythonsdk:dev
-          build-args: PIP_FLAGS=--pre
+    

.github/workflows/pre_release.yml

@@ -25,22 +25,4 @@ jobs:
         with:
           password: ${{ secrets.pypi_password }}
           verbose: true
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      -
-        name: Build and push to Docker Hub
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          tags: superannotate/pythonsdk:latest
+   

.github/workflows/release.yml

@@ -36,7 +36,6 @@ ________
 .. autofunction:: superannotate.delete_folders
 .. autofunction:: superannotate.upload_images_to_project
 .. autofunction:: superannotate.attach_image_urls_to_project
-.. autofunction:: superannotate.upload_images_from_public_urls_to_project
 .. autofunction:: superannotate.attach_document_urls_to_project
 .. autofunction:: superannotate.attach_items_from_integrated_storage
 .. autofunction:: superannotate.upload_image_to_project
@@ -70,6 +69,15 @@ _______
 
 ----------
 
+Items
+______
+
+.. autofunction:: superannotate.query
+.. autofunction:: superannotate.search_items
+.. autofunction:: superannotate.get_item_metadata
+
+----------
+
 Images
 ______
 
@@ -81,7 +89,6 @@ ______
 .. autofunction:: superannotate.download_image
 .. autofunction:: superannotate.set_image_annotation_status
 .. autofunction:: superannotate.set_images_annotation_statuses
-.. autofunction:: superannotate.get_image_annotations
 .. autofunction:: superannotate.download_image_annotations
 .. autofunction:: superannotate.upload_image_annotations
 .. autofunction:: superannotate.copy_image
@@ -175,6 +182,44 @@ Export metadata example:
    }
 
 
+----------
+
+Integration metadata
+_______________
+
+Integration metadata example:
+
+.. code-block:: python
+
+   {
+   "name": "My S3 Bucket",
+   "type": "aws",
+   "root": "test-openseadragon-1212"
+    }
+
+
+----------
+
+Item metadata
+_______________
+
+Item metadata example:
+
+.. code-block:: python
+
+  {
+   "name": "example.jpeg",
+   "path": "project/folder_1/meow.jpeg",
+   "url": "https://sa-public-files.s3.../text_file_example_1.jpeg",
+   "annotation_status": "NotStarted",
+   "annotator_name": None,
+   "qa_name": None,
+   "entropy_value": None,
+   "createdAt": "2022-02-15T20:46:44.000Z",
+   "updatedAt": "2022-02-15T20:46:44.000Z"
+}
+
+
 ----------
 
 Image metadata
@@ -188,8 +233,8 @@ Image metadata example:
    {
       "name": "000000000001.jpg",
       "annotation_status": "Completed",
-      "prediction_status": 1,
-      "segmentation_status": 1,
+      "prediction_status": "NotStarted",
+      "segmentation_status": "NotStarted",
       "annotator_id": None,
       "annotator_name": None,
       "qa_id": None,

docs/source/superannotate.sdk.rst

@@ -1 +1 @@
-superannotate_schemas>=1.0.40b3
+superannotate_schemas>=1.0.41dev1

requirements_dev.txt

@@ -25,7 +25,9 @@
     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_integrated_storage
+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
@@ -55,9 +57,9 @@
 from superannotate.lib.app.interface.sdk_interface import get_annotations_per_frame
 from superannotate.lib.app.interface.sdk_interface import get_exports
 from superannotate.lib.app.interface.sdk_interface import get_folder_metadata
-from superannotate.lib.app.interface.sdk_interface import get_image_annotations
 from superannotate.lib.app.interface.sdk_interface import get_image_metadata
 from superannotate.lib.app.interface.sdk_interface import get_integrations
+from superannotate.lib.app.interface.sdk_interface import get_item_metadata
 from superannotate.lib.app.interface.sdk_interface import (
     get_project_and_folder_metadata,
 )
@@ -71,12 +73,14 @@
 from superannotate.lib.app.interface.sdk_interface import move_images
 from superannotate.lib.app.interface.sdk_interface import pin_image
 from superannotate.lib.app.interface.sdk_interface import prepare_export
+from superannotate.lib.app.interface.sdk_interface import query
 from superannotate.lib.app.interface.sdk_interface import rename_project
 from superannotate.lib.app.interface.sdk_interface import run_prediction
 from superannotate.lib.app.interface.sdk_interface import search_annotation_classes
 from superannotate.lib.app.interface.sdk_interface import search_folders
 from superannotate.lib.app.interface.sdk_interface import search_images
 from superannotate.lib.app.interface.sdk_interface import search_images_all_folders
+from superannotate.lib.app.interface.sdk_interface import search_items
 from superannotate.lib.app.interface.sdk_interface import search_models
 from superannotate.lib.app.interface.sdk_interface import search_projects
 from superannotate.lib.app.interface.sdk_interface import search_team_contributors
@@ -98,16 +102,11 @@
 from superannotate.lib.app.interface.sdk_interface import (
     upload_images_from_folder_to_project,
 )
-from superannotate.lib.app.interface.sdk_interface import (
-    upload_images_from_public_urls_to_project,
-)
 from superannotate.lib.app.interface.sdk_interface import upload_images_to_project
 from superannotate.lib.app.interface.sdk_interface import (
     upload_preannotations_from_folder_to_project,
 )
-from superannotate.lib.app.interface.sdk_interface import (
-    upload_priority_scores,
-)
+from superannotate.lib.app.interface.sdk_interface import upload_priority_scores
 from superannotate.lib.app.interface.sdk_interface import upload_video_to_project
 from superannotate.lib.app.interface.sdk_interface import (
     upload_videos_from_folder_to_project,
@@ -159,6 +158,7 @@
     "clone_project",
     "share_project",
     "delete_project",
+    "rename_project",
     "upload_priority_scores",
     # Images Section
     "search_images",
@@ -171,6 +171,10 @@
     "search_folders",
     "assign_folder",
     "unassign_folder",
+    # Items Section
+    "get_item_metadata",
+    "search_items",
+    "query",
     # Image Section
     "copy_images",
     "move_images",
@@ -186,7 +190,6 @@
     "delete_annotations",
     "upload_image_to_project",
     "upload_image_annotations",
-    "upload_images_from_public_urls_to_project",
     "upload_images_from_folder_to_project",
     "attach_image_urls_to_project",
     "attach_video_urls_to_project",
@@ -202,7 +205,6 @@
     "add_annotation_bbox_to_image",
     "add_annotation_point_to_image",
     "add_annotation_comment_to_image",
-    "get_image_annotations",
     "search_annotation_classes",
     "create_annotation_classes_from_classes_json",
     "upload_annotations_from_folder_to_project",
@@ -212,7 +214,6 @@
     "run_prediction",
     "search_models",
     "download_model",
-    "rename_project",
     "set_image_annotation_status",
     "benchmark",
     "consensus",

src/superannotate/__init__.py

@@ -8,4 +8,5 @@
 
 def get_default_controller():
     from lib.infrastructure.controller import Controller
+
     return Controller.get_default()

src/superannotate/lib/__init__.py

@@ -143,7 +143,7 @@ def aggregate_video_annotations_as_df(self, annotation_paths: List[str]):
             raw_data.videoStatus = annotation_data["metadata"].get("status")
             raw_data.videoUrl = annotation_data["metadata"].get("url")
             raw_data.videoDuration = annotation_data["metadata"].get("duration")
-            # todo check
+
             raw_data.videoError = annotation_data["metadata"].get("error")
             raw_data.videoAnnotator = annotation_data["metadata"].get("annotatorEmail")
             raw_data.videoQA = annotation_data["metadata"].get("qaEmail")

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

@@ -56,15 +56,18 @@ def add_annotation_comment_to_json(
 ):
     """Add a comment to SuperAnnotate format annotation JSON
 
-
     :param annotation_json: annotations in SuperAnnotate format JSON or filepath to JSON
     :type annotation_json: dict or Pathlike (str or Path)
+
     :param comment_text: comment text
     :type comment_text: str
+
     :param comment_coords: [x, y] coords
     :type comment_coords: list
+
     :param comment_author: comment author email
     :type comment_author: str
+
     :param resolved: comment resolve status
     :type resolved: bool
     """
@@ -106,12 +109,16 @@ def add_annotation_bbox_to_json(
 
     :param annotation_json: annotations in SuperAnnotate format JSON or filepath to JSON
     :type annotation_json: dict or Pathlike (str or Path)
+
     :param bbox: 4 element list of top-left x,y and bottom-right x, y coordinates
     :type bbox: list of floats
+
     :param annotation_class_name: annotation class name
     :type annotation_class_name: str
+
     :param annotation_class_attributes: list of annotation class attributes
     :type annotation_class_attributes: list of 2 element dicts
+
     :param error: if not None, marks annotation as error (True) or no-error (False)
     :type error: bool
     """