digitalhub-runtime-python 0.15.0b9__tar.gz → 0.15.0b10__tar.gz

{digitalhub_runtime_python-0.15.0b9 → digitalhub_runtime_python-0.15.0b10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalhub-runtime-python
-Version: 0.15.0b9
+Version: 0.15.0b10
 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.15.0b9 → digitalhub_runtime_python-0.15.0b10}/digitalhub_runtime_python/__init__.py

@@ -19,7 +19,7 @@ from digitalhub_runtime_python.entities.task.openinference_serve.builder import
 from digitalhub_runtime_python.entities.task.python_build.builder import TaskPythonBuildBuilder
 from digitalhub_runtime_python.entities.task.python_job.builder import TaskPythonJobBuilder
 from digitalhub_runtime_python.entities.task.python_serve.builder import TaskPythonServeBuilder
-from digitalhub_runtime_python.utils.utils import handler, parse_requirements
+from digitalhub_runtime_python.utils.utils import handler
 
 entity_builders = (
     (EntityKinds.FUNCTION_GUARDRAIL.value, FunctionGuardrailBuilder),
@@ -70,6 +70,7 @@ try:
     )
 except ImportError as e:
     from digitalhub.utils.logger.logger import get_logger
+
     logger = get_logger(__name__)
     logger.debug(f"Error importing runtime builders: {e}")
     runtime_builders = tuple()

{digitalhub_runtime_python-0.15.0b9 → digitalhub_runtime_python-0.15.0b10}/digitalhub_runtime_python/entities/function/python/entity.py

@@ -11,7 +11,7 @@ from digitalhub.utils.generic_utils import decode_base64_string
 from digitalhub.utils.io_utils import write_text
 from digitalhub.utils.uri_utils import has_local_scheme
 
-from digitalhub_runtime_python.entities.function.python.utils import read_installed_packages
+from digitalhub_runtime_python.entities.function.python.utils import parse_requirements, read_installed_packages
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.function.python.spec import FunctionSpecPython
@@ -66,4 +66,6 @@ class FunctionPython(Function):
         in Core.
         Can be overridden in subclasses to implement custom behavior.
         """
+        if isinstance(self.spec.requirements, str):
+            self.spec.requirements = parse_requirements(self.spec.requirements)
         self.spec.requirements = read_installed_packages(self.spec.requirements)

{digitalhub_runtime_python-0.15.0b9 → digitalhub_runtime_python-0.15.0b10}/digitalhub_runtime_python/entities/function/python/spec.py

@@ -48,5 +48,5 @@ class FunctionValidatorPython(FunctionValidator):
     base_image: str | None = None
     "Base image used to build the image where the function will be executed"
 
-    requirements: list[str] | None = None
+    requirements: list[str] | str | None = None
     "Requirements list to be installed in the image where the function will be executed"

{digitalhub_runtime_python-0.15.0b9 → digitalhub_runtime_python-0.15.0b10}/digitalhub_runtime_python/entities/function/python/utils.py

@@ -12,7 +12,9 @@ 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_string, read_source
 from digitalhub.utils.uri_utils import has_local_scheme
+from pip._internal.network.session import PipSession
 from pip._internal.operations import freeze
+from pip._internal.req import parse_requirements as pip_parse
 
 from digitalhub_runtime_python.entities.function.python.models import Lang
 
@@ -214,3 +216,36 @@ def read_installed_packages(requirements: list[str] | None = None) -> list[str]
                 result.append(req)
 
     return result
+
+
+def parse_requirements(source: str) -> list[str]:
+    """
+    Parse a requirements.txt file using pip's internal parser.
+
+    Parameters
+    ----------
+    source : str
+        Path to a requirements.txt file.
+
+    Returns
+    -------
+    list[str]
+        A list of requirement strings as they would be understood by pip.
+
+    Examples
+    --------
+    >>> requirements = parse_requirements_with_pip("/path/to/requirements.txt")
+    >>> print(requirements)
+    ['numpy>=1.0', 'pandas==2.0.0', 'git+https://github.com/user/repo.git@main']
+    """
+    # Parse using pip's internal parser
+    session = PipSession()
+    parsed = pip_parse(source, session=session)
+
+    # Extract requirement strings
+    requirements = []
+    for req in parsed:
+        if req.requirement:
+            requirements.append(str(req.requirement))
+
+    return requirements

{digitalhub_runtime_python-0.15.0b9 → digitalhub_runtime_python-0.15.0b10}/digitalhub_runtime_python/utils/utils.py

@@ -7,9 +7,6 @@ from __future__ import annotations
 import functools
 from typing import Callable
 
-from pip._internal.network.session import PipSession
-from pip._internal.req import parse_requirements as pip_parse
-
 from digitalhub_runtime_python.utils.outputs import collect_outputs
 
 
@@ -81,36 +78,3 @@ def handler(outputs: list[str] | None = None) -> Callable:
         return wrapper
 
     return decorator
-
-
-def parse_requirements(source: str) -> list[str]:
-    """
-    Parse a requirements.txt file using pip's internal parser.
-
-    Parameters
-    ----------
-    source : str
-        Path to a requirements.txt file.
-
-    Returns
-    -------
-    list[str]
-        A list of requirement strings as they would be understood by pip.
-
-    Examples
-    --------
-    >>> requirements = parse_requirements_with_pip("/path/to/requirements.txt")
-    >>> print(requirements)
-    ['numpy>=1.0', 'pandas==2.0.0', 'git+https://github.com/user/repo.git@main']
-    """
-    # Parse using pip's internal parser
-    session = PipSession()
-    parsed = pip_parse(source, session=session)
-
-    # Extract requirement strings
-    requirements = []
-    for req in parsed:
-        if req.requirement:
-            requirements.append(str(req.requirement))
-
-    return requirements

{digitalhub_runtime_python-0.15.0b9 → digitalhub_runtime_python-0.15.0b10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.15.0b9"
+version = "0.15.0b10"
 description = "Python runtime for DHCore"
 readme = "README.md"
 authors = [
@@ -52,7 +52,7 @@ docstring-code-line-length = 120
 convention = "numpy"
 
 [tool.bumpver]
-current_version = "0.15.0b9"
+current_version = "0.15.0b10"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false