ruff

Author: ihrpr

examples/servers/simple-streamablehttp-stateless/mcp_simple_streamablehttp_stateless/__main__.py

@@ -3,5 +3,5 @@
 if __name__ == "__main__":
     # Click will handle CLI arguments
     import sys
-    
+
     sys.exit(main())  # type: ignore[call-arg]

src/mcp/shared/session.py

@@ -384,19 +384,19 @@ async def _receive_loop(self) -> None:
                             cancelled_id = notification.root.params.requestId
                             if cancelled_id in self._in_flight:
                                 await self._in_flight[cancelled_id].cancel()
-                        # Handle progress notifications
-                        elif isinstance(notification.root, ProgressNotification):
-                            progress_token = notification.root.params.progressToken
-                            # If there is a progress callback for this token,
-                            # call it with the progress information
-                            if progress_token in self._progress_callbacks:
-                                callback = self._progress_callbacks[progress_token]
-                                callback(
-                                    notification.root.params.progress,
-                                    notification.root.params.total,
-                                    notification.root.params.message,
-                                )
                         else:
+                            # Handle progress notifications callback
+                            if isinstance(notification.root, ProgressNotification):
+                                progress_token = notification.root.params.progressToken
+                                # If there is a progress callback for this token,
+                                # call it with the progress information
+                                if progress_token in self._progress_callbacks:
+                                    callback = self._progress_callbacks[progress_token]
+                                    callback(
+                                        notification.root.params.progress,
+                                        notification.root.params.total,
+                                        notification.root.params.message,
+                                    )
                             await self._received_notification(notification)
                             await self._handle_incoming(notification)
                     except Exception as e:

tests/client/test_list_methods_cursor.py

@@ -11,7 +11,7 @@
 
 async def test_list_tools_cursor_parameter():
     """Test that the cursor parameter is accepted for list_tools.
-    
+
     Note: FastMCP doesn't currently implement pagination, so this test
     only verifies that the cursor parameter is accepted by the client.
     """

tests/server/fastmcp/test_integration.py

@@ -10,7 +10,6 @@
 import time
 from collections.abc import Generator
 
-import anyio
 import pytest
 import uvicorn
 from pydantic import AnyUrl
@@ -20,13 +19,15 @@
 from mcp.client.sse import sse_client
 from mcp.client.streamable_http import streamablehttp_client
 from mcp.server.fastmcp import FastMCP
+from mcp.server.fastmcp.resources import FunctionResource
 from mcp.shared.context import RequestContext
 from mcp.types import (
     CreateMessageRequestParams,
     CreateMessageResult,
     GetPromptResult,
     InitializeResult,
     ReadResourceResult,
+    SamplingMessage,
     TextContent,
     TextResourceContents,
 )
@@ -123,8 +124,6 @@ def echo(message: str) -> str:
     # Tool with sampling capability
     @mcp.tool(description="A tool that uses sampling to generate content")
     async def sampling_tool(prompt: str, ctx: Context) -> str:
-        from mcp.types import SamplingMessage, TextContent
-
         await ctx.info(f"Requesting sampling for prompt: {prompt}")
 
         # Request sampling from the client
@@ -161,10 +160,6 @@ async def notification_tool(message: str, ctx: Context) -> str:
         return f"Sent notifications and logs for: {message}"
 
     # Resource - static
-    from pydantic import AnyUrl
-
-    from mcp.server.fastmcp.resources import FunctionResource
-
     def get_static_info() -> str:
         return "This is static resource content"
 
@@ -293,7 +288,7 @@ def run_streamable_http_server(server_port: int) -> None:
     server.run()
 
 
-def run_comprehensive_streamable_http_server(server_port: int) -> None:
+def run_everything_streamable_http_server(server_port: int) -> None:
     """Run the comprehensive StreamableHTTP server with all features."""
     _, app = make_everything_fastmcp_streamable_http_app()
     server = uvicorn.Server(
@@ -492,7 +487,6 @@ async def test_fastmcp_stateless_streamable_http(
                 assert tool_result.content[0].text == f"Echo: test_{i}"
 
 
-# Fixtures for comprehensive servers
 @pytest.fixture
 def everything_server_port() -> int:
     """Get a free port for testing the comprehensive server."""
@@ -557,12 +551,12 @@ def everything_server(everything_server_port: int) -> Generator[None, None, None
 
 
 @pytest.fixture()
-def comprehensive_streamable_http_server(
+def everything_streamable_http_server(
     everything_http_server_port: int,
 ) -> Generator[None, None, None]:
     """Start the comprehensive StreamableHTTP server in a separate process."""
     proc = multiprocessing.Process(
-        target=run_comprehensive_streamable_http_server,
+        target=run_everything_streamable_http_server,
         args=(everything_http_server_port,),
         daemon=True,
     )
@@ -858,7 +852,7 @@ async def message_handler(message):
 
 @pytest.mark.anyio
 async def test_fastmcp_all_features_streamable_http(
-    comprehensive_streamable_http_server: None, everything_http_server_url: str
+    everything_streamable_http_server: None, everything_http_server_url: str
 ) -> None:
     """Test all MCP features work correctly with StreamableHTTP transport."""