aiohttp-tiny-mcp 0.3.6__tar.gz → 0.3.7__tar.gz

{aiohttp_tiny_mcp-0.3.6 → aiohttp_tiny_mcp-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiohttp-tiny-mcp
-Version: 0.3.6
+Version: 0.3.7
 Summary: Remote MCP server and client library for aiohttp
 License-Expression: Apache-2.0
 License-File: LICENSE

{aiohttp_tiny_mcp-0.3.6 → aiohttp_tiny_mcp-0.3.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aiohttp-tiny-mcp"
-version = "0.3.6"
+version = "0.3.7"
 description = "Remote MCP server and client library for aiohttp"
 readme = "README.md"
 license = "Apache-2.0"

{aiohttp_tiny_mcp-0.3.6 → aiohttp_tiny_mcp-0.3.7}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "aiohttp-tiny-mcp"
-version = "0.3.6"
+version = "0.3.7"
 description = "Remote MCP server and client library for aiohttp"
 readme = "README.md"
 license = "Apache-2.0"

{aiohttp_tiny_mcp-0.3.6 → aiohttp_tiny_mcp-0.3.7}/src/aiohttp_tiny_mcp/endpoint.py

@@ -7,7 +7,6 @@ import json
 import logging
 import re
 from collections.abc import Mapping
-from contextlib import suppress
 from dataclasses import replace
 from functools import cached_property
 from typing import Any
@@ -46,6 +45,7 @@ from .sessions import (
 )
 from .sse import SSEResponse
 from .subscriptions import relays, wanted
+from .tasks import stop
 
 log = logging.getLogger("aiohttp_tiny_mcp")
 
@@ -419,9 +419,7 @@ class Endpoint:
                 if transport is None or transport.is_closing():
                     break
         finally:
-            relay.cancel()
-            with suppress(asyncio.CancelledError, ConnectionError):
-                await relay
+            await stop(relay)
         return response
 
     async def relay_notifications(
@@ -578,10 +576,7 @@ class Endpoint:
             ex.cancel()
             raise
         finally:
-            if not task.done():
-                task.cancel()
-                with suppress(asyncio.CancelledError):
-                    await task
+            await stop(task)
 
 
 MCP_ENDPOINT = web.AppKey("mcp_endpoint", Endpoint)

{aiohttp_tiny_mcp-0.3.6 → aiohttp_tiny_mcp-0.3.7}/src/aiohttp_tiny_mcp/extensions.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import dataclasses
 import json
 from collections.abc import Awaitable, Callable, Iterable, Mapping
 from copy import deepcopy
@@ -57,7 +58,7 @@ class ExtensionSpec:
     methods: Mapping[str, Bound]
     #: Broadcast method to the params field that carries its topic, or None for one
     #: every listener of the method gets.
-    notifications: Mapping[str, str | None] = MappingProxyType({})
+    notifications: Mapping[str, str | None] = dataclasses.field(default_factory=dict)
 
 
 class ExtensionResult(ResultModel):

{aiohttp_tiny_mcp-0.3.6 → aiohttp_tiny_mcp-0.3.7}/src/aiohttp_tiny_mcp/http_sse.py

@@ -6,7 +6,6 @@ import asyncio
 import json
 import logging
 from collections.abc import Coroutine
-from contextlib import suppress
 from dataclasses import replace
 from typing import Any
 
@@ -41,6 +40,7 @@ from .sessions import (
 )
 from .sse import SSEResponse
 from .subscriptions import relays, wanted
+from .tasks import stop
 
 log = logging.getLogger(__name__)
 
@@ -148,11 +148,7 @@ class SseEndpoint:
                 if transport is None or transport.is_closing():
                     break
         finally:
-            for task in tasks:
-                task.cancel()
-            for task in tasks:
-                with suppress(asyncio.CancelledError, ConnectionError):
-                    await task
+            await stop(*tasks)
 
     async def relay(self, response: SSEResponse, events: Subscription) -> None:
         """Write everything published for this connection, until cancelled."""

{aiohttp_tiny_mcp-0.3.6 → aiohttp_tiny_mcp-0.3.7}/src/aiohttp_tiny_mcp/stdio.py

@@ -11,6 +11,7 @@ import json
 import logging
 import sys
 from collections.abc import Callable, Mapping
+from contextlib import suppress
 from dataclasses import replace
 from typing import Any
 
@@ -26,6 +27,7 @@ from .dispatcher import Dispatcher
 from .exchange import Exchange, is_reply, relay_reply
 from .protocol.selection import AdapterSet
 from .registry import Registry
+from .tasks import stop
 
 log = logging.getLogger("aiohttp_tiny_mcp")
 
@@ -155,9 +157,9 @@ async def serve_stdio(
         tasks = []
         for exchange, task in list(active.values()):
             exchange.cancel()
-            task.cancel()
             tasks.append(task)
-        await asyncio.gather(*tasks, return_exceptions=True)
+        with suppress(Exception):
+            await stop(*tasks)
 
 
 async def stdin_reader() -> asyncio.StreamReader:

aiohttp_tiny_mcp-0.3.7/src/aiohttp_tiny_mcp/tasks.py

@@ -0,0 +1,37 @@
+"""Ending a task that may not honour its first cancellation."""
+
+from __future__ import annotations
+
+import asyncio
+from typing import Any
+
+STOP_GRACE_SECONDS = 1.0
+
+
+async def stop(*tasks: asyncio.Task[Any], grace: float = STOP_GRACE_SECONDS) -> None:
+    """Cancel `tasks` and return when every one of them has ended.
+
+    One cancellation is not always enough. A library may catch it, and on
+    Python before 3.12 `asyncio.wait_for` drops it when the future it waits
+    on completes in the same loop turn: psycopg_pool waits for a connection
+    that way, and a sibling task that is cancelled first hands its
+    connection back at exactly that moment. A task still running after
+    `grace` seconds is cancelled again, at whatever it awaits by then.
+
+    A cancelled task and one that ended with `ConnectionError` are what
+    stopping looks like. Any other exception is raised, the first one found.
+    """
+    pending = {task for task in tasks if not task.done()}
+    while pending:
+        for task in pending:
+            task.cancel()
+        _, pending = await asyncio.wait(pending, timeout=grace)
+    for task in tasks:
+        if task.cancelled():
+            continue
+        error = task.exception()
+        if error is not None and not isinstance(error, ConnectionError):
+            raise error
+
+
+__all__ = ["STOP_GRACE_SECONDS", "stop"]