digitalhub-runtime-python 0.16.0b4__tar.gz → 0.16.0b6__tar.gz

{digitalhub_runtime_python-0.16.0b4 → digitalhub_runtime_python-0.16.0b6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: digitalhub-runtime-python
-Version: 0.16.0b4
+Version: 0.16.0b6
 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.16.0b4 → digitalhub_runtime_python-0.16.0b6}/digitalhub_runtime_python/entities/function/hydra/utils.py

@@ -193,7 +193,7 @@ def _check_config_params(
     if path is not None:
         config["path"] = path
 
-    if config_src is None and config_content is None and config_base64 is None:
+    if config_src is None and config_content is None and config_base64 is None and path is None:
         raise EntityError("Config must be provided.")
 
     if config_src is not None:

{digitalhub_runtime_python-0.16.0b4 → digitalhub_runtime_python-0.16.0b6}/digitalhub_runtime_python/runtimes/hydra_runtime.py

@@ -19,6 +19,8 @@ from digitalhub_runtime_python.utils.configuration import (
     has_git_scheme,
     has_remote_scheme,
     has_s3_scheme,
+    import_function_from_source,
+    save_function_source,
 )
 from digitalhub_runtime_python.utils.outputs import build_new_status, collect_outputs
 
@@ -70,6 +72,9 @@ class RuntimeHydraJob(RuntimePythonJob):
     def _configure_execution(self, spec: dict, run: dict) -> tuple[Callable, bool]:
         args = ["main", "-m"]
 
+        # prepare source code
+        source_path = save_function_source(self.runtime_dir, spec.get("source", {}))
+
         # write runtime config for dh launcher
         dh_launcher_config = {
             "defaults": ["dh"],
@@ -111,6 +116,8 @@ class RuntimeHydraJob(RuntimePythonJob):
                 # Unsupported scheme
                 else:
                     raise RuntimeError(f"Unable to collect source from: {source}")
+                if "path" in config:
+                    path = path / config["path"]
                 sys.argv = args + [f"--config-path={path.absolute()}"]
             elif "path" in config:
                 path = self.runtime_dir / config["path"]
@@ -122,7 +129,16 @@ class RuntimeHydraJob(RuntimePythonJob):
             f"hydra.launcher.job_ref={run['id']}",
         ]
 
-        fnc, _ = super()._configure_execution(spec)
+        if "parameters" in spec:
+            sys.argv += [f"{key}={value}" for key, value in spec["parameters"].items()]
+
+
+        # import from source
+        fnc = import_function_from_source(
+            source_path,
+            spec.get("source", {}),
+            skip_save=True,
+        )
         # treat as not wrapped, as the wrapping is done by hydra.main and we do not need to pass the extra attributes
         return fnc, {"cfg_passthrough": None}
 
@@ -133,6 +149,9 @@ class RuntimeHydraSubtask(RuntimePythonJob):
     """
 
     def _configure_execution(self, spec: dict) -> tuple[Callable, bool]:
+        from hydra.core.utils import  setup_globals
+        setup_globals()
+
         source_spec = spec.get("source", {})
         path = self.runtime_dir
 

{digitalhub_runtime_python-0.16.0b4 → digitalhub_runtime_python-0.16.0b6}/digitalhub_runtime_python/utils/configuration.py

@@ -210,7 +210,7 @@ def _import_function_from_path(function_path: Path, function_name: str) -> Calla
     return import_function(function_path, function_name)
 
 
-def import_function_from_source(path: Path, source_spec: dict) -> Callable:
+def import_function_from_source(path: Path, source_spec: dict, skip_save: bool = False) -> Callable:
     """
     Get function from source.
 
@@ -227,7 +227,7 @@ def import_function_from_source(path: Path, source_spec: dict) -> Callable:
         Function.
     """
     try:
-        source_path = save_function_source(path, source_spec)
+        source_path = save_function_source(path, source_spec) if not skip_save else path
         function_path, function_name = _get_function_path(source_path, source_spec["handler"])
         return _import_function_from_path(function_path, function_name)
     except Exception as e:

{digitalhub_runtime_python-0.16.0b4 → digitalhub_runtime_python-0.16.0b6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.16.0b4"
+version = "0.16.0b6"
 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.16.0b4"
+current_version = "0.16.0b6"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false