Merge pull request #243 from superannotateai/develop

Develop

Author: dshabin

src/superannotate/__init__.py

@@ -57,6 +57,7 @@
 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
@@ -162,6 +163,7 @@
 
 __all__ = [
     "__version__",
+    "controller",
     # Utils
     "AppException",
     #

src/superannotate/lib/app/helpers.py

@@ -42,22 +42,30 @@ def get_annotation_paths(folder_path, s3_bucket=None, recursive=False):
         return get_s3_annotation_paths(
             folder_path, s3_bucket, annotation_paths, recursive
         )
-    return get_local_annotation_paths(folder_path, annotation_paths, recursive)
+    return get_local_annotation_paths(folder_path, set(annotation_paths), recursive)
 
 
 def get_local_annotation_paths(
-    folder_path: Union[str, Path], annotation_paths: List, recursive: bool
+    folder_path: Union[str, Path], annotation_paths: set, recursive: bool
 ) -> List[str]:
-    for path in Path(folder_path).glob("*"):
-        if recursive and path.is_dir():
-            get_local_annotation_paths(path, annotation_paths, recursive)
-        for annotation_path in Path(folder_path).glob("*.json"):
-            if (
-                annotation_path.name.endswith(VECTOR_ANNOTATION_POSTFIX)
-                or annotation_path.name.endswith(PIXEL_ANNOTATION_POSTFIX)
-            ) and str(annotation_path) not in annotation_paths:
-                annotation_paths.append(str(annotation_path))
-    return annotation_paths
+    all_items = [*Path(folder_path).glob("*")]
+    all_folders = [i for i in all_items if i.is_dir()]
+    all_not_folders = [i for i in all_items if not i.is_dir()]
+    annotation_paths.update(
+        [
+            str(i)
+            for i in all_not_folders
+            if i.name.endswith((VECTOR_ANNOTATION_POSTFIX, PIXEL_ANNOTATION_POSTFIX))
+        ]
+    )
+    if recursive:
+        for folder in all_folders:
+            get_local_annotation_paths(
+                folder_path=folder,
+                annotation_paths=annotation_paths,
+                recursive=recursive,
+            )
+    return list(annotation_paths)
 
 
 def get_s3_annotation_paths(folder_path, s3_bucket, annotation_paths, recursive):

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

@@ -1,12 +1,7 @@
-import logging
-
 from lib.infrastructure.controller import Controller
 from lib.infrastructure.repositories import ConfigRepository
 
 
-logger = logging.getLogger()
-
-
 class BaseInterfaceFacade:
     def __init__(self):
         self._config_path = None
@@ -15,6 +10,7 @@ def __init__(self):
     def controller(self):
         if not ConfigRepository().get_one("token"):
             raise Exception("Config does not exists!")
+        controller = Controller.get_instance()
         if self._config_path:
-            return Controller(logger, self._config_path)
-        return Controller(logger)
+            controller.init(self._config_path)
+        return controller

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

@@ -1,5 +1,4 @@
 import json
-import logging
 import os
 import sys
 import tempfile
@@ -24,8 +23,8 @@
 from lib.infrastructure.controller import Controller
 from lib.infrastructure.repositories import ConfigRepository
 
-logger = logging.getLogger()
-controller = Controller(logger)
+
+controller = Controller.get_instance()
 
 
 class CLIFacade(BaseInterfaceFacade):

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

@@ -53,12 +53,12 @@
 from tqdm import tqdm
 
 
+controller = Controller.get_instance()
 logger = logging.getLogger("root")
-controller = Controller(logger)
 
 
 @validate_arguments
-def init(path_to_config_json: str):
+def init(path_to_config_json: Optional[str] = None):
     """
     Initializes and authenticates to SuperAnnotate platform using the config file.
     If not initialized then $HOME/.superannotate/config.json
@@ -67,7 +67,7 @@ def init(path_to_config_json: str):
     :param path_to_config_json: Location to config JSON file
     :type path_to_config_json: str or Path
     """
-    # global controller
+    global controller
     controller.init(path_to_config_json)
 
 

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

@@ -3,7 +3,6 @@
 from typing import Union
 
 from lib.core.enums import AnnotationStatus
-from lib.core.exceptions import AppException
 from pydantic import constr
 from pydantic import StrictStr
 from pydantic import validate_arguments as pydantic_validate_arguments

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

@@ -1,17 +1,15 @@
 import functools
 import sys
 
+from lib.infrastructure.controller import Controller
 from mixpanel import Mixpanel
-from superannotate.lib.infrastructure.controller import Controller
-from superannotate.version import __version__
+from version import __version__
 
 from .config import TOKEN
 from .utils import parsers
 
 mp = Mixpanel(TOKEN)
 
-controller = Controller.get_instance()
-
 
 def get_default(team_name, user_id, project_name=None):
     return {
@@ -38,23 +36,26 @@ def track(self, *args, **kwargs):
             data = getattr(parsers, self.function.__name__)(*args, **kwargs)
             event_name = data["event_name"]
             properties = data["properties"]
+            team_data = self.__class__.TEAM_DATA.data
+            user_id = team_data.creator_id
+            team_name = team_data.name
             properties["Success"] = self._success
             default = get_default(
-                team_name=self.__class__.TEAM_DATA[1],
-                user_id=self.__class__.TEAM_DATA[0],
+                team_name=team_name,
+                user_id=user_id,
                 project_name=properties.get("project_name", None),
             )
             properties.pop("project_name", None)
             properties = {**default, **properties}
 
             if "pytest" not in sys.modules:
-                mp.track(controller.user_id, event_name, properties)
+                mp.track(user_id, event_name, properties)
         except Exception as _:
             pass
 
     def __call__(self, *args, **kwargs):
         try:
-            self.__class__.TEAM_DATA = controller.get_team()
+            self.__class__.TEAM_DATA = Controller.get_instance().get_team()
             ret = self.function(*args, **kwargs)
             self._success = True
         except Exception as e:

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

@@ -1,11 +1,9 @@
-import logging
+import lib.core as constances
+from lib.app.helpers import extract_project_folder
+from lib.core.enums import ProjectType
+from lib.infrastructure.controller import Controller
 
-import superannotate.lib.core as constances
-from superannotate.lib.app.helpers import extract_project_folder
-from superannotate.lib.core.enums import ProjectType
-from superannotate.lib.infrastructure.controller import Controller
-
-controller = Controller(logger=logging.getLogger())
+controller = Controller.get_instance()
 
 
 def get_project_name(project):

src/superannotate/lib/core/usecases/images.py

@@ -2027,9 +2027,7 @@ def validate_limitations(self):
         if response.data.folder_limit.remaining_image_count < 1:
             raise AppValidationException(constances.COPY_FOLDER_LIMIT_ERROR_MESSAGE)
         if response.data.project_limit.remaining_image_count < 1:
-            raise AppValidationException(
-                constances.COPY_PROJECT_LIMIT_ERROR_MESSAGE
-            )
+            raise AppValidationException(constances.COPY_PROJECT_LIMIT_ERROR_MESSAGE)
         if (
             response.data.user_limit
             and response.data.user_limit.remaining_image_count < 1
@@ -2736,20 +2734,16 @@ def execute(self):
                             failed_annotations.append(annotation)
                         yield
 
-                uploaded_annotations = [
-                    annotation.path for annotation in uploaded_annotations
-                ]
-                missing_annotations.extend(
-                    [annotation.path for annotation in self._missing_annotations]
-                )
-                failed_annotations = [
-                    annotation.path for annotation in failed_annotations
-                ]
-            self._response.data = (
-                uploaded_annotations,
-                failed_annotations,
-                missing_annotations,
-            )
+        uploaded_annotations = [annotation.path for annotation in uploaded_annotations]
+        missing_annotations.extend(
+            [annotation.path for annotation in self._missing_annotations]
+        )
+        failed_annotations = [annotation.path for annotation in failed_annotations]
+        self._response.data = (
+            uploaded_annotations,
+            failed_annotations,
+            missing_annotations,
+        )
         self.report_missing_data()
         return self._response
 

src/superannotate/lib/core/usecases/projects.py

@@ -833,7 +833,7 @@ def execute(self):
         try:
             self._response.data = self._teams.get_one(self._team_id)
         except Exception:
-            raise AppException("Can't get team data.")
+            raise AppException("Can't get team data.") from None
         return self._response