synapse-sdk 1.0.0a33__py3-none-any.whl → 1.0.0a35__py3-none-any.whl

synapse_sdk/clients/validators/collections.py

@@ -0,0 +1,31 @@
+class FileSpecificationValidator:
+    """File specification validator class for synapse backend collection.
+
+    Args:
+        file_spec_template (list):
+            * List of dictionaries containing file specification template
+            * This is from synapse-backend file specification data.
+        organized_files (list): List of dictionaries containing organized files.
+    """
+
+    def __init__(self, file_spec_template, organized_files):
+        self.file_spec_template = file_spec_template
+        self.organized_files = organized_files
+
+    def validate(self):
+        """Validate the file specification template with organized files.
+
+        Returns:
+            bool: True if the file specification template is valid, False otherwise.
+        """
+        for spec in self.file_spec_template:
+            spec_name = spec['name']
+            is_required = spec['is_required']
+
+            for file_group in self.organized_files:
+                files = file_group['files']
+                if is_required and spec_name not in files:
+                    return False
+                if spec_name in files and not files[spec_name]:
+                    return False
+        return True

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

@@ -1,4 +1,7 @@
+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
@@ -25,12 +28,36 @@ class DeploymentAction(Action):
 
         self.ray_init()
 
-        deployment = serve.deployment(ray_actor_options=self.get_actor_options())(serve.ingress(app)(self.entrypoint))
+        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'])
+
         serve.delete(self.plugin_release.code)
 
         # TODO add run object
         serve.run(
-            deployment.bind(self.envs['SYNAPSE_PLUGIN_RUN_HOST']),
+            deployment,
             name=self.plugin_release.code,
             route_prefix=f'/{self.plugin_release.checksum}',
         )
@@ -51,3 +78,30 @@ 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/upload/actions/upload.py

@@ -1,4 +1,3 @@
-from enum import Enum
 from typing import Annotated, Dict, List
 
 from pydantic import AfterValidator, BaseModel, field_validator
@@ -6,6 +5,7 @@ from pydantic_core import PydanticCustomError
 
 from synapse_sdk.clients.exceptions import ClientError
 from synapse_sdk.clients.utils import get_batched_list
+from synapse_sdk.clients.validators.collections import FileSpecificationValidator
 from synapse_sdk.i18n import gettext as _
 from synapse_sdk.plugins.categories.base import Action
 from synapse_sdk.plugins.categories.decorators import register_action
@@ -145,7 +145,7 @@ class UploadAction(Action):
 
         # Analyze Collection file specifications to determine the data structure for upload.
         self.run.set_progress(0, 1, category='analyze_collection')
-        file_specification_skeleton = self._analyze_collection()
+        file_specification_template = self._analyze_collection()
         self.run.set_progress(1, 1, category='analyze_collection')
 
         # Setup result dict.
@@ -153,7 +153,7 @@ class UploadAction(Action):
 
         # Organize data according to Collection file specification structure.
         organized_files = uploader.handle_upload_files()
-        if not self._validate_organized_files(file_specification_skeleton, organized_files):
+        if not self._validate_organized_files(file_specification_template, organized_files):
             self.run.log_message('Validate organized files failed.')
             return result
 
@@ -219,9 +219,10 @@ class UploadAction(Action):
         collection = client.get_dataset(collection_id)
         return collection['file_specifications']
 
-    def _validate_organized_files(self, file_specification_skeleton: Dict, organized_files: List) -> bool:
+    def _validate_organized_files(self, file_specification_template: Dict, organized_files: List) -> bool:
         """Validate organized files from Uploader."""
