fix: fixed specs for guardrail and openinference

Author: EvangMM

digitalhub_runtime_python/entities/function/guardrail/models.py

@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: © 2025 DSLab - Fondazione Bruno Kessler
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import annotations
+
+from enum import Enum
+
+
+class ProcessingMode(Enum):
+    """Enum for processing modes."""
+
+    PREPROCESSOR = "preprocessor"
+    POSTPROCESSOR = "postprocessor"
+    WRAPPROCESSOR = "wrapprocessor"

digitalhub_runtime_python/entities/function/guardrail/spec.py

@@ -6,6 +6,7 @@
 
 from digitalhub.entities.function._base.spec import FunctionSpec, FunctionValidator
 
+from digitalhub_runtime_python.entities.function.guardrail.models import ProcessingMode
 from digitalhub_runtime_python.entities.function.python.models import PythonVersion, SourceValidator
 
 
@@ -21,6 +22,7 @@ def __init__(
         base_image: str | None = None,
         python_version: str | None = None,
         requirements: list | None = None,
+        processing_mode: str | None = None,
     ) -> None:
         super().__init__()
 
@@ -29,6 +31,7 @@ def __init__(
         self.python_version = python_version
         self.requirements = requirements
         self.source = source
+        self.processing_mode = processing_mode
 
 
 class FunctionValidatorGuardrail(FunctionValidator):
@@ -50,3 +53,6 @@ class FunctionValidatorGuardrail(FunctionValidator):
 
     requirements: list[str] | None = None
     "Requirements list to be installed in the image where the function will be executed"
+
+    processing_mode: ProcessingMode
+    """Processing mode"""

digitalhub_runtime_python/entities/function/openinference/spec.py

@@ -23,6 +23,9 @@ def __init__(
         base_image: str | None = None,
         python_version: str | None = None,
         requirements: list | None = None,
+        model_name: str | None = None,
+        inputs: list | None = None,
+        outputs: list | None = None,
     ) -> None:
         super().__init__()
 
@@ -31,6 +34,9 @@ def __init__(
         self.python_version = python_version
         self.requirements = requirements
         self.source = source
+        self.model_name = model_name
+        self.inputs = inputs
+        self.outputs = outputs
 
 
 class FunctionValidatorOpeninference(FunctionValidator):

digitalhub_runtime_python/entities/run/guardrail_build/spec.py

@@ -4,12 +4,67 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.spec import RunSpecPythonRun, RunValidatorPythonRun
+from digitalhub.entities.run._base.spec import RunSpec, RunValidator
 
 
-class RunSpecGuardrailRunBuild(RunSpecPythonRun):
+class RunSpecGuardrailRunBuild(RunSpec):
     """RunSpecGuardrailRunBuild specifications."""
 
+    def __init__(
+        self,
+        task: str,
+        function: str | None = None,
+        workflow: str | None = None,
+        volumes: list[dict] | None = None,
+        resources: dict | None = None,
+        envs: list[dict] | None = None,
+        secrets: list[str] | None = None,
+        profile: str | None = None,
+        source: dict | None = None,
+        image: str | None = None,
+        base_image: str | None = None,
+        python_version: str | None = None,
+        requirements: list | None = None,
+        processing_mode: str | None = None,
+        instructions: dict | None = None,
+        init_parameters: dict | None = None,
+        **kwargs,
+    ):
+        super().__init__(
+            task,
+            function,
+            workflow,
+            volumes,
+            resources,
+            envs,
+            secrets,
+            profile,
+            **kwargs,
+        )
+        self.source = source
+        self.image = image
+        self.base_image = base_image
+        self.python_version = python_version
+        self.requirements = requirements
+        self.instructions = instructions
+        self.processing_mode = processing_mode
+        self.init_parameters = init_parameters
 
-class RunValidatorGuardrailRunBuild(RunValidatorPythonRun):
+
+class RunValidatorGuardrailRunBuild(RunValidator):
     """RunValidatorGuardrailRunBuild validator."""
+
+    # Function parameters
+    source: dict | None = None
+    image: str | None = None
+    base_image: str | None = None
+    python_version: str | None = None
+    requirements: list | None = None
+    processing_mode: str | None = None
+
+    # Task parameters
+    instructions: dict | None = None
+
+    # Run parameters
+    init_parameters: dict | None = None
+    """Init parameters."""

digitalhub_runtime_python/entities/run/guardrail_serve/spec.py

@@ -4,12 +4,73 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.spec import RunSpecPythonRun, RunValidatorPythonRun
+from digitalhub.entities.run._base.spec import RunSpec, RunValidator
 
 
-class RunSpecGuardrailRunServe(RunSpecPythonRun):
+class RunSpecGuardrailRunServe(RunSpec):
     """RunSpecGuardrailRunServe specifications."""
 
+    def __init__(
+        self,
+        task: str,
+        function: str | None = None,
+        workflow: str | None = None,
+        volumes: list[dict] | None = None,
+        resources: dict | None = None,
+        envs: list[dict] | None = None,
+        secrets: list[str] | None = None,
+        profile: str | None = None,
+        source: dict | None = None,
+        image: str | None = None,
+        base_image: str | None = None,
+        python_version: str | None = None,
+        requirements: list | None = None,
+        service_type: str | None = None,
+        service_name: str | None = None,
+        replicas: int | None = None,
+        processing_mode: str | None = None,
+        init_parameters: dict | None = None,
+        **kwargs,
+    ):
+        super().__init__(
+            task,
+            function,
+            workflow,
+            volumes,
+            resources,
+            envs,
+            secrets,
+            profile,
+            **kwargs,
+        )
+        self.source = source
+        self.image = image
+        self.base_image = base_image
+        self.python_version = python_version
+        self.requirements = requirements
+        self.service_type = service_type
+        self.service_name = service_name
+        self.replicas = replicas
+        self.processing_mode = processing_mode
+        self.init_parameters = init_parameters
 
-class RunValidatorGuardrailRunServe(RunValidatorPythonRun):
+
+class RunValidatorGuardrailRunServe(RunValidator):
     """RunValidatorGuardrailRunServe validator."""
+
+    # Function parameters
+    source: dict | None = None
+    image: str | None = None
+    base_image: str | None = None
+    python_version: str | None = None
+    requirements: list | None = None
+    processing_mode: str | None = None
+
+    # Task parameters
+    service_type: str | None = None
+    service_name: str | None = None
+    replicas: int | None = None
+
+    # Run parameters
+    init_parameters: dict | None = None
+    """Init parameters."""

digitalhub_runtime_python/entities/run/openinference_build/spec.py

@@ -4,12 +4,73 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.spec import RunSpecPythonRun, RunValidatorPythonRun
+from digitalhub.entities.run._base.spec import RunSpec, RunValidator
 
 
-class RunSpecOpeninferenceRunBuild(RunSpecPythonRun):
+class RunSpecOpeninferenceRunBuild(RunSpec):
     """RunSpecOpeninferenceRunBuild specifications."""
 
+    def __init__(
+        self,
+        task: str,
+        function: str | None = None,
+        workflow: str | None = None,
+        volumes: list[dict] | None = None,
+        resources: dict | None = None,
+        envs: list[dict] | None = None,
+        secrets: list[str] | None = None,
+        profile: str | None = None,
+        source: dict | None = None,
+        image: str | None = None,
+        base_image: str | None = None,
+        python_version: str | None = None,
+        requirements: list | None = None,
+        model_name: str | None = None,
+        inputs: dict | None = None,
+        outputs: dict | None = None,
+        instructions: dict | None = None,
+        init_parameters: dict | None = None,
+        **kwargs,
+    ):
+        super().__init__(
+            task,
+            function,
+            workflow,
+            volumes,
+            resources,
+            envs,
+            secrets,
+            profile,
+            **kwargs,
+        )
+        self.source = source
+        self.image = image
+        self.base_image = base_image
+        self.python_version = python_version
+        self.requirements = requirements
+        self.model_name = model_name
+        self.inputs = inputs
+        self.outputs = outputs
+        self.instructions = instructions
+        self.init_parameters = init_parameters
 
-class RunValidatorOpeninferenceRunBuild(RunValidatorPythonRun):
+
+class RunValidatorOpeninferenceRunBuild(RunValidator):
     """RunValidatorOpeninferenceRunBuild validator."""
+
+    # Function parameters
+    source: dict | None = None
+    image: str | None = None
+    base_image: str | None = None
+    python_version: str | None = None
+    requirements: list | None = None
+    model_name: str | None = None
+    inputs: dict | None = None
+    outputs: dict | None = None
+
+    # Task parameters
+    instructions: dict | None = None
+
+    # Run parameters
+    init_parameters: dict | None = None
+    """Initialization parameters"""

digitalhub_runtime_python/entities/run/openinference_serve/spec.py

@@ -4,12 +4,79 @@
 
 from __future__ import annotations
 
-from digitalhub_runtime_python.entities.run._base.spec import RunSpecPythonRun, RunValidatorPythonRun
+from digitalhub.entities.run._base.spec import RunSpec, RunValidator
 
 
-class RunSpecOpeninferenceRunServe(RunSpecPythonRun):
+class RunSpecOpeninferenceRunServe(RunSpec):
     """RunSpecOpeninferenceRunServe specifications."""
 
+    def __init__(
+        self,
+        task: str,
+        function: str | None = None,
+        workflow: str | None = None,
+        volumes: list[dict] | None = None,
+        resources: dict | None = None,
+        envs: list[dict] | None = None,
+        secrets: list[str] | None = None,
+        profile: str | None = None,
+        source: dict | None = None,
+        image: str | None = None,
+        base_image: str | None = None,
+        python_version: str | None = None,
+        requirements: list | None = None,
+        model_name: str | None = None,
+        inputs: dict | None = None,
+        outputs: dict | None = None,
+        service_type: str | None = None,
+        service_name: str | None = None,
+        replicas: int | None = None,
+        init_parameters: dict | None = None,
+        **kwargs,
+    ):
+        super().__init__(
+            task,
+            function,
+            workflow,
+            volumes,
+            resources,
+            envs,
+            secrets,
+            profile,
+            **kwargs,
+        )
+        self.source = source
+        self.image = image
+        self.base_image = base_image
+        self.python_version = python_version
+        self.requirements = requirements
+        self.model_name = model_name
+        self.inputs = inputs
+        self.outputs = outputs
+        self.service_type = service_type
+        self.service_name = service_name
+        self.replicas = replicas
+        self.init_parameters = init_parameters
 
-class RunValidatorOpeninferenceRunServe(RunValidatorPythonRun):
+
+class RunValidatorOpeninferenceRunServe(RunValidator):
     """RunValidatorOpeninferenceRunServe validator."""
+
+    # Function parameters
+    source: dict | None = None
+    image: str | None = None
+    base_image: str | None = None
+    python_version: str | None = None
+    requirements: list | None = None
+    model_name: str | None = None
+    inputs: dict | None = None
+    outputs: dict | None = None
+
+    # Task parameters
+    service_type: str | None = None
+    service_name: str | None = None
+    replicas: int | None = None
+
+    # Run parameters
+    init_parameters: dict | None = None
+    """Initialization parameters"""