π The fast, Pythonic way to build MCP servers and clients.
Consolidate session state reset logic and improve cancellation cleanup (#2615)
Jeremiah Lowin0cd3690aefa9
diff --git a/src/fastmcp/client/client.py b/src/fastmcp/client/client.pyindex d67b7de8e..6dd13d892 100644--- a/src/fastmcp/client/client.py+++ b/src/fastmcp/client/client.py@@ -6,7 +6,7 @@ import datetimeimport secretsimport uuidimport weakref-from contextlib import AsyncExitStack, asynccontextmanager, suppress+from contextlib import AsyncExitStack, asynccontextmanagerfrom dataclasses import dataclass, fieldfrom pathlib import Pathfrom typing import Any, Generic, Literal, TypeVar, cast, overload@@ -324,6 +324,20 @@ class Client(Generic[ClientTransportT]):str, weakref.ref[ToolTask | PromptTask | ResourceTask]] = {}+ def _reset_session_state(self, full: bool = False) -> None:+ """Reset session state after disconnect or cancellation.++ Args:+ full: If True, also resets session_task and nesting_counter.+ Use full=True for cancellation cleanup where the session+ task was started but never completed normally.+ """+ self._session_state.session = None+ self._session_state.initialize_result = None+ if full:+ self._session_state.session_task = None+ self._session_state.nesting_counter = 0+@propertydef session(self) -> ClientSession:"""Get the current active session. Raises RuntimeError if not connected."""@@ -404,8 +418,7 @@ class Client(Generic[ClientTransportT]):except anyio.ClosedResourceError as e:raise RuntimeError("Server session was closed unexpectedly") from efinally:- self._session_state.session = None- self._session_state.initialize_result = None+ self._reset_session_state()async def initialize(self,@@ -510,25 +523,38 @@ class Client(Generic[ClientTransportT]):# when __aenter__ is cancelled. Since we hold the session lock here# and we know we started the session task, it's safe to tear it down# without impacting other active contexts.+ #+ # Note: session_task is an asyncio.Task (not anyio) because it needs+ # to outlive individual context manager scopes - anyio's structured+ # concurrency doesn't allow tasks to escape their task group.session_task = self._session_state.session_taskif session_task is not None:# Request a graceful stop if the runner has already reached# its stop_event wait.self._session_state.stop_event.set()session_task.cancel()- # Preserve the original cancellation.- with suppress(asyncio.CancelledError, Exception):- await asyncio.shield(session_task)+ with anyio.CancelScope(shield=True):+ with anyio.move_on_after(3):+ try:+ await session_task+ except asyncio.CancelledError:+ pass+ except Exception as e:+ logger.debug(+ f"Error during cancelled session cleanup: {e}"+ )# Reset session state so future callers can reconnect cleanly.- self._session_state.session_task = None- self._session_state.session = None- self._session_state.initialize_result = None- self._session_state.nesting_counter = 0-- # Preserve the original cancellation.- with suppress(asyncio.CancelledError, Exception):- await asyncio.shield(self.transport.close())+ self._reset_session_state(full=True)++ with anyio.CancelScope(shield=True):+ with anyio.move_on_after(3):+ try:+ await self.transport.close()+ except Exception as e:+ logger.debug(+ f"Error closing transport after cancellation: {e}"+ )raise