Skip to content

πŸš€ The fast, Pythonic way to build MCP servers and clients.

Merge branch 'main' into elicitation

Jeremiah Lowin11d2bacbb477
diff --cc src/fastmcp/client/client.py
index e742f8f11,f160e978a..34aeb6bea
--- a/src/fastmcp/client/client.py
+++ b/src/fastmcp/client/client.py
@@@ -13,11 -16,8 +16,9 @@@ from mcp import ClientSessio
from pydantic import AnyUrl
import fastmcp
+from fastmcp.client.elicitation import ElicitationHandler, create_elicitation_callback
from fastmcp.client.logging import (
LogHandler,
- MessageHandler,
create_log_callback,
default_log_handler,
)
@@@ -144,9 -154,8 +156,9 @@@ class Client(Generic[ClientTransportT])
# Common args
roots: RootsList | RootsHandler | None = None,
sampling_handler: SamplingHandler | None = None,
+ elicitation_handler: ElicitationHandler | None = None,
log_handler: LogHandler | None = None,
- message_handler: MessageHandler | None = None,
+ message_handler: MessageHandlerT | MessageHandler | None = None,
progress_handler: ProgressHandler | None = None,
timeout: datetime.timedelta | float | int | None = None,
init_timeout: datetime.timedelta | float | int | None = None,
diff --cc src/fastmcp/server/context.py
index 2eb1f94a1,ca841ffbf..dc6f4edb5
--- a/src/fastmcp/server/context.py
+++ b/src/fastmcp/server/context.py
@@@ -1,5 -1,6 +1,6 @@@
-from __future__ import annotations as _annotations
+from __future__ import annotations
+ import asyncio
import warnings
from collections.abc import Generator
from contextlib import contextmanager
@@@ -38,8 -30,8 +39,9 @@@ from fastmcp.utilities.types import get
logger = get_logger(__name__)
+T = TypeVar("T")
_current_context: ContextVar[Context | None] = ContextVar("context", default=None)
+ _flush_lock = asyncio.Lock()
@contextmanager
@@@ -221,12 -167,59 +177,62 @@@ class Context
if level is None:
level = "info"
await self.session.send_log_message(
- level=level, data=message, logger=logger_name
+ level=level,
+ data=message,
+ logger=logger_name,
+ related_request_id=self.request_id,
)
+ @property
+ def client_id(self) -> str | None:
+ """Get the client ID if available."""
+ return (
+ getattr(self.request_context.meta, "client_id", None)
+ if self.request_context.meta
+ else None
+ )
+
+ @property
+ def request_id(self) -> str:
+ """Get the unique ID for this request."""
+ return str(self.request_context.request_id)
+
+ @property
+ def session_id(self) -> str | None:
+ """Get the MCP session ID for HTTP transports.
+
+ Returns the session ID that can be used as a key for session-based
+ data storage (e.g., Redis) to share data between tool calls within
+ the same client session.
+
+ Returns:
+ The session ID for HTTP transports (SSE, StreamableHTTP), or None
+ for stdio and in-memory transports which don't use session IDs.
+
+ Example:
+ ```python
+ @server.tool
+ def store_data(data: dict, ctx: Context) -> str:
+ if session_id := ctx.session_id:
+ redis_client.set(f"session:{session_id}:data", json.dumps(data))
+ return f"Data stored for session {session_id}"
+ return "No session ID available (stdio/memory transport)"
+ ```
+ """
+ try:
+ from fastmcp.server.dependencies import get_http_headers
+
+ headers = get_http_headers(include_all=True)
+ return headers.get("mcp-session-id")
+ except RuntimeError:
+ # No HTTP context available (stdio/in-memory transport)
+ return None
+
+ @property
+ def session(self) -> ServerSession:
+ """Access to the underlying session for advanced usage."""
+ return self.request_context.session
+
# Convenience methods for common log levels
async def debug(self, message: str, logger_name: str | None = None) -> None:
"""Send a debug log message."""