synapse-sdk 1.0.0a15__py3-none-any.whl → 1.0.0a17__py3-none-any.whl

synapse_sdk/clients/backend/ml.py

@@ -9,9 +9,7 @@ class MLClientMixin(BaseClient):
 
     def get_model(self, pk, params=None, url_conversion=None):
         path = f'models/{pk}/'
-        url_conversion = get_default_url_conversion(
-            url_conversion, files_fields=['files', 'parent.files'], is_list=False
-        )
+        url_conversion = get_default_url_conversion(url_conversion, files_fields=['file'], is_list=False)
         return self._get(path, params=params, url_conversion=url_conversion)
 
     def create_model(self, data):

synapse_sdk/clients/base.py

@@ -62,7 +62,7 @@ class BaseClient:
         response = self._request('get', path, **kwargs)
         if url_conversion:
             if url_conversion['is_list']:
-                files_url_to_path_from_objs(response['results'], **url_conversion)
+                files_url_to_path_from_objs(response['results'], **url_conversion, is_async=True)
             else:
                 files_url_to_path_from_objs(response, **url_conversion)
         return response
@@ -80,14 +80,14 @@ class BaseClient:
         return self._request('delete', path, **kwargs)
 
     def _list(self, path, url_conversion=None, list_all=False, **kwargs):
-        response = self._get(path, url_conversion, **kwargs)
+        response = self._get(path, **kwargs)
         if list_all:
             return self._list_all(path, url_conversion, **kwargs), response['count']
         else:
             return response
 
-    def _list_all(self, path, url_conversion=None, **kwargs):
-        response = self._get(path, url_conversion, **kwargs)
+    def _list_all(self, path, url_conversion=None, params=None, **kwargs):
+        response = self._get(path, url_conversion, params=params, **kwargs)
         yield from response['results']
         if response['next']:
             yield from self._list_all(response['next'], url_conversion, **kwargs)

synapse_sdk/plugins/categories/base.py

@@ -92,13 +92,15 @@ class Action:
     @property
     def debug_modules(self):
         debug_modules = []
-        for module_path in self.envs.get('SYNAPSE_DEBUG_MODULES', '').split(','):
-            if module_path.startswith('https://'):  # TODO ray에서 지원하는 remote uri 형식 (https, s3, gs) 모두 지원
-                module_url = module_path
-            else:
-                module_url = build_and_upload(module_path, self.plugin_storage_url)
-            debug_modules.append(module_url)
-        self.envs['SYNAPSE_DEBUG_MODULES'] = ','.join(debug_modules)
+        if self.envs.get('SYNAPSE_DEBUG_MODULES'):
+            for module_path in self.envs['SYNAPSE_DEBUG_MODULES'].split(','):
+                # TODO ray에서 지원하는 remote uri 형식 (https, s3, gs) 모두 지원
+                if module_path.startswith('https://'):
+                    module_url = module_path
+                else:
+                    module_url = build_and_upload(module_path, self.plugin_storage_url)
+                debug_modules.append(module_url)
+            self.envs['SYNAPSE_DEBUG_MODULES'] = ','.join(debug_modules)
         return debug_modules
 
     def get_run(self):

synapse_sdk/plugins/categories/neural_net/actions/train.py

@@ -12,7 +12,7 @@ from synapse_sdk.plugins.categories.base import Action
 from synapse_sdk.plugins.categories.decorators import register_action
 from synapse_sdk.plugins.enums import PluginCategory, RunMethod
 from synapse_sdk.plugins.models import Run
-from synapse_sdk.utils.file import archive
+from synapse_sdk.utils.file import archive, get_temp_path, unarchive
 from synapse_sdk.utils.pydantic.validators import non_blank
 
 
@@ -83,10 +83,15 @@ class TrainAction(Action):
         self.run.log_message('Preparing dataset for training.')
         input_dataset = self.get_dataset()
 
+        # retrieve checkpoint
+        checkpoint = None
+        if self.params['checkpoint']:
+            self.run.log_message('Retrieving checkpoint.')
+            checkpoint = self.get_model(self.params['checkpoint'])
+
         # train dataset
         self.run.log_message('Starting model training.')
