synapse-sdk 1.0.0a20__tar.gz → 1.0.0a22__tar.gz

{synapse_sdk-1.0.0a20/synapse_sdk.egg-info → synapse_sdk-1.0.0a22}/PKG-INFO

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

{synapse_sdk-1.0.0a20 → synapse_sdk-1.0.0a22}/synapse_sdk/clients/backend/__init__.py

@@ -1,10 +1,17 @@
 from synapse_sdk.clients.backend.annotation import AnnotationClientMixin
+from synapse_sdk.clients.backend.core import CoreClientMixin
 from synapse_sdk.clients.backend.dataset import DatasetClientMixin
 from synapse_sdk.clients.backend.integration import IntegrationClientMixin
 from synapse_sdk.clients.backend.ml import MLClientMixin
 
 
-class BackendClient(AnnotationClientMixin, DatasetClientMixin, IntegrationClientMixin, MLClientMixin):
+class BackendClient(
+    AnnotationClientMixin,
+    CoreClientMixin,
+    DatasetClientMixin,
+    IntegrationClientMixin,
+    MLClientMixin,
+):
     name = 'Backend'
     token = None
     tenant = None

synapse_sdk-1.0.0a22/synapse_sdk/clients/backend/core.py

@@ -0,0 +1,32 @@
+import hashlib
+import os
+from pathlib import Path
+
+from synapse_sdk.clients.base import BaseClient
+
+
+class CoreClientMixin(BaseClient):
+    def create_chunked_upload(self, file_path):
+        def read_file_in_chunks(file_path, chunk_size=1024 * 1024 * 50):
+            with open(file_path, 'rb') as file:
+                while chunk := file.read(chunk_size):
+                    yield chunk
+
+        file_path = Path(file_path)
+        size = os.path.getsize(file_path)
+        hash_md5 = hashlib.md5()
+
+        url = 'chunked_upload/'
+        offset = 0
+        for chunk in read_file_in_chunks(file_path):
+            hash_md5.update(chunk)
+            data = self._put(
+                url,
+                data={'filename': file_path.name},
+                files={'file': chunk},
+                headers={'Content-Range': f'bytes {offset}-{offset + len(chunk) - 1}/{size}'},
+            )
+            offset = data['offset']
+            url = data['url']
+
+        return self._post(url, data={'md5': hash_md5.hexdigest()})

{synapse_sdk-1.0.0a20 → synapse_sdk-1.0.0a22}/synapse_sdk/clients/backend/ml.py

@@ -14,8 +14,9 @@ class MLClientMixin(BaseClient):
 
     def create_model(self, data):
         path = 'models/'
-        files = {'file': data.pop('file')}
-        return self._post(path, data=data, files=files)
+        file = data.pop('file')
+        data['chunked_upload'] = self.create_chunked_upload(file)['id']
+        return self._post(path, data=data)
 
     def list_ground_truth_events(self, params=None, url_conversion=None, list_all=False):
         path = 'ground_truth_events/'

{synapse_sdk-1.0.0a20 → synapse_sdk-1.0.0a22}/synapse_sdk/clients/base.py

@@ -28,11 +28,13 @@ class BaseClient:
     def _request(self, method, path, **kwargs):
         url = self._get_url(path)
         headers = self._get_headers()
+        headers.update(kwargs.pop('headers', {}))
 
         if method in ['post', 'put', 'patch']:
             if kwargs.get('files') is not None:
                 for name, file in kwargs['files'].items():
-                    kwargs['files'][name] = Path(str(file)).open(mode='rb')
+                    if isinstance(file, (str, Path)):
+                        kwargs['files'][name] = Path(str(file)).open(mode='rb')
                 for name, value in kwargs['data'].items():
                     if isinstance(value, dict):
                         kwargs['data'][name] = json.dumps(value)

{synapse_sdk-1.0.0a20 → synapse_sdk-1.0.0a22}/synapse_sdk/plugins/categories/base.py

@@ -30,6 +30,7 @@ class Action:
     plugin_config = None
     plugin_release = None
     config = None
+    requirements = None
     job_id = None
     direct = None
     debug = None
@@ -48,11 +49,12 @@ class Action:
         'SYNAPSE_PLUGIN_RUN_TENANT',
     ]
 
-    def __init__(self, params, plugin_config, envs=None, job_id=None, direct=False, debug=False):
+    def __init__(self, params, plugin_config, requirements=None, envs=None, job_id=None, direct=False, debug=False):
         self.params = params
         self.plugin_config = plugin_config
         self.plugin_release = PluginRelease(config=plugin_config)
         self.config = self.plugin_release.get_action_config(self.name)
+        self.requirements = requirements
         self.job_id = job_id
         self.direct = direct
         self.debug = debug
@@ -117,10 +119,10 @@ class Action:
         return {env: os.environ[env] for env in self.REQUIRED_ENVS if env in os.environ}
 
     def get_runtime_env(self):
-        runtime_env = {
-            'pip': ['-r ${RAY_RUNTIME_ENV_CREATE_WORKING_DIR}/requirements.txt'],
-            'working_dir': self.plugin_url,
-        }
+        runtime_env = {'pip': [], 'working_dir': self.plugin_url}
+
+        if self.requirements:
+            runtime_env['pip'] += self.requirements
 
         if self.debug:
             runtime_env['pip'] += self.debug_modules

{synapse_sdk-1.0.0a20 → synapse_sdk-1.0.0a22}/synapse_sdk/plugins/categories/neural_net/actions/train.py

@@ -17,8 +17,8 @@ from synapse_sdk.utils.pydantic.validators import non_blank
 
 
 class TrainRun(Run):
