synapse-sdk 1.0.0a12__py3-none-any.whl → 1.0.0a13__py3-none-any.whl

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/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/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/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/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/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/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/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/plugins/categories/neural_net/templates/plugin/train.py

@@ -2,12 +2,12 @@ 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):
+    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_iterations - i) / count_iterations, 2))
+        loss = float(round((count_epochs - i) / count_epochs, 2))
         miou = 1 - loss
-        run.log_metric('iteration', i, loss=loss, miou=miou)
-        run.set_progress(i, count_iterations, category='train')
+        run.log_metric('epoch', i, loss=loss, miou=miou)
+        run.set_progress(i, count_epochs, category='train')
     return './'

{synapse_sdk-1.0.0a12.dist-info → synapse_sdk-1.0.0a13.dist-info}/METADATA

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

@@ -8,18 +8,18 @@ synapse_sdk/loggers.py,sha256=RsDDOiOeUCih1XOkWQJseYdYCX_wt50AZJRe6aPf96Q,4004
 synapse_sdk/cli/__init__.py,sha256=WmYGW1qZEXXIGJe3SGr8QjOStY4svuZKK1Lp_aPvtPs,140
 synapse_sdk/cli/create_plugin.py,sha256=egbW_92WwxfHz50Gy4znX5Bf5fxDdQj3GFyd0l3Y3SY,228
 synapse_sdk/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse_sdk/clients/base.py,sha256=BPQjM-5Uq-u1wksPnIXaFAzKjNXtcKT4s6-WgxYWs80,3232
+synapse_sdk/clients/base.py,sha256=b34uGFZyV13NVWPfycDK3FNz3W9gT5r4-oLQ_mVrDPQ,3327
 synapse_sdk/clients/exceptions.py,sha256=ylv7x10eOp4aA3a48jwonnvqvkiYwzJYXjkVkRTAjwk,220
 synapse_sdk/clients/utils.py,sha256=8pPJTdzHiRPSbZMoQYHAgR2BAMO6u_R_jMV6a2p34iQ,392
 synapse_sdk/clients/agent/__init__.py,sha256=Pz8_iTbIbnb7ywGJ3feqoZVmO2I3mEbwpWsISIxh0BU,1968
 synapse_sdk/clients/agent/core.py,sha256=YicfkO0YvjDDOt1jNWoZ0mokrh8xxKibBL4qF5yOjKs,169
-synapse_sdk/clients/agent/ray.py,sha256=eQydp2ar0XDlzaY82XbS9TvGPOn_c9c7t7pig48P14g,1436
+synapse_sdk/clients/agent/ray.py,sha256=JrwLyVOUDG2yYsbPrxyUtWbM-FWp9B6Bl_GdDby0rt8,1559
 synapse_sdk/clients/agent/service.py,sha256=s7KuPK_DB1nr2VHrigttV1WyFonaGHNrPvU8loRxHcE,478
 synapse_sdk/clients/backend/__init__.py,sha256=SVC7kDO_z_4YqpLDR-O_RrrxJFkWmMhJC8Hl_Mc5Sz4,830
 synapse_sdk/clients/backend/annotation.py,sha256=eZc5EidgR_RfMGwvv1r1_mLkPdRd8e52c4zuuMjMX34,979
 synapse_sdk/clients/backend/dataset.py,sha256=X8R71vff1gLytlEaOnKhBWjVQaZcIG_WYy32new4Vq0,1737
-synapse_sdk/clients/backend/integration.py,sha256=0NNwbkGMYrfz5Baq8s_FfZ6U4uXs0AfTl78YuW6Samo,1860
-synapse_sdk/clients/backend/ml.py,sha256=rBF_iWRpGPbwP9obblqayYgAAMvGkERposBlOgoRXP8,1180
+synapse_sdk/clients/backend/integration.py,sha256=VxhQ91VWAn6eLEptxK561Vt-2bQh97kmCyuznadFMno,2123
+synapse_sdk/clients/backend/ml.py,sha256=SwA4_noRCZ1dVIzyXfrs2zHuRlQZdZt17o1We5QOxl8,1053
 synapse_sdk/clients/ray/__init__.py,sha256=9ZSPXVVxlJ8Wp8ku7l021ENtPjVrGgQDgqifkkVAXgM,187
 synapse_sdk/clients/ray/core.py,sha256=a4wyCocAma2HAm-BHlbZnoVbpfdR-Aad2FM0z6vPFvw,731
 synapse_sdk/clients/ray/serve.py,sha256=rbCpXZYWf0oP8XJ9faa9QFNPYU7h8dltIG8xn9ZconY,907
@@ -30,7 +30,7 @@ synapse_sdk/plugins/models.py,sha256=LTD5fUk1Y2i2kNx5MaCYVFvXEyzyheY6cEHpNC248ls
 synapse_sdk/plugins/upload.py,sha256=VJOotYMayylOH0lNoAGeGHRkLdhP7jnC_A0rFQMvQpQ,3228
 synapse_sdk/plugins/utils.py,sha256=n3s-zFnj4hrGWFtaBTJFbaupI8qUQL6S8_5YcbxOmeY,1482
 synapse_sdk/plugins/categories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse_sdk/plugins/categories/base.py,sha256=yTaV2Cx1kWiYY1LF9T4fWL56MVa2wNOmr2DujxdNvt4,8058
+synapse_sdk/plugins/categories/base.py,sha256=2XMBdYs-feqEFfqae2wM5GqbhnINUQF1EcUMpRmodKg,8091
 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
@@ -48,15 +48,15 @@ synapse_sdk/plugins/categories/import/actions/__init__.py,sha256=47DEQpj8HBSa-_T
 synapse_sdk/plugins/categories/import/actions/import.py,sha256=URn6TOp081odMT5D4NlZ2XEcyKelJx8fxzdoKSkXSAI,320
 synapse_sdk/plugins/categories/neural_net/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/neural_net/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse_sdk/plugins/categories/neural_net/actions/deployment.py,sha256=ASRY0-ijdNZl9zTslszIBoaKpn0q_MITcUSoGWoc25c,1741
+synapse_sdk/plugins/categories/neural_net/actions/deployment.py,sha256=HeNGfRBIjiw_rRwzoApAuPm6nuT0qEj-BlJBpI8nGKc,1505
 synapse_sdk/plugins/categories/neural_net/actions/inference.py,sha256=i18bDDjkuF9V8nxxW-T_umNIOD-Jnq_MMjIjZc6W8n8,645
 synapse_sdk/plugins/categories/neural_net/actions/test.py,sha256=JY25eg-Fo6WbgtMkGoo_qNqoaZkp3AQNEypJmeGzEog,320
-synapse_sdk/plugins/categories/neural_net/actions/train.py,sha256=TPtCAfovmFyzCYRbiRtlrov9AjE6XPQLDB94W0M1OuU,4558
-synapse_sdk/plugins/categories/neural_net/templates/config.yaml,sha256=HHiXhCc8BEitfcCOy2Jjstc5IfAsl4yitTva8qYbk54,349
+synapse_sdk/plugins/categories/neural_net/actions/train.py,sha256=7SNhETRw-L-dNEXXANejHMPYCYeqmYjpuUaRFS5vIYA,4554
+synapse_sdk/plugins/categories/neural_net/templates/config.yaml,sha256=dXKB1hO53hDZB73xnxLVCNQl8Sm7svMmVmuMrOCQmEU,343
 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=InfqKWJYi6sqiUnfPKHC5KYGhxckDaWZNQ202u-uVP4,366
 synapse_sdk/plugins/categories/neural_net/templates/plugin/test.py,sha256=kYyk7l4UtcDUAH4nkdVUGrHHHjxI4p1U13HSLnmGPyE,53
-synapse_sdk/plugins/categories/neural_net/templates/plugin/train.py,sha256=easC8kVGB6AfvUVFyyywTsatSIMaR0i7n3QqQNKObko,492
+synapse_sdk/plugins/categories/neural_net/templates/plugin/train.py,sha256=R4sjNjqRHOJApdKy1p3wXiCPC0Hn_NQf44LJCDopY9E,460
 synapse_sdk/plugins/categories/post_annotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/post_annotation/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/post_annotation/actions/post_annotation.py,sha256=dkPqOPPMUoxn7h1e-momdhqezhTJ7wLf-Dyx04zKfjw,347
@@ -103,9 +103,9 @@ synapse_sdk/utils/pydantic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 synapse_sdk/utils/pydantic/config.py,sha256=1vYOcUI35GslfD1rrqhFkNXXJOXt4IDqOPSx9VWGfNE,123
 synapse_sdk/utils/pydantic/errors.py,sha256=0v0T12eQBr1KrFiEOBu6KMaPK4aPEGEC6etPJGoR5b4,1061
 synapse_sdk/utils/pydantic/validators.py,sha256=G47P8ObPhsePmd_QZDK8EdPnik2CbaYzr_N4Z6En8dc,193
-synapse_sdk-1.0.0a12.dist-info/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
-synapse_sdk-1.0.0a12.dist-info/METADATA,sha256=cPJ9URHKdZwjsC4lFzzmMIx4bm-LET60fvKUMquaJC4,1049
-synapse_sdk-1.0.0a12.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-synapse_sdk-1.0.0a12.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
-synapse_sdk-1.0.0a12.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
-synapse_sdk-1.0.0a12.dist-info/RECORD,,
+synapse_sdk-1.0.0a13.dist-info/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
+synapse_sdk-1.0.0a13.dist-info/METADATA,sha256=KRozKnQDQqVd48GRU_jMUTMijCrWUmUuVv2YmPjPhWo,1049
+synapse_sdk-1.0.0a13.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+synapse_sdk-1.0.0a13.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
+synapse_sdk-1.0.0a13.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
+synapse_sdk-1.0.0a13.dist-info/RECORD,,