synapse-sdk 1.0.0a14__tar.gz → 1.0.0a16__tar.gz

{synapse_sdk-1.0.0a14/synapse_sdk.egg-info → synapse_sdk-1.0.0a16}/PKG-INFO

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

{synapse_sdk-1.0.0a14 → synapse_sdk-1.0.0a16}/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-1.0.0a14 → synapse_sdk-1.0.0a16}/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-1.0.0a14 → synapse_sdk-1.0.0a16}/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.0a14 → synapse_sdk-1.0.0a16}/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.0a14 → synapse_sdk-1.0.0a16}/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
 
@@ -38,18 +40,69 @@ def files_url_to_path(files, coerce=None):
             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):
+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)
+                    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 = Path('/tmp/datamaker') / 'media'
+    path_download.mkdir(parents=True, exist_ok=True)
+    for file_name in files:
+        if isinstance(files[file_name], str):
+            files[file_name] = await adownload_file(files[file_name], path_download, coerce=coerce)
+        else:
+            files[file_name]['path'] = await adownload_file(files[file_name].pop('url'), path_download, coerce=coerce)
+
+
+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):

{synapse_sdk-1.0.0a14 → synapse_sdk-1.0.0a16/synapse_sdk.egg-info}/PKG-INFO

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