removing unused constants

Author: adolfo-ab

tests/model_explainability/guardrails/conftest.py

@@ -33,14 +33,10 @@
 from utilities.serving_runtime import ServingRuntimeFromTemplate
 
 
-USER_ONE: str = "user-one"
+GUARDRAILS_ORCHESTRATOR_NAME = "guardrails-orchestrator"
 
-GORCH_NAME = "guardrails-orchestrator"
-GORCH_CONFIGMAP_NAME = "fms-orchestr8-config-nlp"
-GORCH_PORT: int = 8032
 
-
-# GuardrailsOrchestrator related fixtures
+# Fixtures related to the Guardrails Orchestrator
 @pytest.fixture(scope="class")
 def guardrails_orchestrator(
     request: FixtureRequest,
@@ -50,7 +46,7 @@ def guardrails_orchestrator(
 ) -> Generator[GuardrailsOrchestrator, Any, Any]:
     gorch_kwargs = {
         "client": admin_client,
-        "name": GORCH_NAME,
+        "name": GUARDRAILS_ORCHESTRATOR_NAME,
         "namespace": model_namespace.name,
         "orchestrator_config": orchestrator_config.name,
         "replicas": 1,
@@ -104,7 +100,11 @@ def guardrails_orchestrator_pod(
     model_namespace: Namespace,
     guardrails_orchestrator: GuardrailsOrchestrator,
 ) -> Pod:
-    return list(Pod.get(namespace=model_namespace.name, label_selector=f"app.kubernetes.io/instance={GORCH_NAME}"))[0]
+    return list(
+        Pod.get(
+            namespace=model_namespace.name, label_selector=f"app.kubernetes.io/instance={GUARDRAILS_ORCHESTRATOR_NAME}"
+        )
+    )[0]
 
 
 @pytest.fixture(scope="class")
@@ -154,10 +154,10 @@ def vllm_runtime(
         containers={
             "kserve-container": {
                 "args": [
-                    f"--port={str(GORCH_PORT)}",
+                    f"--port={str(8032)}",
                     "--model=/mnt/models",
                 ],
-                "ports": [{"containerPort": GORCH_PORT, "protocol": "TCP"}],
+                "ports": [{"containerPort": 8032, "protocol": "TCP"}],
                 "volumeMounts": [{"mountPath": "/dev/shm", "name": "shm"}],
             }
         },
@@ -280,7 +280,7 @@ def prompt_injection_detector_route(
     )
 
 
-# Llama-stack fixtures
+# LlamaStack fixtures
 @pytest.fixture(scope="class")
 def llamastack_distribution_trustyai(
     admin_client: DynamicClient,
@@ -369,7 +369,7 @@ def llamastack_client_trustyai(
     return LlamaStackClient(base_url=f"http://{llamastack_distribution_trustyai_route.host}")
 
 
-# Other
+# Other "helper" fixtures
 @pytest.fixture(scope="class")
 def openshift_ca_bundle_file(
     admin_client: DynamicClient,
@@ -382,17 +382,16 @@ def guardrails_orchestrator_ssl_cert(guardrails_orchestrator_route: Route):
     hostname = guardrails_orchestrator_route.host
 
     try:
-        cmd = ["openssl", "s_client", "-showcerts", "-connect", f"{hostname}:443"]
-
-        process = subprocess.Popen(
-            args=cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
+        result = subprocess.run(
+            args=["openssl", "s_client", "-showcerts", "-connect", f"{hostname}:443"],
+            input="",
+            capture_output=True,
+            text=True,
         )
 
-        stdout, _ = process.communicate(input="")
-
         cert_lines = []
         in_cert = False
-        for line in stdout.split("\n"):
+        for line in result.stdout.splitlines():
             if "-----BEGIN CERTIFICATE-----" in line:
                 in_cert = True
             if in_cert:

tests/model_explainability/guardrails/constants.py

@@ -20,3 +20,6 @@
         "port": 8032,
     }
 }
+
+EXAMPLE_EMAIL_ADDRESS: str = "myemail@domain.com"
+PROMPT_WITH_PII: str = f"This is my email address: {EXAMPLE_EMAIL_ADDRESS}, just answer ACK."

tests/model_explainability/guardrails/test_guardrails.py

@@ -11,6 +11,8 @@
     QWEN_ISVC_NAME,
     CHAT_GENERATION_CONFIG,
     BUILTIN_DETECTOR_CONFIG,
+    PROMPT_WITH_PII,
+    EXAMPLE_EMAIL_ADDRESS,
 )
 from tests.model_explainability.guardrails.utils import (
     verify_builtin_detector_unsuitable_input_response,
@@ -25,8 +27,6 @@
 
 LOGGER = get_logger(name=__name__)
 
-EXAMPLE_EMAIL_ADDRESS: str = "myemail@domain.com"
-PROMPT_WITH_PII: str = f"This is my email address: {EXAMPLE_EMAIL_ADDRESS}, just answer ACK."
 HARMLESS_PROMPT: str = "What is the opposite of up?"
 MNT_MODELS: str = "/mnt/models"
 
@@ -59,7 +59,6 @@
     indirect=True,
 )
 @pytest.mark.smoke
-@pytest.mark.usefixtures("guardrails_orchestrator")
 def test_validate_guardrails_orchestrator_images(guardrails_orchestrator_pod, trustyai_operator_configmap):
     """Test to verify Guardrails pod images.
     Checks if the image tag from the ConfigMap is used within the Pod and if it's pinned using a sha256 digest.
@@ -112,7 +111,7 @@ def test_validate_guardrails_orchestrator_images(guardrails_orchestrator_pod, tr
 )
 @pytest.mark.smoke
 @pytest.mark.rawdeployment
-@pytest.mark.usefixtures("guardrails_gateway_config", "guardrails_orchestrator")
+@pytest.mark.usefixtures("guardrails_gateway_config")
 class TestGuardrailsOrchestratorWithBuiltInDetectors:
     """
     Tests that the basic functionality of the GuardrailsOrchestrator work properly with the built-in (regex) detectors.
@@ -261,7 +260,6 @@ def test_guardrails_builtin_detectors_negative_detection(
     indirect=True,
 )
 @pytest.mark.rawdeployment
-@pytest.mark.usefixtures("guardrails_orchestrator")
 class TestGuardrailsOrchestratorWithHuggingFaceDetectors:
     """
     These tests verify that the GuardrailsOrchestrator works as expected when using HuggingFace detectors

tests/model_explainability/guardrails/test_llamastack_fms_provider.py

@@ -2,7 +2,11 @@
 import yaml
 from simple_logger.logger import get_logger
 
-from tests.model_explainability.guardrails.constants import CHAT_GENERATION_CONFIG, BUILTIN_DETECTOR_CONFIG
+from tests.model_explainability.guardrails.constants import (
+    CHAT_GENERATION_CONFIG,
+    BUILTIN_DETECTOR_CONFIG,
+    PROMPT_WITH_PII,
+)
 from tests.model_explainability.guardrails.test_guardrails import MNT_MODELS
 from utilities.constants import MinIo
 
@@ -30,7 +34,6 @@
     ],
     indirect=True,
 )
-@pytest.mark.usefixtures("minio_pod", "guardrails_orchestrator")
 class TestLlamaStackFMSGuardrailsProvider:
     """
     Adds basic tests for the LlamaStack FMS Guardrails provider.
@@ -41,7 +44,7 @@ class TestLlamaStackFMSGuardrailsProvider:
     1. Register the generator model via lls client
     2. Test that we can run inferences on said model via lls client
     3. Register the shields (detectors)
-    4. TODO: Add tests for run_shields
+    4. Test a basic detection (PII) by using run_shields
     """
 
     def test_fms_guardrails_register_model(self, qwen_isvc, llamastack_client_trustyai):
@@ -85,6 +88,7 @@ def test_fms_guardrails_register_shield(
             provider_shield_id=PII_REGEX_SHIELD_ID,
             provider_id=trustyai_fms_provider_id,
             params=shield_params,
+            timeout=120,
         )
         shields = llamastack_client_trustyai.shields.list()
 
@@ -98,7 +102,7 @@ def test_fms_guardrails_run_shield(self, llamastack_client_trustyai):
             shield_id=PII_REGEX_SHIELD_ID,
             messages=[
                 {
-                    "content": "my email is example@mail.com",
+                    "content": PROMPT_WITH_PII,
                     "role": "system",
                 },
             ],