Merge pull request #465 from superannotateai/1206_client

fix init flow

Author: VaghinakDev

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
         name: Style Guide Enforcement (flake8)
         args:
           - '--max-line-length=120'
-          - --ignore=D100,D203,D405,W503,E203,E501,F841,E126,E712,E123,E131,F821,E121
+          - --ignore=D100,D203,D405,W503,E203,E501,F841,E126,E712,E123,E131,F821,E121,W605
   - repo: 'https://github.com/asottile/pyupgrade'
     rev: v2.4.3
     hooks:

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

@@ -26,7 +26,7 @@ def __init__(self, token: str = None, config_path: str = None):
         version = os.environ.get("SA_VERSION", "v1")
         _token, _config_path = None, None
         _host = os.environ.get("SA_URL", constants.BACKEND_URL)
-        _ssl_verify = bool(os.environ.get("SA_SSL", True))
+        _ssl_verify = os.environ.get("SA_SSL", "True") in ("false", "f", "0")
         if token:
             _token = Controller.validate_token(token=token)
         elif config_path:
@@ -37,6 +37,9 @@ def __init__(self, token: str = None, config_path: str = None):
                 _token, _host, _ssl_verify = self._retrieve_configs(
                     constants.CONFIG_PATH
                 )
+        _host = _host if _host else constants.BACKEND_URL
+        _ssl_verify = True if _ssl_verify is None else _ssl_verify
+
         self._token, self._host = _token, _host
         self.controller = Controller(_token, _host, _ssl_verify, version)
         BaseInterfaceFacade.REGISTRY.append(self)

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

