digitalhub-runtime-python 0.10.1__tar.gz → 0.11.0__tar.gz

{digitalhub_runtime_python-0.10.1 → digitalhub_runtime_python-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub-runtime-python
-Version: 0.10.1
+Version: 0.11.0
 Summary: Python runtime for DHCore
 Project-URL: Homepage, https://github.com/scc-digitalhub/digitalhub-sdk-runtime-python
 Author-email: Fondazione Bruno Kessler <dslab@fbk.eu>, Matteo Martini <mmartini@fbk.eu>
@@ -228,10 +228,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: <3.13,>=3.9
-Requires-Dist: digitalhub[full]<0.11,>=0.10.0b
+Requires-Dist: digitalhub[full]<0.12,>=0.11.0b
 Requires-Dist: nuclio-sdk
 Provides-Extra: dev
-Requires-Dist: digitalhub[dev]<0.11,>=0.10.0b; extra == 'dev'
+Requires-Dist: digitalhub[dev]<0.12,>=0.11.0b; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # SDK for DHCore

{digitalhub_runtime_python-0.10.1 → digitalhub_runtime_python-0.11.0}/digitalhub_runtime_python/entities/function/python/utils.py

@@ -4,10 +4,10 @@ import typing
 from pathlib import Path
 
 from digitalhub.stores.data.api import get_store
-from digitalhub.stores.data.s3.utils import get_s3_bucket_from_env
+from digitalhub.stores.data.utils import get_default_store
 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.generic_utils import encode_string, read_source
 from digitalhub.utils.uri_utils import has_local_scheme
 
 from digitalhub_runtime_python.entities.function.python.models import Lang
@@ -138,12 +138,12 @@ def source_post_check(exec: FunctionPython) -> FunctionPython:
     if has_local_scheme(code_src) and Path(code_src).is_file():
         # Check py
         if eval_py_type(code_src):
-            exec.spec.source["base64"] = encode_source(code_src)
+            exec.spec.source["base64"] = read_source(code_src)
 
         # Check zip
         elif eval_zip_type(code_src):
             filename = Path(code_src).name
-            dst = f"zip+s3://{get_s3_bucket_from_env()}/{exec.project}/{exec.ENTITY_TYPE}/{exec.name}/{exec.id}/{filename}"
+            dst = f"zip+{get_default_store(exec.project)}/{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"]:

{digitalhub_runtime_python-0.10.1 → digitalhub_runtime_python-0.11.0}/digitalhub_runtime_python/entities/run/python_run/entity.py

@@ -8,7 +8,7 @@ import requests
 from digitalhub.entities._commons.enums import Relationship, State
 from digitalhub.entities._commons.utils import get_entity_type_from_key
 from digitalhub.entities.run._base.entity import Run
-from digitalhub.factory.api import get_action_from_task_kind
+from digitalhub.factory.factory import factory
 from digitalhub.utils.exceptions import EntityError
 from digitalhub.utils.logger import LOGGER
 
@@ -77,7 +77,7 @@ class RunPythonRun(Run):
             Run object.
         """
         task_kind = self.spec.task.split("://")[0]
-        action = get_action_from_task_kind(self.kind, task_kind)
+        action = factory.get_action_from_task_kind(self.kind, task_kind)
 
         if action == TaskActions.SERVE.value:
             serve_timeout = 300
@@ -125,7 +125,7 @@ class RunPythonRun(Run):
             Inputs.
         """
         inputs = {}
-        if self.inputs is None:
+        if self.spec.inputs is None:
             return inputs
 
         for parameter, key in self.spec.inputs.items():

{digitalhub_runtime_python-0.10.1 → digitalhub_runtime_python-0.11.0}/digitalhub_runtime_python/entities/run/python_run/spec.py

@@ -27,7 +27,6 @@ class RunSpecPythonRun(RunSpec):
         base_image: str | None = None,
         python_version: str | None = None,
         requirements: list | None = None,
-        schedule: str | None = None,
         service_type: str | None = None,
         replicas: int | None = None,
         instructions: dict | None = None,
@@ -59,7 +58,6 @@ class RunSpecPythonRun(RunSpec):
         self.python_version = python_version
         self.requirements = requirements
 
-        self.schedule = schedule
         self.service_type = service_type
         self.replicas = replicas
         self.instructions = instructions
@@ -78,9 +76,6 @@ class RunValidatorPythonRun(RunValidator):
     python_version: str = None
     requirements: list = None
 
-    # Task job
-    schedule: str = None
-
     # Task serve
     service_type: str = None
     replicas: int = None

