Merge

Author: dshabin

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,8 +53,8 @@
 from tqdm import tqdm
 
 
+controller = Controller.get_instance()
 logger = logging.getLogger("root")
-controller = Controller(logger)
 
 
 @validate_arguments
@@ -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/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
 
-controller = Controller(logger=logging.getLogger())
+controller = Controller.get_instance()
 
 
 def get_project_name(project):

src/superannotate/lib/infrastructure/controller.py

@@ -1,5 +1,6 @@
 import copy
 import io
+import logging
 from pathlib import Path
 from typing import Iterable
 from typing import List
@@ -43,13 +44,14 @@ def __call__(cls, *args, **kwargs):
     def get_instance(cls):
         if cls._instances:
             return cls._instances[cls]
+        return cls()
 
 
 class BaseController(metaclass=SingleInstanceMetaClass):
-    def __init__(self, logger, config_path=constances.CONFIG_FILE_LOCATION):
+    def __init__(self, config_path=constances.CONFIG_FILE_LOCATION):
         self._config_path = None
         self._backend_client = None
-        self._logger = logger
+        self._logger = logging.getLogger("root")
         self._s3_upload_auth_data = None
         self._projects = None
         self._folders = None
@@ -93,17 +95,17 @@ def init(self, config_path):
             self._backend_client.api_url = main_endpoint
             self._backend_client._auth_token = token
             self._backend_client.get_session.cache_clear()
-        token = self.configs.get_one("token").value
-        self.validate_token(token)
-        self._team_id = int(token.split("=")[-1])
+        if self.is_valid_token(token):
+            self._team_id = int(token.split("=")[-1])
         self._team = None
 
     @staticmethod
-    def validate_token(token: str):
+    def is_valid_token(token: str):
         try:
-            return int(token.split("=")[-1])
+            int(token.split("=")[-1])
+            return True
         except Exception:
-            raise AppException("Invalid token.")
+            return False
 
     @property
     def config_path(self):
@@ -181,6 +183,8 @@ def configs(self):
     @property
     def team_id(self) -> int:
         if not self._team_id:
+            if not self.is_valid_token(self.configs.get_one("token").value):
+                raise AppException("Invalid token.")
             self._team_id = int(self.configs.get_one("token").value.split("=")[-1])
         return self._team_id
 
@@ -208,8 +212,8 @@ def s3_repo(self):
 
 
 class Controller(BaseController):
-    def __init__(self, logger, config_path=constances.CONFIG_FILE_LOCATION):
-        super().__init__(logger, config_path)
+    def __init__(self, config_path=constances.CONFIG_FILE_LOCATION):
+        super().__init__(config_path)
         self._team = None
 
     def _get_project(self, name: str):