[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

tests/model_explainability/guardrails/conftest.py

@@ -1,34 +1,27 @@
 from typing import Generator, Any
 
 import pytest
-import yaml
 from kubernetes.dynamic import DynamicClient
 from kubernetes.dynamic.exceptions import ResourceNotFoundError
 from ocp_resources.cluster_service_version import ClusterServiceVersion
-from ocp_resources.config_map import ConfigMap
 from ocp_resources.deployment import Deployment
-from ocp_resources.exceptions import MissingRequiredArgumentError
-from ocp_resources.guardrails_orchestrator import GuardrailsOrchestrator
 from ocp_resources.inference_service import InferenceService
-from ocp_resources.jaeger import Jaeger
 from ocp_resources.namespace import Namespace
 from ocp_resources.open_telemetry_collector import OpenTelemetryCollector
 from ocp_resources.pod import Pod
-from ocp_resources.resource import ResourceEditor, NamespacedResource
 from ocp_resources.route import Route
 from ocp_resources.secret import Secret
 from ocp_resources.serving_runtime import ServingRuntime
-from ocp_resources.subscription import Subscription
 from ocp_utilities.operators import install_operator, uninstall_operator
-from pytest_testconfig import py_config
 from timeout_sampler import TimeoutSampler
 
 from tests.model_explainability.guardrails.constants import AUTOCONFIG_DETECTOR_LABEL
 from utilities.certificates_utils import create_ca_bundle_file
 from utilities.constants import (
     KServeDeploymentType,
-    Labels,
-    Timeout, OPENSHIFT_OPERATORS, RuntimeTemplates,
+    Timeout,
+    OPENSHIFT_OPERATORS,
+    RuntimeTemplates,
 )
 from utilities.inference_utils import create_isvc
 from utilities.operator_utils import get_cluster_service_version
@@ -153,6 +146,7 @@ def hap_detector_route(
         wait_for_resource=True,
     )
 
+
 @pytest.fixture(scope="class")
 def installed_opentelemetry_operator(admin_client: DynamicClient) -> Generator[None, Any, None]:
     """
@@ -191,6 +185,7 @@ def installed_opentelemetry_operator(admin_client: DynamicClient) -> Generator[N
         clean_up_namespace=False,
     )
 
+
 @pytest.fixture(scope="class")
 def otel_operator_cr(
     admin_client: DynamicClient,
@@ -206,14 +201,13 @@ def otel_operator_cr(
 
     alm_examples: list[dict[str, Any]] = otel_csv.get_alm_examples()
     otel_cr_dict: dict[str, Any] = next(
-        example for example in alm_examples if example["kind"]  == "OpenTelemetryCollector" and example["apiVersion"]=="opentelemetry.io/v1beta1"
+        example
+        for example in alm_examples
+        if example["kind"] == "OpenTelemetryCollector" and example["apiVersion"] == "opentelemetry.io/v1beta1"
     )
 
-
     if not otel_cr_dict:
-        raise ResourceNotFoundError(
-            f"No OpenTelemetryCollector dict found in alm_examples for CSV {otel_csv.name}"
-        )
+        raise ResourceNotFoundError(f"No OpenTelemetryCollector dict found in alm_examples for CSV {otel_csv.name}")
 
     otel_cr_dict["metadata"]["namespace"] = model_namespace.name
 
@@ -224,10 +218,9 @@ def otel_operator_cr(
         )
         yield otel_cr
 
+
 @pytest.fixture(scope="class")
-def installed_tempo_operator(
-        admin_client: DynamicClient, model_namespace: Namespace
-) -> Generator[None, Any, None]:
+def installed_tempo_operator(admin_client: DynamicClient, model_namespace: Namespace) -> Generator[None, Any, None]:
     """
     Installs the Tempo operator and waits for its deployment.
     """
@@ -264,12 +257,11 @@ def installed_tempo_operator(
     )
 
 
-
 @pytest.fixture(scope="class")
 def tempo_instance(
-        admin_client: DynamicClient,
-        installed_tempo_operator: None,
-        model_namespace: Namespace,
+    admin_client: DynamicClient,
+    installed_tempo_operator: None,
+    model_namespace: Namespace,
 ) -> Generator[Any, Any, None]:
     """
     Create a Tempo instance in the test namespace.
@@ -283,23 +275,16 @@ def tempo_instance(
     )
 
     alm_examples: list[dict[str, Any]] = tempo_csv.get_alm_examples()
-    tempo_dict: dict[str, Any] = next(
-        example for example in alm_examples if example["kind"] == "TempoMonolithic"
-    )
+    tempo_dict: dict[str, Any] = next(example for example in alm_examples if example["kind"] == "TempoMonolithic")
 
     if not tempo_dict:
-        raise ResourceNotFoundError(
-            f"No Tempo dict found in alm_examples for CSV {tempo_csv.name}"
-        )
+        raise ResourceNotFoundError(f"No Tempo dict found in alm_examples for CSV {tempo_csv.name}")
 
     tempo_dict["metadata"]["namespace"] = model_namespace.name
     tempo_dict["metadata"]["name"] = "my-tempo"
 
     # Create Tempo resource
-    tempo_resource = admin_client.resources.get(
-        api_version=tempo_dict["apiVersion"],
-        kind=tempo_dict["kind"]
-    )
+    tempo_resource = admin_client.resources.get(api_version=tempo_dict["apiVersion"], kind=tempo_dict["kind"])
     created_tempo = tempo_resource.create(body=tempo_dict, namespace=model_namespace.name)
 
     wait_for_tempo_pods(
@@ -320,6 +305,7 @@ def wait_for_tempo_pods(
     """
     Wait for pods created by a Tempo instance to be ready.
     """
+
     def _get_tempo_pods() -> list[Pod]:
         return [
             _pod
@@ -330,9 +316,7 @@ def _get_tempo_pods() -> list[Pod]:
             )
         ]
 
-    sampler = TimeoutSampler(
-        wait_timeout=timeout, sleep=1, func=lambda: bool(_get_tempo_pods())
-    )
+    sampler = TimeoutSampler(wait_timeout=timeout, sleep=1, func=lambda: bool(_get_tempo_pods()))
 
     for sample in sampler:
         if sample:
@@ -361,14 +345,12 @@ def _get_collector_pods() -> list[Pod]:
             for _pod in Pod.get(
                 dyn_client=client,
                 namespace=namespace,
-                label_selector=f"app.kubernetes.io/component=opentelemetry-collector",
+                label_selector="app.kubernetes.io/component=opentelemetry-collector",
             )
         ]
         return pods
 
-    sampler = TimeoutSampler(
-        wait_timeout=timeout, sleep=1, func=lambda: bool(_get_collector_pods())
-    )
+    sampler = TimeoutSampler(wait_timeout=timeout, sleep=1, func=lambda: bool(_get_collector_pods()))
 
     for sample in sampler:
         if sample:
@@ -384,13 +366,11 @@ def _get_collector_pods() -> list[Pod]:
 
 @pytest.fixture(scope="class")
 def tempo_query_route(
-    admin_client: DynamicClient,
-    model_namespace: Namespace,
-    tempo_instance
+    admin_client: DynamicClient, model_namespace: Namespace, tempo_instance
 ) -> Generator[Route, Any, Any]:
     tempo_query_route = Route(
         name="tempo-query",
         namespace=model_namespace.name,
         wait_for_resource=True,
         ensure_exists=True,
-    )
+    )

