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

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

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

{synapse_sdk-1.0.0a12 → synapse_sdk-1.0.0a13}/synapse_sdk/clients/agent/ray.py

@@ -46,9 +46,13 @@ class RayClientMixin(BaseClient):
         return self._get(path)
 
     def get_serve_application(self, pk):
-        path = f'serve_application/{pk}/'
+        path = f'serve_applications/{pk}/'
         return self._get(path)
 
     def list_serve_applications(self):
         path = 'serve_applications/'
         return self._get(path)
+
+    def delete_serve_application(self, pk):
+        path = f'serve_applications/{pk}/'
+        return self._delete(path)

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

@@ -61,3 +61,11 @@ class IntegrationClientMixin(BaseClient):
     def create_logs(self, data):
         path = 'logs/'
         return self._post(path, data=data)
+
+    def create_serve_application(self, data):
+        path = 'serve_applications/'
+        return self._post(path, data=data)
+
+    def list_serve_applications(self, params=None):
+        path = 'serve_applications/'
+        return self._get(path, params=params)

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

@@ -19,10 +19,6 @@ class MLClientMixin(BaseClient):
         files = {'file': data.pop('file')}
         return self._post(path, data=data, files=files)
 
-    def create_serve_application(self, data):
-        path = 'serve_applications/'
-        return self._post(path, data=data)
-
     def list_ground_truth_events(self, params=None, url_conversion=None, list_all=False):
         path = 'ground_truth_events/'
         url_conversion = get_default_url_conversion(url_conversion, files_fields=['files'])

{synapse_sdk-1.0.0a12 → synapse_sdk-1.0.0a13}/synapse_sdk/clients/base.py

@@ -76,6 +76,9 @@ class BaseClient:
     def _patch(self, path, **kwargs):
         return self._request('patch', path, **kwargs)
 
+    def _delete(self, path, **kwargs):
+        return self._request('delete', path, **kwargs)
+
     def _list(self, path, url_conversion=None, list_all=False, **kwargs):
         response = self._get(path, url_conversion, **kwargs)
         if list_all:

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

@@ -4,11 +4,8 @@ import os
 from functools import cached_property
 from pprint import pprint
 
-import ray
 import requests
 from pydantic import ValidationError
-from ray.dashboard.modules.job.sdk import JobSubmissionClient
-from ray.exceptions import RayTaskError
 
 from synapse_sdk.clients.ray import RayClient
 from synapse_sdk.plugins.enums import RunMethod
@@ -143,9 +140,6 @@ class Action:
     def run_action(self):
         self.validate_params()
 
-        if not ray.is_initialized():
-            ray.init(address=self.envs['RAY_ADDRESS'], ignore_reinit_error=True)
-
         if self.direct:
             if self.method == RunMethod.RESTAPI:
                 return self.start_by_restapi()
@@ -161,6 +155,9 @@ class Action:
         return self.entrypoint(**self.params)
 
     def start_by_task(self):
+        import ray
+        from ray.exceptions import RayTaskError
+
         @ray.remote(runtime_env=self.get_runtime_env())
         def run_task(category, action, *args, **kwargs):
             from synapse_sdk.plugins.utils import get_action_class
@@ -183,6 +180,8 @@ class Action:
 
         kwargs['direct'] = True
         try:
+            if not ray.is_initialized():
+                ray.init(address=self.envs['RAY_ADDRESS'], ignore_reinit_error=True)
             return ray.get(run_task.remote(self.category.value, self.name, *args, **kwargs))
         except RayTaskError as e:
             raise ActionError(e.cause)
@@ -232,4 +231,6 @@ class Action:
             self.client.update_job(self.job_id, data={'result': result or {}, 'console_logs': logs})
 
     def get_job_client(self):
+        from ray.dashboard.modules.job.sdk import JobSubmissionClient
+
         return JobSubmissionClient(address=self.envs.get('RAY_DASHBOARD_URL'))

