SDK new version 4.2.1b1

Author: Vaghinak Basentsyan

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/interface/sdk_interface.py

@@ -58,7 +58,7 @@
 
 
 @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

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

@@ -10,8 +10,6 @@
 
 mp = Mixpanel(TOKEN)
 
-controller = Controller.get_instance()
-
 
 def get_default(team_name, user_id, project_name=None):
     return {
@@ -57,7 +55,7 @@ def track(self, *args, **kwargs):
 
     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/infrastructure/controller.py

@@ -1,6 +1,7 @@
 import copy
 import io
 import logging
+from os.path import expanduser
 from pathlib import Path
 from typing import Iterable
 from typing import List
@@ -61,18 +62,21 @@ def __init__(self, config_path=constances.CONFIG_FILE_LOCATION):
         self._team_id = None
         self._user_id = None
         self._team_name = None
-        self._config_path = Path(config_path)
-        if str(self._config_path) == constances.CONFIG_FILE_LOCATION:
-            if not self._config_path.is_file():
-                self.configs.insert(ConfigEntity("main_endpoint", constances.BACKEND_URL))
-                self.configs.insert(ConfigEntity("token", ""))
+        self._config_path = expanduser(config_path)
         try:
             self.init(config_path)
         except AppException:
             pass
 
-    def init(self, config_path=constances.CONFIG_FILE_LOCATION):
-        config_path = Path(config_path)
+    def init(self, config_path=None):
+        if not config_path:
+            config_path = constances.CONFIG_FILE_LOCATION
+        config_path = Path(expanduser(config_path))
+        if str(config_path) == constances.CONFIG_FILE_LOCATION:
+            if not Path(self._config_path).is_file():
+                self.configs.insert(ConfigEntity("main_endpoint", constances.BACKEND_URL))
+                self.configs.insert(ConfigEntity("token", ""))
+                return
         if not config_path.is_file():
             raise AppException(
                 f"SuperAnnotate config file {str(config_path)} not found."
@@ -97,26 +101,27 @@ def init(self, config_path=constances.CONFIG_FILE_LOCATION):
             verify_ssl = verify_ssl_entity.value
         if not self._backend_client:
             self._backend_client = SuperannotateBackendService(
-                api_url=self.configs.get_one("main_endpoint").value,
-                auth_token=self.configs.get_one("token").value,
+                api_url=main_endpoint,
+                auth_token=token,
                 logger=self._logger,
                 verify_ssl=verify_ssl,
             )
         else:
             self._backend_client.api_url = main_endpoint
             self._backend_client._auth_token = token
             self._backend_client.get_session.cache_clear()
-        if self.is_valid_token(token):
-            self._team_id = int(token.split("=")[-1])
+        self._team_id = None
+        self.validate_token(token)
+        self._team_id = int(token.split("=")[-1])
         self._teams = None
 
     @staticmethod
-    def is_valid_token(token: str):
+    def validate_token(token: str):
         try:
             int(token.split("=")[-1])
             return True
         except Exception:
-            return False
+            raise AppException("Invalid token.") from None
 
     @property
     def config_path(self):
@@ -167,7 +172,6 @@ def get_team(self):
             teams=self.teams, team_id=self.team_id
         ).execute()
 
-
     @property
     def ml_models(self):
         if not self._ml_models:
@@ -176,7 +180,7 @@ def ml_models(self):
 
     @property
     def teams(self):
-        if not self._teams:
+        if self.team_id and not self._teams:
             self._teams = TeamRepository(self._backend_client)
         return self._teams
 
@@ -193,9 +197,7 @@ 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])
+            raise AppException(f"Invalid credentials provided in the {self._config_path}.")
         return self._team_id
 
     @timed_lru_cache(seconds=3600)

src/superannotate/version.py

@@ -1 +1 @@
-__version__ = "5.0.0b47"
+__version__ = "4.2.1b1"

tests/unit/test_controller_init.py

@@ -1,5 +1,6 @@
 import sys
 from io import StringIO
+from os.path import join
 import json
 from contextlib import contextmanager
 import pkg_resources
@@ -8,6 +9,7 @@
 from unittest.mock import mock_open
 from unittest.mock import patch
 
+
 from src.superannotate.lib.app.interface.cli_interface import CLIFacade
 from src.superannotate.lib.core import CONFIG_FILE_LOCATION
 
@@ -69,6 +71,14 @@ def test_init_create(self, input_mock):
 
 
 class SKDInitTest(TestCase):
+    VALID_JSON = {
+        "token": "a"*28 + "=1234"
+    }
+    INVALID_JSON ={
+        "token": "a" * 28 + "=1234asd"
+    }
+    FILE_NAME = "config.json"
+    FILE_NAME_2 = "config.json"
 
     def test_init_flow(self):
         with tempfile.TemporaryDirectory() as temp_dir:
@@ -78,3 +88,12 @@ def test_init_flow(self):
                 temp_config.close()
                 import src.superannotate as sa
                 sa.init(token_path)
+
+    def test_init(self):
+        with tempfile.TemporaryDirectory() as temp_dir:
+            path = join(temp_dir, self.FILE_NAME)
+            with open(path, "w") as config:
+                json.dump(self.VALID_JSON, config)
+            import src.superannotate as sa
+            sa.init(path)
+            self.assertEqual(sa.controller.team_id, 1234)