-
-        result = self.entrypoint(self.run, input_dataset, hyperparameter)
+        result = self.entrypoint(self.run, input_dataset, hyperparameter, checkpoint=checkpoint)
 
         # upload model_data
         self.run.log_message('Registering model data.')
@@ -106,6 +111,7 @@ class TrainAction(Action):
         ground_truths, count_dataset = client.list_ground_truth_events(
             params={
                 'fields': ['category', 'files', 'data'],
+                'expand': ['data'],
                 'ground_truth_dataset_versions': self.params['dataset'],
             },
             list_all=True,
@@ -120,11 +126,16 @@ class TrainAction(Action):
 
         return input_dataset
 
-    def create_model(self, path):
-        if not self.client:
-            print(path)
-            return None
+    def get_model(self, model_id):
+        model = self.client.get_model(model_id)
+        model_file = Path(model['file'])
+        output_path = get_temp_path(f'models/{model_file.stem}')
+        if not output_path.exists():
+            unarchive(model_file, output_path)
+        model['path'] = output_path
+        return model
 
+    def create_model(self, path):
         params = copy.deepcopy(self.params)
         configuration_fields = ['hyperparameter']
         configuration = {field: params.pop(field) for field in configuration_fields}

synapse_sdk/plugins/cli/publish.py

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

synapse_sdk/utils/file.py

@@ -1,3 +1,4 @@
+import asyncio
 import hashlib
 import json
 import operator
@@ -6,6 +7,7 @@ from functools import reduce
 from pathlib import Path
 from urllib.parse import urlparse
 
+import aiohttp
 import requests
 import yaml
 
@@ -28,28 +30,85 @@ def download_file(url, path_download, name=None, coerce=None):
     return path
 
 
-def files_url_to_path(files, coerce=None):
+def files_url_to_path(files, coerce=None, file_field=None):
     path_download = Path('/tmp/datamaker') / 'media'
     path_download.mkdir(parents=True, exist_ok=True)
+    if file_field:
+        files[file_field] = download_file(files[file_field], path_download, coerce=coerce)
+    else:
+        for file_name in files:
+            if isinstance(files[file_name], str):
+                files[file_name] = download_file(files[file_name], path_download, coerce=coerce)
+            else:
+                files[file_name]['path'] = download_file(files[file_name].pop('url'), path_download, coerce=coerce)
+
+
+def files_url_to_path_from_objs(objs, files_fields, coerce=None, is_list=False, is_async=False):
+    if is_async:
+        asyncio.run(afiles_url_to_path_from_objs(objs, files_fields, coerce=coerce, is_list=is_list))
+    else:
+        if not is_list:
+            objs = [objs]
+
+        for obj in objs:
+            for files_field in files_fields:
+                try:
+                    files = reduce(operator.getitem, files_field.split('.'), obj)
+                    if isinstance(files, str):
+                        files_url_to_path(obj, coerce=coerce, file_field=files_field)
+                    else:
+                        files_url_to_path(files, coerce=coerce)
+                except KeyError:
+                    pass
+
+
+async def adownload_file(url, path_download, name=None, coerce=None):
+    if name:
+        name += Path(url).suffix
+    else:
+        name = Path(url).name
+
+    name = urlparse(name).path
+    path = Path(path_download) / name
+    if not path.is_file():
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url) as response:
+                with open(str(path), 'wb') as file:
+                    while chunk := await response.content.read(1024 * 64):
+                        file.write(chunk)
+
+    if coerce:
+        path = coerce(path)
+
+    return path
+
+
+async def afiles_url_to_path(files, coerce=None):
+    path_download = get_temp_path('media')
+    path_download.mkdir(parents=True, exist_ok=True)
     for file_name in files:
         if isinstance(files[file_name], str):
-            files[file_name] = download_file(files[file_name], path_download, coerce=coerce)
+            files[file_name] = await adownload_file(files[file_name], path_download, coerce=coerce)
         else:
