Replace SimpleNamespace with Pydantic FunctionLike model for tool definitions

Co-authored-by: bchen <bchen@fireworks.ai>

Author: cursoragent

eval_protocol/mcp/mcp_multi_client.py

@@ -3,7 +3,15 @@
 from contextlib import AsyncExitStack
 from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Union
-from types import SimpleNamespace
+from pydantic import BaseModel
+from typing import Optional
+
+
+class FunctionLike(BaseModel):
+    name: Optional[str] = None
+    description: Optional[str] = None
+    parameters: Any = None
+
 
 from dotenv import load_dotenv
 from mcp import ClientSession, StdioServerParameters
@@ -135,7 +143,7 @@ async def get_available_tools(self) -> List[Dict[str, Any]]:
                     all_tools.append(
                         {
                             "type": "function",
-                            "function": SimpleNamespace(
+                            "function": FunctionLike(
                                 name=tool.name,
                                 description=tool.description,
                                 parameters=tool.inputSchema,

eval_protocol/pytest/default_agent_rollout_processor.py

@@ -15,7 +15,14 @@
 from eval_protocol.models import EvaluationRow, Message
 from eval_protocol.pytest.rollout_processor import RolloutProcessor
 from eval_protocol.pytest.types import Dataset, RolloutProcessorConfig
-from types import SimpleNamespace
+from pydantic import BaseModel
+from typing import Optional
+
+
+class FunctionLike(BaseModel):
+    name: Optional[str] = None
+    parameters: Any = None
+
 
 logger = logging.getLogger(__name__)
 
@@ -53,10 +60,10 @@ async def _get_tools(self) -> Optional[List[dict[str, Any]]]:
                             f_params = getattr(f, "parameters", None)
                             if hasattr(f_params, "model_dump"):
                                 f_params = f_params.model_dump()
-                            func_obj = SimpleNamespace(name=f_name, parameters=f_params)
+                            func_obj = FunctionLike(name=f_name, parameters=f_params)
                             t = {"type": t.get("type", "function"), "function": func_obj}
                         elif isinstance(f, dict):
-                            func_obj = SimpleNamespace(name=f.get("name"), parameters=f.get("parameters"))
+                            func_obj = FunctionLike(name=f.get("name"), parameters=f.get("parameters"))
                             t = {"type": t.get("type", "function"), "function": func_obj}
                         tools_dicts.append(t)
                         continue
@@ -69,7 +76,7 @@ async def _get_tools(self) -> Optional[List[dict[str, Any]]]:
                         params_payload = params
                     else:
                         params_payload = {}
-                    func_obj = SimpleNamespace(name=name, parameters=params_payload)
+                    func_obj = FunctionLike(name=name, parameters=params_payload)
                     tools_dicts.append({"type": tool_type or "function", "function": func_obj})
                 self.evaluation_row.tools = tools_dicts
             else: