Merge pull request #382 from superannotateai/friday

Friday

Author: dshabin

pytest.ini

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

src/superannotate/__init__.py

@@ -5,6 +5,7 @@
 import requests
 import superannotate.lib.core as constances
 from packaging.version import parse
+from superannotate.lib import get_default_controller
 from superannotate.lib.app.analytics.class_analytics import class_distribution
 from superannotate.lib.app.exceptions import AppException
 from superannotate.lib.app.input_converters.conversion import convert_json_version
@@ -28,7 +29,6 @@
 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 controller
 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 create_annotation_class
@@ -109,9 +109,13 @@
 from superannotate.logger import get_default_logger
 from superannotate.version import __version__
 
+
+controller = get_default_controller()
+
 __all__ = [
     "__version__",
     "controller",
+    "constances",
     # Utils
     "AppException",
     "validate_annotations",
@@ -235,4 +239,5 @@ def log_version_info():
             )
 
 
-log_version_info()
+if not os.environ.get("SA_VERSION_CHECK", "True").lower() == "false":
+    log_version_info()

src/superannotate/lib/__init__.py

@@ -1,4 +1,16 @@
 import os
 import sys
 
+
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+controller = None
+
+
+def get_default_controller():
+    from lib.infrastructure.controller import Controller
+
+    global controller
+    controller = Controller()
+    return controller

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

@@ -10,7 +10,7 @@ def __init__(self):
     def controller(self):
         if not ConfigRepository().get_one("token"):
             raise Exception("Config does not exists!")
-        controller = Controller.get_instance()
+        controller = Controller()
         if self._config_path:
-            controller.init(self._config_path)
+            controller.init(config_path=self._config_path)
         return controller

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

@@ -12,18 +12,16 @@
 from lib.app.interface.sdk_interface import attach_document_urls_to_project
 from lib.app.interface.sdk_interface import attach_image_urls_to_project
 from lib.app.interface.sdk_interface import attach_video_urls_to_project
+from lib.app.interface.sdk_interface import controller
 from lib.app.interface.sdk_interface import create_folder
 from lib.app.interface.sdk_interface import create_project
 from lib.app.interface.sdk_interface import upload_annotations_from_folder_to_project
 from lib.app.interface.sdk_interface import upload_images_from_folder_to_project
 from lib.app.interface.sdk_interface import upload_preannotations_from_folder_to_project
 from lib.app.interface.sdk_interface import upload_videos_from_folder_to_project
 from lib.core.entities import ConfigEntity
-from lib.infrastructure.controller import Controller
 from lib.infrastructure.repositories import ConfigRepository
 
-controller = Controller.get_instance()
-
 
 class CLIFacade(BaseInterfaceFacade):
     """

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

@@ -12,6 +12,7 @@
 
 import boto3
 import lib.core as constances
+from lib import controller
 from lib.app.annotation_helpers import add_annotation_bbox_to_json
 from lib.app.annotation_helpers import add_annotation_comment_to_json
 from lib.app.annotation_helpers import add_annotation_point_to_json
@@ -21,6 +22,7 @@
 from lib.app.interface.types import AnnotationStatuses
 from lib.app.interface.types import AnnotationType
 from lib.app.interface.types import AnnotatorRole
+from lib.app.interface.types import ClassType
 from lib.app.interface.types import EmailStr
 from lib.app.interface.types import ImageQualityChoices
 from lib.app.interface.types import NotEmptyStr
@@ -33,35 +35,37 @@
 from lib.app.serializers import SettingsSerializer
 from lib.app.serializers import TeamSerializer
 from lib.core import LIMITED_FUNCTIONS
+from lib.core.entities.project_entities import AnnotationClassEntity
 from lib.core.enums import ImageQuality
 from lib.core.exceptions import AppException
 from lib.core.types import AttributeGroup
-from lib.core.types import ClassesJson
 from lib.core.types import MLModel
 from lib.core.types import Project
-from lib.infrastructure.controller import Controller
 from pydantic import conlist
 from pydantic import parse_obj_as
 from pydantic import StrictBool
 from superannotate.logger import get_default_logger
 from tqdm import tqdm
 
-controller = Controller.get_instance()
+
 logger = get_default_logger()
 
 
 @validate_arguments
-def init(path_to_config_json: Optional[str] = None):
+def init(path_to_config_json: Optional[str] = None, token: str = None):
     """
     Initializes and authenticates to SuperAnnotate platform using the config file.
     If not initialized then $HOME/.superannotate/config.json
     will be used.
 
     :param path_to_config_json: Location to config JSON file
     :type path_to_config_json: str or Path
+
+    :param token: Team token
+    :type token: str
     """
     global controller
-    controller.init(path_to_config_json)
+    controller.init(config_path=path_to_config_json, token=token)
 
 
 @validate_arguments
@@ -1525,6 +1529,7 @@ def create_annotation_class(
     name: NotEmptyStr,
     color: NotEmptyStr,
     attribute_groups: Optional[List[AttributeGroup]] = None,
+    type: ClassType = "object",
 ):
     """Create annotation class in project
 