tests/model_explainability/guardrails/test_guardrails.py

@@ -5,12 +5,9 @@
 import pytest
 import requests
 import yaml
-from ocp_resources.pod import Pod
 from simple_logger.logger import get_logger
 from timeout_sampler import retry
 
-from tests.model_explainability.constants import MNT_MODELS
-from tests.model_explainability.guardrails.conftest import wait_for_jaeger_pods
 from tests.model_explainability.guardrails.constants import (
     AUTOCONFIG_DETECTOR_LABEL,
     PII_INPUT_DETECTION_PROMPT,
@@ -259,17 +256,16 @@ def test_guardrails_builtin_detectors_unsuitable_output(
         )
 
     def test_guardrails_traces_in_jaeger(
-            self,
-            admin_client,
-            jaeger_instance,
-            otel_operator_cr,
-            model_namespace,
-            minio_pod,
-            minio_data_connection,
-            orchestrator_config,
-            guardrails_orchestrator,
-            guardrails_gateway_config,
-
+        self,
+        admin_client,
+        jaeger_instance,
+        otel_operator_cr,
+        model_namespace,
+        minio_pod,
+        minio_data_connection,
+        orchestrator_config,
+        guardrails_orchestrator,
+        guardrails_gateway_config,
     ):
         """
         Ensure that OpenTelemetry traces from Guardrails Orchestrator are collected in Jaeger.
@@ -797,4 +793,3 @@ def test_guardrails_autoconfig_gateway_negative_detection(
         )
 
         verify_negative_detection_response(response=response)
-