Changed validation message

Author: Vaghinak Basentsyan

src/superannotate/__init__.py

@@ -299,4 +299,4 @@
 logging.config.fileConfig(
     os.path.join(WORKING_DIR, "logging.conf"), disable_existing_loggers=False
 )
-sys.tracebacklimit = 1
+sys.tracebacklimit = 0

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

@@ -74,7 +74,6 @@ def init(path_to_config_json: str):
 @validate_arguments
 def set_auth_token(token: str):
     controller.set_token(token)
-    controller.init(controller.config_path)
 
 
 @Trackable

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

@@ -40,16 +40,18 @@ def wrapped(*args, **kwargs):
         try:
             return pydantic_validate_arguments(func)(*args, **kwargs)
         except ValidationError as e:
-            messages = defaultdict(list)
+            error_messages = defaultdict(list)
             for error in e.errors():
-                messages[error["loc"][0]].append(f"{error['loc'][-1]} {error['msg']}")
-            raise AppException(
-                "\n".join(
-                    [
-                        f"Invalid {message}: {','.join(text)}"
-                        for message, text in messages.items()
-                    ]
+                error_messages[error["loc"][0]].append(
+                    f"{error['loc'][-1]} {error['msg']}"
                 )
-            )
+            texts = ["\n"]
+            for error, text in error_messages.items():
+                texts.append(
+                    "{} |{}{}".format(
+                        error, " " * (20 - len(error) + 1), f"\n {' ' * 20}".join(text)
+                    )
+                )
+            raise AppException("\n".join(texts))
 
     return wrapped

src/superannotate/lib/core/serviceproviders.py

@@ -16,6 +16,10 @@ def __call__(cls, *args, **kwargs):
             SingleInstanceMetaClass._instances[cls] = super().__call__(*args, **kwargs)
         return SingleInstanceMetaClass._instances[cls]
 
+    def get_instance(cls):
+        if cls._instances:
+            return cls._instances[cls]
+
 
 class SuerannotateServiceProvider(metaclass=SingleInstanceMetaClass):
     @abstractmethod

src/superannotate/lib/core/usecases.py

@@ -2281,9 +2281,7 @@ def fill_classes_data(self, annotations: dict):
         for annotation in (
             i for i in annotations["instances"] if i.get("type", None) == "template"
         ):
-            template_name = templates.get(
-                annotation.get("templateId"), None
-            )
+            template_name = templates.get(annotation.get("templateId"), None)
             if template_name:
                 annotation["templateName"] = template_name
 

src/superannotate/lib/infrastructure/controller.py

@@ -108,13 +108,21 @@ def team_name(self):
             _, self._team_name = self.get_team()
         return self._team_name
 
+    @staticmethod
+    def _validate_token(token: str):
+        try:
+            int(token.split("=")[-1])
+        except ValueError:
+            raise AppException("Invalid token.")
+
     def set_token(self, token):
+        self._validate_token(token)
+        self._team_id = int(token.split("=")[-1])
         self.configs.insert(ConfigEntity("token", token))
-        self._backend_client = SuperannotateBackendService(
-            api_url=self.configs.get_one("main_endpoint").value,
-            auth_token=self.configs.get_one("token").value,
-            logger=self._logger,
-        )
+        self._backend_client = SuperannotateBackendService.get_instance()
+        self._backend_client._api_url = self.configs.get_one("main_endpoint").value
+        self._backend_client._auth_token = self.configs.get_one("token").value
+        self._backend_client.get_session.cache_clear()
 
     @property
     def projects(self):

src/superannotate/lib/infrastructure/helpers.py

@@ -12,6 +12,7 @@ def wrapper_cache(func):
 
         @wraps(func)
         def wrapped_func(*args, **kwargs):
+            wrapped_func.cache_clear = func.cache_clear
             if datetime.utcnow() >= func.expiration:
                 func.cache_clear()
                 func.expiration = datetime.utcnow() + func.lifetime

tests/integration/test_interface.py

@@ -1,6 +1,7 @@
 import os
 from os.path import dirname
 import tempfile
+import unittest
 
 import src.superannotate as sa
 from src.superannotate.lib.app.exceptions import AppException