synapse-sdk 1.0.0a38__py3-none-any.whl → 1.0.0a39__py3-none-any.whl

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

@@ -1,7 +1,4 @@
-from packaging import version
-
 from synapse_sdk.clients.exceptions import ClientError
-from synapse_sdk.i18n import gettext as _
 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
@@ -30,28 +27,9 @@ class DeploymentAction(Action):
 
         ray_actor_options = self.get_actor_options()
 
-        if self.is_gradio_deployment:
-            from ray.serve.gradio_integrations import GradioServer
-
-            self.assert_gradio_version()
-
-            # GradioIngress differs from serve.ingress(app), thus the difference in self.entrypoint callable
-            try:
-                entrypoint = self.entrypoint().app
-            except (TypeError, ImportError):
-                raise ClientError(
-                    400,
-                    _(
-                        'Gradio app is not callable.'
-                        'Please ensure that your Deployment class defines a callable `app` function'
-                    ),
-                )
-
-            deployment = GradioServer.options(ray_actor_options=ray_actor_options).bind(entrypoint)
-        else:
-            deployment = serve.deployment(ray_actor_options=ray_actor_options)(
-                serve.ingress(app)(self.entrypoint)
-            ).bind(self.envs['SYNAPSE_PLUGIN_RUN_HOST'])
+        deployment = serve.deployment(ray_actor_options=ray_actor_options)(serve.ingress(app)(self.entrypoint)).bind(
+            self.envs['SYNAPSE_PLUGIN_RUN_HOST']
+        )
 
         serve.delete(self.plugin_release.code)
 
@@ -78,30 +56,3 @@ class DeploymentAction(Action):
             except ClientError:
                 pass
         return None
-
-    @property
-    def is_gradio_deployment(self):
-        return self.config.get('gradio_app', False)
-
-    def assert_gradio_version(self):
-        """Assert gradio version is not greater than 3.50.2.
-        Ray Serve cannot pickle gradio endpoints, thus gradio version greater than 3.50.2 is not supported (SSE Issues)
-        """
-        GRADIO_VERSION_MAX_ALLOWED = '3.50.2'
-
-        gradio_installed = False
-        gradio_version = None
-        for req in self.requirements:
-            if req.startswith('gradio=='):
-                gradio_installed = True
-                gradio_version = req.split('==')[1]
-                break
-
-        assert gradio_installed, _(
-            'Gradio is not installed or version is not specified. Please install gradio==3.50.2 to use this feature.'
-        )
-
-        if version.parse(gradio_version) > version.parse(GRADIO_VERSION_MAX_ALLOWED):
-            raise AssertionError(
-                f'Gradio version {gradio_version} is greater than maximum allowed version {GRADIO_VERSION_MAX_ALLOWED}'
-            )

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

