fix more tests

Author: Benny Chen

eval_protocol/mcp_agent/orchestration/local_docker_client.py

@@ -649,7 +649,7 @@ async def list_tools_on_instance(self, instance: ManagedInstanceInfo) -> types.L
                 )
             target_base_url = instance.mcp_endpoint_url.rstrip("/")
             try:
-                async with streamablehttp_client(target_base_url) as (
+                async with streamablehttp_client(base_url=target_base_url) as (
                     read_s,
                     write_s,
                     _,  # get_session_id_func usually not needed for a single call

eval_protocol/typed_interface.py

@@ -99,6 +99,23 @@ def decorator(func: F) -> F:
         # Detect if the user supplied function is a coroutine (async def)
         _is_async_function = inspect.iscoroutinefunction(func)
 
+        def _is_list_of_message_annotation(annotation: Any) -> bool:
+            origin = get_origin(annotation)
+            args = get_args(annotation)
+            # Direct List[Message]
+            if origin in (list, List) and args and args[0] == Message:
+                return True
+            # Optional[List[Message]] or Union[List[Message], None]
+            if origin is Union and args:
+                # Filter out NoneType
+                non_none = [a for a in args if a is not type(None)]  # noqa: E721
+                if len(non_none) == 1:
+                    inner = non_none[0]
+                    inner_origin = get_origin(inner)
+                    inner_args = get_args(inner)
+                    return inner_origin in (list, List) and inner_args and inner_args[0] == Message
+            return False
+
         def _prepare_final_args(*args: Any, **kwargs: Any):
             """Prepare final positional and keyword arguments for the user function call.
             This includes Pydantic coercion and resource injection. Returns a tuple of
@@ -127,16 +144,11 @@ def _coerce_to_list_message(data_list: Any, arg_name_for_error: str) -> List[Mes
             # 1. Conditional Pydantic conversion for 'messages' (pointwise) or 'rollouts_messages' (batch)
             if mode == "pointwise" and "messages" in params and "messages" in final_func_args:
                 messages_param_annotation = params["messages"].annotation
-                if (
-                    get_origin(messages_param_annotation) in (list, List)
-                    and get_args(messages_param_annotation)
-                    and get_args(messages_param_annotation)[0] == Message
-                ):
+                if _is_list_of_message_annotation(messages_param_annotation):
                     try:
                         final_func_args["messages"] = _coerce_to_list_message(final_func_args["messages"], "messages")
-                    except Exception:
-                        # Be lenient: leave messages as-is if coercion fails (backward compatibility)
-                        pass
+                    except Exception as err:
+                        raise ValueError(f"Input 'messages' failed Pydantic validation: {err}") from None
 
             elif mode == "batch" and "rollouts_messages" in params and "rollouts_messages" in final_func_args:
                 param_annotation = params["rollouts_messages"].annotation
@@ -156,28 +168,22 @@ def _coerce_to_list_message(data_list: Any, arg_name_for_error: str) -> List[Mes
             # Ground truth coercion (if needed)
             if "ground_truth" in params and "ground_truth" in final_func_args:
                 gt_ann = params["ground_truth"].annotation
-                if get_origin(gt_ann) in (list, List) and get_args(gt_ann) and get_args(gt_ann)[0] == Message:
+                if _is_list_of_message_annotation(gt_ann):
                     if final_func_args["ground_truth"] is not None:
-                        # Accept flexible ground_truth inputs: list, dict, or str
                         gt_val = final_func_args["ground_truth"]
-                        if isinstance(gt_val, list):
-                            try:
+                        try:
+                            if isinstance(gt_val, list):
                                 final_func_args["ground_truth"] = _coerce_to_list_message(gt_val, "ground_truth")
-                            except Exception:
-                                # Leave as-is if strict coercion fails
-                                pass
-                        elif isinstance(gt_val, dict):
-                            try:
+                            elif isinstance(gt_val, dict):
                                 final_func_args["ground_truth"] = _coerce_to_list_message([gt_val], "ground_truth")
-                            except Exception:
-                                pass
-                        elif isinstance(gt_val, str):
-                            try:
+                            elif isinstance(gt_val, str):
                                 final_func_args["ground_truth"] = _coerce_to_list_message(
                                     [{"role": "system", "content": gt_val}], "ground_truth"
                                 )
-                            except Exception:
-                                pass
+                        except Exception as err:
+                            raise ValueError(
+                                f"Input 'ground_truth' failed Pydantic validation for List[Message]: {err}"
+                            ) from None
 
             # Inject resource clients into kwargs (resources are already setup)
             if resource_managers: