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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.6.0b4
+Version: 0.6.0b6
 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.6.0b4 → digitalhub_runtime_python-0.6.0b6}/digitalhub_runtime_python/entities/functions/spec.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Literal
 
-from digitalhub_core.entities.functions.spec import FunctionParams, FunctionSpec, SourceCodeStruct
+from digitalhub_core.entities.functions.spec import FunctionParams, FunctionSpec
 from digitalhub_core.utils.exceptions import EntityError
 from digitalhub_core.utils.generic_utils import decode_string, encode_source, encode_string
 from digitalhub_core.utils.uri_utils import map_uri_scheme
@@ -16,7 +16,13 @@ class FunctionSpecPython(FunctionSpec):
 
     def __init__(
         self,
-        source: dict,
+        source: str | dict | None = None,
+        code_src: str | None = None,
+        handler: str | None = None,
+        code: str | None = None,
+        base64: str | None = None,
+        init_function: str | None = None,
+        lang: str | None = None,
         image: str | None = None,
         base_image: str | None = None,
         python_version: str | None = None,
@@ -29,8 +35,21 @@ class FunctionSpecPython(FunctionSpec):
         self.python_version = python_version
         self.requirements = requirements
 
-        source = self._source_check(source)
-        self.source = SourceCodeStruct(**source)
+        # Give source precedence
+        if source is not None:
+            source_dict = source
+        else:
+            source_dict = {
+                "source": code_src,
+                "handler": handler,
+                "code": code,
+                "base64": base64,
+                "init_function": init_function,
+                "lang": lang,
+            }
+
+        source_checked = self._source_check(source_dict)
+        self.source = SourceCodeStruct(**source_checked)
 
     @staticmethod
     def _source_check(source: dict) -> dict:
@@ -47,9 +66,6 @@ class FunctionSpecPython(FunctionSpec):
         dict
             Checked source.
         """
-        if source is None:
-            raise EntityError("Source must be provided.")
-
         # Source check
         source_path = source.get("source")
         code = source.get("code")
@@ -123,17 +139,101 @@ class FunctionParamsPython(FunctionParams):
     Function python parameters model.
     """
 
-    source: dict
-    "Source code"
+    source: dict = None
+    "Source code details as dictionary"
+
+    code_src: str = None
+    "Pointer to source code"
+
+    handler: str = None
+    "Function entrypoint"
+
+    code: str = None
+    "Source code (plain text)"
 
-    python_version: Literal["PYTHON3_9", "PYTHON3_10"]
+    base64: str = None
+    "Source code (base64 encoded)"
+
+    init_function: str = None
+    "Init function for remote nuclio execution"
+
+    lang: str = None
+    "Source code language (hint)"
+
+    python_version: Literal["PYTHON3_9", "PYTHON3_10", "PYTHON3_11"]
     "Python version"
 
     image: str = None
-    "Image"
+    "Image where the function will be executed"
 
     base_image: str = None
-    "Base image"
+    "Base image used to build the image where the function will be executed"
 
     requirements: list = None
-    "Requirements list, as used by the runtime"
+    "Requirements list to be installed in the image where the function will be executed"
+
+
+class SourceCodeStruct:
+    """
+    Source code struct.
+    """
+
+    def __init__(
+        self,
+        source: str | None = None,
+        handler: str | None = None,
+        code: str | None = None,
+        base64: str | None = None,
+        init_function: str | None = None,
+        lang: str | None = None,
+    ) -> None:
+        """
+        Constructor.
+
+        Parameters
+        ----------
+        source : str
+            Source reference.
+        handler : str
+            Function entrypoint.
+        code : str
+            Source code (plain).
+        base64 : str
+            Source code (base64 encoded).
+        init_function : str
+            Init function for remote execution.
+        lang : str
+            Source code language (hint).
+        """
+        self.source = source
+        self.handler = handler
+        self.code = code
+        self.base64 = base64
+        self.init_function = init_function
+        self.lang = lang
+
+    def to_dict(self) -> dict:
+        """
+        Convert to dictionary.
+
+        Returns
+        -------
+        dict
+            Dictionary representation of the object.
+        """
+        dict_ = {}
+        if self.source is not None:
+            dict_["source"] = self.source
+        if self.handler is not None:
+            dict_["handler"] = self.handler
+        if self.base64 is not None:
+            dict_["base64"] = self.base64
+        if self.init_function is not None:
+            dict_["init_function"] = self.init_function
+        if self.lang is not None:
+            dict_["lang"] = self.lang
+
+        return dict_
+
+    def __repr__(self) -> str:
+        return str(self.to_dict())

{digitalhub_runtime_python-0.6.0b4 → digitalhub_runtime_python-0.6.0b6}/digitalhub_runtime_python/utils/inputs.py

@@ -6,7 +6,7 @@ from typing import Any, Callable
 
 from digitalhub_core.context.builder import get_context
 from digitalhub_core.entities.artifacts.crud import artifact_from_dict
-from digitalhub_core.utils.generic_utils import parse_entity_key
+from digitalhub_core.entities.utils import parse_entity_key
 from digitalhub_core.utils.logger import LOGGER
 from digitalhub_data.entities.dataitems.crud import dataitem_from_dict
 from digitalhub_ml.entities.entity_types import EntityTypes

{digitalhub_runtime_python-0.6.0b4 → digitalhub_runtime_python-0.6.0b6}/digitalhub_runtime_python/utils/outputs.py

@@ -4,9 +4,9 @@ import pickle
 from typing import Any
 
 from digitalhub_core.entities._base.status import State
+from digitalhub_core.entities._builders.uuid import build_uuid
 from digitalhub_core.entities.artifacts.crud import new_artifact
 from digitalhub_core.entities.artifacts.entity import Artifact
-from digitalhub_core.utils.generic_utils import build_uuid
 from digitalhub_core.utils.logger import LOGGER
 from digitalhub_data.entities.dataitems.crud import create_dataitem
 from digitalhub_data.entities.dataitems.entity.table import DataitemTable

{digitalhub_runtime_python-0.6.0b4 → digitalhub_runtime_python-0.6.0b6}/digitalhub_runtime_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: digitalhub-runtime-python
-Version: 0.6.0b4
+Version: 0.6.0b6
 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.6.0b4 → digitalhub_runtime_python-0.6.0b6}/pyproject.toml

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