@@ -0,0 +1,149 @@
+import contextlib
+import subprocess
+from functools import cached_property
+from pathlib import Path
+
+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
+
+
+@register_action
+class GradioAction(Action):
+    name = 'gradio'
+    category = PluginCategory.NEURAL_NET
+    method = RunMethod.JOB
+
+    @property
+    def working_directory(self):
+        dir = Path.cwd() / self.config['directory'].replace('.', '/')
+        assert dir.is_dir(), f'Working directory {dir} does not exist.'
+        return dir
+
+    @property
+    def _requirements(self):
+        return self.config.get('requirements', ['gradio>=5'])
+
+    @property
+    def tag(self):
+        _tag = f'{self.plugin_release.code}-{self.plugin_release.checksum}'
+        return _tag.replace('@', '-')
+
+    @cached_property
+    def deploy_port(self):
+        return self._get_avail_ports_host()
+
+    def deploy(self):
+        self.run.log('deploy', 'Start deploying')
+
+        try:
+            # Write Dockerfile and requirements.txt
+            path_dockerfile = self.write_dockerfile_template()
+            self.write_requirements(path_dockerfile.parent / 'requirements.txt')
+
+            # Build docker image
+            self.build_docker_image(path_dockerfile)
+
+            # Run docker image
+            self.run_docker_image()
+        except Exception as e:
+            self.run.log('deploy', f'Error: {e}')
+            raise e
+
+    def start(self):
+        self.deploy()
+        return {'endpoint': f'http://localhost:{self.deploy_port}'}
+
+    def write_dockerfile_template(self):
+        dockerfile_path = self.working_directory / 'Dockerfile'
+
+        with open(dockerfile_path, 'w') as f:
+            f.write("""FROM python:3.10
+WORKDIR /home/user/app
+
+RUN pip install --no-cache-dir pip -U && \\
+    pip install --no-cache-dir uvicorn
+
+RUN apt-get update && \\
+    apt-get install -y curl && \\
+    curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \\
+    apt-get install -y nodejs && \\
+    rm -rf /var/lib/apt/lists/* && \\
+    apt-get clean
+
+COPY . /home/user/app
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+EXPOSE 7860
+
+CMD ["python", "app.py"]
+""")
+        return dockerfile_path
+
+    def write_requirements(self, path):
+        with open(path, 'w') as f:
+            f.write('\n'.join(self._requirements))
+
+    def build_docker_image(self, path_dockerfile):
+        self.run.log('deploy', 'Start building docker image')
+        result = subprocess.run(
+            [
+                'docker',
+                'build',
+                '-t',
+                self.tag,
+                '-f',
+                str(path_dockerfile),
+                '.',
+            ],
+            cwd=self.working_directory,
+            check=True,
+        )
+        print(result)
+
+    @staticmethod
+    def _get_avail_ports_host(start_port=8900, end_port=8999):
+        import nmap
+
+        nm = nmap.PortScanner()
+
+        scan_range = f'{start_port}-{end_port}'
+        nm.scan(hosts='host.docker.internal', arguments=f'-p {scan_range}')
+
+        try:
+            open_ports = nm['host.docker.internal']['tcp'].keys()
+            open_ports = [int(port) for port in open_ports]
+        except KeyError:
+            open_ports = []
+
+        for port in range(start_port, end_port + 1):
+            if port not in open_ports:
+                return port
+
+        raise IOError(f'No free ports available in range {start_port}-{end_port}')
+
+    def run_docker_image(self):
+        self.run.log('deploy', 'Start running docker image')
+
+        # Check for existing container
+        self.run.log('deploy', 'Check for existing container')
+        with contextlib.suppress(subprocess.CalledProcessError):
+            subprocess.run(['docker', 'stop', self.tag], check=True)
+            subprocess.run(['docker', 'rm', self.tag], check=True)
+
+        # Run docker image
+        self.run.log('deploy', 'Starting docker container')
+        subprocess.run(
+            [
+                'docker',
+                'run',
+                '-d',
+                '--name',
+                self.tag,
+                '-p',
+                f'{self.deploy_port}:7860',
+                self.tag,
+            ],
+            check=True,
+        )

synapse_sdk/utils/file.py

@@ -4,6 +4,7 @@ import hashlib
 import json
 import mimetypes
 import operator
+import re
 import zipfile
 from functools import reduce
 from pathlib import Path
