some pyright fixes

Author: asheshvidyut

examples/clients/simple-task-interactive-client/mcp_simple_task_interactive_client/main.py

@@ -10,7 +10,7 @@
 from typing import Any
 
 import click
-from mcp import ClientSession
+from mcp import ClientSession, ClientTransportSession
 from mcp.client.streamable_http import streamable_http_client
 from mcp.shared.context import RequestContext
 from mcp.types import (
@@ -24,7 +24,7 @@
 
 
 async def elicitation_callback(
-    context: RequestContext[ClientSession, Any],
+    context: RequestContext[ClientTransportSession, Any],
     params: ElicitRequestParams,
 ) -> ElicitResult:
     """Handle elicitation requests from the server."""
@@ -39,7 +39,7 @@ async def elicitation_callback(
 
 
 async def sampling_callback(
-    context: RequestContext[ClientSession, Any],
+    context: RequestContext[ClientTransportSession, Any],
     params: CreateMessageRequestParams,
 ) -> CreateMessageResult:
     """Handle sampling requests from the server."""

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

@@ -13,6 +13,8 @@
 from starlette.routing import Mount
 from starlette.types import Receive, Scope, Send
 
+from pydantic import AnyUrl
+
 from .event_store import InMemoryEventStore
 
 # Configure logging
@@ -73,7 +75,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="http:///test_resource")
+        await ctx.session.send_resource_updated(uri=AnyUrl("http:///test_resource"))
         return [
             types.TextContent(
                 type="text",

examples/snippets/clients/stdio_client.py

@@ -6,7 +6,6 @@
 import os
 
 from mcp import ClientSession, StdioServerParameters, types
-from pydantic import AnyUrl
 
 from mcp import ClientSession, ClientTransportSession, StdioServerParameters, types
 from mcp.client.stdio import stdio_client

examples/snippets/clients/url_elicitation_client.py

@@ -30,15 +30,15 @@
 from typing import Any
 from urllib.parse import urlparse
 
-from mcp import ClientSession, types
+from mcp import ClientSession, ClientTransportSession, types
 from mcp.client.sse import sse_client
 from mcp.shared.context import RequestContext
 from mcp.shared.exceptions import McpError, UrlElicitationRequiredError
 from mcp.types import URL_ELICITATION_REQUIRED
 
 
 async def handle_elicitation(
-    context: RequestContext[ClientSession, Any],
+    context: RequestContext[ClientTransportSession, Any],
     params: types.ElicitRequestParams,
 ) -> types.ElicitResult | types.ErrorData:
     """Handle elicitation requests from the server.

src/mcp/client/transport_session.py

@@ -41,19 +41,19 @@ async def set_logging_level(
         raise NotImplementedError
 
     @abstractmethod
-    async def list_resources(
-        self,
-        cursor: str | None = None,
-    ) -> types.ListResourcesResult:
+    async def list_resources(self, *, params: types.PaginatedRequestParams | None = None) -> types.ListResourcesResult:
         """Send a resources/list request."""
         raise NotImplementedError
 
     @abstractmethod
     async def list_resource_templates(
-        self,
-        cursor: str | None = None,
+        self, *, params: types.PaginatedRequestParams | None = None
     ) -> types.ListResourceTemplatesResult:
-        """Send a resources/templates/list request."""
+        """Send a resources/templates/list request.
+
+        Args:
+            params: Full pagination parameters including cursor and any future fields
+        """
         raise NotImplementedError
 
     @abstractmethod
@@ -62,22 +62,24 @@ async def read_resource(self, uri: AnyUrl) -> types.ReadResourceResult:
         raise NotImplementedError
 
     @abstractmethod
-    async def subscribe_resource(self, uri: AnyUrl) -> types.EmptyResult:
+    async def subscribe_resource(self, uri: str, *, meta: RequestParamsMeta | None = None) -> types.EmptyResult:
         """Send a resources/subscribe request."""
         raise NotImplementedError
 
     @abstractmethod
-    async def unsubscribe_resource(self, uri: AnyUrl) -> types.EmptyResult:
+    async def unsubscribe_resource(self, uri: str, *, meta: RequestParamsMeta | None = None) -> types.EmptyResult:
         """Send a resources/unsubscribe request."""
         raise NotImplementedError
 
     @abstractmethod
     async def call_tool(
         self,
         name: str,
-        arguments: Any | None = None,
-        read_timeout_seconds: timedelta | None = None,
+        arguments: dict[str, Any] | None = None,
+        read_timeout_seconds: float | None = None,
         progress_callback: ProgressFnT | None = None,
+        *,
+        meta: RequestParamsMeta | None = None,
     ) -> types.CallToolResult:
         """Send a tools/call request with optional progress callback support."""
         raise NotImplementedError

tests/server/test_cancel_handling.py

@@ -6,7 +6,6 @@
 import pytest
 
 import mcp.types as types
-from mcp.client.session import ClientSession
 from mcp import Client
 from mcp.server.lowlevel.server import Server
 from mcp.shared.exceptions import McpError

tests/shared/test_memory.py

@@ -1,8 +1,6 @@
 import pytest
 
 from mcp import Client
-from mcp.client.session import ClientSession
-from mcp.client.transport_session import ClientTransportSession
 from mcp.server import Server
 from mcp.types import EmptyResult, Resource