digitalhub_runtime_python-0.11.0/digitalhub_runtime_python/entities/task/python_job/spec.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from digitalhub.entities.task._base.spec import TaskSpecFunction, TaskValidatorFunction
+
+
+class TaskSpecPythonJob(TaskSpecFunction):
+    """
+    TaskSpecPythonJob specifications.
+    """
+
+
+class TaskValidatorPythonJob(TaskValidatorFunction):
+    """
+    TaskValidatorPythonJob validator.
+    """

{digitalhub_runtime_python-0.10.1 → digitalhub_runtime_python-0.11.0}/digitalhub_runtime_python/utils/inputs.py

@@ -6,7 +6,7 @@ from typing import Any, Callable
 
 from digitalhub.context.api import get_context
 from digitalhub.entities.project.crud import get_project
-from digitalhub.factory.api import build_entity_from_dict
+from digitalhub.factory.factory import factory
 from digitalhub.utils.logger import LOGGER
 
 if typing.TYPE_CHECKING:
@@ -85,7 +85,7 @@ def get_entity_inputs(inputs: dict) -> dict[str, Entity]:
         Dictionary of inputs.
     """
     try:
-        return {k: build_entity_from_dict(v) for k, v in inputs.items()}
+        return {k: factory.build_entity_from_dict(v) for k, v in inputs.items()}
     except Exception as e:
         msg = f"Error during inputs collection. Exception: {e.__class__}. Error: {e.args}"
         LOGGER.exception(msg)

{digitalhub_runtime_python-0.10.1 → digitalhub_runtime_python-0.11.0}/digitalhub_runtime_python/utils/utils.py

@@ -20,6 +20,8 @@ def handler(outputs: list[str] | None = None) -> Callable:
     Callable
         Decorated function.
     """
+    if outputs is None:
+        outputs = []
 
     def decorator(func: Callable) -> Callable:
         """

{digitalhub_runtime_python-0.10.1 → digitalhub_runtime_python-0.11.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.10.1"
+version = "0.11.0"
 description = "Python runtime for DHCore"
 readme = "README.md"
 authors = [
@@ -22,13 +22,13 @@ classifiers = [
 keywords = ["data", "dataops", "kubernetes"]
 requires-python = ">=3.9, <3.13"
 dependencies = [
-"digitalhub[full]>=0.10.0b, <0.11",
+"digitalhub[full]>=0.11.0b, <0.12",
 "nuclio-sdk"
 ]
 
 [project.optional-dependencies]
 dev = [
-    "digitalhub[dev]>=0.10.0b, <0.11"
+    "digitalhub[dev]>=0.11.0b, <0.12"
 ]
 
 [project.urls]
@@ -47,7 +47,7 @@ line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.10.1"
+current_version = "0.11.0"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false

{digitalhub_runtime_python-0.10.1 → digitalhub_runtime_python-0.11.0}/test/local/instances/test_validate.py

@@ -46,7 +46,7 @@ def is_valid(built, kind):
         schema = json.load(schema_file)
 
     # To validate all the properties
-    schema["required"] = [a for a in  list(schema['properties'].keys())]
+    schema["required"] = [a for a in list(schema["properties"].keys())]
     validate(instance=built, schema=schema)
     return True
 

digitalhub_runtime_python-0.10.1/digitalhub_runtime_python/entities/task/python_job/spec.py

@@ -1,49 +0,0 @@
-from __future__ import annotations
-
-from digitalhub.entities.task._base.spec import TaskSpecFunction, TaskValidatorFunction
-
-
-class TaskSpecPythonJob(TaskSpecFunction):
-    """TaskSpecPythonJob specifications."""
-
-    def __init__(
-        self,
-        function: str,
-        node_selector: list[dict] | None = None,
-        volumes: list[dict] | None = None,
-        resources: dict | None = None,
-        affinity: dict | None = None,
-        tolerations: list[dict] | None = None,
-        envs: list[dict] | None = None,
-        secrets: list[str] | None = None,
-        profile: str | None = None,
-        runtime_class: str | None = None,
-        priority_class: str | None = None,
-        schedule: str | None = None,
-        **kwargs,
-    ) -> None:
-        super().__init__(
-            function,
-            node_selector,
-            volumes,
-            resources,
-            affinity,
-            tolerations,
-            envs,
-            secrets,
-            profile,
-            runtime_class,
-            priority_class,
-            **kwargs,
-        )
-
-        self.schedule = schedule
-
-
-class TaskValidatorPythonJob(TaskValidatorFunction):
-    """
-    TaskValidatorPythonJob validator.
-    """
-
-    schedule: str = None
-    """Schedule."""