Adjusted integrations

Author: VaghinakDev

docs/source/superannotate.sdk.rst

@@ -38,6 +38,7 @@ ________
 .. 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
 .. autofunction:: superannotate.delete_annotations
 .. _ref_upload_images_from_folder_to_project:
@@ -108,10 +109,11 @@ __________________
 
 ----------
 
-Team contributors
+Team
 _________________
 
 .. autofunction:: superannotate.get_team_metadata
+.. autofunction:: superannotate.get_integrations
 .. autofunction:: superannotate.invite_contributors_to_team
 .. autofunction:: superannotate.search_team_contributors
 

src/superannotate/__init__.py

@@ -21,12 +21,11 @@
 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 get_integrations
-from superannotate.lib.app.interface.sdk_interface import attach_items_from_integrated_storage
 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_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
@@ -58,6 +57,7 @@
 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_project_and_folder_metadata,
 )

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

@@ -2958,7 +2958,7 @@ def attach_items_from_integrated_storage(
 
     :param integration:  existing integration name or metadata dict to pull items from.
      Mandatory keys in integration metadata’s dict is “name”.
-    :type integration: str
+    :type integration: str or dict
 
     :param folder_path: Points to an exact folder/directory within given storage.
     If None, items are fetched from the root directory.

src/superannotate/lib/app/mixp/utils/parsers.py

@@ -1,7 +1,7 @@
 import lib.core as constances
 from lib.app.helpers import extract_project_folder
-from lib.core.enums import ProjectType
 from lib.core.entities import IntegrationEntity
+from lib.core.enums import ProjectType
 from lib.infrastructure.controller import Controller
 
 
@@ -1249,15 +1249,9 @@ def get_integrations(*args, **kwargs):
 
 
 def attach_items_from_integrated_storage(*args, **kwargs):
-    project = kwargs.get("project")
-    integration = kwargs.get("integration")
-    folder_path = kwargs.get("folder_path")
-    if not project:
-        project = args[0]
-    if not integration:
-        integration = args[1]
-    if not folder_path:
-        folder_path = args[2]
+    project = kwargs.get("project", args[0])
+    integration = kwargs.get("integration", args[1])
+    folder_path = kwargs.get("folder_path", args[2])
 
     project_name, _ = extract_project_folder(project)
     if isinstance(integration, str):
@@ -1271,4 +1265,3 @@ def attach_items_from_integrated_storage(*args, **kwargs):
             "folder_path": bool(folder_path)
         },
     }
-

src/superannotate/lib/app/serializers.py

@@ -1,8 +1,8 @@
 from abc import ABC
+from typing import Any
 from typing import List
 from typing import Set
 from typing import Union
-from typing import Any
 
 import superannotate.lib.core as constance
 from pydantic import BaseModel
@@ -16,7 +16,7 @@ def __init__(self, entity: BaseEntity):
         self._entity = entity
 
     def serialize(self, fields: List[str] = None, by_alias: bool = True, flat: bool = False):
-            return self._serialize(self._entity, fields, by_alias, flat)
+        return self._serialize(self._entity, fields, by_alias, flat)
 
     @staticmethod
     def _serialize(entity: Any, fields: List[str] = None, by_alias: bool = False, flat: bool = False):
@@ -28,8 +28,7 @@ def _serialize(entity: Any, fields: List[str] = None, by_alias: bool = False, fl
                 if len(fields) == 1:
                     if flat:
                         return entity.dict(include=fields, by_alias=by_alias)[next(iter(fields))]
-                    else:
-                        return entity.dict(include=fields, by_alias=by_alias)
+                    return entity.dict(include=fields, by_alias=by_alias)
                 return entity.dict(include=fields, by_alias=by_alias)
             return entity.dict(by_alias=by_alias)
         return entity.to_dict()

src/superannotate/lib/core/entities/__init__.py

@@ -1,3 +1,4 @@
+from lib.core.entities.integrations import IntegrationEntity
 from lib.core.entities.project_entities import AnnotationClassEntity
 from lib.core.entities.project_entities import BaseEntity
 from lib.core.entities.project_entities import ConfigEntity
@@ -11,7 +12,6 @@
 from lib.core.entities.project_entities import TeamEntity
 from lib.core.entities.project_entities import UserEntity
 from lib.core.entities.project_entities import WorkflowEntity
-from lib.core.entities.integrations import IntegrationEntity
 from superannotate_schemas.schemas.internal.document import DocumentAnnotation
 from superannotate_schemas.schemas.internal.pixel import PixelAnnotation
 from superannotate_schemas.schemas.internal.vector import VectorAnnotation

src/superannotate/lib/core/entities/base.py

@@ -7,4 +7,3 @@
 class TimedBaseModel(BaseModel):
     created_at: datetime = Field(None, alias="createdAt")
     updated_at: datetime = Field(None, alias="updatedAt")
-

src/superannotate/lib/core/entities/integrations.py

@@ -1,5 +1,5 @@
-from pydantic import Field
 from lib.core.entities.base import TimedBaseModel
+from pydantic import Field
 
 
 class IntegrationEntity(TimedBaseModel):

src/superannotate/lib/core/repositories.py

@@ -8,7 +8,7 @@
 from lib.core.conditions import Condition
 from lib.core.entities import BaseEntity
 from lib.core.entities import ProjectEntity
-from lib.core.serviceproviders import SuerannotateServiceProvider
+from lib.core.serviceproviders import SuperannotateServiceProvider
 
 
 class BaseReadOnlyRepository(ABC):
@@ -50,7 +50,7 @@ def _drop_nones(data: dict):
 
 
 class BaseProjectRelatedManageableRepository(BaseManageableRepository):
-    def __init__(self, service: SuerannotateServiceProvider, project: ProjectEntity):
+    def __init__(self, service: SuperannotateServiceProvider, project: ProjectEntity):
         self._service = service
         self._project = project
 

src/superannotate/lib/core/serviceproviders.py

@@ -9,7 +9,7 @@
 from lib.core.service_types import ServiceResponse
 
 
-class SuerannotateServiceProvider:
+class SuperannotateServiceProvider:
     @abstractmethod
     def attach_files(
             self,