Skip to content

Python: Filter framework kwargs from MCP tool invocations #2870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moonbox3 merged 2 commits into from
Dec 16, 2025
Merged

Python: Filter framework kwargs from MCP tool invocations #2870

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b17c00e
Filter framework kwargs from MCP tool invocations
moonbox3 Dec 15, 2025
15f45dd
Fixes
moonbox3 Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion python/packages/core/agent_framework/_mcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,8 +685,16 @@ async def call_tool(self, tool_name: str, **kwargs: Any) -> list[Contents]:
raise ToolExecutionException(
"Tools are not loaded for this server, please set load_tools=True in the constructor."
)
# Filter out framework kwargs that cannot be serialized by the MCP SDK.
# These are internal objects passed through the function invocation pipeline
# that should not be forwarded to external MCP servers.
filtered_kwargs = {
k: v for k, v in kwargs.items() if k not in {"chat_options", "tools", "tool_choice", "thread"}
}
try:
return _mcp_call_tool_result_to_ai_contents(await self.session.call_tool(tool_name, arguments=kwargs))
return _mcp_call_tool_result_to_ai_contents(
await self.session.call_tool(tool_name, arguments=filtered_kwargs)
)
except McpError as mcp_exc:
raise ToolExecutionException(mcp_exc.error.message, inner_exception=mcp_exc) from mcp_exc
except Exception as ex:
Expand Down
Loading