fix: add type params to generic Context

Author: fubuloubu

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

@@ -11,6 +11,8 @@
 
 if TYPE_CHECKING:
     from mcp.server.fastmcp.server import Context
+    from mcp.server.session import ServerSessionT
+    from mcp.shared.context import LifespanContextT
 
 logger = get_logger(__name__)
 
@@ -69,7 +71,9 @@ def add_template(
         return template
 
     async def get_resource(
-        self, uri: AnyUrl | str, context: "Context | None" = None
+        self,
+        uri: AnyUrl | str,
+        context: "Context[ServerSessionT, LifespanContextT] | None" = None,
     ) -> Resource | None:
         """Get resource by URI, checking concrete resources first, then templates."""
         uri_str = str(uri)

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

@@ -10,10 +10,12 @@
 from pydantic import BaseModel, Field, validate_call
 
 from mcp.server.fastmcp.resources.types import FunctionResource, Resource
+from mcp.server.fastmcp.server import Context
 from mcp.server.fastmcp.utilities.func_metadata import func_metadata
 
 if TYPE_CHECKING:
-    from mcp.server.fastmcp.server import Context
+    from mcp.server.session import ServerSessionT
+    from mcp.shared.context import LifespanContextT
 
 
 class ResourceTemplate(BaseModel):
@@ -43,23 +45,20 @@ def from_function(
         name: str | None = None,
         description: str | None = None,
         mime_type: str | None = None,
+        context_kwarg: str | None = None,
     ) -> ResourceTemplate:
         """Create a template from a function."""
         func_name = name or fn.__name__
         if func_name == "<lambda>":
             raise ValueError("You must provide a name for lambda functions")
 
         # Find context parameter if it exists
-        context_kwarg = None
-        sig = inspect.signature(fn)
-        for param_name, param in sig.parameters.items():
-            if (
-                param.annotation.__name__ == "Context"
-                if hasattr(param.annotation, "__name__")
-                else False
-            ):
-                context_kwarg = param_name
-                break
+        if context_kwarg is None:
+            sig = inspect.signature(fn)
+            for param_name, param in sig.parameters.items():
+                if param.annotation is Context:
+                    context_kwarg = param_name
+                    break
 
         # Get schema from func_metadata, excluding context parameter
         func_arg_metadata = func_metadata(
@@ -91,7 +90,10 @@ def matches(self, uri: str) -> dict[str, Any] | None:
         return None
 
     async def create_resource(
-        self, uri: str, params: dict[str, Any], context: Context | None = None
+        self,
+        uri: str,
+        params: dict[str, Any],
+        context: Context[ServerSessionT, LifespanContextT] | None = None,
     ) -> Resource:
         """Create a resource from the template with the given parameters."""
         try: