fastmcp 2.12.4__py3-none-any.whl → 2.13.0__py3-none-any.whl

fastmcp/client/logging.py

@@ -1,4 +1,5 @@
 from collections.abc import Awaitable, Callable
+from logging import Logger
 from typing import TypeAlias
 
 from mcp.client.session import LoggingFnT
@@ -6,7 +7,8 @@ from mcp.types import LoggingMessageNotificationParams
 
 from fastmcp.utilities.logging import get_logger
 
-logger = get_logger(__name__)
+logger: Logger = get_logger(name=__name__)
+from_server_logger: Logger = get_logger(name="fastmcp.client.from_server")
 
 LogMessage: TypeAlias = LoggingMessageNotificationParams
 LogHandler: TypeAlias = Callable[[LogMessage], Awaitable[None]]
@@ -14,30 +16,32 @@ LogHandler: TypeAlias = Callable[[LogMessage], Awaitable[None]]
 
 async def default_log_handler(message: LogMessage) -> None:
     """Default handler that properly routes server log messages to appropriate log levels."""
-    msg = message.data.get("msg", str(message))
-    extra = message.data.get("extra", {})
+    # data can be any JSON-serializable type, not just a dict
+    data = message.data
 
     # Map MCP log levels to Python logging levels
     level_map = {
-        "debug": logger.debug,
-        "info": logger.info,
-        "notice": logger.info,  # Python doesn't have 'notice', map to info
-        "warning": logger.warning,
-        "error": logger.error,
-        "critical": logger.critical,
-        "alert": logger.critical,  # Map alert to critical
-        "emergency": logger.critical,  # Map emergency to critical
+        "debug": from_server_logger.debug,
+        "info": from_server_logger.info,
+        "notice": from_server_logger.info,  # Python doesn't have 'notice', map to info
+        "warning": from_server_logger.warning,
+        "error": from_server_logger.error,
+        "critical": from_server_logger.critical,
+        "alert": from_server_logger.critical,  # Map alert to critical
+        "emergency": from_server_logger.critical,  # Map emergency to critical
     }
 
     # Get the appropriate logging function based on the message level
     log_fn = level_map.get(message.level.lower(), logger.info)
 
     # Include logger name if available
+    msg_prefix: str = f"Received {message.level.upper()} from server"
+
     if message.logger:
-        msg = f"[{message.logger}] {msg}"
+        msg_prefix += f" ({message.logger})"
 
-    # Log with appropriate level and extra data
-    log_fn(f"Server log: {msg}", extra=extra)
+    # Log with appropriate level and data
+    log_fn(msg=f"{msg_prefix}: {data}")
 
 
 def create_log_callback(handler: LogHandler | None = None) -> LoggingFnT:

fastmcp/client/oauth_callback.py

@@ -7,17 +7,26 @@ and display styled responses to users.
 
 from __future__ import annotations
 
-import asyncio
 from dataclasses import dataclass
 
+import anyio
 from starlette.applications import Starlette
 from starlette.requests import Request
-from starlette.responses import HTMLResponse
 from starlette.routing import Route
 from uvicorn import Config, Server
 
 from fastmcp.utilities.http import find_available_port
 from fastmcp.utilities.logging import get_logger
+from fastmcp.utilities.ui import (
+    HELPER_TEXT_STYLES,
+    INFO_BOX_STYLES,
+    STATUS_MESSAGE_STYLES,
+    create_info_box,
+    create_logo,
+    create_page,
+    create_secure_html_response,
+    create_status_message,
+)
 
 logger = get_logger(__name__)
 
@@ -29,155 +38,43 @@ def create_callback_html(
     server_url: str | None = None,
 ) -> str:
     """Create a styled HTML response for OAuth callbacks."""
-    logo_url = "https://gofastmcp.com/assets/brand/blue-logo.png"
-
     # Build the main status message
-    if is_success:
-        status_title = "Authentication successful"
-        status_icon = "✓"
-        icon_bg = "#10b98120"
-    else:
-        status_title = "Authentication failed"
-        status_icon = "✕"
-        icon_bg = "#ef444420"
+    status_title = (
+        "Authentication successful" if is_success else "Authentication failed"
+    )
 
     # Add detail info box for both success and error cases
     detail_info = ""
     if is_success and server_url:
