ruff check and format fixes

Author: davemssavage

src/mcp/client/session.py

@@ -9,7 +9,12 @@
 import mcp.types as types
 from mcp.shared.context import RequestContext
 from mcp.shared.message import SessionMessage
-from mcp.shared.session import BaseSession, ProgressFnT, RequestResponder, ResourceProgressFnT
+from mcp.shared.session import (
+    BaseSession,
+    ProgressFnT,
+    RequestResponder,
+    ResourceProgressFnT,
+)
 from mcp.shared.version import SUPPORTED_PROTOCOL_VERSIONS
 
 DEFAULT_CLIENT_INFO = types.Implementation(name="mcp", version="0.1.0")
@@ -204,8 +209,10 @@ async def set_logging_level(self, level: types.LoggingLevel) -> types.EmptyResul
         )
 
     async def list_resources(
-        self, cursor: str | None = None
-        # TODO suggest in progress resources should be excluded by default? possibly add an optional flag to include?
+        self,
+        cursor: str | None = None,
+        # TODO suggest in progress resources should be excluded by default?
+        # possibly add an optional flag to include?
     ) -> types.ListResourcesResult:
         """Send a resources/list request."""
         return await self.send_request(
@@ -236,7 +243,9 @@ async def list_resource_templates(
             types.ListResourceTemplatesResult,
         )
 
-    async def read_resource(self, uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]) -> types.ReadResourceResult:
+    async def read_resource(
+        self, uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+    ) -> types.ReadResourceResult:
         """Send a resources/read request."""
         return await self.send_request(
             types.ClientRequest(
@@ -248,7 +257,9 @@ async def read_resource(self, uri: Annotated[AnyUrl, UrlConstraints(host_require
             types.ReadResourceResult,
         )
 
-    async def subscribe_resource(self, uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]) -> types.EmptyResult:
+    async def subscribe_resource(
+        self, uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+    ) -> types.EmptyResult:
         """Send a resources/subscribe request."""
         return await self.send_request(
             types.ClientRequest(
@@ -260,7 +271,9 @@ async def subscribe_resource(self, uri: Annotated[AnyUrl, UrlConstraints(host_re
             types.EmptyResult,
         )
 
-    async def unsubscribe_resource(self, uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]) -> types.EmptyResult:
+    async def unsubscribe_resource(
+        self, uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+    ) -> types.EmptyResult:
         """Send a resources/unsubscribe request."""
         return await self.send_request(
             types.ClientRequest(

src/mcp/client/session_group.py

@@ -154,7 +154,6 @@ async def __aexit__(
             for exit_stack in self._session_exit_stacks.values():
                 tg.start_soon(exit_stack.aclose)
 
-
     @property
     def sessions(self) -> list[mcp.ClientSession]:
         """Returns the list of sessions being managed."""

src/mcp/server/fastmcp/server.py

@@ -960,7 +960,8 @@ async def report_progress(
         progress: float,
         total: float | None = None,
         message: str | None = None,
-        resource_uri: Annotated[AnyUrl, UrlConstraints(host_required=False)] | None = None,
+        resource_uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+        | None = None,
     ) -> None:
         """Report progress for the current operation.
 

src/mcp/server/session.py

@@ -288,7 +288,8 @@ async def send_progress_notification(
         total: float | None = None,
         message: str | None = None,
         related_request_id: str | None = None,
-        resource_uri: Annotated[AnyUrl, UrlConstraints(host_required=False)] | None = None,
+        resource_uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+        | None = None,
     ) -> None:
         """Send a progress notification."""
         await self.send_notification(

src/mcp/shared/session.py

@@ -1,3 +1,4 @@
+import inspect
 import logging
 from collections.abc import Callable
 from contextlib import AsyncExitStack
@@ -7,7 +8,6 @@
 
 import anyio
 import httpx
-import inspect
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from pydantic import BaseModel
 from pydantic.networks import AnyUrl, UrlConstraints
@@ -53,14 +53,21 @@ async def __call__(
         self, progress: float, total: float | None, message: str | None
     ) -> None: ...
 
+
 @runtime_checkable
 class ResourceProgressFnT(Protocol):
     """Protocol for progress notification callbacks with resources."""
 
     async def __call__(
-        self, progress: float, total: float | None, message: str | None, resource_uri: Annotated[AnyUrl, UrlConstraints(host_required=False)] | None = None
+        self,
+        progress: float,
+        total: float | None,
+        message: str | None,
+        resource_uri: Annotated[AnyUrl, UrlConstraints(host_required=False)]
+        | None = None,
     ) -> None: ...
 
+
 class RequestResponder(Generic[ReceiveRequestT, SendResultT]):
     """Handles responding to MCP requests and manages request lifecycle.
 
@@ -188,8 +195,8 @@ class BaseSession(
     ]
     _request_id: int
     _in_flight: dict[RequestId, RequestResponder[ReceiveRequestT, SendResultT]]
-    _progress_callbacks: dict[RequestId, ProgressFnT ]
-    _resource_progress_callbacks: dict[RequestId, ResourceProgressFnT]
+    _progress_callbacks: dict[RequestId, ProgressFnT]
+    _resource_callbacks: dict[RequestId, ResourceProgressFnT]
 
     def __init__(
         self,
@@ -209,7 +216,7 @@ def __init__(
         self._session_read_timeout_seconds = read_timeout_seconds
         self._in_flight = {}
         self._progress_callbacks = {}
-        self._resource_progress_callbacks = {}
+        self._resource_callbacks = {}
         self._exit_stack = AsyncExitStack()
 
     async def __aenter__(self) -> Self:
@@ -264,11 +271,12 @@ async def send_request(
             if "_meta" not in request_data["params"]:
                 request_data["params"]["_meta"] = {}
             request_data["params"]["_meta"]["progressToken"] = request_id
-            # note this is required to ensure backwards compatibility for previous clients
+            # note this is required to ensure backwards compatibility
+            # for previous clients
             signature = inspect.signature(progress_callback.__call__)
-            if 'resource_uri' in signature.parameters:
+            if "resource_uri" in signature.parameters:
                 # Store the callback for this request
-                self._resource_progress_callbacks[request_id] = progress_callback # type: ignore
+                self._resource_callbacks[request_id] = progress_callback  # type: ignore
             else:
                 # Store the callback for this request
                 self._progress_callbacks[request_id] = progress_callback
@@ -415,8 +423,8 @@ async def _receive_loop(self) -> None:
                                         notification.root.params.total,
                                         notification.root.params.message,
                                     )
-                                elif progress_token in self._resource_progress_callbacks:
-                                    callback = self._resource_progress_callbacks[progress_token]
+                                elif progress_token in self._resource_callbacks:
+                                    callback = self._resource_callbacks[progress_token]
                                     await callback(
                                         notification.root.params.progress,
                                         notification.root.params.total,

src/mcp/types.py

@@ -354,9 +354,10 @@ class ProgressNotificationParams(NotificationParams):
     """
     resource_uri: Annotated[AnyUrl, UrlConstraints(host_required=False)] | None = None
     """
-    An optional reference to an ephemeral resource associated with this progress, servers 
-    may delete these at their descretion, but are encouraged to make them available for 
-    a reasonable time period to allow clients to retrieve and cache the resources locally
+    An optional reference to an ephemeral resource associated with this 
+    progress, servers may delete these at their descretion, but are encouraged 
+    to make them available for a reasonable time period to allow clients to 
+    retrieve and cache the resources locally
     """
     model_config = ConfigDict(extra="allow")