{synapse_sdk-1.0.0a12 → synapse_sdk-1.0.0a13}/synapse_sdk/plugins/categories/neural_net/actions/deployment.py

@@ -1,5 +1,3 @@
-from ray import serve
-
 from synapse_sdk.clients.exceptions import ClientError
 from synapse_sdk.plugins.categories.base import Action
 from synapse_sdk.plugins.categories.decorators import register_action
@@ -12,14 +10,13 @@ class DeploymentAction(Action):
     category = PluginCategory.NEURAL_NET
     method = RunMethod.JOB
 
-    def get_deployment(self):
-        return serve.deployment(ray_actor_options=self.get_actor_options())(self.entrypoint)
-
     def get_actor_options(self):
         return {'runtime_env': self.get_runtime_env()}
 
     def start(self):
-        deployment = self.get_deployment()
+        from ray import serve
+
+        deployment = serve.deployment(ray_actor_options=self.get_actor_options())(self.entrypoint)
         serve.delete(self.plugin_release.code)
         # TODO add run object
         serve.run(deployment.bind(), name=self.plugin_release.code, route_prefix=f'/{self.plugin_release.checksum}')
@@ -31,12 +28,9 @@ class DeploymentAction(Action):
     def create_serve_application(self):
         if self.client:
             try:
-                job = self.client.get_job(self.job_id)
                 serve_application = self.ray_client.get_serve_application(self.plugin_release.code)
                 return self.client.create_serve_application({
-                    'plugin': self.plugin_release.plugin,
-                    'version': self.plugin_release.version,
-                    'agent': job['agent'],
+                    'job': self.job_id,
                     'status': serve_application['status'],
                     'data': serve_application,
                 })

{synapse_sdk-1.0.0a12 → synapse_sdk-1.0.0a13}/synapse_sdk/plugins/categories/neural_net/actions/train.py

@@ -23,7 +23,7 @@ class TrainRun(Run):
 
 class Hyperparameter(BaseModel):
     batch_size: int
-    iterations: int
+    epochs: int
     learning_rate: Decimal
 
 

{synapse_sdk-1.0.0a12 → synapse_sdk-1.0.0a13}/synapse_sdk/plugins/categories/neural_net/templates/config.yaml

@@ -2,10 +2,10 @@ task: object_detection
 data_type: image
 actions:
   train:
-    dataset: datamaker
+    dataset: dataset
     entrypoint: plugin.train.train
     metrics:
-      iteration:
+      epoch:
         - loss
         - miou
   deployment:

synapse_sdk-1.0.0a13/synapse_sdk/plugins/categories/neural_net/templates/plugin/train.py

@@ -0,0 +1,13 @@
+import time
+
+
+def train(run, dataset, hyperparameter, checkpoint=None):
+    count_epochs = hyperparameter['epochs']
+    run.set_progress(0, count_epochs, category='train')
+    for i in range(1, count_epochs + 1):
+        time.sleep(0.5)
+        loss = float(round((count_epochs - i) / count_epochs, 2))
+        miou = 1 - loss
+        run.log_metric('epoch', i, loss=loss, miou=miou)
+        run.set_progress(i, count_epochs, category='train')
+    return './'

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

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

synapse_sdk-1.0.0a12/synapse_sdk/plugins/categories/neural_net/templates/plugin/train.py

@@ -1,13 +0,0 @@
-import time
-
-
-def train(run, dataset, hyperparameter, checkpoint=None):
-    count_iterations = hyperparameter['iterations']
-    run.set_progress(0, count_iterations, category='train')
-    for i in range(1, count_iterations + 1):
-        time.sleep(0.5)
-        loss = float(round((count_iterations - i) / count_iterations, 2))
-        miou = 1 - loss
-        run.log_metric('iteration', i, loss=loss, miou=miou)
-        run.set_progress(i, count_iterations, category='train')
-    return './'