synapse-sdk 1.0.0a13__tar.gz → 1.0.0a15__tar.gz

{synapse_sdk-1.0.0a13/synapse_sdk.egg-info → synapse_sdk-1.0.0a15}/PKG-INFO

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

{synapse_sdk-1.0.0a13 → synapse_sdk-1.0.0a15}/pyproject.toml

@@ -33,11 +33,14 @@ all = [
 synapse = "synapse_sdk.cli:cli"
 
 [tool.setuptools]
-packages = ["synapse_sdk"]
+include-package-data = true
 
 [tool.setuptools.package-data]
 "synapse_sdk" = ["../locale/**/*"]
 
+[tool.setuptools.packages.find]
+include = ["synapse_sdk*"]
+
 [tool.setuptools_scm]
 
 [tool.ruff]

{synapse_sdk-1.0.0a13 → synapse_sdk-1.0.0a15}/synapse_sdk/clients/backend/__init__.py

@@ -8,16 +8,20 @@ class BackendClient(AnnotationClientMixin, DatasetClientMixin, IntegrationClient
     name = 'Backend'
     token = None
     tenant = None
+    agent_token = None
 
-    def __init__(self, base_url, token=None, tenant=None):
+    def __init__(self, base_url, token=None, tenant=None, agent_token=None):
         super().__init__(base_url)
         self.token = token
         self.tenant = tenant
+        self.agent_token = agent_token
 
     def _get_headers(self):
         headers = {}
         if self.token:
-            headers = {'Authorization': f'Token {self.token}'}
+            headers['Authorization'] = f'Token {self.token}'
         if self.tenant:
             headers['SYNAPSE-Tenant'] = f'Token {self.tenant}'
+        if self.agent_token:
+            headers['SYNAPSE-Agent'] = f'Token {self.agent_token}'
         return headers

{synapse_sdk-1.0.0a13 → synapse_sdk-1.0.0a15}/synapse_sdk/clients/backend/dataset.py

@@ -9,7 +9,7 @@ from synapse_sdk.clients.utils import get_batched_list
 class DatasetClientMixin(BaseClient):
     def list_dataset(self):
         path = 'datasets/'
-        return self._get(path)
+        return self._list(path)
 
     def create_data_file(self, file_path):
         path = 'data_files/'

{synapse_sdk-1.0.0a13 → synapse_sdk-1.0.0a15}/synapse_sdk/clients/backend/integration.py

@@ -37,7 +37,7 @@ class IntegrationClientMixin(BaseClient):
 
     def list_jobs(self, params=None):
         path = 'jobs/'
-        return self._get(path, params=params)
+        return self._list(path, params=params)
 
     def update_job(self, pk, data):
         path = f'jobs/{pk}/'
@@ -66,6 +66,6 @@ class IntegrationClientMixin(BaseClient):
         path = 'serve_applications/'
         return self._post(path, data=data)
 
-    def list_serve_applications(self, params=None):
+    def list_serve_applications(self, params=None, list_all=False):
         path = 'serve_applications/'
-        return self._get(path, params=params)
+        return self._list(path, params=params, list_all=list_all)

{synapse_sdk-1.0.0a13 → synapse_sdk-1.0.0a15}/synapse_sdk/clients/backend/ml.py

@@ -5,7 +5,7 @@ from synapse_sdk.clients.utils import get_default_url_conversion
 class MLClientMixin(BaseClient):
     def list_models(self, params=None):
         path = 'models/'
-        return self._get(path, params=params)
+        return self._list(path, params=params)
 
     def get_model(self, pk, params=None, url_conversion=None):
         path = f'models/{pk}/'

{synapse_sdk-1.0.0a13 → synapse_sdk-1.0.0a15}/synapse_sdk/plugins/categories/base.py

@@ -36,7 +36,7 @@ class Action:
     envs = None
     run = None
 
-    default_envs = [
+    REQUIRED_ENVS = [
         'RAY_ADDRESS',
         'RAY_DASHBOARD_URL',
         'RAY_SERVE_ADDRESS',
@@ -112,7 +112,7 @@ class Action:
         return self.run_class(self.job_id, context)
 
     def get_default_envs(self):
-        return {env: os.environ[env] for env in self.default_envs if env in os.environ}
+        return {env: os.environ[env] for env in self.REQUIRED_ENVS if env in os.environ}
 
     def get_runtime_env(self):
         runtime_env = {

{synapse_sdk-1.0.0a13 → synapse_sdk-1.0.0a15}/synapse_sdk/plugins/cli/publish.py

@@ -26,7 +26,8 @@ def publish(ctx, host, user_token, tenant, debug_modules):
 
     data = {'plugin': plugin_release.plugin, 'file': str(archive_path), 'debug': debug}
     if debug:
-        data['debug_meta'] = json.dumps({'modules': debug_modules.split(',')})
+        if debug_modules:
+            data['debug_meta'] = json.dumps({'modules': debug_modules.split(',')})
 
     client = BackendClient(host, user_token, tenant=tenant)
     client.create_plugin_release(data)

{synapse_sdk-1.0.0a13 → synapse_sdk-1.0.0a15}/synapse_sdk/plugins/models.py

@@ -86,28 +86,26 @@ class Run:
     logger = None
     job_id = None
     context = None
+    client = None
 
     def __init__(self, job_id, context):
         self.job_id = job_id
         self.context = context
+        self.client = BackendClient(
+            self.context['envs']['SYNAPSE_PLUGIN_RUN_HOST'],
+            self.context['envs']['SYNAPSE_PLUGIN_RUN_USER_TOKEN'],
+            self.context['envs']['SYNAPSE_PLUGIN_RUN_TENANT'],
+        )
         self.set_logger()
 
     def set_logger(self):
         kwargs = {'progress_categories': self.context['progress_categories']}
+
         if self.job_id:
-            client = BackendClient(
-                self.context['envs']['SYNAPSE_PLUGIN_RUN_HOST'],
-                self.context['envs']['SYNAPSE_PLUGIN_RUN_USER_TOKEN'],
-                self.context['envs']['SYNAPSE_PLUGIN_RUN_TENANT'],
-            )
-            self.logger = BackendLogger(client, self.job_id, **kwargs)
+            self.logger = BackendLogger(self.client, self.job_id, **kwargs)
         else:
             self.logger = ConsoleLogger(**kwargs)
 
-    @property
-    def client(self):
-        return getattr(self.logger, 'client', None)
-
     def set_progress(self, current, total, category=''):
         self.logger.set_progress(current, total, category)
 

{synapse_sdk-1.0.0a13 → synapse_sdk-1.0.0a15}/synapse_sdk/plugins/utils.py

@@ -1,8 +1,10 @@
 import json
 from pathlib import Path
 
+from synapse_sdk.i18n import gettext as _
 from synapse_sdk.plugins.categories.registry import _REGISTERED_ACTIONS, register_actions
 from synapse_sdk.plugins.enums import PluginCategory
+from synapse_sdk.plugins.exceptions import ActionError
 from synapse_sdk.utils.file import get_dict_from_file
 
 
@@ -48,3 +50,43 @@ def read_plugin_config(plugin_path=None):
     else:
         config_path = config_file_name
     return get_dict_from_file(config_path)
+
+
+def run_plugin(action, params, plugin_config=None, plugin_path=None, modules=None, envs=None, debug=False, **kwargs):
+    from synapse_sdk.plugins.models import PluginRelease
+
+    if not envs:
+        envs = {}
+
+    if debug:
+        if not plugin_path:
+            raise ActionError({'plugin_path': _('디버그 모드에서는 plugin_path는 필수입니다.')})
+
+        if plugin_path.startswith('http'):
+            if not plugin_config:
+                raise ActionError({'config': _('"plugin_path"가 url인 경우에는 "config"가 필수입니다.')})
+            plugin_release = PluginRelease(config=plugin_config)
+        else:
+            plugin_release = PluginRelease(plugin_path=plugin_path)
+            plugin_config = plugin_release.config
+
+        if action not in plugin_release.actions:
+            raise ActionError({'action': _('해당 액션은 존재하지 않습니다.')})
+
+        envs['SYNAPSE_DEBUG_PLUGIN_PATH'] = plugin_path
+        if modules:
+            envs['SYNAPSE_DEBUG_MODULES'] = ','.join(modules)
+    else:
+        if plugin_config is None:
+            raise ActionError({'config': _('플러그인 설정은 필수입니다.')})
+
+    action = get_action(
+        action,
+        params,
+        config=plugin_config,
+        envs=envs,
+        debug=debug,
+        **kwargs,
+    )
+
+    return action.run_action()

{synapse_sdk-1.0.0a13 → synapse_sdk-1.0.0a15/synapse_sdk.egg-info}/PKG-INFO

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