synapse-sdk 1.0.0a64__py3-none-any.whl → 1.0.0a65__py3-none-any.whl

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/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/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/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.dist-info → synapse_sdk-1.0.0a65.dist-info}/METADATA

@@ -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.dist-info → synapse_sdk-1.0.0a65.dist-info}/RECORD

@@ -30,7 +30,7 @@ synapse_sdk/clients/agent/__init__.py,sha256=FqYbtzMJdzRfuU2SA-Yxdc0JKmVP1wxH6Ol
 synapse_sdk/clients/agent/core.py,sha256=x2jgORTjT7pJY67SLuc-5lMG6CD5OWpy8UgGeTf7IhA,270
 synapse_sdk/clients/agent/ray.py,sha256=1EDl-bMN2CvKl07-qMidSWNOGpvIvzcWl7jDBCza65o,3248
 synapse_sdk/clients/agent/service.py,sha256=s7KuPK_DB1nr2VHrigttV1WyFonaGHNrPvU8loRxHcE,478
-synapse_sdk/clients/backend/__init__.py,sha256=qIT2x-bLdopanpsc5DCodggGJyRhH4Udh4jukq2V2pA,1121
+synapse_sdk/clients/backend/__init__.py,sha256=ZIOtyumZUw2u1k71rf5CjMCqhR1RwRTKJaZ19sCuTuE,1947
 synapse_sdk/clients/backend/annotation.py,sha256=dX7os4zFxI3oyh8SzqB83eTW_mR07Hp2bhCHwe64AkE,1356
 synapse_sdk/clients/backend/core.py,sha256=5XAOdo6JZ0drfk-FMPJ96SeTd9oja-VnTwzGXdvK7Bg,1027
 synapse_sdk/clients/backend/data_collection.py,sha256=uI-_ByLh-Xez4VIIVRBO8FCNUpDcxhBcLxCVFb_aG7o,4104
@@ -108,11 +108,11 @@ synapse_sdk/devtools/web/src/views/PluginView.jsx,sha256=_-V8elSiEtsvKECeROtQopS
 synapse_sdk/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/enums.py,sha256=ibixwqA3sCNSriG1jAtL54JQc_Zwo3MufwYUqGhVncc,523
 synapse_sdk/plugins/exceptions.py,sha256=Qs7qODp_RRLO9y2otU2T4ryj5LFwIZODvSIXkAh91u0,691
-synapse_sdk/plugins/models.py,sha256=AjfC8Cr8g_IrKh10M2sneVRJNIzSgCGi6d90Uu5N9EQ,4431
+synapse_sdk/plugins/models.py,sha256=dte0Thx4O8KS5WKrtERbtOmyZ85MG_TFqE6FUCplkjk,4645
 synapse_sdk/plugins/upload.py,sha256=VJOotYMayylOH0lNoAGeGHRkLdhP7jnC_A0rFQMvQpQ,3228
 synapse_sdk/plugins/utils.py,sha256=4_K6jIl0WrsXOEhFp94faMOriSsddOhIiaXcawYYUUA,3300
 synapse_sdk/plugins/categories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse_sdk/plugins/categories/base.py,sha256=akaBeRK23knqyipTohWu5dKNU4WmPJtxRLu9cdV-xOU,10570
+synapse_sdk/plugins/categories/base.py,sha256=ZBgRh3tTdSnqBrzjux8oi1_3PidHMmpmLClPXiTmU3Q,10690
 synapse_sdk/plugins/categories/decorators.py,sha256=Gw6T-UHwpCKrSt596X-g2sZbY_Z1zbbogowClj7Pr5Q,518
 synapse_sdk/plugins/categories/registry.py,sha256=KdQR8SUlLT-3kgYzDNWawS1uJnAhrcw2j4zFaTpilRs,636
 synapse_sdk/plugins/categories/templates.py,sha256=FF5FerhkZMeW1YcKLY5cylC0SkWSYdJODA_Qcm4OGYQ,887
@@ -138,7 +138,7 @@ synapse_sdk/plugins/categories/neural_net/actions/test.py,sha256=JY25eg-Fo6WbgtM
 synapse_sdk/plugins/categories/neural_net/actions/train.py,sha256=i406Ar0V74QwdvqI_g_DgHblB_SoGRPMsuwWcxfoeew,5429
 synapse_sdk/plugins/categories/neural_net/actions/tune.py,sha256=C2zv3o0S-5Hjjsms8ULDGD-ad_DdNTqCPOcDqXa0v1Y,13494
 synapse_sdk/plugins/categories/neural_net/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse_sdk/plugins/categories/neural_net/base/inference.py,sha256=tekHb5kNAVBqXtermtNUmpEOFvXbXNEEvGOXw51DYw8,1280
+synapse_sdk/plugins/categories/neural_net/base/inference.py,sha256=R5DASI6-5vzsjDOYxqeGGMBjnav5qHF4hNJT8zNUR3I,1097
 synapse_sdk/plugins/categories/neural_net/templates/config.yaml,sha256=TMdvthf0zQYYTHf0IibKJ6InziRCWM4100C1DKkJVqU,1094
 synapse_sdk/plugins/categories/neural_net/templates/plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/neural_net/templates/plugin/inference.py,sha256=rXvECCewVlLSotv7UaIyyGfEv0OODlXBuk1JwBLNhh8,838
@@ -205,9 +205,9 @@ synapse_sdk/utils/storage/providers/__init__.py,sha256=x7RGwZryT2FpVxS7fGWryRVpq
 synapse_sdk/utils/storage/providers/gcp.py,sha256=i2BQCu1Kej1If9SuNr2_lEyTcr5M_ncGITZrL0u5wEA,363
 synapse_sdk/utils/storage/providers/s3.py,sha256=W94rQvhGRXti3R4mYP7gmU5pcyCQpGFIBLvxxqLVdRM,2231
 synapse_sdk/utils/storage/providers/sftp.py,sha256=_8s9hf0JXIO21gvm-JVS00FbLsbtvly4c-ETLRax68A,1426
-synapse_sdk-1.0.0a64.dist-info/licenses/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
-synapse_sdk-1.0.0a64.dist-info/METADATA,sha256=KsTQlvh0eS2Fmrfma6vovk3TNgZ2FNBCG7jYy9I_3QI,1130
-synapse_sdk-1.0.0a64.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-synapse_sdk-1.0.0a64.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
-synapse_sdk-1.0.0a64.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
-synapse_sdk-1.0.0a64.dist-info/RECORD,,
+synapse_sdk-1.0.0a65.dist-info/licenses/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
+synapse_sdk-1.0.0a65.dist-info/METADATA,sha256=tZri6hM4wsmNTYDKgWGfrmgxYa1LKGUz1f-ad8Xzwoo,1130
+synapse_sdk-1.0.0a65.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+synapse_sdk-1.0.0a65.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
+synapse_sdk-1.0.0a65.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
+synapse_sdk-1.0.0a65.dist-info/RECORD,,