[Bugfix] Support MCP SDK 2.x tool input schemas (#53870)

Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com>
This commit is contained in:
Chauncey
2026-09-01 11:02:39 -04:00
committed by GitHub
parent 0d4ad47981
commit 339e16cbb6
7 changed files with 118 additions and 37 deletions
@@ -10,7 +10,10 @@ from openai import OpenAI
from openai_harmony import Message, ToolDescription, ToolNamespaceConfig
from tests.utils import RemoteOpenAIServer
from vllm.entrypoints.mcp.tool_server import MCPToolServer
from vllm.entrypoints.mcp.tool_server import (
MCPToolServer,
post_process_tools_description,
)
from .conftest import (
BASE_TEST_ENV,
@@ -36,8 +39,9 @@ _PYTHON_TOOL_INSTRUCTION = (
)
@pytest.mark.skip_global_cleanup
class TestMCPToolServerUnit:
"""Test MCPToolServer.get_tool_description filtering logic.
"""Test MCP tool description processing and filtering.
Note: The wildcard "*" is normalized to None by
_extract_allowed_tools_from_mcp_requests before reaching this layer,
@@ -96,6 +100,41 @@ class TestMCPToolServerUnit:
# Empty list - returns None
assert server.get_tool_description("test_server", allowed_tools=[]) is None
def test_post_process_tools_description_uses_trim_schema_result(self, monkeypatch):
mcp_types = pytest.importorskip("mcp.types")
tool = mcp_types.Tool(
name="tool",
input_schema={"type": "object"},
)
result = mcp_types.ListToolsResult(tools=[tool])
trimmed_schema = {"type": "object", "properties": {}}
monkeypatch.setattr(
"vllm.entrypoints.mcp.tool_server.trim_schema",
lambda _schema: trimmed_schema,
)
post_process_tools_description(result)
assert tool.input_schema is trimmed_schema
def test_post_process_tools_description_honors_meta_opt_out(self):
mcp_types = pytest.importorskip("mcp.types")
included = mcp_types.Tool(
name="included",
input_schema={"type": "object"},
)
excluded = mcp_types.Tool(
name="excluded",
input_schema={"type": "object"},
meta={"include_in_prompt": False},
)
result = mcp_types.ListToolsResult(tools=[included, excluded])
post_process_tools_description(result)
assert result.tools == [included]
def test_builtin_tools_consistency(self):
"""MCP_BUILTIN_TOOLS must match BUILTIN_TOOL_TO_MCP_SERVER_LABEL values."""
from vllm.entrypoints.openai.parser.harmony_utils import (