-        detail_info = f"""
-            <div class="info-box">
-                Connected to: <strong>{server_url}</strong>
-            </div>
-        """
+        detail_info = create_info_box(
+            f"Connected to: {server_url}", centered=True, monospace=True
+        )
     elif not is_success:
-        detail_info = f"""
-            <div class="info-box error">
-                {message}
-            </div>
-        """
-
-    return f"""
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>{title}</title>
-        <style>
-            * {{
-                margin: 0;
-                padding: 0;
-                box-sizing: border-box;
-            }}
-            
-            body {{
-                font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
-                margin: 0;
-                padding: 0;
-                min-height: 100vh;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                background: #ffffff;
-                color: #0a0a0a;
-            }}
-            
-            .container {{
-                background: #ffffff;
-                border: 1px solid #e5e5e5;
-                padding: 3rem 2rem;
-                border-radius: 0.75rem;
-                box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px -1px rgba(0, 0, 0, 0.1);
-                text-align: center;
-                max-width: 28rem;
-                margin: 1rem;
-                position: relative;
-            }}
-            
-            .logo {{
-                width: 60px;
-                height: auto;
-                margin-bottom: 2rem;
-                display: block;
-                margin-left: auto;
-                margin-right: auto;
-            }}
-            
-            .status-message {{
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                gap: 0.75rem;
-                margin-bottom: 1.5rem;
-            }}
-            
-            .status-icon {{
-                font-size: 1.5rem;
-                line-height: 1;
-                display: inline-flex;
-                align-items: center;
-                justify-content: center;
-                width: 2rem;
-                height: 2rem;
-                background: {icon_bg};
-                border-radius: 0.5rem;
-                flex-shrink: 0;
-            }}
-            
-            .message {{
-                font-size: 1.125rem;
-                line-height: 1.75;
-                color: #0a0a0a;
-                font-weight: 600;
-                text-align: left;
-            }}
-            
-            .info-box {{
-                background: #f5f5f5;
-                border: 1px solid #e5e5e5;
-                border-radius: 0.5rem;
-                padding: 0.875rem;
-                margin: 1.25rem 0;
-                font-size: 0.875rem;
-                color: #525252;
-                font-family: 'SF Mono', 'Monaco', 'Consolas', 'Courier New', monospace;
-                text-align: left;
-            }}
-            
-            .info-box.error {{
-                background: #fef2f2;
-                border-color: #fecaca;
-                color: #991b1b;
-            }}
-            
-            .info-box strong {{
-                color: #0a0a0a;
-                font-weight: 600;
-            }}
-            
-            .close-instruction {{
-                font-size: 0.875rem;
-                color: #737373;
-                margin-top: 1.5rem;
-            }}
-        </style>
-    </head>
-    <body>
+        detail_info = create_info_box(
+            message, is_error=True, centered=True, monospace=True
+        )
+
+    # Build the page content
+    content = f"""
         <div class="container">
-            <img src="{logo_url}" alt="FastMCP" class="logo" />
-            <div class="status-message">
-                <span class="status-icon">{status_icon}</span>
-                <div class="message">{status_title}</div>
-            </div>
+            {create_logo()}
+            {create_status_message(status_title, is_success=is_success)}
             {detail_info}
             <div class="close-instruction">
                 You can safely close this tab now.
             </div>
         </div>
-    </body>
-    </html>
     """
 
+    # Additional styles needed for this page
+    additional_styles = STATUS_MESSAGE_STYLES + INFO_BOX_STYLES + HELPER_TEXT_STYLES
+
+    return create_page(
+        content=content,
+        title=title,
+        additional_styles=additional_styles,
+    )
+
 
 @dataclass
 class CallbackResponse:
@@ -194,11 +91,21 @@ class CallbackResponse:
         return {k: v for k, v in self.__dict__.items() if v is not None}
 
 
+@dataclass
+class OAuthCallbackResult:
+    """Container for OAuth callback results, used with anyio.Event for async coordination."""
+
+    code: str | None = None
+    state: str | None = None
+    error: Exception | None = None
+
+
 def create_oauth_callback_server(
     port: int,
     callback_path: str = "/callback",
     server_url: str | None = None,
-    response_future: asyncio.Future | None = None,
+    result_container: OAuthCallbackResult | None = None,
+    result_ready: anyio.Event | None = None,
 ) -> Server:
     """
     Create an OAuth callback server.