@@ -2237,9 +2237,7 @@ def validate_annotations(
         """
         with open(annotations_json) as file:
             annotation_data = json.loads(file.read())
-            response = Controller.validate_annotations(
-                project_type, annotation_data
-            )
+            response = Controller.validate_annotations(project_type, annotation_data)
             if response.errors:
                 raise AppException(response.errors)
             is_valid, _ = response.data
@@ -2710,7 +2708,7 @@ def download_annotations(
         :param path:  local directory path where the annotations will be downloaded. If none, the current directory is used.
         :type path: Path-like (str or Path)
 
-        :param items: list of item names whose annotations will be downloaded 
+        :param items: list of item names whose annotations will be downloaded
             (e.g., ["Image_1.jpeg", "Image_2.jpeg"]). If the value is None, then all the annotations of the given directory will be downloaded.
 
         :type items: list of str

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

@@ -155,7 +155,7 @@ def validate_arguments(self):
             raise AppException(
                 "The query and subset params cannot have the value None at the same time."
             )
-        if  self._subset and not self._folder.is_root:
+        if self._subset and not self._folder.is_root:
             raise AppException(
                 "The folder name should be specified in the query string."
             )

src/superannotate/lib/core/video_convertor.py

@@ -2,12 +2,10 @@
 import math
 from collections import defaultdict
 from typing import Any
-from typing import Dict
 from typing import List
 from typing import Optional
 
 from lib.core.enums import AnnotationTypes
-from lib.core.exceptions import AppException
 from pydantic import BaseModel
 
 

src/superannotate/lib/infrastructure/controller.py

@@ -75,8 +75,8 @@ def __init__(self, token: str, host: str, ssl_verify: bool, version: str):
         self._integrations = None
         self._ml_models = None
         self._user_id = None
-        self._team_name = None
         self._reporter = None
+        self._team = self._get_team()
 
     @staticmethod
     def validate_token(token: str):
@@ -96,12 +96,6 @@ def user_id(self):
             self._user_id, _ = self.get_team()
         return self._user_id
 
-    @property
-    def team_name(self):
-        if not self._team_name:
-            _, self._team_name = self.get_team()
-        return self._team_name
-
     @property
     def projects(self):
         if not self._projects:
@@ -114,6 +108,18 @@ def folders(self):
             self._folders = FolderRepository(self._backend_client)
         return self._folders
 
+    @property
+    def team(self):
+        return self._team
+
+    def _get_team(self):
+        response = usecases.GetTeamUseCase(
+            teams=self.teams, team_id=self.team_id
+        ).execute()
+        if response.errors:
+            raise AppException(response.errors)
+        return response.data
+
     def get_team(self):
         return usecases.GetTeamUseCase(teams=self.teams, team_id=self.team_id).execute()
 
@@ -130,7 +136,7 @@ def teams(self):
     @property
     def team_data(self):
         if not self._team_data:
-            self._team_data = self.get_team().data
+            self._team_data = self.team
         return self._team_data
 
     @property
@@ -1366,13 +1372,12 @@ def validate_annotations(
         return use_case.execute()
 
     def add_contributors_to_project(self, project_name: str, emails: list, role: str):
-        team = self.get_team()
         project = self.get_project_metadata(
             project_name=project_name, include_contributors=True
         )
         use_case = usecases.AddContributorsToProject(
             reporter=self.get_default_reporter(),
-            team=team.data,
+            team=self.team,
             project=project.data["project"],
             emails=emails,
             role=role,
@@ -1381,10 +1386,9 @@ def add_contributors_to_project(self, project_name: str, emails: list, role: str
         return use_case.execute()
 
     def invite_contributors_to_team(self, emails: list, set_admin: bool):
-        team = self.get_team()
         use_case = usecases.InviteContributorsToTeam(
             reporter=self.get_default_reporter(),
-            team=team.data,
+            team=self.team,
             emails=emails,
             set_admin=set_admin,
             service=self.backend_client,

src/superannotate/lib/infrastructure/services.py

@@ -56,7 +56,7 @@ def __init__(
         auth_token: str,
         logger,
         paginate_by=None,
-        verify_ssl=False,
+        verify_ssl: bool = False,
         testing: bool = False,
     ):
         self.api_url = api_url

tests/integration/client/test_client_init.py

@@ -0,0 +1,71 @@
+import json
+import os
+import tempfile
+from unittest import TestCase
+
+import superannotate.lib.core as constants
+from superannotate import SAClient
+
+
+class TestClientInit(TestCase):
+    TEST_TOKEN = "test=6085"
+    TEST_URL = "https://test.com"
+
+    def setUp(self) -> None:
+        os.environ.pop('SA_TOKEN', None)
+        os.environ.pop('SA_URL', None)
+        os.environ.pop('SA_SSL', None)
+
+    def test_via_token(self):
+        sa = SAClient(token=self.TEST_TOKEN)
+        assert sa.controller._token == self.TEST_TOKEN
+        assert sa.controller._backend_client.api_url == constants.BACKEND_URL
+
+    def test_via_env_token(self):
+        os.environ.update(
+            {"SA_TOKEN": self.TEST_TOKEN}
+        )
+        sa = SAClient()
+        assert sa.controller._token == self.TEST_TOKEN
+        assert sa.controller._backend_client.api_url == constants.BACKEND_URL
+
+    def test_via_env_vars(self):
+        os.environ.update(
+            {
+                "SA_TOKEN": self.TEST_TOKEN,
+                "SA_URL": self.TEST_URL,
+                "SA_SSL": "False"
+            }
+        )
+        sa = SAClient()
+        assert sa.controller._token == self.TEST_TOKEN
+        assert sa.controller._backend_client.api_url == self.TEST_URL
+        assert sa.controller._backend_client._verify_ssl == False
+
+    def test_via_config_path_with_url_token(self):
+        data = {
+            "token": self.TEST_TOKEN,
+            "main_endpoint": self.TEST_URL,
+            "ssl_verify": True
+        }
+        with tempfile.TemporaryDirectory() as temp_dir:
+            file_path = f"{temp_dir}/config.json"
+            with open(file_path, "w") as file:
+                json.dump(data, file)
+            sa = SAClient(config_path=file_path)
+            assert sa.controller._token == self.TEST_TOKEN
+            assert sa.controller._backend_client.api_url == self.TEST_URL
+            assert sa.controller._backend_client._verify_ssl == True
+
+    def test_via_config_path_with_token(self):
+        data = {
+            "token": self.TEST_TOKEN,
+        }
+        with tempfile.TemporaryDirectory() as temp_dir:
+            file_path = f"{temp_dir}/config.json"
+            with open(file_path, "w") as file:
+                json.dump(data, file)
+            sa = SAClient(config_path=file_path)
+            assert sa.controller._token == self.TEST_TOKEN
+            assert sa.controller._backend_client.api_url == constants.BACKEND_URL
+            assert sa.controller._backend_client._verify_ssl == True