Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/mcp/server/mcpserver/tools/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
returns_input_required,
)
from mcp.server.mcpserver.utilities.context_injection import find_context_parameter
from mcp.server.mcpserver.utilities.func_metadata import FuncMetadata, func_metadata
from mcp.server.mcpserver.utilities.func_metadata import FuncMetadata, NoTitleJsonSchema, func_metadata
from mcp.shared._callable_inspection import is_async_callable
from mcp.shared.exceptions import MCPError
from mcp.shared.tool_name_validation import validate_and_warn_tool_name
Expand Down Expand Up @@ -103,7 +103,7 @@ def from_function(
skip_names=skip_names,
structured_output=structured_output,
)
parameters = func_arg_metadata.arg_model.model_json_schema(by_alias=True)
parameters = func_arg_metadata.arg_model.model_json_schema(by_alias=True, schema_generator=NoTitleJsonSchema)

# Match `model_dump_one_level`'s kwarg keys (alias when present, else field name)
# so a by-name resolver param resolves to a key that exists at call time.
Expand Down
8 changes: 8 additions & 0 deletions src/mcp/server/mcpserver/utilities/func_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ def emit_warning(self, kind: JsonSchemaWarningKind, detail: str) -> None:
raise ValueError(f"JSON schema warning: {kind} - {detail}")


class NoTitleJsonSchema(StrictJsonSchema):
"""A strict JSON schema generator that omits titles derived from field names."""

def field_title_should_be_set(self, schema: Any) -> bool:
"""Return false so Pydantic does not add a title derived from the field name."""
return False


_LOCAL_DEFS_PREFIX = "#/$defs/"


Expand Down
20 changes: 20 additions & 0 deletions tests/server/mcpserver/test_title.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
"""Integration tests for title field functionality."""

from typing import Annotated

import pytest
from mcp_types import Prompt, Resource, ResourceTemplate, Tool, ToolAnnotations
from pydantic import Field

from mcp import Client
from mcp.server.mcpserver import MCPServer
Expand Down Expand Up @@ -87,6 +90,23 @@ def tool_with_both(message: str) -> str: # pragma: no cover
assert both.title == "Primary Title"


@pytest.mark.anyio
async def test_tool_input_schema_omits_derived_titles_but_preserves_explicit_titles():
"""Tool schemas omit Pydantic's field-name titles while preserving explicit titles."""
mcp = MCPServer(name="SchemaTitleServer")

@mcp.tool()
def typed_tool(required: str, explicit: Annotated[int, Field(title="Explicit Count")]) -> str: # pragma: no cover
return f"{required}: {explicit}"

async with Client(mcp) as client:
tools = await client.list_tools()

properties = tools.tools[0].input_schema["properties"]
assert properties["required"] == {"type": "string"}
assert properties["explicit"] == {"title": "Explicit Count", "type": "integer"}


@pytest.mark.anyio
async def test_prompt_title():
"""Test that prompt titles work correctly."""
Expand Down
Loading