Merge upstream main to get async generator cleanup fix

stevebillings · stevebillings · commit 66a7048a36be · 2025-08-15T10:04:20.000-04:00
diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml
@@ -36,6 +36,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
+        dep-resolution: ["lowest-direct", "highest"]
         os: [ubuntu-latest, windows-latest]
 
     steps:
@@ -48,18 +49,11 @@ jobs:
           version: 0.7.2
 
       - name: Install the project
-        run: uv sync --frozen --all-extras --python ${{ matrix.python-version }}
+        run: uv sync --frozen --all-extras --python ${{ matrix.python-version }} --resolution ${{ matrix.dep-resolution }}
 
       - name: Run pytest
         run: uv run --frozen --no-sync pytest
 
-      # This must run last as it modifies the environment!
-      - name: Run pytest with lowest versions
-        run: |
-          uv sync --all-extras --upgrade
-          uv run --no-sync pytest
-        env:
-          UV_RESOLUTION: lowest-direct
   readme-snippets:
     runs-on: ubuntu-latest
     steps:
diff --git a/examples/clients/simple-auth-client/pyproject.toml b/examples/clients/simple-auth-client/pyproject.toml
@@ -15,7 +15,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
 ]
 dependencies = [
-    "click>=8.0.0",
+    "click>=8.2.0",
     "mcp>=1.0.0",
 ]
 
diff --git a/examples/servers/simple-auth/pyproject.toml b/examples/servers/simple-auth/pyproject.toml
@@ -8,7 +8,7 @@ authors = [{ name = "Anthropic, PBC." }]
 license = { text = "MIT" }
 dependencies = [
     "anyio>=4.5",
-    "click>=8.1.0",
+    "click>=8.2.0",
     "httpx>=0.27",
     "mcp",
     "pydantic>=2.0",
diff --git a/examples/servers/simple-prompt/pyproject.toml b/examples/servers/simple-prompt/pyproject.toml
@@ -18,7 +18,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
 ]
-dependencies = ["anyio>=4.5", "click>=8.1.0", "httpx>=0.27", "mcp"]
+dependencies = ["anyio>=4.5", "click>=8.2.0", "httpx>=0.27", "mcp"]
 
 [project.scripts]
 mcp-simple-prompt = "mcp_simple_prompt.server:main"
diff --git a/examples/servers/simple-resource/pyproject.toml b/examples/servers/simple-resource/pyproject.toml
@@ -18,7 +18,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
 ]
-dependencies = ["anyio>=4.5", "click>=8.1.0", "httpx>=0.27", "mcp"]
+dependencies = ["anyio>=4.5", "click>=8.2.0", "httpx>=0.27", "mcp"]
 
 [project.scripts]
 mcp-simple-resource = "mcp_simple_resource.server:main"
diff --git a/examples/servers/simple-streamablehttp-stateless/pyproject.toml b/examples/servers/simple-streamablehttp-stateless/pyproject.toml
@@ -7,7 +7,7 @@ requires-python = ">=3.10"
 authors = [{ name = "Anthropic, PBC." }]
 keywords = ["mcp", "llm", "automation", "web", "fetch", "http", "streamable", "stateless"]
 license = { text = "MIT" }
-dependencies = ["anyio>=4.5", "click>=8.1.0", "httpx>=0.27", "mcp", "starlette", "uvicorn"]
+dependencies = ["anyio>=4.5", "click>=8.2.0", "httpx>=0.27", "mcp", "starlette", "uvicorn"]
 
 [project.scripts]
 mcp-simple-streamablehttp-stateless = "mcp_simple_streamablehttp_stateless.server:main"
diff --git a/examples/servers/simple-streamablehttp/pyproject.toml b/examples/servers/simple-streamablehttp/pyproject.toml
@@ -7,7 +7,7 @@ requires-python = ">=3.10"
 authors = [{ name = "Anthropic, PBC." }]
 keywords = ["mcp", "llm", "automation", "web", "fetch", "http", "streamable"]
 license = { text = "MIT" }
-dependencies = ["anyio>=4.5", "click>=8.1.0", "httpx>=0.27", "mcp", "starlette", "uvicorn"]
+dependencies = ["anyio>=4.5", "click>=8.2.0", "httpx>=0.27", "mcp", "starlette", "uvicorn"]
 
 [project.scripts]
 mcp-simple-streamablehttp = "mcp_simple_streamablehttp.server:main"
diff --git a/examples/servers/simple-tool/pyproject.toml b/examples/servers/simple-tool/pyproject.toml
@@ -18,7 +18,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
 ]
-dependencies = ["anyio>=4.5", "click>=8.1.0", "httpx>=0.27", "mcp"]
+dependencies = ["anyio>=4.5", "click>=8.2.0", "httpx>=0.27", "mcp"]
 
 [project.scripts]
 mcp-simple-tool = "mcp_simple_tool.server:main"
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,14 +23,14 @@ classifiers = [
 ]
 dependencies = [
     "anyio>=4.5",
-    "httpx>=0.27",
+    "httpx>=0.27.1",
     "httpx-sse>=0.4",
     "pydantic>=2.11.0,<3.0.0",
     "starlette>=0.27",
     "python-multipart>=0.0.9",
     "sse-starlette>=1.6.1",
     "pydantic-settings>=2.5.2",
-    "uvicorn>=0.23.1; sys_platform != 'emscripten'",
+    "uvicorn>=0.31.1; sys_platform != 'emscripten'",
     "jsonschema>=4.20.0",
     "pywin32>=310; sys_platform == 'win32'",
 ]
