digitalhub-runtime-python 0.8.0b6__tar.gz → 0.8.0b7__tar.gz

{digitalhub_runtime_python-0.8.0b6 → digitalhub_runtime_python-0.8.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.8.0b6
+Version: 0.8.0b7
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License

{digitalhub_runtime_python-0.8.0b6 → digitalhub_runtime_python-0.8.0b7}/digitalhub_runtime_python/entities/run/python_run/entity.py

@@ -4,8 +4,11 @@ import typing
 from typing import Any
 
 import requests
+from digitalhub_runtime_python.entities.run.python_run.utils import get_getter_for_material
 
 from digitalhub.entities.run._base.entity import Run
+from digitalhub.entities.utils.utils import get_entity_type_from_key
+from digitalhub.utils.exceptions import EntityError
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.run.python_run.spec import RunSpecPythonRun
@@ -46,7 +49,7 @@ class RunPythonRun(Run):
         self.refresh()
         self.spec.inputs = self.inputs(as_dict=True)
 
-    def inputs(self, as_dict: bool = False) -> list[dict]:
+    def inputs(self, as_dict: bool = False) -> dict:
         """
         Get inputs passed in spec as objects or as dictionaries.
 
@@ -57,41 +60,54 @@ class RunPythonRun(Run):
 
         Returns
         -------
-        list[dict]
-            List of input objects.
+        dict
+            Inputs.
         """
-        return self.spec.get_inputs(as_dict=as_dict)
+        inputs = {}
+        if self.inputs is None:
+            return inputs
 
-    def results(self) -> dict:
-        """
-        Get results from runtime execution.
+        for parameter, key in self.spec.inputs.items():
+            entity_type = get_entity_type_from_key(key)
+            entity = get_getter_for_material(entity_type)(key)
+            if as_dict:
+                entity = entity.to_dict()
+            inputs[parameter] = entity
 
-        Returns
-        -------
-        dict
-            Results.
-        """
-        return self.status.get_results()
+        return inputs
 
-    def result(self, key: str) -> Any:
+    def output(
+        self,
+        output_name: str,
+        as_key: bool = False,
+        as_dict: bool = False,
+    ) -> MaterialEntity | dict | str | None:
         """
-        Get result from runtime execution by key.
+        Get run's output by name.
 
         Parameters
         ----------
-        key : str
+        output_name : str
             Key of the result.
+        as_key : bool
+            If True, return result as key.
+        as_dict : bool
+            If True, return result as dictionary.
 
         Returns
         -------
-        Any
+        Entity | dict | str | None
             Result.
         """
-        return self.results().get(key)
+        return self.outputs(as_key=as_key, as_dict=as_dict).get(output_name)
 
-    def outputs(self, as_key: bool = False, as_dict: bool = False) -> dict:
+    def outputs(
+        self,
+        as_key: bool = False,
+        as_dict: bool = False,
+    ) -> MaterialEntity | dict | str | None:
         """
-        Get run objects results.
+        Get run's outputs.
 
         Parameters
         ----------
@@ -105,48 +121,66 @@ class RunPythonRun(Run):
         dict
             List of output objects.
         """
-        return self.status.get_outputs(as_key=as_key, as_dict=as_dict)
+        outputs = {}
+        if self.status.outputs is None:
+            return outputs
+
+        for parameter, key in self.status.outputs.items():
+            entity_type = get_entity_type_from_key(key)
+            entity = get_getter_for_material(entity_type)(key)
+            if as_key:
+                entity = entity.key
+            if as_dict:
+                entity = entity.to_dict()
+            outputs[parameter] = entity
 
-    def output(self, key: str, as_key: bool = False, as_dict: bool = False) -> MaterialEntity | dict | str | None:
+        return outputs
+
+    def result(self, result_name: str) -> Any:
         """
-        Get run object result by key.
+        Get result by name.
 
         Parameters
         ----------
-        key : str
-            Key of the result.
-        as_key : bool
-            If True, return result as key.
-        as_dict : bool
-            If True, return result as dictionary.
+        result_name : str
+            Name of the result.
 
         Returns
         -------
-        Entity | dict | str | None
-            Result.
+        Any
+            The result.
         """
-        return self.outputs(as_key=as_key, as_dict=as_dict).get(key)
+        return self.results().get(result_name)
 
-    def values(self) -> dict:
+    def results(self) -> dict:
         """
-        Get values from runtime execution.
+        Get results.
 
         Returns
         -------
         dict
-            Values from backend.
+            The results.
         """
-        value_list = getattr(self.spec, "values", [])
-        value_list = value_list if value_list is not None else []
-        return self.status.get_values(value_list)
+        if self.status.results is None:
+            return {}
+        return self.status.results
 
-    def invoke(self, **kwargs) -> requests.Response:
+    def invoke(
+        self,
+        method: str = "POST",
+        url: str | None = None,
+        **kwargs,
+    ) -> requests.Response:
         """
         Invoke run.
 
         Parameters
         ----------
-        kwargs
+        method : str
+            Method of the request.
+        url : str
+            URL of the request.
+        **kwargs : dict
             Keyword arguments to pass to the request.
 
         Returns
@@ -154,10 +188,8 @@ class RunPythonRun(Run):
         requests.Response
             Response from service.
         """
-        if not self._context().local and not self.spec.local_execution:
-            local = False
-        else:
-            local = True
-        if kwargs is None:
-            kwargs = {}
-        return self.status.invoke(local, **kwargs)
+        if self._context().local:
+            raise EntityError("Invoke not supported locally.")
+        if url is None:
+            url = f"http://{self.status.service.get('url')}"
+        return requests.request(method=method, url=url, **kwargs)

digitalhub_runtime_python-0.8.0b7/digitalhub_runtime_python/entities/run/python_run/status.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+from digitalhub.entities.run._base.status import RunStatus
+
+
+class RunStatusPythonRun(RunStatus):
+    """
+    RunStatusPythonRun status.
+    """
+
+    def __init__(
+        self,
+        state: str,
+        message: str | None = None,
+        transitions: list[dict] | None = None,
+        k8s: dict | None = None,
+        outputs: dict | None = None,
+        results: dict | None = None,
+        service: dict | None = None,
+        **kwargs,
+    ) -> None:
+        super().__init__(state, message, transitions, k8s, **kwargs)
+        self.outputs = outputs
+        self.results = results
+        self.service = service

digitalhub_runtime_python-0.8.0b7/digitalhub_runtime_python/entities/run/python_run/utils.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+from typing import Callable
+
+from digitalhub.entities.artifact.crud import get_artifact
+from digitalhub.entities.dataitem.crud import get_dataitem
+from digitalhub.entities.model.crud import get_model
+from digitalhub.entities.utils.entity_types import EntityTypes
+
+
+def get_getter_for_material(entity_type: str) -> Callable:
+    """
+    Return appropriate getter function.
+
+    Parameters
+    ----------
+    entity_type : str
+        The entity type.
+
+    Returns
+    -------
+    Callable
+        The getter function.
+    """
+    if entity_type == EntityTypes.ARTIFACT.value:
+        return get_artifact
+
+    if entity_type == EntityTypes.DATAITEM.value:
+        return get_dataitem
+
+    if entity_type == EntityTypes.MODEL.value:
+        return get_model
+
+    raise ValueError(f"Unhandled entity type: {entity_type}")

{digitalhub_runtime_python-0.8.0b6 → digitalhub_runtime_python-0.8.0b7}/digitalhub_runtime_python/runtimes/runtime.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import typing
 from typing import Callable
 
 from digitalhub_runtime_python.utils.configuration import get_function_from_source

{digitalhub_runtime_python-0.8.0b6 → digitalhub_runtime_python-0.8.0b7}/digitalhub_runtime_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.8.0b6
+Version: 0.8.0b7
 Summary: Python runtime for DHCore
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
 License:                               Apache License

{digitalhub_runtime_python-0.8.0b6 → digitalhub_runtime_python-0.8.0b7}/digitalhub_runtime_python.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ digitalhub_runtime_python/entities/run/python_run/builder.py
 digitalhub_runtime_python/entities/run/python_run/entity.py
 digitalhub_runtime_python/entities/run/python_run/spec.py
 digitalhub_runtime_python/entities/run/python_run/status.py
+digitalhub_runtime_python/entities/run/python_run/utils.py
 digitalhub_runtime_python/entities/task/__init__.py
 digitalhub_runtime_python/entities/task/python_build/__init__.py
 digitalhub_runtime_python/entities/task/python_build/builder.py

{digitalhub_runtime_python-0.8.0b6 → digitalhub_runtime_python-0.8.0b7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.8.0b6"
+version = "0.8.0b7"
 description = "Python runtime for DHCore"
 readme = "README.md"
 authors = [
@@ -40,7 +40,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.8.0b6"
+current_version = "0.8.0b7"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false

digitalhub_runtime_python-0.8.0b6/digitalhub_runtime_python/entities/run/python_run/status.py

@@ -1,40 +0,0 @@
-from __future__ import annotations
-
-import requests
-
-from digitalhub.entities.run._base.status import RunStatus
-from digitalhub.utils.exceptions import EntityError
-
-
-class RunStatusPythonRun(RunStatus):
-    """
-    RunStatusPythonRun status.
-    """
-
-    def invoke(self, local: bool, **kwargs) -> requests.Response:
-        """
-        Invoke running process.
-
-        Parameters
-        ----------
-        kwargs
-            Keyword arguments to pass to the request.
-
-        Returns
-        -------
-        requests.Response
-            Response from service.
-        """
-        try:
-            if local:
-                raise EntityError("Invoke not supported locally.")
-
-            method = kwargs.pop("method", "POST")
-            url = kwargs.get("url", "http://" + self.service.get("url"))
-
-            response = requests.request(method=method, url=url, **kwargs)
-            response.raise_for_status()
-            return response
-        except Exception as e:
-            msg = f"Something got wrong during model serving. Exception: {e.__class__}. Error: {e.args}"
-            raise EntityError(msg)