digitalhub-runtime-python 0.9.1__tar.gz → 0.10.0b0__tar.gz

{digitalhub_runtime_python-0.9.1 → digitalhub_runtime_python-0.10.0b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: digitalhub-runtime-python
-Version: 0.9.1
+Version: 0.10.0b0
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License
@@ -229,6 +229,6 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: digitalhub[full]<0.10,>=0.9.0b
+Requires-Dist: digitalhub[full]<0.11,>=0.10.0b
 
 # SDK for DHCore

{digitalhub_runtime_python-0.9.1 → digitalhub_runtime_python-0.10.0b0}/digitalhub_runtime_python/entities/function/python/utils.py

@@ -4,10 +4,10 @@ import typing
 from pathlib import Path
 
 from digitalhub.stores.api import get_store
+from digitalhub.stores.s3.utils import get_s3_bucket_from_env
 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_source, encode_string
-from digitalhub.utils.s3_utils import get_s3_bucket
 from digitalhub.utils.uri_utils import has_local_scheme
 
 from digitalhub_runtime_python.entities.function.python.models import Lang
@@ -143,8 +143,8 @@ def source_post_check(exec: FunctionPython) -> FunctionPython:
         # Check zip
         elif eval_zip_type(code_src):
             filename = Path(code_src).name
-            dst = f"zip+s3://{get_s3_bucket()}/{exec.project}/{exec.ENTITY_TYPE}/{exec.name}/{exec.id}/{filename}"
-            get_store(dst).upload(code_src, dst)
+            dst = f"zip+s3://{get_s3_bucket_from_env()}/{exec.project}/{exec.ENTITY_TYPE}/{exec.name}/{exec.id}/{filename}"
+            get_store(exec.project, 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']}"

{digitalhub_runtime_python-0.9.1 → digitalhub_runtime_python-0.10.0b0}/digitalhub_runtime_python/entities/run/python_run/status.py

@@ -14,12 +14,13 @@ class RunStatusPythonRun(RunStatus):
         message: str | None = None,
         transitions: list[dict] | None = None,
         k8s: dict | None = None,
+        metrics: dict[str, list] | None = None,
         outputs: dict | None = None,
         results: dict | None = None,
         service: dict | None = None,
         **kwargs,
     ) -> None:
-        super().__init__(state, message, transitions, k8s, **kwargs)
+        super().__init__(state, message, transitions, k8s, metrics, **kwargs)
         self.outputs = outputs
         self.results = results
         self.service = service

{digitalhub_runtime_python-0.9.1 → digitalhub_runtime_python-0.10.0b0}/digitalhub_runtime_python/utils/configuration.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Callable, Union
 
+from digitalhub.stores.s3.utils import get_bucket_and_key, get_s3_source
 from digitalhub.utils.generic_utils import (
     decode_base64_string,
     extract_archive,
@@ -11,7 +12,6 @@ from digitalhub.utils.generic_utils import (
 )
 from digitalhub.utils.git_utils import clone_repository
 from digitalhub.utils.logger import LOGGER
-from digitalhub.utils.s3_utils import get_bucket_and_key, get_s3_source
 from digitalhub.utils.uri_utils import (
     get_filename_from_uri,
     has_git_scheme,
@@ -113,7 +113,9 @@ def save_function_source(path: Path, source_spec: dict) -> Path:
 
 
 def import_function_and_init_from_source(
-    path: Path, source_spec: dict, default_py: str
+    path: Path,
+    source_spec: dict,
+    default_py: str,
 ) -> tuple[Callable, Union[Callable, None]]:
     """
     Import function and init from source.

{digitalhub_runtime_python-0.9.1 → digitalhub_runtime_python-0.10.0b0}/digitalhub_runtime_python/utils/inputs.py

@@ -13,6 +13,8 @@ if typing.TYPE_CHECKING:
     from digitalhub.entities._base.entity.entity import Entity
     from digitalhub.entities.project._base.entity import Project
 
+    from digitalhub_runtime_python.entities.run.python_run.entity import RunPythonRun
+
 
 def get_project_(project_name: str) -> Project:
     """
@@ -37,6 +39,33 @@ def get_project_(project_name: str) -> Project:
         raise RuntimeError(msg)
 
 
+def get_run_(project_name: str) -> RunPythonRun:
+    """
+    Get run.
+
+    Parameters
+    ----------
+    project_name : str
+        Project name.
+    run_id : str
+        Run id.
+
+    Returns
+    -------
+    Run
+        Run.
+    """
+    try:
+        ctx = get_context(project_name)
+        proj = get_project(project_name, local=ctx.local)
+        run_key = ctx.get_run_ctx()
+        return proj.get_run(run_key)
+    except Exception as e:
+        msg = f"Error during run collection. Exception: {e.__class__}. Error: {e.args}"
+        LOGGER.exception(msg)
+        raise RuntimeError(msg)
+
+
 def get_entity_inputs(inputs: dict) -> dict[str, Entity]:
     """
     Set inputs.
@@ -104,6 +133,7 @@ def compose_inputs(
         fnc_parameters = inspect.signature(func).parameters
 
         _has_project = "project" in fnc_parameters
+        _has_run = "run" in fnc_parameters
         _has_context = "context" in fnc_parameters
         _has_event = "event" in fnc_parameters
 
@@ -117,6 +147,19 @@ def compose_inputs(
             else:
                 fnc_args["project"] = project
 
+        if _has_context and not local_execution:
+            project_name: str = context.project.name
+        elif isinstance(project, str):
+            project_name = project
+        else:
+            project_name = project.name
+
+        if _has_run:
+            if _has_context and not local_execution:
+                fnc_args["run"] = context.run
+            else:
+                fnc_args["run"] = get_run_(project_name)
+
         # Context and event are reserved keyword arguments
         # only in remote executions
         if not local_execution:

{digitalhub_runtime_python-0.9.1 → digitalhub_runtime_python-0.10.0b0}/digitalhub_runtime_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: digitalhub-runtime-python
-Version: 0.9.1
+Version: 0.10.0b0
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License
@@ -229,6 +229,6 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: digitalhub[full]<0.10,>=0.9.0b
+Requires-Dist: digitalhub[full]<0.11,>=0.10.0b
 
 # SDK for DHCore

digitalhub_runtime_python-0.10.0b0/digitalhub_runtime_python.egg-info/requires.txt

@@ -0,0 +1 @@
+digitalhub[full]<0.11,>=0.10.0b

{digitalhub_runtime_python-0.9.1 → digitalhub_runtime_python-0.10.0b0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.9.1"
+version = "0.10.0b0"
 description = "Python runtime for DHCore"
 readme = "README.md"
 authors = [
@@ -21,7 +21,7 @@ classifiers = [
 keywords = ["data", "dataops", "kubernetes"]
 requires-python = ">=3.9"
 dependencies = [
-"digitalhub[full]>=0.9.0b, <0.10",
+"digitalhub[full]>=0.10.0b, <0.11",
 ]
 
 [project.urls]
@@ -40,7 +40,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.9.1"
+current_version = "0.10.0b0"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false

digitalhub_runtime_python-0.9.1/digitalhub_runtime_python.egg-info/requires.txt

@@ -1 +0,0 @@
-digitalhub[full]<0.10,>=0.9.0b