Merge pull request #2 from hackthemarket/copilot/pull-1406-into-fork

Add support for context-only resources (modelcontextprotocol#1406)

Author: hackthemarket

examples/snippets/servers/context_resource.py

@@ -0,0 +1,11 @@
+from mcp.server.fastmcp import Context, FastMCP
+from mcp.server.session import ServerSession
+
+mcp = FastMCP(name="Context Resource Example")
+
+
+@mcp.resource("resource://only_context")
+def resource_only_context(ctx: Context[ServerSession, None]) -> str:
+    """Resource that only receives context."""
+    assert ctx is not None
+    return "Resource with only context injected"

src/mcp/server/fastmcp/resources/base.py

@@ -1,7 +1,7 @@
 """Base classes and interfaces for FastMCP resources."""
 
 import abc
-from typing import Annotated
+from typing import Annotated, Any
 
 from pydantic import (
     AnyUrl,
@@ -44,6 +44,6 @@ def set_default_name(cls, name: str | None, info: ValidationInfo) -> str:
         raise ValueError("Either name or uri must be provided")
 
     @abc.abstractmethod
-    async def read(self) -> str | bytes:
+    async def read(self, context: Any | None = None) -> str | bytes:
         """Read the resource content."""
         pass

src/mcp/server/fastmcp/resources/types.py

@@ -14,6 +14,7 @@
 from pydantic import AnyUrl, Field, ValidationInfo, validate_call
 
 from mcp.server.fastmcp.resources.base import Resource
+from mcp.server.fastmcp.utilities.context_injection import find_context_parameter
 from mcp.types import Annotations, Icon
 
 
@@ -22,7 +23,7 @@ class TextResource(Resource):
 
     text: str = Field(description="Text content of the resource")
 
-    async def read(self) -> str:
+    async def read(self, context: Any | None = None) -> str:
         """Read the text content."""
         return self.text
 
@@ -32,7 +33,7 @@ class BinaryResource(Resource):
 
     data: bytes = Field(description="Binary content of the resource")
 
-    async def read(self) -> bytes:
+    async def read(self, context: Any | None = None) -> bytes:
         """Read the binary content."""
         return self.data
 
@@ -51,24 +52,30 @@ class FunctionResource(Resource):
     """
 
     fn: Callable[[], Any] = Field(exclude=True)
+    context_kwarg: str | None = Field(None, exclude=True)
+
+    async def read(self, context: Any | None = None) -> str | bytes:
+        """Read the resource content by calling the function."""
+        args = {}
+        if self.context_kwarg:
+            args[self.context_kwarg] = context
 
-    async def read(self) -> str | bytes:
-        """Read the resource by calling the wrapped function."""
         try:
-            # Call the function first to see if it returns a coroutine
-            result = self.fn()
-            # If it's a coroutine, await it
-            if inspect.iscoroutine(result):
-                result = await result
-
-            if isinstance(result, Resource):
-                return await result.read()
-            elif isinstance(result, bytes):
-                return result
-            elif isinstance(result, str):
-                return result
+            if inspect.iscoroutinefunction(self.fn):
+                result = await self.fn(**args)
             else:
-                return pydantic_core.to_json(result, fallback=str, indent=2).decode()
+                result = self.fn(**args)
+
+            if isinstance(result, str | bytes):
+                return result
+            if isinstance(result, pydantic.BaseModel):
+                return result.model_dump_json(indent=2)
+
+            # For other types, convert to a JSON string
+            try:
+                return json.dumps(pydantic_core.to_jsonable_python(result))
+            except pydantic_core.PydanticSerializationError:
+                return json.dumps(str(result))
         except Exception as e:
             raise ValueError(f"Error reading resource {self.uri}: {e}")
 
@@ -89,6 +96,8 @@ def from_function(
         if func_name == "<lambda>":
             raise ValueError("You must provide a name for lambda functions")
 
+        context_kwarg = find_context_parameter(fn)
+
         # ensure the arguments are properly cast
         fn = validate_call(fn)
 
@@ -100,6 +109,7 @@ def from_function(
             mime_type=mime_type or "text/plain",
             fn=fn,
             icons=icons,
+            context_kwarg=context_kwarg,
             annotations=annotations,
         )
 
@@ -137,7 +147,7 @@ def set_binary_from_mime_type(cls, is_binary: bool, info: ValidationInfo) -> boo
         mime_type = info.data.get("mime_type", "text/plain")
         return not mime_type.startswith("text/")
 
-    async def read(self) -> str | bytes:
+    async def read(self, context: Any | None = None) -> str | bytes:
         """Read the file content."""
         try:
             if self.is_binary:
@@ -153,7 +163,7 @@ class HttpResource(Resource):
     url: str = Field(description="URL to fetch content from")
     mime_type: str = Field(default="application/json", description="MIME type of the resource content")
 
-    async def read(self) -> str | bytes:
+    async def read(self, context: Any | None = None) -> str | bytes:
         """Read the HTTP content."""
         async with httpx.AsyncClient() as client:
             response = await client.get(self.url)
@@ -191,7 +201,7 @@ def list_files(self) -> list[Path]:
         except Exception as e:
             raise ValueError(f"Error listing directory {self.path}: {e}")
 
-    async def read(self) -> str:  # Always returns JSON string
+    async def read(self, context: Any | None = None) -> str:  # Always returns JSON string
         """Read the directory listing."""
         try:
             files = await anyio.to_thread.run_sync(self.list_files)

src/mcp/server/fastmcp/server.py

@@ -372,7 +372,7 @@ async def read_resource(self, uri: AnyUrl | str) -> Iterable[ReadResourceContent
             raise ResourceError(f"Unknown resource: {uri}")
 
         try:
-            content = await resource.read()
+            content = await resource.read(context=context)
             return [ReadResourceContents(content=content, mime_type=resource.mime_type)]
         except Exception as e:
             logger.exception(f"Error reading resource {uri}")
@@ -571,24 +571,22 @@ async def get_weather(city: str) -> str:
             )
 
         def decorator(fn: AnyFunction) -> AnyFunction:
-            # Check if this should be a template
             sig = inspect.signature(fn)
-            has_uri_params = "{" in uri and "}" in uri
-            has_func_params = bool(sig.parameters)
+            context_param = find_context_parameter(fn)
+
+            # Determine effective parameters, excluding context
+            effective_func_params = {p for p in sig.parameters.keys() if p != context_param}
 
-            if has_uri_params or has_func_params:
-                # Check for Context parameter to exclude from validation
-                context_param = find_context_parameter(fn)
+            has_uri_params = "{" in uri and "}" in uri
+            has_effective_func_params = bool(effective_func_params)
 
-                # Validate that URI params match function params (excluding context)
+            if has_uri_params or has_effective_func_params:
+                # Register as template
                 uri_params = set(re.findall(r"{(\w+)}", uri))
-                # We need to remove the context_param from the resource function if
-                # there is any.
-                func_params = {p for p in sig.parameters.keys() if p != context_param}
 
-                if uri_params != func_params:
+                if uri_params != effective_func_params:
                     raise ValueError(
-                        f"Mismatch between URI parameters {uri_params} and function parameters {func_params}"
+                        f"Mismatch between URI parameters {uri_params} and function parameters {effective_func_params}"
                     )
 
                 # Register as template

src/mcp/server/fastmcp/utilities/context_injection.py

@@ -31,17 +31,16 @@ def find_context_parameter(fn: Callable[..., Any]) -> str | None:
 
     # Check each parameter's type hint
     for param_name, annotation in hints.items():
-        # Handle direct Context type
+        # Handle direct Context type and generic aliases of Context
+        origin = typing.get_origin(annotation)
+
+        # Check if the annotation itself is Context or a subclass
         if inspect.isclass(annotation) and issubclass(annotation, Context):
             return param_name
 
-        # Handle generic types like Optional[Context]
-        origin = typing.get_origin(annotation)
-        if origin is not None:
-            args = typing.get_args(annotation)
-            for arg in args:
-                if inspect.isclass(arg) and issubclass(arg, Context):
-                    return param_name
+        # Check if it's a generic alias of Context (e.g., Context[...])
+        if origin is not None and inspect.isclass(origin) and issubclass(origin, Context):
+            return param_name
 
     return None
 

tests/server/fastmcp/resources/test_function_resources.py

@@ -18,6 +18,7 @@ def my_func() -> str:
             name="test",
             description="test function",
             fn=my_func,
+            context_kwarg=None,
         )
         assert str(resource.uri) == "fn://test"
         assert resource.name == "test"
@@ -36,6 +37,7 @@ def get_data() -> str:
             uri=AnyUrl("function://test"),
             name="test",
             fn=get_data,
+            context_kwarg=None,
         )
         content = await resource.read()
         assert content == "Hello, world!"
@@ -52,6 +54,7 @@ def get_data() -> bytes:
             uri=AnyUrl("function://test"),
             name="test",
             fn=get_data,
+            context_kwarg=None,
         )
         content = await resource.read()
         assert content == b"Hello, world!"
@@ -67,6 +70,7 @@ def get_data() -> dict[str, str]:
             uri=AnyUrl("function://test"),
             name="test",
             fn=get_data,
+            context_kwarg=None,
         )
         content = await resource.read()
         assert isinstance(content, str)
@@ -83,6 +87,7 @@ def failing_func() -> str:
             uri=AnyUrl("function://test"),
             name="test",
             fn=failing_func,
+            context_kwarg=None,
         )
         with pytest.raises(ValueError, match="Error reading resource function://test"):
             await resource.read()
@@ -98,6 +103,7 @@ class MyModel(BaseModel):
             uri=AnyUrl("function://test"),
             name="test",
             fn=lambda: MyModel(name="test"),
+            context_kwarg=None,
         )
         content = await resource.read()
         assert content == '{\n  "name": "test"\n}'
@@ -117,6 +123,7 @@ def get_data() -> CustomData:
             uri=AnyUrl("function://test"),
             name="test",
             fn=get_data,
+            context_kwarg=None,
         )
         content = await resource.read()
         assert isinstance(content, str)
@@ -132,6 +139,7 @@ async def get_data() -> str:
             uri=AnyUrl("function://test"),
             name="test",
             fn=get_data,
+            context_kwarg=None,
         )
         content = await resource.read()
         assert content == "Hello, world!"

tests/server/fastmcp/resources/test_resources.py

@@ -20,6 +20,7 @@ def dummy_func() -> str:
             uri=AnyUrl("http://example.com/data"),
             name="test",
             fn=dummy_func,
+            context_kwarg=None,
         )
         assert str(resource.uri) == "http://example.com/data"
 
@@ -29,6 +30,7 @@ def dummy_func() -> str:
                 uri=AnyUrl("invalid"),
                 name="test",
                 fn=dummy_func,
+                context_kwarg=None,
             )
 
         # Missing host
@@ -37,6 +39,7 @@ def dummy_func() -> str:
                 uri=AnyUrl("http://"),
                 name="test",
                 fn=dummy_func,
+                context_kwarg=None,
             )
 
     def test_resource_name_from_uri(self):
@@ -48,6 +51,7 @@ def dummy_func() -> str:
         resource = FunctionResource(
             uri=AnyUrl("resource://my-resource"),
             fn=dummy_func,
+            context_kwarg=None,
         )
         assert resource.name == "resource://my-resource"
 
@@ -61,13 +65,15 @@ def dummy_func() -> str:
         with pytest.raises(ValueError, match="Either name or uri must be provided"):
             FunctionResource(
                 fn=dummy_func,
+                context_kwarg=None,
             )
 
         # Explicit name takes precedence over URI
         resource = FunctionResource(
             uri=AnyUrl("resource://uri-name"),
             name="explicit-name",
             fn=dummy_func,
+            context_kwarg=None,
         )
         assert resource.name == "explicit-name"
 
@@ -81,6 +87,7 @@ def dummy_func() -> str:
         resource = FunctionResource(
             uri=AnyUrl("resource://test"),
             fn=dummy_func,
+            context_kwarg=None,
         )
         assert resource.mime_type == "text/plain"
 
@@ -89,6 +96,7 @@ def dummy_func() -> str:
             uri=AnyUrl("resource://test"),
             fn=dummy_func,
             mime_type="application/json",
+            context_kwarg=None,
         )
         assert resource.mime_type == "application/json"