-            files[file_name]['path'] = download_file(files[file_name].pop('url'), path_download, coerce=coerce)
+            files[file_name]['path'] = await adownload_file(files[file_name].pop('url'), path_download, coerce=coerce)
 
 
-def files_url_to_path_from_objs(objs, files_fields, coerce=None, is_list=False):
+async def afiles_url_to_path_from_objs(objs, files_fields, coerce=None, is_list=False):
     if not is_list:
         objs = [objs]
 
+    tasks = []
+
     for obj in objs:
         for files_field in files_fields:
             try:
                 files = reduce(operator.getitem, files_field.split('.'), obj)
-                files_url_to_path(files, coerce=coerce)
+                tasks.append(afiles_url_to_path(files, coerce=coerce))
             except KeyError:
                 pass
 
+    await asyncio.gather(*tasks)
+
 
 def get_dict_from_file(file_path):
     if isinstance(file_path, str):
@@ -85,3 +144,25 @@ def archive(input_path, output_path):
                 if file_path.is_file():  # Only add files, skip directories
                     arcname = file_path.relative_to(input_path.parent)
                     zipf.write(file_path, arcname)
+
+
+def unarchive(file_path, output_path):
+    """
+    Unarchives a ZIP file to a given directory.
+
+    Parameters:
+        file_path (str | Path): The path to the ZIP file.
+        output_path (str): The directory where the files will be extracted.
+    """
+    output_path = Path(output_path)
+    output_path.mkdir(parents=True, exist_ok=True)
+
+    with zipfile.ZipFile(str(file_path), 'r') as zip_ref:
+        zip_ref.extractall(output_path)
+
+
+def get_temp_path(sub_path=None):
+    path = Path('/tmp/datamaker')
+    if sub_path:
+        path = path / sub_path
+    return path

{synapse_sdk-1.0.0a15.dist-info → synapse_sdk-1.0.0a17.dist-info}/METADATA

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

{synapse_sdk-1.0.0a15.dist-info → synapse_sdk-1.0.0a17.dist-info}/RECORD

@@ -8,7 +8,7 @@ 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=b34uGFZyV13NVWPfycDK3FNz3W9gT5r4-oLQ_mVrDPQ,3327
+synapse_sdk/clients/base.py,sha256=un2vseaQ7YY6rVQqd5fIyzclg7VYLAEx2TwUkZof3ik,3354
 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
@@ -19,7 +19,7 @@ synapse_sdk/clients/backend/__init__.py,sha256=50MW1CMWGaKnALSv2fOjhJZG55Xb3yrql
 synapse_sdk/clients/backend/annotation.py,sha256=eZc5EidgR_RfMGwvv1r1_mLkPdRd8e52c4zuuMjMX34,979
 synapse_sdk/clients/backend/dataset.py,sha256=a_svyCKgzF7N99l8V4u4wXD8JxiGuLW9z2EBinnz7b8,1738
 synapse_sdk/clients/backend/integration.py,sha256=Jg_8fEmbrgYXfZZcG8cDtLxR6ugPmnbNhPDyRu_Uib0,2160
-synapse_sdk/clients/backend/ml.py,sha256=lg978cCMcPiLN4ByjhrSlJHlw1_kgZQgaNZNKr9zPsI,1054
+synapse_sdk/clients/backend/ml.py,sha256=vNo1FOG9welXGizcnylLSW_-l9iJSQrTI3DhyCCyFKw,1015
 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=T3ZuTw7BZwMKpz2QGaErnEPetKRD9d4z3qceJkV363o
 synapse_sdk/plugins/upload.py,sha256=VJOotYMayylOH0lNoAGeGHRkLdhP7jnC_A0rFQMvQpQ,3228
 synapse_sdk/plugins/utils.py,sha256=UYkwxkmrs0-mRgQB63SkTGD1HpIQEIiHndzTcpdNaF4,2936
 synapse_sdk/plugins/categories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse_sdk/plugins/categories/base.py,sha256=Q14bnUTdPLeNeFodcOBMr9Z0d8LM1VRIq-pl8vTKgTc,8093
+synapse_sdk/plugins/categories/base.py,sha256=5BrOWXbLiwZw4I1sfElQ5CF12kLDXY97b8MSvpdNIb0,8179
 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