-    def log_metric(self, key, value, **metrics):
-        self.log('metric', {'key': key, 'value': value, 'metrics': metrics})
+    def log_metric(self, category, key, value, **metrics):
+        self.log('metric', {'category': category, 'key': key, 'value': value, 'metrics': metrics})
 
 
 class Hyperparameter(BaseModel):

{synapse_sdk-1.0.0a20 → synapse_sdk-1.0.0a22}/synapse_sdk/plugins/cli/publish.py

@@ -1,4 +1,3 @@
-import json
 from pathlib import Path
 
 import click
@@ -27,7 +26,7 @@ def publish(ctx, host, user_token, tenant, debug_modules):
     data = {'plugin': plugin_release.plugin, 'file': str(archive_path), 'debug': debug}
     if debug:
         modules = debug_modules.split(',') if debug_modules else []
-        data['debug_meta'] = json.dumps({'modules': modules})
+        data['meta'] = {'modules': modules}
 
     client = BackendClient(host, user_token, tenant=tenant)
     client.create_plugin_release(data)

{synapse_sdk-1.0.0a20 → synapse_sdk-1.0.0a22}/synapse_sdk/plugins/cli/run.py

@@ -1,11 +1,12 @@
 import os
+from pathlib import Path
 
 import click
 
 from synapse_sdk.clients.agent import AgentClient
 from synapse_sdk.clients.backend import BackendClient
 from synapse_sdk.plugins.models import PluginRelease
-from synapse_sdk.plugins.utils import get_action
+from synapse_sdk.plugins.utils import read_requirements, run_plugin
 
 
 @click.command()
@@ -33,8 +34,8 @@ def run(ctx, action, params, job_id, direct, run_by, agent_host, agent_token, ho
 
 
 def run_by_script(action, params, job_id, direct, debug):
-    action = get_action(action, params, job_id=job_id, direct=direct, debug=debug)
-    result = action.run_action()
+    requirements = read_requirements('./requirements.txt')
+    result = run_plugin(action, params, requirements=requirements, debug=debug, job_id=job_id, direct=direct)
 
     if debug:
         click.echo(result)
@@ -43,17 +44,23 @@ def run_by_script(action, params, job_id, direct, debug):
 def run_by_agent(action, params, job_id, agent_host, agent_token, user_token, tenant, debug):
     client = AgentClient(agent_host, agent_token, user_token, tenant)
     data = {'action': action, 'params': params}
+    plugin_path = os.getcwd()
+    requirements = read_requirements(Path(plugin_path) / 'requirements.txt')
+    if requirements:
+        data = {'requirements': requirements}
+
     if job_id:
         data['job_id'] = job_id
+
     if debug:
         data.update({
-            'plugin_path': os.getcwd(),
+            'plugin_path': plugin_path,
             'modules': os.getenv('SYNAPSE_DEBUG_MODULES', '').split(','),
         })
         result = client.run_debug_plugin_release(data=data)
     else:
         plugin_release = PluginRelease()
-        result = client.run_plugin_release(code=plugin_release.code, data=data)
+        result = client.run_plugin_release(plugin_release.code, data=data)
 
     click.echo(result)
 

{synapse_sdk-1.0.0a20 → synapse_sdk-1.0.0a22}/synapse_sdk/plugins/utils.py

@@ -52,17 +52,37 @@ def read_plugin_config(plugin_path=None):
     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):
+def read_requirements(file_path):
+    file_path = Path(file_path)
+    if not file_path.exists():
+        return None
+
+    requirements = []
+    for line in file_path.read_text().splitlines():
+        stripped_line = line.strip()
+        if stripped_line and not stripped_line.startswith('#'):
+            requirements.append(stripped_line)
+    return requirements
+
+
+def run_plugin(
+    action,
+    params,
+    plugin_config=None,
+    plugin_path=None,
+    modules=None,
+    requirements=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 plugin_path and plugin_path.startswith('http'):
             if not plugin_config:
                 raise ActionError({'config': _('"plugin_path"가 url인 경우에는 "config"가 필수입니다.')})
             plugin_release = PluginRelease(config=plugin_config)
@@ -73,9 +93,12 @@ def run_plugin(action, params, plugin_config=None, plugin_path=None, modules=Non
         if action not in plugin_release.actions:
             raise ActionError({'action': _('해당 액션은 존재하지 않습니다.')})
 
-        envs['SYNAPSE_DEBUG_PLUGIN_PATH'] = plugin_path
+        if plugin_path:
+            envs['SYNAPSE_DEBUG_PLUGIN_PATH'] = plugin_path
+
         if modules:
             envs['SYNAPSE_DEBUG_MODULES'] = ','.join(modules)
+
     else:
         if plugin_config is None:
             raise ActionError({'config': _('플러그인 설정은 필수입니다.')})
@@ -84,9 +107,9 @@ def run_plugin(action, params, plugin_config=None, plugin_path=None, modules=Non
         action,
         params,
         config=plugin_config,
+        requirements=requirements,
         envs=envs,
         debug=debug,
         **kwargs,
     )
-
     return action.run_action()

{synapse_sdk-1.0.0a20 → synapse_sdk-1.0.0a22/synapse_sdk.egg-info}/PKG-INFO

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

{synapse_sdk-1.0.0a20 → synapse_sdk-1.0.0a22}/synapse_sdk.egg-info/SOURCES.txt

@@ -33,6 +33,7 @@ synapse_sdk/clients/agent/ray.py
 synapse_sdk/clients/agent/service.py
 synapse_sdk/clients/backend/__init__.py
 synapse_sdk/clients/backend/annotation.py
+synapse_sdk/clients/backend/core.py
 synapse_sdk/clients/backend/dataset.py
 synapse_sdk/clients/backend/integration.py
 synapse_sdk/clients/backend/ml.py