digitalhub-runtime-python 0.16.0b4__py3-none-any.whl → 0.16.0b6__py3-none-any.whl

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/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/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.dist-info → digitalhub_runtime_python-0.16.0b6.dist-info}/METADATA

@@ -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.dist-info → digitalhub_runtime_python-0.16.0b6.dist-info}/RECORD

@@ -31,7 +31,7 @@ digitalhub_runtime_python/entities/function/hydra/entity.py,sha256=U1h2H8UVDPskp
 digitalhub_runtime_python/entities/function/hydra/models.py,sha256=DXQa9DTnHw_YAos2lfcNPFL2LpeWy0VAqa5s7joWflI,1155
 digitalhub_runtime_python/entities/function/hydra/spec.py,sha256=n0meR5mUz6dIzpoa76Zfm6ezKxUHeOKezOXjpd0qlLU,1630
 digitalhub_runtime_python/entities/function/hydra/status.py,sha256=O26R7uqJLRZ_UHrnTgiS7hsmdfHOho1szNrK9lITSEI,306
-digitalhub_runtime_python/entities/function/hydra/utils.py,sha256=wd8Hx_rQzoYjMXuSyJKbX3D5JqXci1OUcTafu030g7I,5570
+digitalhub_runtime_python/entities/function/hydra/utils.py,sha256=-cLXGoqJ2G4T1awSLjBpZ-k21dto8spFOZdWJhNZ2WA,5587
 digitalhub_runtime_python/entities/function/openinference/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub_runtime_python/entities/function/openinference/builder.py,sha256=jYGi-Qol5Vreyubd_MGB3hG83Hfv75sVJt2evHTtKeo,1177
 digitalhub_runtime_python/entities/function/openinference/entity.py,sha256=43KLWGd-x9Vq7oTeiqXISmelWcBXoLGA_a8TYgwUu7Q,778
@@ -153,14 +153,14 @@ digitalhub_runtime_python/entities/task/python_serve/spec.py,sha256=VDkEvgoxYv5O
 digitalhub_runtime_python/entities/task/python_serve/status.py,sha256=OqKVBAhiQDXJb_qogxV8qqh6eyPjudT4puXx8bg_6XU,298
 digitalhub_runtime_python/runtimes/__init__.py,sha256=IRY2i9U97wptE3OcC_NO-EBmcAH6-Q36gMCspKetQ0k,107
 digitalhub_runtime_python/runtimes/builder.py,sha256=vfSyxh5iEkSmTngTWM2BMpcnyvtAagBJpbN0M7ICjKw,1370
-digitalhub_runtime_python/runtimes/hydra_runtime.py,sha256=9qnXdmUzX_uP-_qfZzZJilYChPlUivzO6LLQoGVR65c,5831
+digitalhub_runtime_python/runtimes/hydra_runtime.py,sha256=kU55HLaktyb2XnoltIKY2A6BooCTRJHvhKFs2TYuB8k,6411
 digitalhub_runtime_python/runtimes/runtime.py,sha256=kJgDfXk_UbXXryRw7LNAIETJJH5nB7IwjnJgYVBrBRI,3965
-digitalhub_runtime_python/utils/configuration.py,sha256=BhrHFsvlCcAHA1hfmx7b5lURKeMV9TuC1dtMKXpcHOM,9125
+digitalhub_runtime_python/utils/configuration.py,sha256=1GyCOtl-mQ4lgv6UplpaB-wj1E-VoWChAC_G6HbYXzE,9177
 digitalhub_runtime_python/utils/inputs.py,sha256=c-dU61jHXrTd-5XJt4LacjfDzi_vWZFKwuJCbqAGdJQ,5806
 digitalhub_runtime_python/utils/outputs.py,sha256=irGUqy43F26NC1_ruH831NDyDTIVQHwIf15oXpR-q2M,9571
 digitalhub_runtime_python/utils/utils.py,sha256=qO-wh-9qJFvoJnWIWNeajtFQuBSYw3xhCI3JqV9gVHE,1936
-digitalhub_runtime_python-0.16.0b4.dist-info/METADATA,sha256=s85f6B7jhPyIX6-3XzNAtO18CWnWIoWjvoAVAhbj2qs,17080
-digitalhub_runtime_python-0.16.0b4.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-digitalhub_runtime_python-0.16.0b4.dist-info/licenses/AUTHORS,sha256=iDleK_2EAMmh0o8Te_E9mdXQCP4rBfFr9dW9d0-pCno,301
-digitalhub_runtime_python-0.16.0b4.dist-info/licenses/LICENSE,sha256=z3xQCHfGmTnigfoUe3uidW_GUSVeFBdos30w9VNTRec,11361
-digitalhub_runtime_python-0.16.0b4.dist-info/RECORD,,
+digitalhub_runtime_python-0.16.0b6.dist-info/METADATA,sha256=-OVuO1MBrEUSCRR_dBCNc_an_VsUjJ8DCLUySqvX5q8,17080
+digitalhub_runtime_python-0.16.0b6.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+digitalhub_runtime_python-0.16.0b6.dist-info/licenses/AUTHORS,sha256=iDleK_2EAMmh0o8Te_E9mdXQCP4rBfFr9dW9d0-pCno,301
+digitalhub_runtime_python-0.16.0b6.dist-info/licenses/LICENSE,sha256=z3xQCHfGmTnigfoUe3uidW_GUSVeFBdos30w9VNTRec,11361
+digitalhub_runtime_python-0.16.0b6.dist-info/RECORD,,