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
19 changes: 19 additions & 0 deletions src/mcp/server/mcpserver/resources/templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,25 @@ async def create_resource(
if isinstance(result, InputRequiredResult):
return result

if isinstance(result, Resource):
# The template function returned a concrete resource (e.g. BinaryResource)
# to describe THIS URI's content. Its explicitly set fields win over the
# template defaults — otherwise a blob would be served as text/plain and the
# per-URI meta would be dropped, since read_resource() reports the wrapping
# FunctionResource's mime_type/meta.
explicit = result.model_fields_set
return FunctionResource(
uri=uri, # type: ignore
name=result.name or self.name,
title=result.title if "title" in explicit else self.title,
description=result.description if "description" in explicit else self.description,
mime_type=result.mime_type if "mime_type" in explicit else self.mime_type,
icons=result.icons if "icons" in explicit else self.icons,
annotations=result.annotations if "annotations" in explicit else self.annotations,
meta=result.meta if "meta" in explicit else self.meta,
fn=result.read,
)

return FunctionResource(
uri=uri, # type: ignore
name=self.name,
Expand Down
75 changes: 75 additions & 0 deletions tests/server/mcpserver/resources/test_resource_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,81 @@ def get_item(item_id: str) -> str:
assert resource.meta["cacheable"] is True


class TestTemplateReturnedResourceWins:
"""A template function may return a concrete Resource for the matched URI.

Its explicitly set fields must survive the wrapping: read_resource() reports
the wrapping FunctionResource's mime_type/meta, so a returned BinaryResource
served as text/plain (and losing its meta) is the bug in #3874.
"""

@pytest.mark.anyio
async def test_returned_resource_mime_type_and_meta_survive(self):
from mcp.server.mcpserver.resources.types import BinaryResource

def get_bin(name: str) -> BinaryResource:
return BinaryResource(
uri=f"bin://{name}",
name=name,
data=b"\x89PNG\r\n\x1a\n",
mime_type="image/png",
meta={"source": "camera"},
)

template = ResourceTemplate.from_function(fn=get_bin, uri_template="bin://{name}")

resource = await template.create_resource("bin://cat.png", {"name": "cat.png"}, Context())

assert isinstance(resource, FunctionResource)
assert resource.uri == "bin://cat.png"
assert resource.mime_type == "image/png"
assert resource.meta == {"source": "camera"}
assert await resource.read() == b"\x89PNG\r\n\x1a\n"

@pytest.mark.anyio
async def test_unset_fields_fall_back_to_the_template(self):
from mcp.server.mcpserver.resources.types import TextResource

def get_doc(slug: str) -> TextResource:
# Only uri/text are set; mime_type keeps its Resource default and
# must not override the template's declared type.
return TextResource(uri=f"doc://{slug}", text=f"# {slug}")

template = ResourceTemplate.from_function(
fn=get_doc,
uri_template="doc://{slug}",
mime_type="text/markdown",
meta={"template": True},
)

resource = await template.create_resource("doc://guide", {"slug": "guide"}, Context())

assert resource.mime_type == "text/markdown"
assert resource.meta == {"template": True}
assert await resource.read() == "# guide"

@pytest.mark.anyio
async def test_read_resource_reports_the_returned_mime_type(self):
from mcp.server.mcpserver.resources.types import BinaryResource

mcp = MCPServer("test")

@mcp.resource("bin://{name}")
def get_bin(name: str) -> BinaryResource:
return BinaryResource(
uri=f"bin://{name}",
name=name,
data=b"\x89PNG\r\n\x1a\n",
mime_type="image/png",
meta={"source": "camera"},
)

contents = list(await mcp.read_resource("bin://cat.png"))

assert contents[0].mime_type == "image/png"
assert contents[0].meta == {"source": "camera"}


@pytest.mark.anyio
async def test_sync_fn_runs_in_worker_thread():
"""Sync template functions must run in a worker thread, not the event loop."""
Expand Down
Loading