digitalhub-runtime-python 0.15.0b14__tar.gz → 0.15.0b16__tar.gz

{digitalhub_runtime_python-0.15.0b14 → digitalhub_runtime_python-0.15.0b16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub-runtime-python
-Version: 0.15.0b14
+Version: 0.15.0b16
 Summary: Python runtime for DHCore
 Project-URL: Homepage, https://github.com/scc-digitalhub/digitalhub-sdk-runtime-python
 Author-email: Fondazione Bruno Kessler <digitalhub@fbk.eu>, Matteo Martini <mmartini@fbk.eu>

{digitalhub_runtime_python-0.15.0b14 → digitalhub_runtime_python-0.15.0b16}/digitalhub_runtime_python/entities/function/python/utils.py

@@ -7,10 +7,11 @@ from __future__ import annotations
 import typing
 from pathlib import Path
 
-from digitalhub.stores.data.api import get_default_store, get_store
+from digitalhub.entities._commons.utils import build_zip_path
+from digitalhub.stores.data.api import get_store
 from digitalhub.utils.exceptions import EntityError
 from digitalhub.utils.file_utils import eval_py_type, eval_zip_type
-from digitalhub.utils.generic_utils import encode_string, read_source
+from digitalhub.utils.generic_utils import create_archive, encode_string, read_source
 from digitalhub.utils.uri_utils import has_local_scheme
 
 from digitalhub_runtime_python.entities.function.python.models import Lang
@@ -139,20 +140,28 @@ def source_post_check(exec: FunctionPython) -> FunctionPython:
 
     # Check local source
     if has_local_scheme(code_src):
-        if not Path(code_src).is_file():
-            raise EntityError(f"Source file {code_src} does not exist.")
+        path_src = Path(code_src)
 
-        # Check py
-        if eval_py_type(code_src):
+        if not path_src.exists():
+            raise EntityError(f"Source {code_src} does not exist.")
+
+        # If source is a folder, zip it and upload it
+        if not path_src.is_file():
+            archive_path = path_src.parent / f"{path_src.name}.zip"
+            create_archive(path_src, archive_path)
+            dst = build_zip_path(exec, archive_path.name)
+            get_store(dst).upload(str(archive_path), dst)
+            exec.spec.source["source"] = dst
+            archive_path.unlink()
+
+        # If source is a file, read it and encode it in base64
+        elif eval_py_type(code_src):
             exec.spec.source["base64"] = read_source(code_src)
 
-        # Check zip
+        # If source is a zip file, upload it and update the source
         elif eval_zip_type(code_src):
-            filename = Path(code_src).name
-            dst = f"zip+{get_default_store(exec.project)}/{exec.project}/{exec.ENTITY_TYPE}/{exec.name}/{exec.id}/{filename}"
+            dst = build_zip_path(exec, path_src.name)
             get_store(dst).upload(code_src, dst)
             exec.spec.source["source"] = dst
-            if ":" not in exec.spec.source["handler"]:
-                exec.spec.source["handler"] = f"{Path(code_src).stem}:{exec.spec.source['handler']}"
 
     return exec

{digitalhub_runtime_python-0.15.0b14 → digitalhub_runtime_python-0.15.0b16}/digitalhub_runtime_python/entities/run/guardrail_build/spec.py

@@ -26,7 +26,7 @@ class RunSpecGuardrailRunBuild(RunSpec):
         python_version: str | None = None,
         requirements: list | None = None,
         processing_mode: str | None = None,
-        instructions: dict | None = None,
+        instructions: list | None = None,
         init_parameters: dict | None = None,
         **kwargs,
     ):
@@ -63,7 +63,7 @@ class RunValidatorGuardrailRunBuild(RunValidator):
     processing_mode: str | None = None
 
     # Task parameters
-    instructions: dict | None = None
+    instructions: list | None = None
 
     # Run parameters
     init_parameters: dict | None = None

{digitalhub_runtime_python-0.15.0b14 → digitalhub_runtime_python-0.15.0b16}/digitalhub_runtime_python/entities/run/openinference_build/spec.py

@@ -28,7 +28,7 @@ class RunSpecOpeninferenceRunBuild(RunSpec):
         model_name: str | None = None,
         inputs: list | None = None,
         outputs: list | None = None,
-        instructions: dict | None = None,
+        instructions: list | None = None,
         init_parameters: dict | None = None,
         **kwargs,
     ):
@@ -69,7 +69,7 @@ class RunValidatorOpeninferenceRunBuild(RunValidator):
     outputs: list | None = None
 
     # Task parameters
-    instructions: dict | None = None
+    instructions: list | None = None
 
     # Run parameters
     init_parameters: dict | None = None

{digitalhub_runtime_python-0.15.0b14 → digitalhub_runtime_python-0.15.0b16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.15.0b14"
+version = "0.15.0b16"
 description = "Python runtime for DHCore"
 readme = "README.md"
 authors = [
@@ -54,7 +54,7 @@ docstring-code-line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.15.0b14"
+current_version = "0.15.0b16"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false