Skip to content

Commit e522882

Browse files
committed
ruff fixes
1 parent f0a8a41 commit e522882

File tree

16 files changed

+17
-21
lines changed

16 files changed

+17
-21
lines changed

examples/servers/simple-streamablehttp/mcp_simple_streamablehttp/server.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from starlette.routing import Mount
1414
from starlette.types import Receive, Scope, Send
1515

16-
1716
from .event_store import InMemoryEventStore
1817

1918
# Configure logging

examples/snippets/clients/stdio_client.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import asyncio
66
import os
77

8-
from mcp import ClientSession, StdioServerParameters, types
9-
108
from mcp import ClientSession, ClientTransportSession, StdioServerParameters, types
119
from mcp.client.stdio import stdio_client
1210
from mcp.shared.context import RequestContext

examples/snippets/servers/elicitation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
from mcp.server.fastmcp import Context, FastMCP
1313
from mcp.server.session import ServerSession
14+
from mcp.server.transport_session import ServerTransportSession
1415
from mcp.shared.exceptions import UrlElicitationRequiredError
1516
from mcp.types import ElicitRequestURLParams
16-
from mcp.server.transport_session import ServerTransportSession
1717

1818
mcp = FastMCP(name="Elicitation Example")
1919

src/mcp/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
from .client.transport_session import ClientTransportSession
66
from .server.session import ServerSession
77
from .server.stdio import stdio_server
8-
from .shared.exceptions import McpError, UrlElicitationRequiredError
98
from .server.transport_session import ServerTransportSession
10-
from .shared.exceptions import McpError
9+
from .shared.exceptions import McpError, UrlElicitationRequiredError
1110
from .types import (
1211
CallToolRequest,
1312
ClientCapabilities,

src/mcp/server/lowlevel/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ async def main():
9797
from mcp.server.lowlevel.helper_types import ReadResourceContents
9898
from mcp.server.models import InitializationOptions
9999
from mcp.server.session import ServerSession
100-
from mcp.server.transport_session import ServerTransportSession
101100
from mcp.server.streamable_http import EventStore
102101
from mcp.server.streamable_http_manager import StreamableHTTPASGIApp, StreamableHTTPSessionManager
103102
from mcp.server.transport_security import TransportSecuritySettings
103+
from mcp.server.transport_session import ServerTransportSession
104104
from mcp.shared.context import RequestContext
105105
from mcp.shared.exceptions import McpError, UrlElicitationRequiredError
106106
from mcp.shared.message import ServerMessageMetadata, SessionMessage

src/mcp/server/session.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ async def handle_list_prompts(ctx: RequestContext) -> list[types.Prompt]:
4747
import mcp.types as types
4848
from mcp.server.experimental.session_features import ExperimentalServerSessionFeatures
4949
from mcp.server.models import InitializationOptions
50+
from mcp.server.transport_session import ServerTransportSession
5051
from mcp.server.validation import validate_sampling_tools, validate_tool_use_result_messages
5152
from mcp.shared.exceptions import StatelessModeNotSupported
5253
from mcp.shared.experimental.tasks.capabilities import check_tasks_capability
5354
from mcp.shared.experimental.tasks.helpers import RELATED_TASK_METADATA_KEY
54-
from mcp.server.transport_session import ServerTransportSession
5555
from mcp.shared.message import ServerMessageMetadata, SessionMessage
5656
from mcp.shared.session import (
5757
BaseSession,

src/mcp/server/transport_session.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
from abc import ABC, abstractmethod
44
from typing import Any
55

6-
76
import mcp.types as types
87
from mcp.shared.message import SessionMessage
98

109

1110
class ServerTransportSession(ABC):
1211
"""Abstract base class for transport sessions."""
12+
1313
@abstractmethod
1414
async def send_message(self, message: SessionMessage) -> None:
1515
"""Send a raw session message."""

src/mcp/shared/context.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
if TYPE_CHECKING:
1313
from mcp import ClientTransportSession, ServerTransportSession
1414

15-
SessionT = TypeVar(
16-
"SessionT",
15+
SessionT_co = TypeVar(
16+
"SessionT_co",
1717
bound=BaseSession[Any, Any, Any, Any, Any] | "ClientTransportSession" | "ServerTransportSession",
1818
covariant=True,
1919
)
@@ -22,10 +22,10 @@
2222

2323

2424
@dataclass
25-
class RequestContext(Generic[SessionT, LifespanContextT, RequestT]):
25+
class RequestContext(Generic[SessionT_co, LifespanContextT, RequestT]):
2626
request_id: RequestId
2727
meta: RequestParamsMeta | None
28-
session: SessionT
28+
session: SessionT_co
2929
lifespan_context: LifespanContextT
3030
# NOTE: This is typed as Any to avoid circular imports. The actual type is
3131
# mcp.server.experimental.request_context.Experimental, but importing it here

src/mcp/shared/session.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,10 @@ def in_flight(self) -> bool: # pragma: no cover
153153
def cancelled(self) -> bool: # pragma: no cover
154154
return self._cancel_scope.cancel_called
155155

156+
156157
class Session:
157158
"""Base class for a session that can send progress notifications."""
159+
158160
async def send_progress_notification(
159161
self,
160162
progress_token: ProgressToken,
@@ -164,6 +166,7 @@ async def send_progress_notification(
164166
) -> None:
165167
"""Sends a progress notification for a request that is currently being processed."""
166168

169+
167170
class BaseSession(
168171
Session,
169172
Generic[

tests/client/test_list_roots_callback.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import pytest
22
from pydantic import FileUrl
33

4-
from mcp.client.session import ClientSession
54
from mcp import Client
5+
from mcp.client.session import ClientSession
66
from mcp.server.fastmcp import FastMCP
77
from mcp.server.fastmcp.server import Context
88
from mcp.server.session import ServerSession

0 commit comments

Comments
 (0)