synapse-sdk 1.0.0a64__tar.gz → 1.0.0a65__tar.gz

{synapse_sdk-1.0.0a64 → synapse_sdk-1.0.0a65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse-sdk
-Version: 1.0.0a64
+Version: 1.0.0a65
 Summary: synapse sdk
 Author-email: datamaker <developer@datamaker.io>
 License: MIT

{synapse_sdk-1.0.0a64 → synapse_sdk-1.0.0a65}/synapse_sdk/clients/backend/__init__.py

@@ -14,19 +14,38 @@ class BackendClient(
     MLClientMixin,
     HITLClientMixin,
 ):
+    """BackendClient is a client for the synapse backend API.
+
+    * Access token overrides authorization token and tenant token.
+
+    Attrs:
+        access_token (str): The synapse access token for the synapse backend API.
+        authorization_token (str): The authorization token for the synapse backend API.
+        tenant_token (str): The tenant token for the synapse backend API.
+        agent_token (str): The agent token for the backend API.
+    """
+
     name = 'Backend'
     access_token = None
+    authorization_token = None
+    tenant_token = None
     agent_token = None
 
-    def __init__(self, base_url, access_token=None, agent_token=None, **kwargs):
+    def __init__(self, base_url, access_token=None, token=None, tenant=None, agent_token=None, **kwargs):
         super().__init__(base_url)
         self.access_token = access_token
+        self.authorization_token = token
+        self.tenant_token = tenant
         self.agent_token = agent_token
 
     def _get_headers(self):
         headers = {}
         if self.access_token:
             headers['Synapse-Access-Token'] = f'Token {self.access_token}'
+        if self.authorization_token:
+            headers['Authorization'] = f'Token {self.authorization_token}'
+        if self.tenant_token:
+            headers['Synapse-Tenant'] = f'Token {self.tenant_token}'
         if self.agent_token:
             headers['SYNAPSE-Agent'] = f'Token {self.agent_token}'
         return headers

{synapse_sdk-1.0.0a64 → synapse_sdk-1.0.0a65}/synapse_sdk/plugins/categories/base.py

@@ -63,6 +63,7 @@ class Action:
     envs = None
     run = None
 
+    # TODO: Refactor to use Synapse Access Token instead of SYNAPSE_PLUGIN_RUN_USER_TOKEN and SYNAPSE_PLUGIN_RUN_TENANT
     REQUIRED_ENVS = [
         'RAY_ADDRESS',
         'RAY_DASHBOARD_URL',

{synapse_sdk-1.0.0a64 → synapse_sdk-1.0.0a65}/synapse_sdk/plugins/categories/neural_net/base/inference.py

@@ -5,7 +5,6 @@ from fastapi import FastAPI
 from ray import serve
 
 from synapse_sdk.clients.backend import BackendClient
-from synapse_sdk.devtools.config import get_backend_config
 from synapse_sdk.utils.file import unarchive
 
 app = FastAPI()
@@ -21,9 +20,7 @@ class BaseInference:
     @serve.multiplexed()
     async def _load_model(self, model_id: str):
         model_info = jwt.decode(model_id, self.backend_url, algorithms='HS256')
-        if not (config := get_backend_config()):
-            raise ValueError('Backend config not found. Please configure backend in devtools config.')
-        client = BackendClient(config['host'], access_token=config['token'])
+        client = BackendClient(self.backend_url, token=model_info['token'], tenant=model_info['tenant'])
         model = client.get_model(model_info['model'])
         with tempfile.TemporaryDirectory() as temp_path:
             unarchive(model['file'], temp_path)

{synapse_sdk-1.0.0a64 → synapse_sdk-1.0.0a65}/synapse_sdk/plugins/models.py

@@ -113,12 +113,18 @@ class Run:
     def __init__(self, job_id, context):
         self.job_id = job_id
         self.context = context
-        if not (config := get_backend_config()):
-            raise ValueError('Backend config not found. Please configure backend in devtools config.')
-        self.client = BackendClient(
-            config['host'],
-            access_token=config['token'],
-        )
+        config = get_backend_config()
+        if config:
+            self.client = BackendClient(
+                config['host'],
+                access_token=config['token'],
+            )
+        else:
+            self.client = BackendClient(
+                self.context['envs']['SYNAPSE_PLUGIN_RUN_HOST'],
+                token=self.context['envs'].get('SYNAPSE_PLUGIN_RUN_USER_TOKEN'),
+                tenant=self.context['envs'].get('SYNAPSE_PLUGIN_RUN_TENANT'),
+            )
         self.set_logger()
 
     def set_logger(self):

{synapse_sdk-1.0.0a64 → synapse_sdk-1.0.0a65}/synapse_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse-sdk
-Version: 1.0.0a64
+Version: 1.0.0a65
 Summary: synapse sdk
 Author-email: datamaker <developer@datamaker.io>
 License: MIT