-        return True
+        validator = FileSpecificationValidator(file_specification_template, organized_files)
+        return validator.validate()
 
     def _upload_files(self, organized_files) -> List:
         """Upload files to synapse-backend.

{synapse_sdk-1.0.0a33.dist-info → synapse_sdk-1.0.0a35.dist-info}/METADATA

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

{synapse_sdk-1.0.0a33.dist-info → synapse_sdk-1.0.0a35.dist-info}/RECORD

@@ -39,6 +39,8 @@ synapse_sdk/clients/backend/models.py,sha256=ycuzIBi3pyKIFkNzrNGsv3cA49BjLmjyylN
 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
+synapse_sdk/clients/validators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+synapse_sdk/clients/validators/collections.py,sha256=LtnwvutsScubOUcZ2reGHLCzseXxtNIdnH2nv098aUU,1195
 synapse_sdk/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/enums.py,sha256=ibixwqA3sCNSriG1jAtL54JQc_Zwo3MufwYUqGhVncc,523
 synapse_sdk/plugins/exceptions.py,sha256=Qs7qODp_RRLO9y2otU2T4ryj5LFwIZODvSIXkAh91u0,691
@@ -64,7 +66,7 @@ synapse_sdk/plugins/categories/export/templates/plugin/__init__.py,sha256=47DEQp
 synapse_sdk/plugins/categories/export/templates/plugin/export.py,sha256=nbjvgFVQpPN5Lo1UnPL5p__BYeejMZLMZ4RT_yd7vJU,4561
 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=Wmi7in_Mgizt1d5XcDR080h1CIMWKh2_mjub9N380qA,1917
+synapse_sdk/plugins/categories/neural_net/actions/deployment.py,sha256=oetIwZoee5vxriPX3r1onmxgwojUyaRTlnBIdaQ1zk8,3895
 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
@@ -95,7 +97,7 @@ synapse_sdk/plugins/categories/smart_tool/templates/plugin/__init__.py,sha256=47
 synapse_sdk/plugins/categories/smart_tool/templates/plugin/auto_label.py,sha256=eevNg0nOcYFR4z_L_R-sCvVOYoLWSAH1jwDkAf3YCjY,320
 synapse_sdk/plugins/categories/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/upload/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-synapse_sdk/plugins/categories/upload/actions/upload.py,sha256=V7gArcj7FZO8AT_ihUGodrc_7q49Q7j9BKc9DvoYOYQ,11178
+synapse_sdk/plugins/categories/upload/actions/upload.py,sha256=ry5Whogy5opZ7U_G6hQlbej8ufs5BS_VaJLY648vpF4,11347
 synapse_sdk/plugins/categories/upload/templates/config.yaml,sha256=0PhB2uD-9ufavZs7EiF6xj4aBgZuif9mFFGGfzG7HuY,147
 synapse_sdk/plugins/categories/upload/templates/plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synapse_sdk/plugins/categories/upload/templates/plugin/upload.py,sha256=dnK8gy33GjG5ettayawDJv1gM3xCm1K6lM-PfeeTjQw,1163
@@ -127,9 +129,9 @@ synapse_sdk/utils/storage/providers/__init__.py,sha256=NM9yRIWcPkH53DeNHgIhH9zaD
 synapse_sdk/utils/storage/providers/gcp.py,sha256=i2BQCu1Kej1If9SuNr2_lEyTcr5M_ncGITZrL0u5wEA,363
 synapse_sdk/utils/storage/providers/s3.py,sha256=r94aUGVNf8yxihU0lN62yaXdxSS7P783_sfD-hCiK40,1191
 synapse_sdk/utils/storage/providers/sftp.py,sha256=TUQXkKJf0-fh8NhGC_1zzqI4autFNHZVCqngwkQ1aD4,523
-synapse_sdk-1.0.0a33.dist-info/licenses/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
-synapse_sdk-1.0.0a33.dist-info/METADATA,sha256=MQpJhcUDqRQxgZEvjSEBDQcvN8q6z26EFjgILJ0MzhU,1160
-synapse_sdk-1.0.0a33.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-synapse_sdk-1.0.0a33.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
-synapse_sdk-1.0.0a33.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
-synapse_sdk-1.0.0a33.dist-info/RECORD,,
+synapse_sdk-1.0.0a35.dist-info/licenses/LICENSE,sha256=bKzmC5YAg4V1Fhl8OO_tqY8j62hgdncAkN7VrdjmrGk,1101
+synapse_sdk-1.0.0a35.dist-info/METADATA,sha256=lUfa4HBsiikuUTv8HjSpFmlhM0DB0JcOb3aKhYQAx24,1160
+synapse_sdk-1.0.0a35.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+synapse_sdk-1.0.0a35.dist-info/entry_points.txt,sha256=VNptJoGoNJI8yLXfBmhgUefMsmGI0m3-0YoMvrOgbxo,48
+synapse_sdk-1.0.0a35.dist-info/top_level.txt,sha256=ytgJMRK1slVOKUpgcw3LEyHHP7S34J6n_gJzdkcSsw8,12
+synapse_sdk-1.0.0a35.dist-info/RECORD,,