Merge branch 'main' into content_block_handling

Author: strawgate

pyproject.toml

@@ -129,11 +129,9 @@ python-version = "3.10"
 # Rules with too many errors to fix right now (40+ each)
 no-matching-overload = "ignore" # 126 errors  
 unknown-argument = "ignore"     # 61 errors
-unresolved-attribute = "ignore" # 60 errors
 
 # Rules with moderate errors that need more investigation
 call-non-callable = "ignore" # 7 errors
-missing-argument = "ignore"  # 23 errors
 
 [tool.ruff.lint]
 extend-select = ["I", "UP"]

src/fastmcp/client/client.py

@@ -505,7 +505,7 @@ async def cancel(
     ) -> None:
         """Send a cancellation notification for an in-progress request."""
         notification = mcp.types.ClientNotification(
-            mcp.types.CancelledNotification(
+            root=mcp.types.CancelledNotification(
                 method="notifications/cancelled",
                 params=mcp.types.CancelledNotificationParams(
                     requestId=request_id,
@@ -743,13 +743,13 @@ async def get_prompt(
 
     async def complete_mcp(
         self,
-        ref: mcp.types.ResourceReference | mcp.types.PromptReference,
+        ref: mcp.types.ResourceTemplateReference | mcp.types.PromptReference,
         argument: dict[str, str],
     ) -> mcp.types.CompleteResult:
         """Send a completion request and return the complete MCP protocol result.
 
         Args:
-            ref (mcp.types.ResourceReference | mcp.types.PromptReference): The reference to complete.
+            ref (mcp.types.ResourceTemplateReference | mcp.types.PromptReference): The reference to complete.
             argument (dict[str, str]): Arguments to pass to the completion request.
 
         Returns:
@@ -766,13 +766,13 @@ async def complete_mcp(
 
     async def complete(
         self,
-        ref: mcp.types.ResourceReference | mcp.types.PromptReference,
+        ref: mcp.types.ResourceTemplateReference | mcp.types.PromptReference,
         argument: dict[str, str],
     ) -> mcp.types.Completion:
         """Send a completion request to the server.
 
         Args:
-            ref (mcp.types.ResourceReference | mcp.types.PromptReference): The reference to complete.
+            ref (mcp.types.ResourceTemplateReference | mcp.types.PromptReference): The reference to complete.
             argument (dict[str, str]): Arguments to pass to the completion request.
 
         Returns:

src/fastmcp/client/elicitation.py

@@ -59,7 +59,12 @@ async def _elicitation_handler(
                     "Elicitation responses must be serializable as a JSON object (dict). Received: "
                     f"{result.content!r}"
                 )
-            return MCPElicitResult(**result.model_dump() | {"content": content})
+            return MCPElicitResult(
+                _meta=result.meta,
+                action=result.action,
+                content=content,
+            )
+
         except Exception as e:
             return mcp.types.ErrorData(
                 code=mcp.types.INTERNAL_ERROR,

src/fastmcp/contrib/mcp_mixin/mcp_mixin.py

@@ -8,6 +8,7 @@
 from fastmcp.prompts.prompt import Prompt
 from fastmcp.resources.resource import Resource
 from fastmcp.tools.tool import Tool
+from fastmcp.utilities.types import get_fn_name
 
 if TYPE_CHECKING:
     from fastmcp.server import FastMCP
@@ -34,7 +35,7 @@ def mcp_tool(
 
     def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
         call_args = {
-            "name": name or func.__name__,
+            "name": name or get_fn_name(func),
             "description": description,
             "tags": tags,
             "annotations": annotations,
@@ -63,7 +64,7 @@ def mcp_resource(
     def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
         call_args = {
             "uri": uri,
-            "name": name or func.__name__,
+            "name": name or get_fn_name(func),
             "description": description,
             "mime_type": mime_type,
             "tags": tags,
@@ -88,7 +89,7 @@ def mcp_prompt(
 
     def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
         call_args = {
-            "name": name or func.__name__,
+            "name": name or get_fn_name(func),
             "description": description,
             "tags": tags,
             "enabled": enabled,
@@ -146,7 +147,21 @@ def register_tools(
                 registration_info["name"] = (
                     f"{prefix}{separator}{registration_info['name']}"
                 )
-            tool = Tool.from_function(fn=method, **registration_info)
+
+            tool = Tool.from_function(
+                fn=method,
+                name=registration_info.get("name"),
+                title=registration_info.get("title"),
+                description=registration_info.get("description"),
+                tags=registration_info.get("tags"),
+                annotations=registration_info.get("annotations"),
+                exclude_args=registration_info.get("exclude_args"),
+                serializer=registration_info.get("serializer"),
+                output_schema=registration_info.get("output_schema"),
+                meta=registration_info.get("meta"),
+                enabled=registration_info.get("enabled"),
+            )
+
             mcp_server.add_tool(tool)
 
     def register_resources(
@@ -175,7 +190,19 @@ def register_resources(
                 registration_info["uri"] = (
                     f"{prefix}{separator}{registration_info['uri']}"
                 )
-            resource = Resource.from_function(fn=method, **registration_info)
+
+            resource = Resource.from_function(
+                fn=method,
+                uri=registration_info["uri"],
+                name=registration_info.get("name"),
+                description=registration_info.get("description"),
+                mime_type=registration_info.get("mime_type"),
+                tags=registration_info.get("tags"),
+                enabled=registration_info.get("enabled"),
+                annotations=registration_info.get("annotations"),
+                meta=registration_info.get("meta"),
+            )
+
             mcp_server.add_resource(resource)
 
     def register_prompts(
@@ -200,7 +227,15 @@ def register_prompts(
                 registration_info["name"] = (
                     f"{prefix}{separator}{registration_info['name']}"
                 )
-            prompt = Prompt.from_function(fn=method, **registration_info)
+            prompt = Prompt.from_function(
+                fn=method,
+                name=registration_info.get("name"),
+                title=registration_info.get("title"),
+                description=registration_info.get("description"),
+                tags=registration_info.get("tags"),
+                enabled=registration_info.get("enabled"),
+                meta=registration_info.get("meta"),
+            )
             mcp_server.add_prompt(prompt)
 
     def register_all(

src/fastmcp/experimental/utilities/openapi/director.py

@@ -69,7 +69,14 @@ def build(
                 request_data["content"] = body
 
         # Step 5: Create httpx.Request
-        return httpx.Request(**{k: v for k, v in request_data.items() if v is not None})
+        return httpx.Request(
+            method=request_data["method"],
+            url=request_data["url"],
+            params=request_data.get("params"),
+            headers=request_data.get("headers"),
+            json=request_data.get("json"),
+            content=request_data.get("content"),
+        )
 
     def _unflatten_arguments(
         self, route: HTTPRoute, flat_args: dict[str, Any]

src/fastmcp/prompts/prompt.py

@@ -100,14 +100,16 @@ def to_mcp_prompt(
             )
             for arg in self.arguments or []
         ]
-        kwargs = {
-            "name": self.name,
-            "description": self.description,
-            "arguments": arguments,
-            "title": self.title,
-            "_meta": self.get_meta(include_fastmcp_meta=include_fastmcp_meta),
-        }
-        return MCPPrompt(**kwargs | overrides)
+
+        return MCPPrompt(
+            name=overrides.get("name", self.name),
+            description=overrides.get("description", self.description),
+            arguments=arguments,
+            title=overrides.get("title", self.title),
+            _meta=overrides.get(
+                "_meta", self.get_meta(include_fastmcp_meta=include_fastmcp_meta)
+            ),
+        )
 
     @staticmethod
     def from_function(

src/fastmcp/resources/resource.py

@@ -24,6 +24,7 @@
 from fastmcp.utilities.components import FastMCPComponent
 from fastmcp.utilities.types import (
     find_kwarg_by_type,
+    get_fn_name,
 )
 
 if TYPE_CHECKING:
@@ -122,16 +123,18 @@ def to_mcp_resource(
         **overrides: Any,
     ) -> MCPResource:
         """Convert the resource to an MCPResource."""
-        kwargs = {
-            "uri": self.uri,
-            "name": self.name,
-            "description": self.description,
-            "mimeType": self.mime_type,
-            "title": self.title,
-            "annotations": self.annotations,
-            "_meta": self.get_meta(include_fastmcp_meta=include_fastmcp_meta),
-        }
-        return MCPResource(**kwargs | overrides)
+
+        return MCPResource(
+            name=overrides.get("name", self.name),
+            uri=overrides.get("uri", self.uri),
+            description=overrides.get("description", self.description),
+            mimeType=overrides.get("mimeType", self.mime_type),
+            title=overrides.get("title", self.title),
+            annotations=overrides.get("annotations", self.annotations),
+            _meta=overrides.get(
+                "_meta", self.get_meta(include_fastmcp_meta=include_fastmcp_meta)
+            ),
+        )
 
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}(uri={self.uri!r}, name={self.name!r}, description={self.description!r}, tags={self.tags})"
@@ -182,7 +185,7 @@ def from_function(
         return cls(
             fn=fn,
             uri=uri,
-            name=name or fn.__name__,
+            name=name or get_fn_name(fn),
             title=title,
             description=description or inspect.getdoc(fn),
             mime_type=mime_type or "text/plain",

src/fastmcp/resources/template.py

@@ -154,16 +154,18 @@ def to_mcp_template(
         **overrides: Any,
     ) -> MCPResourceTemplate:
         """Convert the resource template to an MCPResourceTemplate."""
-        kwargs = {
-            "uriTemplate": self.uri_template,
-            "name": self.name,
-            "description": self.description,
-            "mimeType": self.mime_type,
-            "title": self.title,
-            "annotations": self.annotations,
-            "_meta": self.get_meta(include_fastmcp_meta=include_fastmcp_meta),
-        }
-        return MCPResourceTemplate(**kwargs | overrides)
+
+        return MCPResourceTemplate(
+            name=overrides.get("name", self.name),
+            uriTemplate=overrides.get("uriTemplate", self.uri_template),
+            description=overrides.get("description", self.description),
+            mimeType=overrides.get("mimeType", self.mime_type),
+            title=overrides.get("title", self.title),
+            annotations=overrides.get("annotations", self.annotations),
+            _meta=overrides.get(
+                "_meta", self.get_meta(include_fastmcp_meta=include_fastmcp_meta)
+            ),
+        )
 
     @classmethod
     def from_mcp_template(cls, mcp_template: MCPResourceTemplate) -> ResourceTemplate:

src/fastmcp/server/dependencies.py

@@ -5,6 +5,9 @@
 from mcp.server.auth.middleware.auth_context import (
     get_access_token as _sdk_get_access_token,
 )
+from mcp.server.auth.provider import (
+    AccessToken as _SDKAccessToken,
+)
 from starlette.requests import Request
 
 from fastmcp.server.auth import AccessToken
@@ -107,17 +110,27 @@ def get_access_token() -> AccessToken | None:
         The access token if an authenticated user is available, None otherwise.
     """
     #
-    obj = _sdk_get_access_token()
-    if obj is None or isinstance(obj, AccessToken):
-        return obj
+    access_token: _SDKAccessToken | None = _sdk_get_access_token()
+
+    if access_token is None or isinstance(access_token, AccessToken):
+        return access_token
 
     # If the object is not a FastMCP AccessToken, convert it to one if the fields are compatible
     # This is a workaround for the case where the SDK returns a different type
     # If it fails, it will raise a TypeError
     try:
-        return AccessToken(**obj.model_dump())
+        access_token_as_dict = access_token.model_dump()
+        return AccessToken(
+            token=access_token_as_dict["token"],
+            client_id=access_token_as_dict["client_id"],
+            scopes=access_token_as_dict["scopes"],
+            # Optional fields
+            expires_at=access_token_as_dict.get("expires_at"),
+            resource_owner=access_token_as_dict.get("resource_owner"),
+            claims=access_token_as_dict.get("claims"),
+        )
     except Exception as e:
         raise TypeError(
-            f"Expected fastmcp.server.auth.auth.AccessToken, got {type(obj).__name__}. "
+            f"Expected fastmcp.server.auth.auth.AccessToken, got {type(access_token).__name__}. "
             "Ensure the SDK is using the correct AccessToken type."
         ) from e

src/fastmcp/server/server.py

@@ -812,6 +812,8 @@ async def _mcp_get_prompt(
 
         Delegates to _get_prompt, which should be overridden by FastMCP subclasses.
         """
+        import fastmcp.server.context
+
         logger.debug(
             f"[{self.name}] Handler called: get_prompt %s with %s", name, arguments
         )