Merge branch 'main' into remove_xfail

Author: dbasunag

tests/fixtures/guardrails.py

@@ -64,7 +64,7 @@ def guardrails_orchestrator(
                 "otlpMetricsEndpoint": metrics_endpoint,
                 "otlpTracesEndpoint": traces_endpoint,
                 "enableMetrics": True,
-                "enableTracing": True,
+                "enableTraces": True,
             }
 
         with GuardrailsOrchestrator(**gorch_kwargs, teardown=teardown_resources) as gorch:

tests/model_explainability/guardrails/test_guardrails.py

@@ -390,8 +390,7 @@ def test_guardrails_traces_in_tempo(
 
         @retry(wait_timeout=Timeout.TIMEOUT_1MIN, sleep=5)
         def check_traces():
-            services = requests.get(f"{tempo_traces_service_portforward}/api/services").json().get("data", [])
-
+            services = requests.get(f"{tempo_traces_service_portforward}/api/services").json().get("data") or []
             guardrails_services = [s for s in services if "guardrails" in s]
             if not guardrails_services:
                 return False

tests/model_serving/model_server/llmd/utils.py

@@ -381,10 +381,10 @@ def get_scheduler_decision_logs(
 
     # Get all logs from the scheduler pod
     # Note: The router-scheduler container is the default/main container
-    raw_logs = router_scheduler_pod.log()
+    raw_logs = router_scheduler_pod.log(container="main")
 
     # Target decision message
-    target_decision_msg = "Selecting pods from candidates sorted by max score"
+    target_decision_msg = "Selecting endpoints from candidates sorted by max score"
 
     # Filtering logs
     filtered_logs = "\n".join(line for line in raw_logs.splitlines() if target_decision_msg in line)