@@ -207,7 +114,8 @@ def create_oauth_callback_server(
         port: The port to run the server on
         callback_path: The path to listen for OAuth redirects on
         server_url: Optional server URL to display in success messages
-        response_future: Optional future to resolve when OAuth callback is received
+        result_container: Optional container to store callback results
+        result_ready: Optional event to signal when callback is received
 
     Returns:
         Configured uvicorn Server instance (not yet running)
@@ -221,32 +129,36 @@ def create_oauth_callback_server(
         if callback_response.error:
             error_desc = callback_response.error_description or "Unknown error"
 
-            # Resolve future with exception if provided
-            if response_future and not response_future.done():
-                response_future.set_exception(
-                    RuntimeError(
-                        f"OAuth error: {callback_response.error} - {error_desc}"
-                    )
-                )
+            # Create user-friendly error messages
+            if callback_response.error == "access_denied":
+                user_message = "Access was denied by the authorization server."
+            else:
+                user_message = f"Authorization failed: {error_desc}"
+
+            # Store error and signal completion if result tracking provided
+            if result_container is not None and result_ready is not None:
+                result_container.error = RuntimeError(user_message)
+                result_ready.set()
 
-            return HTMLResponse(
+            return create_secure_html_response(
                 create_callback_html(
-                    f"FastMCP OAuth Error: {callback_response.error}<br>{error_desc}",
+                    user_message,
                     is_success=False,
                 ),
                 status_code=400,
             )
 
         if not callback_response.code:
-            # Resolve future with exception if provided
-            if response_future and not response_future.done():
-                response_future.set_exception(
-                    RuntimeError("OAuth callback missing authorization code")
-                )
+            user_message = "No authorization code was received from the server."
 
-            return HTMLResponse(
+            # Store error and signal completion if result tracking provided
+            if result_container is not None and result_ready is not None:
+                result_container.error = RuntimeError(user_message)
+                result_ready.set()
+
+            return create_secure_html_response(
                 create_callback_html(
-                    "FastMCP OAuth Error: No authorization code received",
+                    user_message,
                     is_success=False,
                 ),
                 status_code=400,
@@ -254,29 +166,30 @@ def create_oauth_callback_server(
 
         # Check for missing state parameter (indicates OAuth flow issue)
         if callback_response.state is None:
-            # Resolve future with exception if provided
-            if response_future and not response_future.done():
-                response_future.set_exception(
-                    RuntimeError(
-                        "OAuth server did not return state parameter - authentication failed"
-                    )
-                )
-
-            return HTMLResponse(
+            user_message = (
+                "The OAuth server did not return the expected state parameter."
+            )
+
+            # Store error and signal completion if result tracking provided
+            if result_container is not None and result_ready is not None:
+                result_container.error = RuntimeError(user_message)
+                result_ready.set()
+
+            return create_secure_html_response(
                 create_callback_html(
-                    "FastMCP OAuth Error: Authentication failed<br>The OAuth server did not return the expected state parameter",
+                    user_message,
                     is_success=False,
                 ),
                 status_code=400,
             )
 
-        # Success case
-        if response_future and not response_future.done():
-            response_future.set_result(
-                (callback_response.code, callback_response.state)
-            )
+        # Success case - store result and signal completion if result tracking provided
+        if result_container is not None and result_ready is not None:
+            result_container.code = callback_response.code
+            result_container.state = callback_response.state
+            result_ready.set()
 
-        return HTMLResponse(
+        return create_secure_html_response(
             create_callback_html("", is_success=True, server_url=server_url)
         )
 
@@ -289,6 +202,7 @@ def create_oauth_callback_server(
             port=port,
             lifespan="off",
             log_level="warning",
+            ws="websockets-sansio",
         )
     )
 

fastmcp/client/transports.py

@@ -8,7 +8,7 @@ import sys
 import warnings
 from collections.abc import AsyncIterator
 from pathlib import Path
-from typing import Any, Literal, TypeVar, cast, overload
+from typing import Any, Literal, TextIO, TypeVar, cast, overload
 
 import anyio
 import httpx
@@ -313,6 +313,7 @@ class StdioTransport(ClientTransport):
         env: dict[str, str] | None = None,
         cwd: str | None = None,
         keep_alive: bool | None = None,
+        log_file: Path | TextIO | None = None,
     ):
         """
         Initialize a Stdio transport.
@@ -326,6 +327,11 @@ class StdioTransport(ClientTransport):
                        Defaults to True. When True, the subprocess remains active
                        after the connection context exits, allowing reuse in
                        subsequent connections.
+            log_file: Optional path or file-like object where subprocess stderr will
+                   be written. Can be a Path or TextIO object. Defaults to sys.stderr
+                   if not provided. When a Path is provided, the file will be created
+                   if it doesn't exist, or appended to if it does. When set, server
+                   errors will be written to this file instead of appearing in the console.
         """
         self.command = command
         self.args = args
@@ -334,6 +340,7 @@ class StdioTransport(ClientTransport):
         if keep_alive is None:
             keep_alive = True
         self.keep_alive = keep_alive
+        self.log_file = log_file
 
         self._session: ClientSession | None = None
         self._connect_task: asyncio.Task | None = None
@@ -368,6 +375,7 @@ class StdioTransport(ClientTransport):
                 args=self.args,
                 env=self.env,
                 cwd=self.cwd,
+                log_file=self.log_file,
                 session_kwargs=session_kwargs,
                 ready_event=self._ready_event,
                 stop_event=self._stop_event,
@@ -421,6 +429,7 @@ async def _stdio_transport_connect_task(
     args: list[str],
     env: dict[str, str] | None,
     cwd: str | None,
+    log_file: Path | TextIO | None,
     session_kwargs: SessionKwargs,
     ready_event: anyio.Event,
     stop_event: anyio.Event,
@@ -438,7 +447,19 @@ async def _stdio_transport_connect_task(
                     env=env,
                     cwd=cwd,
                 )
-                transport = await stack.enter_async_context(stdio_client(server_params))
+                # Handle log_file: Path needs to be opened, TextIO used as-is
+                if log_file is None:
+                    log_file_handle = sys.stderr
+                elif isinstance(log_file, Path):
+                    log_file_handle = open(log_file, "a")
+                    stack.callback(log_file_handle.close)
+                else:
+                    # Must be TextIO - use it directly
+                    log_file_handle = log_file
+
+                transport = await stack.enter_async_context(
+                    stdio_client(server_params, errlog=log_file_handle)
+                )
                 read_stream, write_stream = transport
                 session_future.set_result(
                     await stack.enter_async_context(
@@ -471,6 +492,7 @@ class PythonStdioTransport(StdioTransport):
         cwd: str | None = None,
         python_cmd: str = sys.executable,
         keep_alive: bool | None = None,
+        log_file: Path | TextIO | None = None,
     ):
         """
         Initialize a Python transport.
@@ -485,6 +507,11 @@ class PythonStdioTransport(StdioTransport):
                        Defaults to True. When True, the subprocess remains active
                        after the connection context exits, allowing reuse in
                        subsequent connections.
+            log_file: Optional path or file-like object where subprocess stderr will
+                   be written. Can be a Path or TextIO object. Defaults to sys.stderr
+                   if not provided. When a Path is provided, the file will be created
+                   if it doesn't exist, or appended to if it does. When set, server
+                   errors will be written to this file instead of appearing in the console.
         """
         script_path = Path(script_path).resolve()
         if not script_path.is_file():
@@ -502,6 +529,7 @@ class PythonStdioTransport(StdioTransport):
             env=env,
             cwd=cwd,
             keep_alive=keep_alive,
+            log_file=log_file,
         )
         self.script_path = script_path
 
@@ -516,6 +544,7 @@ class FastMCPStdioTransport(StdioTransport):
         env: dict[str, str] | None = None,
         cwd: str | None = None,
         keep_alive: bool | None = None,
+        log_file: Path | TextIO | None = None,
     ):
         script_path = Path(script_path).resolve()
         if not script_path.is_file():
@@ -529,6 +558,7 @@ class FastMCPStdioTransport(StdioTransport):
             env=env,
             cwd=cwd,
             keep_alive=keep_alive,
+            log_file=log_file,
         )
         self.script_path = script_path
 
@@ -544,6 +574,7 @@ class NodeStdioTransport(StdioTransport):
         cwd: str | None = None,
         node_cmd: str = "node",
         keep_alive: bool | None = None,
+        log_file: Path | TextIO | None = None,
     ):
         """
         Initialize a Node transport.
@@ -558,6 +589,11 @@ class NodeStdioTransport(StdioTransport):
                        Defaults to True. When True, the subprocess remains active
                        after the connection context exits, allowing reuse in
                        subsequent connections.
+            log_file: Optional path or file-like object where subprocess stderr will
+                   be written. Can be a Path or TextIO object. Defaults to sys.stderr
+                   if not provided. When a Path is provided, the file will be created
+                   if it doesn't exist, or appended to if it does. When set, server
+                   errors will be written to this file instead of appearing in the console.
         """
         script_path = Path(script_path).resolve()
         if not script_path.is_file():
@@ -570,7 +606,12 @@ class NodeStdioTransport(StdioTransport):
             full_args.extend(args)
 
         super().__init__(
-            command=node_cmd, args=full_args, env=env, cwd=cwd, keep_alive=keep_alive
+            command=node_cmd,
+            args=full_args,
+            env=env,
+            cwd=cwd,
+            keep_alive=keep_alive,
+            log_file=log_file,
         )
         self.script_path = script_path
 
@@ -583,15 +624,15 @@ class UvStdioTransport(StdioTransport):
         command: str,
         args: list[str] | None = None,
         module: bool = False,
-        project_directory: str | None = None,
+        project_directory: Path | None = None,
         python_version: str | None = None,
         with_packages: list[str] | None = None,
-        with_requirements: str | None = None,
+        with_requirements: Path | None = None,
         env_vars: dict[str, str] | None = None,
         keep_alive: bool | None = None,
     ):
         # Basic validation
-        if project_directory and not Path(project_directory).exists():
+        if project_directory and not project_directory.exists():
             raise NotADirectoryError(
                 f"Project directory not found: {project_directory}"
             )
@@ -707,6 +748,7 @@ class UvxStdioTransport(StdioTransport):
         env: dict[str, str] | None = None
         if env_vars:
             env = os.environ.copy()
+            env.update(env_vars)
 
         super().__init__(
             command="uvx",
@@ -811,29 +853,42 @@ class FastMCPTransport(ClientTransport):
 
             # Create a cancel scope for the server task
             async with anyio.create_task_group() as tg:
-                tg.start_soon(
-                    lambda: self.server._mcp_server.run(
-                        server_read,
-                        server_write,
-                        self.server._mcp_server.create_initialization_options(),
-                        raise_exceptions=self.raise_exceptions,
+                async with _enter_server_lifespan(server=self.server):
+                    tg.start_soon(
+                        lambda: self.server._mcp_server.run(
+                            server_read,
+                            server_write,
+                            self.server._mcp_server.create_initialization_options(),
+                            raise_exceptions=self.raise_exceptions,
+                        )
                     )
-                )
 
-                try:
-                    async with ClientSession(
-                        read_stream=client_read,
-                        write_stream=client_write,
-                        **session_kwargs,
-                    ) as client_session:
-                        yield client_session
-                finally:
-                    tg.cancel_scope.cancel()
+                    try:
+                        async with ClientSession(
+                            read_stream=client_read,
+                            write_stream=client_write,
+                            **session_kwargs,
+                        ) as client_session:
+                            yield client_session
+                    finally:
+                        tg.cancel_scope.cancel()
 
     def __repr__(self) -> str:
         return f"<FastMCPTransport(server='{self.server.name}')>"
 
 
+@contextlib.asynccontextmanager
+async def _enter_server_lifespan(
+    server: FastMCP | FastMCP1Server,
+) -> AsyncIterator[None]:
+    """Enters the server's lifespan context for FastMCP servers and does nothing for FastMCP 1 servers."""
+    if isinstance(server, FastMCP):
+        async with server._lifespan_manager():
+            yield
+    else:
+        yield
+
+
 class MCPConfigTransport(ClientTransport):
     """Transport for connecting to one or more MCP servers defined in an MCPConfig.