@@ -197,6 +198,10 @@ def convert_file_to_base64(file_path):
     Returns:
         str: Base64 encoded string of the file contents
     """
+    # FIXME base64 is sent sometimes.
+    if file_path.startswith('data:'):
+        return file_path
+
     # Convert string path to Path object
     path = Path(file_path)
 

{synapse_sdk-1.0.0a38.dist-info → synapse_sdk-1.0.0a39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse-sdk
-Version: 1.0.0a38
+Version: 1.0.0a39
 Summary: synapse sdk
 Author-email: datamaker <developer@datamaker.io>
 License: MIT
@@ -21,6 +21,7 @@ Requires-Dist: universal-pathlib
 Requires-Dist: fsspec[gcs,s3,sftp]
 Provides-Extra: all
 Requires-Dist: ray[all]; extra == "all"
+Requires-Dist: python-nmap; extra == "all"
 Dynamic: license-file
 
 This is the SDK to develop synapse plugins

{synapse_sdk-1.0.0a38.dist-info → synapse_sdk-1.0.0a39.dist-info}/RECORD

@@ -67,7 +67,8 @@ synapse_sdk/plugins/categories/export/templates/plugin/__init__.py,sha256=47DEQp
 synapse_sdk/plugins/categories/export/templates/plugin/export.py,sha256=39XLGo8ui5FscbwZyX3JwmrJqGGvOYrY3FMYDKXwTOQ,5192
 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=oetIwZoee5vxriPX3r1onmxgwojUyaRTlnBIdaQ1zk8,3895
+synapse_sdk/plugins/categories/neural_net/actions/deployment.py,sha256=y2LrS-pwazqRI5O0q1NUy45NQYsBj6ykbrXnDMs_fqE,1987
+synapse_sdk/plugins/categories/neural_net/actions/gradio.py,sha256=Tb9vHZAmUXEi1Hp1CIn_XP4URERVuLGHOiQrlPztjy8,4326
 synapse_sdk/plugins/categories/neural_net/actions/inference.py,sha256=0a655ELqNVjPFZTJDiw4EUdcMCPGveUEKyoYqpwMFBU,1019
 synapse_sdk/plugins/categories/neural_net/actions/test.py,sha256=JY25eg-Fo6WbgtMkGoo_qNqoaZkp3AQNEypJmeGzEog,320
 synapse_sdk/plugins/categories/neural_net/actions/train.py,sha256=kve6iTCg2kUeavMQTR2JFuoYDu-QWZFFlB58ZICQtdM,5406
@@ -118,7 +119,7 @@ synapse_sdk/shared/enums.py,sha256=WMZPag9deVF7VCXaQkLk7ly_uX1KwbNzRx9TdvgaeFE,1
 synapse_sdk/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/utils/dataset.py,sha256=zWTzFmv589izFr62BDuApi3r5FpTsdm-5AmriC0AEdM,1865
 synapse_sdk/utils/debug.py,sha256=F7JlUwYjTFZAMRbBqKm6hxOIz-_IXYA8lBInOS4jbS4,100
-synapse_sdk/utils/file.py,sha256=Qb5FihoX1J0wsF2UAckc0d0c3IMHn0NrX9Vt3cXAwt4,6732
+synapse_sdk/utils/file.py,sha256=Wu8ixvEHglNXCVxT-vZTt7vUFkAAK1M1EJSk89P_3FQ,6844
 synapse_sdk/utils/module_loading.py,sha256=chHpU-BZjtYaTBD_q0T7LcKWtqKvYBS4L0lPlKkoMQ8,1020
 synapse_sdk/utils/network.py,sha256=wg-oFM0gKK5REqIUO8d-x9yXJfqbnkSbbF0_qyxpwz4,412
 synapse_sdk/utils/string.py,sha256=rEwuZ9SAaZLcQ8TYiwNKr1h2u4CfnrQx7SUL8NWmChg,216
@@ -132,9 +133,9 @@ synapse_sdk/utils/storage/providers/__init__.py,sha256=x7RGwZryT2FpVxS7fGWryRVpq
 synapse_sdk/utils/storage/providers/gcp.py,sha256=i2BQCu1Kej1If9SuNr2_lEyTcr5M_ncGITZrL0u5wEA,363
 synapse_sdk/utils/storage/providers/s3.py,sha256=W94rQvhGRXti3R4mYP7gmU5pcyCQpGFIBLvxxqLVdRM,2231
 synapse_sdk/utils/storage/providers/sftp.py,sha256=_8s9hf0JXIO21gvm-JVS00FbLsbtvly4c-ETLRax68A,1426
-synapse_sdk-1.0.0a38.dist-info/licenses/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
-synapse_sdk-1.0.0a38.dist-info/METADATA,sha256=GxLFIbbXbVYUjusRE7MAZefelK_XNYz0oGTOOCNuybU,1160
-synapse_sdk-1.0.0a38.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-synapse_sdk-1.0.0a38.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
-synapse_sdk-1.0.0a38.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
-synapse_sdk-1.0.0a38.dist-info/RECORD,,
+synapse_sdk-1.0.0a39.dist-info/licenses/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
+synapse_sdk-1.0.0a39.dist-info/METADATA,sha256=KiYa0ezmc90xuDLUMsnMSGoLQoskOtwsKBR1Fp4dbDY,1203
+synapse_sdk-1.0.0a39.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+synapse_sdk-1.0.0a39.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
+synapse_sdk-1.0.0a39.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
+synapse_sdk-1.0.0a39.dist-info/RECORD,,