synapse-sdk 1.0.0a63__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/devtools/server.py

@@ -69,7 +69,7 @@ class DevtoolsServer:
     def _init_backend_client(self) -> Optional[BackendClient]:
         config = get_backend_config()
         if config:
-            return BackendClient(config['host'], api_token=config['token'])
+            return BackendClient(config['host'], access_token=config['token'])
         return None
 
     def _init_agent_client(self) -> Optional[AgentClient]:

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/upload/actions/upload.py

@@ -194,13 +194,13 @@ class UploadAction(Action):
     run_class = UploadRun
     progress_categories = {
         'analyze_collection': {
-            'proportion': 0,
+            'proportion': 10,
         },
         'upload_data_files': {
-            'proportion': 0,
+            'proportion': 50,
         },
         'generate_data_units': {
-            'proportion': 0,
+            'proportion': 40,
         },
     }
     metrics_categories = {'data_file', 'data_unit'}
@@ -372,7 +372,6 @@ class UploadAction(Action):
             List: List of dictionaries containing organized files.
         """
         organized_files = []
-        self.run.log_message(f'Looking for files in {directory}...')
 
         # Check for type-based directory structure (e.g., image_1/, pcd_1/)
         type_dirs = {}
@@ -396,7 +395,7 @@ class UploadAction(Action):
                 if extensions:
                     common_ext = max(extensions.items(), key=lambda x: x[1])[0]
                     type_extensions[spec_name] = common_ext
-                    self.run.log_message(f'Found type directory: {spec_name} (common extension: {common_ext})')
+                    self.run.log_message(f'Found type directory: {spec_name} (extension: {common_ext})')
 
         # If type-based directories don't exist, exit early
         if not type_dirs:
@@ -432,19 +431,13 @@ class UploadAction(Action):
                             )
 
         if not dataset_files:
-            self.run.log_message('No dataset files found.', context=Context.WARNING.value)
+            self.run.log_message('No files found.', context=Context.WARNING.value)
             return organized_files
 
-        self.run.log_message(f'Found {len(dataset_files)} potential datasets by ID')
+        self.run.log_message(f'Found {len(dataset_files)} files by ID')
 
         # Second pass: organize valid datasets
         for file_name, files_dict in sorted(dataset_files.items()):
-            self.run.log_message(f'Processing file name: {file_name}')
-
-            # Add file spec details for logging
-            for spec_name, file_path in files_dict.items():
-                self.run.log_message(f"Mapped '{spec_name}' to: {file_path.name}")
-
             # Check if all required files are present
             required_specs = [spec['name'] for spec in file_specification if spec.get('is_required', False)]
             if all(req in files_dict for req in required_specs):
@@ -456,7 +449,6 @@ class UploadAction(Action):
 
                 # Add the organized dataset
                 organized_files.append({'files': files_dict, 'meta': meta_data})
-                self.run.log_message(f'Successfully organized dataset for ID {file_name}')
             else:
                 # Missing required files warning
                 missing = [req for req in required_specs if req not in files_dict]

synapse_sdk/plugins/models.py

@@ -3,6 +3,7 @@ from functools import cached_property
 from typing import Any, Dict
 
 from synapse_sdk.clients.backend import BackendClient
+from synapse_sdk.devtools.config import get_backend_config
 from synapse_sdk.loggers import BackendLogger, ConsoleLogger
 from synapse_sdk.plugins.utils import read_plugin_config
 from synapse_sdk.shared.enums import Context
@@ -112,11 +113,18 @@ class Run:
     def __init__(self, job_id, context):
         self.job_id = job_id
         self.context = context
-        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'),
-        )
+        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.0a63.dist-info → synapse_sdk-1.0.0a65.dist-info}/METADATA

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

{synapse_sdk-1.0.0a63.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
@@ -46,7 +46,7 @@ synapse_sdk/clients/validators/collections.py,sha256=LtnwvutsScubOUcZ2reGHLCzseX
 synapse_sdk/devtools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/devtools/config.py,sha256=ODAfnXD4TBZQM2dxL7pcHlx6JfkZo15Kwf1MEenbics,2509
 synapse_sdk/devtools/models.py,sha256=6tdpNblSvE5VQ97J0NZreFkD0jK8v6JuJK4ap0DX2w8,1112
-synapse_sdk/devtools/server.py,sha256=8etZloZDn9pfAN8JydquA7pH6xV2kK1NseRX0Qa1J-Y,34418
+synapse_sdk/devtools/server.py,sha256=WDeVYl5wuh2FneRMeIZ7BuZDrpA30wpFmykKCRtpNaw,34421
 synapse_sdk/devtools/utils.py,sha256=-f3ZxnRpYg6suNQIL-m4n1DhvLdQEbS4e9Mk9tQ8crE,1706
 synapse_sdk/devtools/docs/.gitignore,sha256=fCv2uiY7oUmiiFhHqfcYbg169Y-q4-AfLmmnRl98_sw,233
 synapse_sdk/devtools/docs/README.md,sha256=yBzWf0K1ef4oymFXDaHo0nYWEgMQJqsOyrkNhIOPQrY,774
@@ -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=QSsF9A3MSbujdKEeVgkt7vpm0LGQYg_9P_T05WVSmCA,4362
+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
@@ -166,7 +166,7 @@ synapse_sdk/plugins/categories/smart_tool/templates/plugin/__init__.py,sha256=47
 synapse_sdk/plugins/categories/smart_tool/templates/plugin/auto_label.py,sha256=eevNg0nOcYFR4z_L_R-sCvVOYoLWSAH1jwDkAf3YCjY,320
 synapse_sdk/plugins/categories/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/upload/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse_sdk/plugins/categories/upload/actions/upload.py,sha256=zZx14F3789IJUH7BmZdXI43HXy0RdLknqT3aZk0WIHQ,18965
+synapse_sdk/plugins/categories/upload/actions/upload.py,sha256=YozR4WHDnoFQBth9hZoOYLLrMVtjrA9EFwLwQKqUK-M,18516
 synapse_sdk/plugins/categories/upload/templates/config.yaml,sha256=kwHNWHFYbzDi1mEh40KozatPZbZGH44dlP0t0J7ejJw,483
 synapse_sdk/plugins/categories/upload/templates/plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/upload/templates/plugin/upload.py,sha256=IZU4sdSMSLKPCtlNqF7DP2howTdYR6hr74HCUZsGdPk,1559
@@ -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.0a63.dist-info/licenses/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
-synapse_sdk-1.0.0a63.dist-info/METADATA,sha256=hdkgJNRy-a56VElif9D7_n5Xlyk2IIn4O74e__ZQ4Z4,1130
-synapse_sdk-1.0.0a63.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-synapse_sdk-1.0.0a63.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
-synapse_sdk-1.0.0a63.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
-synapse_sdk-1.0.0a63.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,,