fix: reviewer requested changes

Author: sheltoncyril

tests/fixtures/inference.py

@@ -207,9 +207,9 @@ def patched_dsc_kserve_headed(
     """Configure KServe Services to work in Headed mode i.e. using the Service port instead of the Pod port"""
 
     def _kserve_last_transition_time(dsc_resource: DataScienceCluster) -> str:
-        return next(filter(lambda x: x["type"] == "KserveReady", dsc_resource.instance.status["conditions"]))[
-            "lastTransitionTime"
-        ]
+        return next(
+            filter(lambda condition: condition["type"] == "KserveReady", dsc_resource.instance.status["conditions"])
+        )["lastTransitionTime"]
 
     @retry(wait_timeout=30, sleep=5)
     def _wait_for_headed_entities_status_ready(kserve_last_transition_time: str, dsc_resource: DataScienceCluster):
@@ -221,11 +221,12 @@ def _wait_for_headed_entities_status_ready(kserve_last_transition_time: str, dsc
 
     dsc = get_data_science_cluster(client=admin_client)
     if not dsc.instance.spec.components.kserve.rawDeploymentServiceConfig == "Headed":
+        kserve_pre_transition_time = _kserve_last_transition_time(dsc_resource=dsc)
         with ResourceEditor(
             patches={dsc: {"spec": {"components": {"kserve": {"rawDeploymentServiceConfig": "Headed"}}}}}
         ):
             _wait_for_headed_entities_status_ready(
-                kserve_last_transition_time=_kserve_last_transition_time(dsc), dsc_resource=dsc
+                kserve_last_transition_time=kserve_pre_transition_time, dsc_resource=dsc
             )
             yield dsc
     else:

tests/model_explainability/guardrails/utils.py

@@ -7,6 +7,8 @@
 from typing import Dict, Any, List, Optional
 
 from timeout_sampler import retry
+
+from utilities.exceptions import UnexpectedValueError
 from utilities.guardrails import get_auth_headers
 from tests.model_explainability.guardrails.constants import GuardrailsDetectionPrompt
 
@@ -125,10 +127,14 @@ def verify_builtin_detector_unsuitable_input_response(
     response_data = verify_and_parse_response(response=response)
     errors = []
 
-    warnings = response_data.get("warnings", [])
+    if not response_data:
+        raise UnexpectedValueError("Expected non-empty response data but got an empty response.")
+
+    warnings = response_data.get("warnings")
     unsuitable_input_warning: str = "UNSUITABLE_INPUT"
+
     if warnings is None:
-        errors.append("Expected warnings in response, got None")
+        raise UnexpectedValueError("Expected warnings in response, got None")
     elif len(warnings) != 1:
         errors.append(f"Expected 1 warning in response, got {len(warnings)}")
     elif warnings[0]["type"] != unsuitable_input_warning:

utilities/exceptions.py

@@ -136,3 +136,7 @@ class MissingParameter(Exception):
 
 class ExceptionUserLogin(Exception):
     pass
+
+
+class UnexpectedValueError(Exception):
+    """Unexpected value found"""