merge

Author: Kludex

examples/clients/sse-polling-client/mcp_sse_polling_client/main.py

@@ -21,8 +21,6 @@
 from mcp import ClientSession
 from mcp.client.streamable_http import streamable_http_client
 
-logger = logging.getLogger(__name__)
-
 
 async def run_demo(url: str, items: int, checkpoint_every: int) -> None:
     """Run the SSE polling demo."""

examples/servers/simple-auth/mcp_simple_auth/simple_auth_provider.py

@@ -8,7 +8,6 @@
 
 """
 
-import logging
 import secrets
 import time
 from typing import Any
@@ -29,8 +28,6 @@
 )
 from mcp.shared.auth import OAuthClientInformationFull, OAuthToken
 
-logger = logging.getLogger(__name__)
-
 
 class SimpleAuthSettings(BaseSettings):
     """Simple OAuth settings for demo purposes."""

src/mcp/client/auth/utils.py

@@ -1,4 +1,3 @@
-import logging
 import re
 from urllib.parse import urljoin, urlparse
 
@@ -16,8 +15,6 @@
 )
 from mcp.types import LATEST_PROTOCOL_VERSION
 
-logger = logging.getLogger(__name__)
-
 
 def extract_field_from_www_auth(response: Response, field_name: str) -> str | None:
     """Extract field from WWW-Authenticate header.

src/mcp/client/client.py

@@ -5,13 +5,29 @@
 from contextlib import AsyncExitStack
 from typing import Any
 
-import mcp.types as types
 from mcp.client._memory import InMemoryTransport
 from mcp.client.session import ClientSession, ElicitationFnT, ListRootsFnT, LoggingFnT, MessageHandlerFnT, SamplingFnT
 from mcp.server import Server
 from mcp.server.fastmcp import FastMCP
 from mcp.shared.session import ProgressFnT
-from mcp.types._types import RequestParamsMeta
+from mcp.types import (
+    CallToolResult,
+    CompleteResult,
+    EmptyResult,
+    GetPromptResult,
+    Implementation,
+    ListPromptsResult,
+    ListResourcesResult,
+    ListResourceTemplatesResult,
+    ListToolsResult,
+    LoggingLevel,
+    PaginatedRequestParams,
+    PromptReference,
+    ReadResourceResult,
+    RequestParamsMeta,
+    ResourceTemplateReference,
+    ServerCapabilities,
+)
 
 
 class Client:
@@ -57,7 +73,7 @@ def __init__(
         list_roots_callback: ListRootsFnT | None = None,
         logging_callback: LoggingFnT | None = None,
         message_handler: MessageHandlerFnT | None = None,
-        client_info: types.Implementation | None = None,
+        client_info: Implementation | None = None,
         elicitation_callback: ElicitationFnT | None = None,
     ) -> None:
         """Initialize the client with a server.
@@ -138,11 +154,11 @@ def session(self) -> ClientSession:
         return self._session
 
     @property
-    def server_capabilities(self) -> types.ServerCapabilities | None:
+    def server_capabilities(self) -> ServerCapabilities | None:
         """The server capabilities received during initialization, or None if not yet initialized."""
         return self.session.get_server_capabilities()
 
-    async def send_ping(self, *, meta: RequestParamsMeta | None = None) -> types.EmptyResult:
+    async def send_ping(self, *, meta: RequestParamsMeta | None = None) -> EmptyResult:
         """Send a ping request to the server."""
         return await self.session.send_ping(meta=meta)
 
@@ -161,12 +177,7 @@ async def send_progress_notification(
             message=message,
         )
 
-    async def set_logging_level(
-        self,
-        level: types.LoggingLevel,
-        *,
-        meta: RequestParamsMeta | None = None,
-    ) -> types.EmptyResult:
+    async def set_logging_level(self, level: LoggingLevel, *, meta: RequestParamsMeta | None = None) -> EmptyResult:
         """Set the logging level on the server."""
         return await self.session.set_logging_level(level=level, meta=meta)
 
@@ -175,22 +186,20 @@ async def list_resources(
         *,
         cursor: str | None = None,
         meta: RequestParamsMeta | None = None,
-    ) -> types.ListResourcesResult:
+    ) -> ListResourcesResult:
         """List available resources from the server."""
-        return await self.session.list_resources(params=types.PaginatedRequestParams(cursor=cursor, _meta=meta))
+        return await self.session.list_resources(params=PaginatedRequestParams(cursor=cursor, _meta=meta))
 
     async def list_resource_templates(
         self,
         *,
         cursor: str | None = None,
         meta: RequestParamsMeta | None = None,
-    ) -> types.ListResourceTemplatesResult:
+    ) -> ListResourceTemplatesResult:
         """List available resource templates from the server."""
-        return await self.session.list_resource_templates(
-            params=types.PaginatedRequestParams(cursor=cursor, _meta=meta)
-        )
+        return await self.session.list_resource_templates(params=PaginatedRequestParams(cursor=cursor, _meta=meta))
 
-    async def read_resource(self, uri: str, *, meta: RequestParamsMeta | None = None) -> types.ReadResourceResult:
+    async def read_resource(self, uri: str, *, meta: RequestParamsMeta | None = None) -> ReadResourceResult:
         """Read a resource from the server.
 
         Args:
@@ -202,11 +211,11 @@ async def read_resource(self, uri: str, *, meta: RequestParamsMeta | None = None
         """
         return await self.session.read_resource(uri, meta=meta)
 
-    async def subscribe_resource(self, uri: str, *, meta: RequestParamsMeta | None = None) -> types.EmptyResult:
+    async def subscribe_resource(self, uri: str, *, meta: RequestParamsMeta | None = None) -> EmptyResult:
         """Subscribe to resource updates."""
         return await self.session.subscribe_resource(uri, meta=meta)
 
-    async def unsubscribe_resource(self, uri: str, *, meta: RequestParamsMeta | None = None) -> types.EmptyResult:
+    async def unsubscribe_resource(self, uri: str, *, meta: RequestParamsMeta | None = None) -> EmptyResult:
         """Unsubscribe from resource updates."""
         return await self.session.unsubscribe_resource(uri, meta=meta)
 
@@ -218,7 +227,7 @@ async def call_tool(
         progress_callback: ProgressFnT | None = None,
         *,
         meta: RequestParamsMeta | None = None,
-    ) -> types.CallToolResult:
+    ) -> CallToolResult:
         """Call a tool on the server.
 
         Args:
@@ -244,13 +253,13 @@ async def list_prompts(
         *,
         cursor: str | None = None,
         meta: RequestParamsMeta | None = None,
-    ) -> types.ListPromptsResult:
+    ) -> ListPromptsResult:
         """List available prompts from the server."""
-        return await self.session.list_prompts(params=types.PaginatedRequestParams(cursor=cursor, _meta=meta))
+        return await self.session.list_prompts(params=PaginatedRequestParams(cursor=cursor, _meta=meta))
 
     async def get_prompt(
         self, name: str, arguments: dict[str, str] | None = None, *, meta: RequestParamsMeta | None = None
-    ) -> types.GetPromptResult:
+    ) -> GetPromptResult:
         """Get a prompt from the server.
 
         Args:
@@ -265,10 +274,10 @@ async def get_prompt(
 
     async def complete(
         self,
-        ref: types.ResourceTemplateReference | types.PromptReference,
+        ref: ResourceTemplateReference | PromptReference,
         argument: dict[str, str],
         context_arguments: dict[str, str] | None = None,
-    ) -> types.CompleteResult:
+    ) -> CompleteResult:
         """Get completions for a prompt or resource template argument.
 
         Args:
@@ -281,9 +290,9 @@ async def complete(
         """
         return await self.session.complete(ref=ref, argument=argument, context_arguments=context_arguments)
 
-    async def list_tools(self, *, cursor: str | None = None) -> types.ListToolsResult:
+    async def list_tools(self, *, cursor: str | None = None, meta: RequestParamsMeta | None = None) -> ListToolsResult:
         """List available tools from the server."""
-        return await self.session.list_tools(params=types.PaginatedRequestParams(cursor=cursor))
+        return await self.session.list_tools(params=PaginatedRequestParams(cursor=cursor, _meta=meta))
 
     async def send_roots_list_changed(self) -> None:
         """Send a notification that the roots list has changed."""

src/mcp/server/websocket.py

@@ -1,4 +1,3 @@
-import logging
 from contextlib import asynccontextmanager
 
 import anyio
@@ -10,8 +9,6 @@
 import mcp.types as types
 from mcp.shared.message import SessionMessage
 
-logger = logging.getLogger(__name__)
-
 
 @asynccontextmanager  # pragma: no cover
 async def websocket_server(scope: Scope, receive: Receive, send: Send):