Skip to content

fix: correct MCPClient.__exit__ and stop() type annotations #2248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cogwirrel wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −2
Open

fix: correct MCPClient.__exit__ and stop() type annotations #2248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
198df55
fix: correct MCPClient.__exit__ and stop() type annotations
cogwirrel May 5, 2026
ac77634
fix: format stop() signature to satisfy line length lint
cogwirrel May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/strands/tools/mcp/mcp_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,12 @@ def __enter__(self) -> "MCPClient":
"""
return self.start()

def __exit__(self, exc_type: BaseException, exc_val: BaseException, exc_tb: TracebackType) -> None:
def __exit__(
self,
exc_type: type[BaseException] | None,
exc_val: BaseException | None,
exc_tb: TracebackType | None,
) -> None:
"""Context manager exit point that cleans up resources."""
self.stop(exc_type, exc_val, exc_tb)

Expand Down Expand Up @@ -318,7 +323,12 @@ def remove_consumer(self, consumer_id: Any, **kwargs: Any) -> None:

# MCP-specific methods

def stop(self, exc_type: BaseException | None, exc_val: BaseException | None, exc_tb: TracebackType | None) -> None:
def stop(
self,
exc_type: type[BaseException] | None,
exc_val: BaseException | None,
exc_tb: TracebackType | None,
) -> None:
"""Signals the background thread to stop and waits for it to complete, ensuring proper cleanup of all resources.

This method is defensive and can handle partial initialization states that may occur
Expand Down
Loading