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

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

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

@@ -70,7 +70,6 @@ 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.0b11/digitalhub_runtime_python/entities/_commons/requirement_parser/enums.py

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from enum import Enum
+
+
+class RequirementFormat(Enum):
+    """
+    Enum for requirement file formats.
+    """
+
+    PIP = "pip"
+    PYPROJECT = "pyproject"
+    CONDA = "conda"
+
+
+class RequirementFile(Enum):
+    """
+    Enum for requirement file names.
+    """
+
+    REQUIREMENTS_TXT = "requirements.txt"
+    SETUP_PY = "setup.py"
+    PYPROJECT_TOML = "pyproject.toml"
+    CONDA_ENV_YAML = "conda.yaml"
+    CONDA_ENV_YML = "conda.yml"

digitalhub_runtime_python-0.15.0b11/digitalhub_runtime_python/entities/_commons/requirement_parser/factory.py

@@ -0,0 +1,75 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
+
+from pathlib import Path
+
+from digitalhub_runtime_python.entities._commons.requirement_parser.enums import RequirementFile, RequirementFormat
+from digitalhub_runtime_python.entities._commons.requirement_parser.modules._base import BaseParser
+from digitalhub_runtime_python.entities._commons.requirement_parser.modules._conda import CondaParser
+from digitalhub_runtime_python.entities._commons.requirement_parser.modules._pip import PipParser
+from digitalhub_runtime_python.entities._commons.requirement_parser.modules._pyproject import PyProjectParser
+
+
+class RequirementParserFactory:
+    """
+    Factory for requirement parsers.
+    """
+
+    def get_parser(self, requirements_file: str) -> BaseParser:
+        """
+        Get the requirement parser based on the format.
+
+        Parameters
+        ----------
+        requirements_file : str
+            The path to the requirements file.
+
+        Returns
+        -------
+        BaseParser
+            The requirement parser.
+        """
+        req_type = self._requirements_format(requirements_file)
+        match req_type:
+            case RequirementFormat.PIP:
+                return PipParser()
+            case RequirementFormat.PYPROJECT:
+                return PyProjectParser()
+            case RequirementFormat.CONDA:
+                return CondaParser()
+            case _:
+                raise ValueError(f"No parser found for format: {requirements_file}")
+
+    @staticmethod
+    def _requirements_format(requirements_file: str) -> RequirementFormat:
+        """
+        Understand requirements file format.
+
+        Parameters
+        ----------
+        requirements_file : str
+            The path to the requirements file.
+
+        Returns
+        -------
+        RequirementFormat
+            The format of the requirements file (e.g., 'pip', 'pyproject', 'conda').
+        """
+        match Path(requirements_file).name:
+            case RequirementFile.REQUIREMENTS_TXT.value:
+                return RequirementFormat.PIP
+            case RequirementFile.SETUP_PY.value:
+                return RequirementFormat.PIP
+            case RequirementFile.PYPROJECT_TOML.value:
+                return RequirementFormat.PYPROJECT
+            case RequirementFile.CONDA_ENV_YML.value:
+                return RequirementFormat.CONDA
+            case RequirementFile.CONDA_ENV_YAML.value:
+                return RequirementFormat.CONDA
+            case _:
+                raise ValueError(
+                    f"Unsupported requirements file: {Path(requirements_file).name}."
+                    f" Supported filenames are: {', '.join([f.value for f in RequirementFile])}."
+                )

digitalhub_runtime_python-0.15.0b11/digitalhub_runtime_python/entities/_commons/requirement_parser/modules/_base.py

@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from abc import abstractmethod
+
+
+class BaseParser:
+    @staticmethod
+    @abstractmethod
+    def parse_requirements(source: str) -> list[str]:
+        """
+        Parses the requirements file and returns a list of dependencies.
+        """

digitalhub_runtime_python-0.15.0b11/digitalhub_runtime_python/entities/_commons/requirement_parser/modules/_conda.py

@@ -0,0 +1,38 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+import yaml
+
+from digitalhub_runtime_python.entities._commons.requirement_parser.modules._base import BaseParser
+
+
+class CondaParser(BaseParser):
+    @staticmethod
+    def parse_requirements(source: str) -> list[str]:
+        """
+        Parse an environment.yml file.
+
+        Parameters
+        ----------
+        source : str
+            Path to an environment.yml file.
+
+        Returns
+        -------
+        list[str]
+            A list of requirement strings.
+        """
+        requirements = []
+
+        with open(source, "r") as f:
+            data = yaml.safe_load(f)
+
+        if not data or "dependencies" not in data:
+            return requirements
+
+        for dep in data["dependencies"]:
+            if isinstance(dep, dict) and "pip" in dep:
+                requirements.extend(dep["pip"])
+
+        return requirements