@@ -1538,19 +1543,25 @@ def create_annotation_class(
      [ { "name": "tall", "is_multiselect": 0, "attributes": [ { "name": "yes" }, { "name": "no" } ] },
      { "name": "age", "is_multiselect": 0, "attributes": [ { "name": "young" }, { "name": "old" } ] } ]
     :type attribute_groups: list of dicts
+    :param type: class type
+    :type type: str
 
     :return: new class metadata
     :rtype: dict
     """
     if isinstance(project, Project):
         project = project.dict()
     attribute_groups = (
-        list(map(lambda x: x.dict(), attribute_groups)) if attribute_groups else None
+        list(map(lambda x: x.dict(), attribute_groups)) if attribute_groups else []
     )
     response = controller.create_annotation_class(
-        project_name=project, name=name, color=color, attribute_groups=attribute_groups
+        project_name=project,
+        name=name,
+        color=color,
+        attribute_groups=attribute_groups,
+        class_type=type,
     )
-    return response.data.to_dict()
+    return response.data.dict()
 
 
 @Trackable
@@ -1595,7 +1606,7 @@ def download_annotation_classes_json(project: NotEmptyStr, folder: Union[str, Pa
 @validate_arguments
 def create_annotation_classes_from_classes_json(
     project: Union[NotEmptyStr, dict],
-    classes_json: Union[List[ClassesJson], str, Path],
+    classes_json: Union[List[AnnotationClassEntity], str, Path],
     from_s3_bucket=False,
 ):
     """Creates annotation classes in project from a SuperAnnotate format
@@ -1611,33 +1622,32 @@ def create_annotation_classes_from_classes_json(
     :return: list of created annotation class metadatas
     :rtype: list of dicts
     """
-    if not isinstance(classes_json, list):
-        logger.info(
-            "Creating annotation classes in project %s from %s.", project, classes_json,
-        )
+    classes_json_initial = classes_json
+    if isinstance(classes_json, str) or isinstance(classes_json, Path):
         if from_s3_bucket:
             from_session = boto3.Session()
             from_s3 = from_session.resource("s3")
             file = io.BytesIO()
             from_s3_object = from_s3.Object(from_s3_bucket, classes_json)
             from_s3_object.download_fileobj(file)
             file.seek(0)
-            annotation_classes = parse_obj_as(List[ClassesJson], json.load(file))
+            data = file
         else:
-            annotation_classes = parse_obj_as(
-                List[ClassesJson], json.load(open(classes_json))
-            )
-
-    else:
-        annotation_classes = classes_json
-
-    annotation_classes = list(
-        map(lambda annotation_class: annotation_class.dict(), annotation_classes)
+            data = open(classes_json)
+        classes_json = json.load(data)
+    annotation_classes = parse_obj_as(List[AnnotationClassEntity], classes_json)
+    logger.info(
+        "Creating annotation classes in project %s from %s.",
+        project,
+        classes_json_initial,
     )
     response = controller.create_annotation_classes(
         project_name=project, annotation_classes=annotation_classes,
     )
-    return response.data
+    if response.errors:
+        raise AppException(response.errors)
+
+    return [i.dict() for i in response.data]
 
 
 @Trackable

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

@@ -2,6 +2,7 @@
 from typing import Union
 
 from lib.core.enums import AnnotationStatus
+from lib.core.enums import ClassTypeEnum
 from lib.core.enums import ProjectType
 from lib.core.enums import UserRole
 from lib.core.exceptions import AppException
@@ -12,6 +13,7 @@
 from pydantic import ValidationError
 from pydantic.errors import StrRegexError
 
+
 NotEmptyStr = constr(strict=True, min_length=1)
 
 
@@ -88,6 +90,15 @@ def validate(cls, value: Union[str]) -> Union[str]:
         return value
 
 
+class ClassType(StrictStr):
+    @classmethod
+    def validate(cls, value: Union[str]) -> Union[str]:
+        enum_values = [e.name.lower() for e in ClassTypeEnum]
+        if value.lower() not in enum_values:
+            raise TypeError(f"Available class_types are {', '.join(enum_values)}. ")
+        return value.lower()
+
+
 class AnnotationStatuses(StrictStr):
     @classmethod
     def validate(cls, value: Union[str]) -> Union[str]:

src/superannotate/lib/app/mixp/decorators.py

@@ -1,14 +1,15 @@
 import functools
 import sys
 
-from lib.infrastructure.controller import Controller
+from lib import get_default_controller
 from mixpanel import Mixpanel
 from superannotate.logger import get_default_logger
 from version import __version__
 
 from .utils import parsers
 
-controller = Controller.get_instance()
+controller = get_default_controller()
+
 
 # TODO:
 try:

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

@@ -1,9 +1,9 @@
 import lib.core as constances
+from lib import get_default_controller
 from lib.app.helpers import extract_project_folder
 from lib.core.enums import ProjectType
-from lib.infrastructure.controller import Controller
 
-controller = Controller.get_instance()
+controller = get_default_controller()
 
 
 def get_project_name(project):
@@ -32,7 +32,10 @@ def invite_contributors_to_team(*args, **kwargs):
             admin_value = admin[0]
     else:
         admin_value = admin
-    return {"event_name": "invite_contributors_to_team", "properties": {"Admin": admin_value}}
+    return {
+        "event_name": "invite_contributors_to_team",
+        "properties": {"Admin": admin_value},
+    }
 
 
 def search_team_contributors(*args, **kwargs):
@@ -1079,11 +1082,7 @@ def aggregate_annotations_as_df(*args, **kwargs):
 
     return {
         "event_name": "aggregate_annotations_as_df",
-        "properties": {
-            "Folder Count": len(folder_names),
-            "Project Type": project_type
-
-        },
+        "properties": {"Folder Count": len(folder_names), "Project Type": project_type},
     }
 
 

src/superannotate/lib/app/serializers.py

@@ -1,6 +1,7 @@
 from abc import ABC
 
 import superannotate.lib.core as constance
+from pydantic import BaseModel
 from superannotate.lib.core.entities import BaseEntity
 from superannotate.lib.core.entities import ImageEntity
 from superannotate.lib.core.entities import ProjectEntity
@@ -13,6 +14,8 @@ def __init__(self, entity: BaseEntity):
     def serialize(self):
         if isinstance(self._entity, dict):
             return self._entity
+        if isinstance(self._entity, BaseModel):
+            return self._entity.dict()
         return self._entity.to_dict()