fix some pyright

Author: asheshvidyut

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

@@ -13,7 +13,6 @@
 from starlette.routing import Mount
 from starlette.types import Receive, Scope, Send
 
-from pydantic import AnyUrl
 
 from .event_store import InMemoryEventStore
 
@@ -75,7 +74,7 @@ async def call_tool(name: str, arguments: dict[str, Any]) -> list[types.ContentB
 
         # This will send a resource notificaiton though standalone SSE
         # established by GET request
-        await ctx.session.send_resource_updated(uri=AnyUrl("http:///test_resource"))
+        await ctx.session.send_resource_updated(uri="http:///test_resource")
         return [
             types.TextContent(
                 type="text",

src/mcp/client/session.py

@@ -23,22 +23,22 @@
 class SamplingFnT(Protocol):
     async def __call__(
         self,
-        context: RequestContext["ClientTransportSession", Any],
+        context: RequestContext["ClientSession", Any],
         params: types.CreateMessageRequestParams,
     ) -> types.CreateMessageResult | types.CreateMessageResultWithTools | types.ErrorData: ...  # pragma: no branch
 
 
 class ElicitationFnT(Protocol):
     async def __call__(
         self,
-        context: RequestContext["ClientTransportSession", Any],
+        context: RequestContext["ClientSession", Any],
         params: types.ElicitRequestParams,
     ) -> types.ElicitResult | types.ErrorData: ...  # pragma: no branch
 
 
 class ListRootsFnT(Protocol):
     async def __call__(
-        self, context: RequestContext["ClientTransportSession", Any]
+        self, context: RequestContext["ClientSession", Any]
     ) -> types.ListRootsResult | types.ErrorData: ...  # pragma: no branch
 
 
@@ -418,7 +418,7 @@ async def send_roots_list_changed(self) -> None:  # pragma: no cover
         await self.send_notification(types.RootsListChangedNotification())
 
     async def _received_request(self, responder: RequestResponder[types.ServerRequest, types.ClientResult]) -> None:
-        ctx = RequestContext[ClientTransportSession, Any](
+        ctx = RequestContext[ClientSession, Any](
             request_id=responder.request_id,
             meta=responder.request_meta,
             session=self,

src/mcp/client/transport_session.py

@@ -1,11 +1,9 @@
 from abc import ABC, abstractmethod
-from datetime import timedelta
 from typing import Any
 
-from pydantic import AnyUrl
-
 import mcp.types as types
 from mcp.shared.session import ProgressFnT
+from mcp.types import RequestParamsMeta
 
 
 class ClientTransportSession(ABC):
@@ -57,17 +55,17 @@ async def list_resource_templates(
         raise NotImplementedError
 
     @abstractmethod
-    async def read_resource(self, uri: AnyUrl) -> types.ReadResourceResult:
+    async def read_resource(self, uri: str) -> types.ReadResourceResult:
         """Send a resources/read request."""
         raise NotImplementedError
 
     @abstractmethod
-    async def subscribe_resource(self, uri: str, *, meta: RequestParamsMeta | None = None) -> types.EmptyResult:
+    async def subscribe_resource(self, uri: str) -> types.EmptyResult:
         """Send a resources/subscribe request."""
         raise NotImplementedError
 
     @abstractmethod
-    async def unsubscribe_resource(self, uri: str, *, meta: RequestParamsMeta | None = None) -> types.EmptyResult:
+    async def unsubscribe_resource(self, uri: str) -> types.EmptyResult:
         """Send a resources/unsubscribe request."""
         raise NotImplementedError
 
@@ -87,7 +85,8 @@ async def call_tool(
     @abstractmethod
     async def list_prompts(
         self,
-        cursor: str | None = None,
+        *,
+        params: types.PaginatedRequestParams | None = None,
     ) -> types.ListPromptsResult:
         """Send a prompts/list request."""
         raise NotImplementedError
@@ -114,7 +113,6 @@ async def complete(
     @abstractmethod
     async def list_tools(
         self,
-        cursor: str | None = None,
         *,
         params: types.PaginatedRequestParams | None = None,
     ) -> types.ListToolsResult:

src/mcp/server/elicitation.py

@@ -9,7 +9,10 @@
 from pydantic import BaseModel
 
 from mcp.server.transport_session import ServerTransportSession
-from mcp.types import RequestId
+from mcp.types import (
+    ElicitResult,
+    RequestId,
+)
 
 ElicitSchemaModelT = TypeVar("ElicitSchemaModelT", bound=BaseModel)
 
@@ -123,7 +126,7 @@ async def elicit_with_validation(
 
     json_schema = schema.model_json_schema()
 
-    result = await session.elicit_form(
+    result: ElicitResult = await session.elicit(
         message=message,
         requested_schema=json_schema,
         related_request_id=related_request_id,
@@ -143,7 +146,7 @@ async def elicit_with_validation(
 
 
 async def elicit_url(
-    session: ServerSession,
+    session: ServerTransportSession,
     message: str,
     url: str,
     elicitation_id: str,

src/mcp/server/experimental/task_result_handler.py

@@ -14,7 +14,7 @@
 
 import anyio
 
-from mcp.server.session import ServerSession
+from mcp.server.session import ServerTransportSession
 from mcp.shared.exceptions import McpError
 from mcp.shared.experimental.tasks.helpers import RELATED_TASK_METADATA_KEY, is_terminal
 from mcp.shared.experimental.tasks.message_queue import TaskMessageQueue
@@ -69,7 +69,7 @@ def __init__(
 
     async def send_message(
         self,
-        session: ServerSession,
+        session: ServerTransportSession,
         message: SessionMessage,
     ) -> None:
         """Send a message via the session.
@@ -81,7 +81,7 @@ async def send_message(
     async def handle(
         self,
         request: GetTaskPayloadRequest,
-        session: ServerSession,
+        session: ServerTransportSession,
         request_id: RequestId,
     ) -> GetTaskPayloadResult:
         """Handle a tasks/result request.
@@ -131,7 +131,7 @@ async def handle(
     async def _deliver_queued_messages(
         self,
         task_id: str,
-        session: ServerSession,
+        session: ServerTransportSession,
         request_id: RequestId,
     ) -> None:
         """Dequeue and send all pending messages for a task.

src/mcp/server/session.py

@@ -42,7 +42,7 @@ async def handle_list_prompts(ctx: RequestContext) -> list[types.Prompt]:
 import anyio
 import anyio.lowlevel
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
-from pydantic import AnyUrl, TypeAdapter
+from pydantic import TypeAdapter
 
 import mcp.types as types
 from mcp.server.experimental.session_features import ExperimentalServerSessionFeatures
@@ -232,7 +232,7 @@ async def send_log_message(
             related_request_id,
         )
 
-    async def send_resource_updated(self, uri: str | AnyUrl) -> None:  # pragma: no cover
+    async def send_resource_updated(self, uri: str) -> None:  # pragma: no cover
         """Send a resource updated notification."""
         await self.send_notification(
             types.ResourceUpdatedNotification(

src/mcp/server/transport_session.py

@@ -3,13 +3,17 @@
 from abc import ABC, abstractmethod
 from typing import Any
 
-from pydantic import AnyUrl
 
 import mcp.types as types
+from mcp.shared.message import SessionMessage
 
 
 class ServerTransportSession(ABC):
     """Abstract base class for transport sessions."""
+    @abstractmethod
+    async def send_message(self, message: SessionMessage) -> None:
+        """Send a raw session message."""
+        raise NotImplementedError
 
     @abstractmethod
     async def send_log_message(
@@ -23,7 +27,7 @@ async def send_log_message(
         raise NotImplementedError
 
     @abstractmethod
-    async def send_resource_updated(self, uri: AnyUrl) -> None:
+    async def send_resource_updated(self, uri: str) -> None:
         """Send a resource updated notification."""
         raise NotImplementedError
 
@@ -36,12 +40,33 @@ async def list_roots(self) -> types.ListRootsResult:
     async def elicit(
         self,
         message: str,
-        requestedSchema: types.ElicitRequestedSchema,
+        requested_schema: types.ElicitRequestedSchema,
         related_request_id: types.RequestId | None = None,
     ) -> types.ElicitResult:
         """Send an elicitation/create request."""
         raise NotImplementedError
 
+    @abstractmethod
+    async def elicit_form(
+        self,
+        message: str,
+        requested_schema: types.ElicitRequestedSchema,
+        related_request_id: types.RequestId | None = None,
+    ) -> types.ElicitResult:
+        """Send a form mode elicitation/create request."""
+        raise NotImplementedError
+
+    @abstractmethod
+    async def elicit_url(
+        self,
+        message: str,
+        url: str,
+        elicitation_id: str,
+        related_request_id: types.RequestId | None = None,
+    ) -> types.ElicitResult:
+        """Send a URL mode elicitation/create request."""
+        raise NotImplementedError
+
     @abstractmethod
     async def send_ping(self) -> types.EmptyResult:
         """Send a ping request."""

src/mcp/shared/context.py

@@ -13,7 +13,9 @@
     from mcp import ClientTransportSession, ServerTransportSession
 
 SessionT = TypeVar(
-    "SessionT", bound=BaseSession[Any, Any, Any, Any, Any] | "ClientTransportSession" | "ServerTransportSession"
+    "SessionT",
+    bound=BaseSession[Any, Any, Any, Any, Any] | "ClientTransportSession" | "ServerTransportSession",
+    covariant=True,
 )
 LifespanContextT = TypeVar("LifespanContextT")
 RequestT = TypeVar("RequestT", default=Any)

src/mcp/shared/session.py

@@ -153,8 +153,19 @@ def in_flight(self) -> bool:  # pragma: no cover
     def cancelled(self) -> bool:  # pragma: no cover
         return self._cancel_scope.cancel_called
 
+class Session:
+    """Base class for a session that can send progress notifications."""
+    async def send_progress_notification(
+        self,
+        progress_token: ProgressToken,
+        progress: float,
+        total: float | None = None,
+        message: str | None = None,
+    ) -> None:
+        """Sends a progress notification for a request that is currently being processed."""
 
 class BaseSession(
+    Session,
     Generic[
         SendRequestT,
         SendNotificationT,
@@ -500,15 +511,6 @@ async def _received_notification(self, notification: ReceiveNotificationT) -> No
         to listen on the message stream.
         """
 
-    async def send_progress_notification(
-        self,
-        progress_token: ProgressToken,
-        progress: float,
-        total: float | None = None,
-        message: str | None = None,
-    ) -> None:
-        """Sends a progress notification for a request that is currently being processed."""
-
     async def _handle_incoming(
         self, req: RequestResponder[ReceiveRequestT, SendResultT] | ReceiveNotificationT | Exception
     ) -> None:

tests/client/test_list_roots_callback.py

@@ -1,9 +1,8 @@
 import pytest
 from pydantic import FileUrl
 
-from mcp.client.transport_session import ClientTransportSession
-from mcp import Client
 from mcp.client.session import ClientSession
+from mcp import Client
 from mcp.server.fastmcp import FastMCP
 from mcp.server.fastmcp.server import Context
 from mcp.server.session import ServerSession
@@ -29,7 +28,7 @@ async def test_list_roots_callback():
     )
 
     async def list_roots_callback(
-        context: RequestContext[ClientTransportSession, None],
+        context: RequestContext[ClientSession, None],
     ) -> ListRootsResult:
         return callback_return