digitalhub_runtime_python-0.15.0b11/digitalhub_runtime_python/entities/_commons/requirement_parser/modules/_pip.py

@@ -0,0 +1,43 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from pip._internal.network.session import PipSession
+from pip._internal.req import parse_requirements as pip_parse
+
+from digitalhub_runtime_python.entities._commons.requirement_parser.modules._base import BaseParser
+
+
+class PipParser(BaseParser):
+    @staticmethod
+    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.0b11/digitalhub_runtime_python/entities/_commons/requirement_parser/modules/_pyproject.py

@@ -0,0 +1,41 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+try:
+    import tomllib
+except ImportError:
+    import tomli as tomllib
+
+from digitalhub_runtime_python.entities._commons.requirement_parser.modules._base import BaseParser
+
+
+class PyProjectParser(BaseParser):
+    @staticmethod
+    def parse_requirements(source: str) -> list[str]:
+        """
+        Parse a pyproject.toml file.
+
+        Parameters
+        ----------
+        source : str
+            Path to a pyproject.toml file.
+
+        Returns
+        -------
+        list[str]
+            A list of requirement strings.
+        """
+        requirements = []
+
+        with open(source, "rb") as f:
+            data = tomllib.load(f)
+
+        project = data.get("project", {})
+
+        # Dependencies
+        dependencies = project.get("dependencies", [])
+        if isinstance(dependencies, list):
+            requirements.extend(dependencies)
+
+        return requirements

digitalhub_runtime_python-0.15.0b11/digitalhub_runtime_python/entities/_commons/requirement_parser/parser.py

@@ -0,0 +1,96 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+from __future__ import annotations
+
+from pathlib import Path
+
+from pip._internal.operations import freeze
+
+from digitalhub_runtime_python.entities._commons.requirement_parser.factory import RequirementParserFactory
+
+
+class RequirementParser:
+    """
+    A utility class for parsing requirements files using pip's internal parser.
+    """
+
+    def parse(self, requirements: list[str] | str | None = None) -> list[str] | None:
+        """
+        Parse the requirements file.
+
+        Returns
+        -------
+        list[str] | None
+            A list of requirement strings or None if no requirements are provided.
+        """
+        if requirements is None:
+            return
+        elif isinstance(requirements, str):
+            self._validate_path(requirements)
+            parser = RequirementParserFactory().get_parser(requirements)
+            parsed = parser.parse_requirements(requirements)
+            return self.read_installed_packages(parsed)
+        return self.read_installed_packages(requirements)
+
+    def _validate_path(self, path: str) -> None:
+        """
+        Validate the provided path.
+        """
+        if not Path(path).exists():
+            raise FileNotFoundError(f"Requirements file not found: {path}")
+        if not Path(path).is_file():
+            raise ValueError(f"Provided path is not a file: {path}")
+
+    @staticmethod
+    def read_installed_packages(requirements: list[str] | None = None) -> list[str] | None:
+        """
+        Read installed packages in execution context.
+
+        If requirements is provided, returns only those packages with their
+        versions filled in from the environment. Package names without versions
+        in the requirements list will have their versions added if found.
+
+        Parameters
+        ----------
+        requirements : list[str]
+            Optional list of package names (e.g., ['pandas', 'torch']) or
+            requirements with versions (e.g., ['pandas==2.0.0']).
+
+        Returns
+        -------
+        list[str]
+            List of installed packages in pip freeze format (e.g., ['numpy==1.24.0', 'pandas==2.0.0']).
+        """
+        separators = ["==", ">=", "<=", ">", "<", "~=", "!="]
+
+        # Build a mapping of normalized package names to their installed versions
+        installed_map: dict[str, str] = {}
+        for pkg in freeze.freeze():
+            # Handle different separators
+            for sep in separators:
+                if sep in pkg:
+                    name, version = pkg.split(sep, 1)
+                    # Normalize package name (lowercase, replace _ with -)
+                    installed_map[name.lower().replace("_", "-")] = f"{name}{sep}{version}"
+                    break
+
+        result = []
+        for req in requirements:
+            # Check if requirement already has a version specifier
+            has_version = any(sep in req for sep in separators)
+
+            if has_version:
+                # Keep as-is if version is already specified
+                result.append(req)
+            else:
+                # Normalize the requirement name for lookup
+                normalized_name = req.lower().replace("_", "-")
+                if normalized_name in installed_map:
+                    # Use the installed version
+                    result.append(installed_map[normalized_name])
+                else:
+                    # Package not found in environment, keep without version
+                    result.append(req)
+
+        return result

