diff --git a/src/mcp/server/mcpserver/resources/templates.py b/src/mcp/server/mcpserver/resources/templates.py index 621b2e9448..074759c7b7 100644 --- a/src/mcp/server/mcpserver/resources/templates.py +++ b/src/mcp/server/mcpserver/resources/templates.py @@ -12,7 +12,8 @@ from pydantic import BaseModel, Field, validate_call from mcp.server.mcpserver.exceptions import ResourceError, UnexpectedResourceError -from mcp.server.mcpserver.resources.types import FunctionResource, Resource +from mcp.server.mcpserver.resources.base import Resource +from mcp.server.mcpserver.resources.types import FunctionResource from mcp.server.mcpserver.utilities.context_injection import find_context_parameter, inject_context from mcp.server.mcpserver.utilities.func_metadata import func_metadata from mcp.shared._callable_inspection import is_async_callable @@ -231,15 +232,26 @@ async def create_resource( if isinstance(result, InputRequiredResult): return result + # A handler-returned Resource describes this URI's content, so the mime_type and + # meta it declares win over the template-wide declaration, which stays the + # fallback for anything it left at its model default. + mime_type = self.mime_type + meta = self.meta + if isinstance(result, Resource): + if "mime_type" in result.model_fields_set: + mime_type = result.mime_type + if result.meta is not None: + meta = result.meta + return FunctionResource( uri=uri, # type: ignore name=self.name, title=self.title, description=self.description, - mime_type=self.mime_type, + mime_type=mime_type, icons=self.icons, annotations=self.annotations, - meta=self.meta, + meta=meta, fn=lambda: result, # Capture result in closure ) except (ResourceError, MCPError): diff --git a/tests/server/mcpserver/resources/test_resource_template.py b/tests/server/mcpserver/resources/test_resource_template.py index b27c77a585..598d11bbf9 100644 --- a/tests/server/mcpserver/resources/test_resource_template.py +++ b/tests/server/mcpserver/resources/test_resource_template.py @@ -8,7 +8,7 @@ from mcp.server.mcpserver import Context, MCPServer from mcp.server.mcpserver.exceptions import ResourceError -from mcp.server.mcpserver.resources import FunctionResource, ResourceTemplate +from mcp.server.mcpserver.resources import BinaryResource, FunctionResource, ResourceTemplate, TextResource from mcp.server.mcpserver.resources.templates import ( DEFAULT_RESOURCE_SECURITY, ResourceSecurity, @@ -507,6 +507,34 @@ def ask(topic: str) -> InputRequiredResult: assert result is sentinel +@pytest.mark.anyio +async def test_handler_returned_resource_supplies_its_content_metadata(): + """A template handler may return a Resource to pick per-URI content metadata; the template's + own declarations only fill what that Resource leaves at its model defaults.""" + server = MCPServer("test") + + @server.resource("bin://{name}") + def get_bin(name: str) -> BinaryResource: + return BinaryResource( + uri=f"bin://{name}", name=name, data=b"\x89PNG", mime_type="image/png", meta={"source": "camera"} + ) + + @server.resource("doc://{name}", mime_type="text/markdown") + def get_doc(name: str) -> TextResource: + return TextResource(uri=f"doc://{name}", name=name, text="# hi") + + declared = await server.read_resource("bin://cat.png") + assert not isinstance(declared, InputRequiredResult) + [png] = list(declared) + assert png.mime_type == "image/png" + assert png.meta == {"source": "camera"} + + inherited = await server.read_resource("doc://readme") + assert not isinstance(inherited, InputRequiredResult) + [markdown] = list(inherited) + assert markdown.mime_type == "text/markdown" + + class _Chart: """A plain class pydantic cannot build a schema for."""