@@ -51,7 +51,7 @@ synapse_sdk/plugins/categories/neural_net/actions/__init__.py,sha256=47DEQpj8HBS
 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=7SNhETRw-L-dNEXXANejHMPYCYeqmYjpuUaRFS5vIYA,4554
+synapse_sdk/plugins/categories/neural_net/actions/train.py,sha256=ZjBE4uHOdVZ318BuepBt2l0KvSflLr1Fqt3dt4KYXJs,5113
 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
@@ -76,7 +76,7 @@ synapse_sdk/plugins/categories/smart_tool/templates/config.yaml,sha256=3jxW8daip
 synapse_sdk/plugins/categories/smart_tool/templates/plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/smart_tool/templates/plugin/auto_label.py,sha256=eevNg0nOcYFR4z_L_R-sCvVOYoLWSAH1jwDkAf3YCjY,320
 synapse_sdk/plugins/cli/__init__.py,sha256=LPtUO0jqkhKq6xR1grpse7da2R6OoT_BeDyCNyUY0T4,380
-synapse_sdk/plugins/cli/publish.py,sha256=rhUtJsKhYyeDTQlul8mQthfMeNuQCou64faHyaP9y1c,1230
+synapse_sdk/plugins/cli/publish.py,sha256=Kg_MaOeTNCra9BIzWBASsIZxLfhnNkzbRPqdlf6aTyk,1251
 synapse_sdk/plugins/cli/run.py,sha256=lw1KbsL-xTGllF4NtD2cq-Rh6HMbhi-sO862_Ds-sUo,2330
 synapse_sdk/plugins/templates/cookiecutter.json,sha256=NxOWk9A_v1pO0Ny4IYT9Cj5iiJ16--cIQrGC67QdR0I,396
 synapse_sdk/plugins/templates/hooks/post_gen_project.py,sha256=jqlYkY1O2TxIR-Vh3gnwILYy8k-D39Xx66d2KNQVMCs,147
@@ -95,7 +95,7 @@ synapse_sdk/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 synapse_sdk/shared/enums.py,sha256=WMZPag9deVF7VCXaQkLk7ly_uX1KwbNzRx9TdvgaeFE,138
 synapse_sdk/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/utils/debug.py,sha256=F7JlUwYjTFZAMRbBqKm6hxOIz-_IXYA8lBInOS4jbS4,100
-synapse_sdk/utils/file.py,sha256=OYch8D5Ub8oaGIIcpO6_R6-McpR3QJk7xlkaffhgd_c,2547
+synapse_sdk/utils/file.py,sha256=r7KBH2uKkpj7qWTWT75zHGgm5Vfw3XKzwgkrCBLqTUU,5163
 synapse_sdk/utils/module_loading.py,sha256=chHpU-BZjtYaTBD_q0T7LcKWtqKvYBS4L0lPlKkoMQ8,1020
 synapse_sdk/utils/storage.py,sha256=a8OVbd38ATr0El4G4kuV07lr_tJZrpIJBSy4GHb0qZ8,2581
 synapse_sdk/utils/string.py,sha256=rEwuZ9SAaZLcQ8TYiwNKr1h2u4CfnrQx7SUL8NWmChg,216
@@ -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.0a15.dist-info/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
-synapse_sdk-1.0.0a15.dist-info/METADATA,sha256=Wh0N4QJ0Hy4XMeV9YUvIHoQUGRNYklUvVnPMv9E7Bbs,1049
-synapse_sdk-1.0.0a15.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-synapse_sdk-1.0.0a15.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
-synapse_sdk-1.0.0a15.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
-synapse_sdk-1.0.0a15.dist-info/RECORD,,
+synapse_sdk-1.0.0a17.dist-info/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
+synapse_sdk-1.0.0a17.dist-info/METADATA,sha256=k2z5Xe9bbv1rYVgzhZ79iVumdgXyUfFNSz2x9euqQWQ,1049
+synapse_sdk-1.0.0a17.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+synapse_sdk-1.0.0a17.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
+synapse_sdk-1.0.0a17.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
+synapse_sdk-1.0.0a17.dist-info/RECORD,,