Merge remote-tracking branch 'origin/develop' into attach_documnet

# Conflicts:
#	src/superannotate/lib/app/interface/sdk_interface.py
#	src/superannotate/lib/core/usecases.py
#	tests/integration/test_cli.py

Author: Vaghinak Basentsyan

.github/workflows/python-tests.yml

@@ -126,6 +126,7 @@ _________________
 .. autofunction:: superannotate.get_team_metadata
 .. autofunction:: superannotate.invite_contributor_to_team
 .. autofunction:: superannotate.delete_contributor_to_team_invitation
+.. autofunction:: superannotate.search_team_contributors
 
 ----------
 

docs/source/superannotate.sdk.rst

@@ -2,4 +2,4 @@
 minversion = 3.0
 log_cli=true
 python_files = test_*.py
-addopts = -n32 --dist=loadscope
+;addopts = -n 32 --dist=loadscope

pytest.ini

@@ -10,12 +10,12 @@ xmltodict==0.12.0
 opencv-python==4.4.0.42
 wheel==0.35.1
 packaging>=20.4
-pandas==1.1.2
+pandas>=1.1.4
 plotly==4.1.0
 ffmpeg-python>=0.2.0
-google-cloud-storage>=1.33.0
-azure-storage-blob>=12.6.0
 fire==0.4.0
 Shapely==1.7.1
 mixpanel==4.8.3
-typeguard==2.12.1
+pydantic>=1.8.2
+pydantic[email]
+setuptools~=57.4.0

requirements.txt

@@ -136,15 +136,9 @@
 )
 from superannotate.lib.app.interface.sdk_interface import upload_image_annotations
 from superannotate.lib.app.interface.sdk_interface import upload_image_to_project
-from superannotate.lib.app.interface.sdk_interface import (
-    upload_images_from_azure_blob_to_project,
-)
 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_google_cloud_to_project,
-)
 from superannotate.lib.app.interface.sdk_interface import (
     upload_images_from_public_urls_to_project,
 )
@@ -244,8 +238,6 @@
     "upload_image_to_project",
     "upload_image_annotations",
     "upload_images_from_public_urls_to_project",
-    "upload_images_from_google_cloud_to_project",
-    "upload_images_from_azure_blob_to_project",
     "upload_images_from_s3_bucket_to_project",
     "upload_images_from_folder_to_project",
     "attach_image_urls_to_project",
@@ -298,8 +290,8 @@
 
 __author__ = "Superannotate"
 
-
-file_dir = os.path.split(os.path.realpath(__file__))[0]
-sys.path.append(file_dir)
-logging.config.fileConfig(os.path.join(file_dir, "logging.conf"))
-logger = logging.getLogger()
+WORKING_DIR = os.path.split(os.path.realpath(__file__))[0]
+sys.path.append(WORKING_DIR)
+logging.config.fileConfig(
+    os.path.join(WORKING_DIR, "logging.conf"), disable_existing_loggers=False
+)

src/superannotate/__init__.py

@@ -72,10 +72,13 @@ def get_s3_annotation_paths(folder_path, s3_bucket, annotation_paths, recursive)
     paginator = s3_client.get_paginator("list_objects_v2")
     for data in paginator.paginate(Bucket=s3_bucket, Prefix=folder_path):
         for annotation in data["Contents"]:
-            if annotation["Key"].endswith(VECTOR_ANNOTATION_POSTFIX) or annotation[
-                "Key"
-            ].endswith(PIXEL_ANNOTATION_POSTFIX):
-                annotation_paths.append(annotation["Key"])
+            key = annotation["Key"]
+            if key.endswith(VECTOR_ANNOTATION_POSTFIX) or key.endswith(
+                PIXEL_ANNOTATION_POSTFIX
+            ):
+                if not recursive and "/" in key[len(folder_path) + 1 :]:
+                    continue
+                annotation_paths.append(key)
     return list(set(annotation_paths))