Apply UP rule

Author: Kludex

Diff for: src/mcp/client/websocket.py

@@ -1,7 +1,7 @@
 import json
 import logging
+from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
-from typing import AsyncGenerator
 
 import anyio
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream

Diff for: src/mcp/server/fastmcp/tools/base.py

@@ -1,7 +1,8 @@
 from __future__ import annotations as _annotations
 
 import inspect
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
 from pydantic import BaseModel, Field
 
@@ -38,7 +39,7 @@ def from_function(
         name: str | None = None,
         description: str | None = None,
         context_kwarg: str | None = None,
-    ) -> "Tool":
+    ) -> Tool:
         """Create a Tool from a function."""
         func_name = name or fn.__name__
 

Diff for: src/mcp/shared/memory.py

@@ -2,9 +2,10 @@
 In-memory transports
 """
 
+from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 from datetime import timedelta
-from typing import Any, AsyncGenerator
+from typing import Any
 
 import anyio
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream

Diff for: src/mcp/shared/progress.py

@@ -1,6 +1,7 @@
+from collections.abc import Generator
 from contextlib import contextmanager
 from dataclasses import dataclass, field
-from typing import Generator, Generic
+from typing import Generic
 
 from pydantic import BaseModel
 

Diff for: src/mcp/shared/session.py

@@ -1,8 +1,9 @@
 import logging
+from collections.abc import Callable
 from contextlib import AsyncExitStack
 from datetime import timedelta
 from types import TracebackType
-from typing import Any, Callable, Generic, TypeVar
+from typing import Any, Generic, TypeVar
 
 import anyio
 import anyio.lowlevel

Diff for: tests/issues/test_88_random_error.py

@@ -1,8 +1,8 @@
 """Test to reproduce issue #88: Random error thrown on response."""
 
+from collections.abc import Sequence
 from datetime import timedelta
 from pathlib import Path
-from typing import Sequence
 
 import anyio
 import pytest

Diff for: tests/server/fastmcp/test_server.py

@@ -1,6 +1,6 @@
 import base64
 from pathlib import Path
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING
 
 import pytest
 from pydantic import AnyUrl
@@ -114,7 +114,7 @@ def image_tool_fn(path: str) -> Image:
     return Image(path)
 
 
-def mixed_content_tool_fn() -> list[Union[TextContent, ImageContent]]:
+def mixed_content_tool_fn() -> list[TextContent | ImageContent]:
     return [
         TextContent(type="text", text="Hello"),
         ImageContent(type="image", data="abc", mimeType="image/png"),

Diff for: tests/server/fastmcp/test_tool_manager.py

@@ -1,6 +1,5 @@
 import json
 import logging
-from typing import Optional
 
 import pytest
 from pydantic import BaseModel
@@ -296,7 +295,7 @@ async def test_context_optional(self):
         """Test that context is optional when calling tools."""
         from mcp.server.fastmcp import Context
 
-        def tool_with_context(x: int, ctx: Optional[Context] = None) -> str:
+        def tool_with_context(x: int, ctx: Context | None = None) -> str:
             return str(x)
 
         manager = ToolManager()

Diff for: tests/server/test_lifespan.py

@@ -1,7 +1,7 @@
 """Tests for lifespan functionality in both low-level and FastMCP servers."""
 
+from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
-from typing import AsyncIterator
 
 import anyio
 import pytest

Diff for: tests/shared/test_session.py

@@ -1,4 +1,4 @@
-from typing import AsyncGenerator
+from collections.abc import AsyncGenerator
 
 import anyio
 import pytest

Diff for: tests/shared/test_sse.py

@@ -1,7 +1,7 @@
 import multiprocessing
 import socket
 import time
-from typing import AsyncGenerator, Generator
+from collections.abc import AsyncGenerator, Generator
 
 import anyio
 import httpx
@@ -139,7 +139,7 @@ def server(server_port: int) -> Generator[None, None, None]:
             attempt += 1
     else:
         raise RuntimeError(
-            "Server failed to start after {} attempts".format(max_attempts)
+            f"Server failed to start after {max_attempts} attempts"
         )
 
     yield

Diff for: tests/shared/test_ws.py

@@ -1,7 +1,7 @@
 import multiprocessing
 import socket
 import time
-from typing import AsyncGenerator, Generator
+from collections.abc import AsyncGenerator, Generator
 
 import anyio
 import pytest
@@ -135,7 +135,7 @@ def server(server_port: int) -> Generator[None, None, None]:
             attempt += 1
     else:
         raise RuntimeError(
-            "Server failed to start after {} attempts".format(max_attempts)
+            f"Server failed to start after {max_attempts} attempts"
         )
 
     yield