Merge pull request #268 from superannotateai/develop

Develop

Author: dshabin

requirements.txt

@@ -14,7 +14,6 @@ pandas>=1.1.4
 plotly==4.1.0
 ffmpeg-python>=0.2.0
 fire==0.4.0
-Shapely==1.7.1
 mixpanel==4.8.3
 pydantic>=1.8.2
 pydantic[email]

src/superannotate/__init__.py

@@ -158,6 +158,7 @@
 from superannotate.lib.app.interface.sdk_interface import (
     upload_videos_from_folder_to_project,
 )
+from superannotate.lib.app.interface.sdk_interface import validate_annotations
 from superannotate.version import __version__
 
 
@@ -166,6 +167,7 @@
     "controller",
     # Utils
     "AppException",
+    "validate_annotations",
     #
     "init",
     "set_auth_token",

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

@@ -6,10 +6,6 @@
 import plotly.express as px
 from lib.app.exceptions import AppException
 from lib.core import DEPRICATED_DOCUMENT_VIDEO_MESSAGE
-from shapely.geometry import box
-from shapely.geometry import Point
-from shapely.geometry import Polygon
-
 
 logger = logging.getLogger()
 
@@ -542,6 +538,17 @@ def image_consensus(df, image_name, annot_type):
     :type dataset_format: str
 
     """
+
+    try:
+        from shapely.geometry import box
+        from shapely.geometry import Point
+        from shapely.geometry import Polygon
+    except ImportError:
+        raise ImportError(
+            "To use superannotate.benchmark or superannotate.consensus functions please install "
+            "shapely package in Anaconda enviornment with # conda install shapely"
+        )
+
     image_df = df[df["imageName"] == image_name]
     all_projects = list(set(df["folderName"]))
     column_names = [

src/superannotate/lib/app/helpers.py

@@ -9,6 +9,7 @@
 import boto3
 import pandas as pd
 from superannotate.lib.app.exceptions import PathError
+from superannotate.lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
 from superannotate.lib.core import PIXEL_ANNOTATION_POSTFIX
 from superannotate.lib.core import VECTOR_ANNOTATION_POSTFIX
 
@@ -55,7 +56,13 @@ def get_local_annotation_paths(
         [
             str(i)
             for i in all_not_folders
-            if i.name.endswith((VECTOR_ANNOTATION_POSTFIX, PIXEL_ANNOTATION_POSTFIX))
+            if i.name.endswith(
+                (
+                    VECTOR_ANNOTATION_POSTFIX,
+                    PIXEL_ANNOTATION_POSTFIX,
+                    ATTACHED_VIDEO_ANNOTATION_POSTFIX,
+                )
+            )
         ]
     )
     if recursive:
@@ -82,8 +89,10 @@ def get_s3_annotation_paths(folder_path, s3_bucket, annotation_paths, recursive)
     for data in paginator.paginate(Bucket=s3_bucket, Prefix=folder_path):
         for annotation in data["Contents"]:
             key = annotation["Key"]
-            if key.endswith(VECTOR_ANNOTATION_POSTFIX) or key.endswith(
-                PIXEL_ANNOTATION_POSTFIX
+            if (
+                key.endswith(VECTOR_ANNOTATION_POSTFIX)
+                or key.endswith(PIXEL_ANNOTATION_POSTFIX)
+                or key.endswith(ATTACHED_VIDEO_ANNOTATION_POSTFIX)
             ):
                 if not recursive and "/" in key[len(folder_path) + 1 :]:
                     continue

src/superannotate/lib/app/interface/cli_interface.py

@@ -268,7 +268,7 @@ def upload_videos(
         self,
         project,
         folder,
-        target_fps=1,
+        target_fps=None,
         recursive=False,
         extensions=constances.DEFAULT_VIDEO_EXTENSIONS,
         set_annotation_status=constances.AnnotationStatus.NOT_STARTED.name,