{digitalhub_runtime_python-0.15.0b10 → digitalhub_runtime_python-0.15.0b11}/digitalhub_runtime_python/entities/function/guardrail/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._commons.requirement_parser.parser import RequirementParser
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.function.guardrail.spec import FunctionSpecGuardrail
@@ -66,4 +66,4 @@ class FunctionGuardrail(Function):
         in Core.
         Can be overridden in subclasses to implement custom behavior.
         """
-        self.spec.requirements = read_installed_packages(self.spec.requirements)
+        self.spec.requirements = RequirementParser().parse(self.spec.requirements)

{digitalhub_runtime_python-0.15.0b10 → digitalhub_runtime_python-0.15.0b11}/digitalhub_runtime_python/entities/function/openinference/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._commons.requirement_parser.parser import RequirementParser
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.function.openinference.spec import FunctionSpecOpeninference
@@ -66,4 +66,4 @@ class FunctionOpeninference(Function):
         in Core.
         Can be overridden in subclasses to implement custom behavior.
         """
-        self.spec.requirements = read_installed_packages(self.spec.requirements)
+        self.spec.requirements = RequirementParser().parse(self.spec.requirements)

{digitalhub_runtime_python-0.15.0b10 → digitalhub_runtime_python-0.15.0b11}/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 parse_requirements, read_installed_packages
+from digitalhub_runtime_python.entities._commons.requirement_parser.parser import RequirementParser
 
 if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.function.python.spec import FunctionSpecPython
@@ -66,6 +66,4 @@ 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)
+        self.spec.requirements = RequirementParser().parse(self.spec.requirements)

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

@@ -12,9 +12,6 @@ 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
 
@@ -22,9 +19,6 @@ if typing.TYPE_CHECKING:
     from digitalhub_runtime_python.entities.function.python.entity import FunctionPython
 
 
-SEPARATORS = ["==", ">=", "<=", ">", "<", "~=", "!="]
-
-
 def source_check(**kwargs) -> dict:
     """
     Check source code.
@@ -162,90 +156,3 @@ def source_post_check(exec: FunctionPython) -> FunctionPython:
                 exec.spec.source["handler"] = f"{Path(code_src).stem}:{exec.spec.source['handler']}"
 
     return exec
-
-
-def read_installed_packages(requirements: list[str] | None = None) -> list[str] | None:
-    """
-    Read installed packages in execution context.
-
-    If requirements is provided, returns only those packages with their
-    versions filled in from the environment. Package names without versions
-    in the requirements list will have their versions added if found.
-
-    Parameters
-    ----------
-    requirements : list[str]
-        Optional list of package names (e.g., ['pandas', 'torch']) or
-        requirements with versions (e.g., ['pandas==2.0.0']).
-
-    Returns
-    -------
-    list[str]
-        List of installed packages in pip freeze format (e.g., ['numpy==1.24.0', 'pandas==2.0.0']).
-    """
-    if requirements is None:
-        return
-
-    # Build a mapping of normalized package names to their installed versions
-    installed_map: dict[str, str] = {}
-    for pkg in freeze.freeze():
-        # Handle different separators
-        for sep in SEPARATORS:
-            if sep in pkg:
-                name, version = pkg.split(sep, 1)
-                # Normalize package name (lowercase, replace _ with -)
-                installed_map[name.lower().replace("_", "-")] = f"{name}{sep}{version}"
-                break
-
-    result = []
-    for req in requirements:
-        # Check if requirement already has a version specifier
-        has_version = any(sep in req for sep in SEPARATORS)
-
-        if has_version:
-            # Keep as-is if version is already specified
-            result.append(req)
-        else:
-            # Normalize the requirement name for lookup
-            normalized_name = req.lower().replace("_", "-")
-            if normalized_name in installed_map:
-                # Use the installed version
-                result.append(installed_map[normalized_name])
-            else:
-                # Package not found in environment, keep without version
-                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.0b11/digitalhub_runtime_python/entities/task/python_serve/__init__.py

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0

digitalhub_runtime_python-0.15.0b11/digitalhub_runtime_python/runtimes/__init__.py

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "digitalhub-runtime-python"
-version = "0.15.0b10"
+version = "0.15.0b11"
 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.0b10"
+current_version = "0.15.0b11"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = false