Merge pull request #239 from superannotateai/sdk_config_fix

Fixed wrong imports

Author: VaghinakDev

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/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,9 +1,9 @@
 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
@@ -38,17 +38,20 @@ 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
 

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/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
 
 

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
@@ -59,7 +61,6 @@ def __init__(self, logger, config_path=constances.CONFIG_FILE_LOCATION):
         self._team_id = None
         self._user_id = None
         self._team_name = None
-        self._team = None
         self.init(config_path)
 
     def init(self, config_path):
@@ -68,15 +69,15 @@ def init(self, config_path):
             self.configs.get_one("token"),
             self.configs.get_one("main_endpoint"),
         )
-        if token:
-            token = token.value
-        if main_endpoint:
-            main_endpoint = main_endpoint.value
+        token = None if not token else token.value
+        main_endpoint = None if not main_endpoint else main_endpoint.value
         if not main_endpoint:
             self.configs.insert(ConfigEntity("main_endpoint", constances.BACKEND_URL))
+            main_endpoint = constances.BACKEND_URL
         if not token:
             self.configs.insert(ConfigEntity("token", ""))
-            self._logger.warning("Fill config.json")
+            # TODO check
+            #self._logger.warning(f"Fill token in the {config_path}")
             return
         verify_ssl_entity = self.configs.get_one("ssl_verify")
         if not verify_ssl_entity:
@@ -94,8 +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()
-        self._team_id = int(self.configs.get_one("token").value.split("=")[-1])
-        self._team = None
+        if self.is_valid_token(token):
+            self._team_id = int(token.split("=")[-1])
+        self._teams = None
+
+    @staticmethod
+    def is_valid_token(token: str):
+        try:
+            int(token.split("=")[-1])
+            return True
+        except Exception:
+            return False
 
     @property
     def config_path(self):
@@ -142,11 +152,10 @@ def folders(self):
         return self._folders
 
     def get_team(self):
-        if not self._team:
-            self._team = usecases.GetTeamUseCase(
-                teams=self.teams, team_id=self.team_id
-            ).execute()
-        return self._team
+        return usecases.GetTeamUseCase(
+            teams=self.teams, team_id=self.team_id
+        ).execute()
+
 
     @property
     def ml_models(self):
@@ -173,6 +182,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
 
@@ -200,8 +211,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):

tests/unit/test_controller_init.py

@@ -3,6 +3,7 @@
 import json
 from contextlib import contextmanager
 import pkg_resources
+import tempfile
 from unittest import TestCase
 from unittest.mock import mock_open
 from unittest.mock import patch
@@ -65,3 +66,15 @@ def test_init_create(self, input_mock):
                     )
                 )
                 self.assertEqual(out.getvalue().strip(), "Configuration file successfully created.")
+
+
+class SKDInitTest(TestCase):
+
+    def test_init_flow(self):
+        with tempfile.TemporaryDirectory() as temp_dir:
+            token_path = f"{temp_dir}/config.json"
+            with open(token_path, "w") as temp_config:
+                json.dump({"token": "token=1234"}, temp_config)
+                temp_config.close()
+                import src.superannotate as sa
+                sa.init(token_path)