@@ -49,7 +49,7 @@ required-version = ">=0.7.2"
 
 [dependency-groups]
 dev = [
-    "pyright>=1.1.391",
+    "pyright>=1.1.400",
     "pytest>=8.3.4",
     "ruff>=0.8.5",
     "trio>=0.26.2",
diff --git a/src/mcp/client/streamable_http.py b/src/mcp/client/streamable_http.py
@@ -248,6 +248,7 @@ async def _handle_resumption_request(self, ctx: RequestContext) -> None:
                     ctx.metadata.on_resumption_token_update if ctx.metadata else None,
                 )
                 if is_complete:
+                    await event_source.response.aclose()
                     break
 
     async def _handle_post_request(self, ctx: RequestContext) -> None:
@@ -330,6 +331,7 @@ async def _handle_sse_response(
                 # If the SSE event indicates completion, like returning respose/error
                 # break the loop
                 if is_complete:
+                    await response.aclose()
                     break
         except Exception as e:
             logger.exception("Error reading SSE stream:")
diff --git a/tests/client/test_list_roots_callback.py b/tests/client/test_list_roots_callback.py
@@ -3,6 +3,7 @@
 
 from mcp.client.session import ClientSession
 from mcp.server.fastmcp.server import Context
+from mcp.server.session import ServerSession
 from mcp.shared.context import RequestContext
 from mcp.shared.memory import (
     create_connected_server_and_client_session as create_session,
@@ -35,7 +36,7 @@ async def list_roots_callback(
         return callback_return
 
     @server.tool("test_list_roots")
-    async def test_list_roots(context: Context, message: str):  # type: ignore[reportUnknownMemberType]
+    async def test_list_roots(context: Context[ServerSession, None], message: str):
         roots = await context.session.list_roots()
         assert roots == callback_return
         return True
diff --git a/tests/client/test_session.py b/tests/client/test_session.py
@@ -32,6 +32,7 @@ async def test_client_session_initialize():
     server_to_client_send, server_to_client_receive = anyio.create_memory_object_stream[SessionMessage](1)
 
     initialized_notification = None
+    result = None
 
     async def mock_server():
         nonlocal initialized_notification
@@ -239,6 +240,7 @@ async def test_client_session_version_negotiation_success():
     """Test successful version negotiation with supported version"""
     client_to_server_send, client_to_server_receive = anyio.create_memory_object_stream[SessionMessage](1)
     server_to_client_send, server_to_client_receive = anyio.create_memory_object_stream[SessionMessage](1)
+    result = None
 
     async def mock_server():
         session_message = await client_to_server_receive.receive()
diff --git a/tests/server/test_lowlevel_input_validation.py b/tests/server/test_lowlevel_input_validation.py
@@ -21,7 +21,7 @@ async def run_tool_test(
     tools: list[Tool],
     call_tool_handler: Callable[[str, dict[str, Any]], Awaitable[list[TextContent]]],
     test_callback: Callable[[ClientSession], Awaitable[CallToolResult]],
-) -> CallToolResult:
+) -> CallToolResult | None:
     """Helper to run a tool test with minimal boilerplate.
 
     Args:
@@ -33,6 +33,7 @@ async def run_tool_test(
         The result of the tool call
     """
     server = Server("test")
+    result = None
 
     @server.list_tools()
     async def list_tools():
diff --git a/tests/server/test_lowlevel_output_validation.py b/tests/server/test_lowlevel_output_validation.py
@@ -21,7 +21,7 @@ async def run_tool_test(
     tools: list[Tool],
     call_tool_handler: Callable[[str, dict[str, Any]], Awaitable[Any]],
     test_callback: Callable[[ClientSession], Awaitable[CallToolResult]],
-) -> CallToolResult:
+) -> CallToolResult | None:
     """Helper to run a tool test with minimal boilerplate.
 
     Args:
@@ -34,6 +34,8 @@ async def run_tool_test(
     """
     server = Server("test")
 
+    result = None
+
     @server.list_tools()
     async def list_tools():
         return tools
diff --git a/tests/server/test_lowlevel_tool_annotations.py b/tests/server/test_lowlevel_tool_annotations.py
@@ -39,6 +39,7 @@ async def list_tools():
             )
         ]
 
+    tools_result = None
     server_to_client_send, server_to_client_receive = anyio.create_memory_object_stream[SessionMessage](10)
     client_to_server_send, client_to_server_receive = anyio.create_memory_object_stream[SessionMessage](10)
 
diff --git a/tests/shared/test_progress_notifications.py b/tests/shared/test_progress_notifications.py
@@ -217,6 +217,8 @@ async def test_progress_context_manager():
 
     server = Server(name="ProgressContextTestServer")
 
+    progress_token = None
+
     # Register progress handler
     @server.progress_notification()
     async def handle_progress(
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ classifiers = [`
`15`	`15`	`"Programming Language :: Python :: 3.10",`
`16`	`16`	`]`
`17`	`17`	`dependencies = [`
`18`		`- "click>=8.0.0",`
	`18`	`+ "click>=8.2.0",`
`19`	`19`	`"mcp>=1.0.0",`
`20`	`20`	`]`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ classifiers = [`
`18`	`18`	`"Programming Language :: Python :: 3",`
`19`	`19`	`"Programming Language :: Python :: 3.10",`
`20`	`20`	`]`
`21`		`-dependencies = ["anyio>=4.5", "click>=8.1.0", "httpx>=0.27", "mcp"]`
	`21`	`+dependencies = ["anyio>=4.5", "click>=8.2.0", "httpx>=0.27", "mcp"]`
`22`	`22`
`23`	`23`	`[project.scripts]`
`24`	`24`	`mcp-simple-prompt = "mcp_simple_prompt.server:main"`