fastmcp 2.11.2__py3-none-any.whl → 2.12.0rc1__py3-none-any.whl

fastmcp/client/auth/oauth.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import asyncio
 import json
 import webbrowser
+from asyncio import Future
+from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from typing import Any, Literal
 from urllib.parse import urlparse
@@ -17,7 +19,8 @@ from mcp.shared.auth import (
 from mcp.shared.auth import (
     OAuthToken as OAuthToken,
 )
-from pydantic import AnyHttpUrl, ValidationError
+from pydantic import AnyHttpUrl, BaseModel, TypeAdapter, ValidationError
+from uvicorn.server import Server
 
 from fastmcp import settings as fastmcp_global_settings
 from fastmcp.client.oauth_callback import (
@@ -31,6 +34,17 @@ __all__ = ["OAuth"]
 logger = get_logger(__name__)
 
 
+class StoredToken(BaseModel):
+    """Token storage format with absolute expiry time."""
+
+    token_payload: OAuthToken
+    expires_at: datetime | None
+
+
+# Create TypeAdapter at module level for efficient parsing
+stored_token_adapter = TypeAdapter(StoredToken)
+
+
 def default_cache_dir() -> Path:
     return fastmcp_global_settings.home / "oauth-mcp-client-cache"
 
@@ -75,13 +89,28 @@ class FileTokenStorage(TokenStorage):
         path = self._get_file_path("tokens")
 
         try:
-            tokens = OAuthToken.model_validate_json(path.read_text())
-            # now = datetime.datetime.now(datetime.timezone.utc)
-            # if tokens.expires_at is not None and tokens.expires_at <= now:
-            #     logger.debug(f"Token expired for {self.get_base_url(self.server_url)}")
-            #     return None
-            return tokens
-        except (FileNotFoundError, json.JSONDecodeError, ValidationError) as e:
+            # Parse JSON and validate as StoredToken
+            stored = stored_token_adapter.validate_json(path.read_text())
+
+            # Check if token is expired
+            if stored.expires_at is not None:
+                now = datetime.now(timezone.utc)
+                if now >= stored.expires_at:
+                    logger.debug(
+                        f"Token expired for {self.get_base_url(self.server_url)}"
+                    )
+                    return None
+
+                # Recalculate expires_in to be correct relative to now
+                if stored.token_payload.expires_in is not None:
+                    remaining = stored.expires_at - now
+                    stored.token_payload.expires_in = max(
+                        0, int(remaining.total_seconds())
+                    )
+
+            return stored.token_payload
+
+        except (FileNotFoundError, ValidationError) as e:
             logger.debug(
                 f"Could not load tokens for {self.get_base_url(self.server_url)}: {e}"
             )
@@ -90,7 +119,18 @@ class FileTokenStorage(TokenStorage):
     async def set_tokens(self, tokens: OAuthToken) -> None:
         """Save tokens to file storage."""
         path = self._get_file_path("tokens")
-        path.write_text(tokens.model_dump_json(indent=2))
+
+        # Calculate absolute expiry time if expires_in is present
+        expires_at = None
+        if tokens.expires_in is not None:
+            expires_at = datetime.now(timezone.utc) + timedelta(
+                seconds=tokens.expires_in
+            )
+
+        # Create StoredToken and save using Pydantic serialization
+        stored = StoredToken(token_payload=tokens, expires_at=expires_at)
+
+        path.write_text(stored.model_dump_json(indent=2))
         logger.debug(f"Saved tokens for {self.get_base_url(self.server_url)}")
 
     async def get_client_info(self) -> OAuthClientInformationFull | None:
@@ -215,8 +255,13 @@ class OAuth(OAuthClientProvider):
         self.redirect_port = callback_port or find_available_port()
         redirect_uri = f"http://localhost:{self.redirect_port}/callback"
 
+        scopes_str: str
         if isinstance(scopes, list):
-            scopes = " ".join(scopes)
+            scopes_str = " ".join(scopes)
+        elif scopes is not None:
+            scopes_str = str(scopes)
+        else:
+            scopes_str = ""
 
         client_metadata = OAuthClientMetadata(
             client_name=client_name,
@@ -224,7 +269,7 @@ class OAuth(OAuthClientProvider):
             grant_types=["authorization_code", "refresh_token"],
             response_types=["code"],
             # token_endpoint_auth_method="client_secret_post",
-            scope=scopes,
+            scope=scopes_str,
             **(additional_client_metadata or {}),
         )
 
@@ -245,6 +290,15 @@ class OAuth(OAuthClientProvider):
             callback_handler=self.callback_handler,
         )
 
+    async def _initialize(self) -> None:
+        """Load stored tokens and client info, properly setting token expiry."""
+        # Call parent's _initialize to load tokens and client info
+        await super()._initialize()
+
+        # If tokens were loaded and have expires_in, update the context's token_expiry_time
+        if self.context.current_tokens and self.context.current_tokens.expires_in:
+            self.context.update_token_expiry(self.context.current_tokens)
+
     async def redirect_handler(self, authorization_url: str) -> None:
         """Open browser for authorization."""
         logger.info(f"OAuth authorization URL: {authorization_url}")
@@ -253,10 +307,10 @@ class OAuth(OAuthClientProvider):
     async def callback_handler(self) -> tuple[str, str | None]:
         """Handle OAuth callback and return (auth_code, state)."""
         # Create a future to capture the OAuth response
-        response_future = asyncio.get_running_loop().create_future()
+        response_future: Future[Any] = asyncio.get_running_loop().create_future()
 
         # Create server with the future
-        server = create_oauth_callback_server(
+        server: Server = create_oauth_callback_server(
             port=self.redirect_port,
             server_url=self.server_base_url,
             response_future=response_future,
@@ -280,3 +334,5 @@ class OAuth(OAuthClientProvider):
                 server.should_exit = True
                 await asyncio.sleep(0.1)  # Allow server to shutdown gracefully
                 tg.cancel_scope.cancel()
+
+        raise RuntimeError("OAuth callback handler could not be started")

fastmcp/client/client.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import asyncio
 import copy
 import datetime
+import secrets
 from contextlib import AsyncExitStack, asynccontextmanager
 from dataclasses import dataclass, field
 from pathlib import Path
@@ -30,7 +31,11 @@ from fastmcp.client.roots import (
     RootsList,
     create_roots_callback,
 )
-from fastmcp.client.sampling import SamplingHandler, create_sampling_callback
+from fastmcp.client.sampling import (
+    ClientSamplingHandler,
+    SamplingHandler,
+    create_sampling_callback,
+)
 from fastmcp.exceptions import ToolError
 from fastmcp.mcp_config import MCPConfig
 from fastmcp.server import FastMCP
@@ -49,6 +54,7 @@ from .transports import (
     PythonStdioTransport,
     SessionKwargs,
     SSETransport,
+    StdioTransport,
     StreamableHttpTransport,
     infer_transport,
 )
@@ -60,6 +66,7 @@ __all__ = [
     "RootsList",
     "LogHandler",
     "MessageHandler",
+    "ClientSamplingHandler",
     "SamplingHandler",
     "ElicitationHandler",
     "ProgressHandler",
@@ -207,8 +214,9 @@ class Client(Generic[ClientTransportT]):
             | dict[str, Any]
             | str
         ),
+        name: str | None = None,
         roots: RootsList | RootsHandler | None = None,
-        sampling_handler: SamplingHandler | None = None,
+        sampling_handler: ClientSamplingHandler | None = None,
         elicitation_handler: ElicitationHandler | None = None,
         log_handler: LogHandler | None = None,
         message_handler: MessageHandlerT | MessageHandler | None = None,
@@ -218,6 +226,8 @@ class Client(Generic[ClientTransportT]):
         client_info: mcp.types.Implementation | None = None,
         auth: httpx.Auth | Literal["oauth"] | str | None = None,
     ) -> None:
+        self.name = name or self.generate_name()
+
         self.transport = cast(ClientTransportT, infer_transport(transport))
         if auth is not None:
             self.transport._set_auth(auth)
@@ -231,7 +241,7 @@ class Client(Generic[ClientTransportT]):
         self._progress_handler = progress_handler
 
         if isinstance(timeout, int | float):
-            timeout = datetime.timedelta(seconds=timeout)
+            timeout = datetime.timedelta(seconds=float(timeout))
 
         # handle init handshake timeout
         if init_timeout is None:
@@ -292,7 +302,7 @@ class Client(Generic[ClientTransportT]):
         """Set the roots for the client. This does not automatically call `send_roots_list_changed`."""
         self._session_kwargs["list_roots_callback"] = create_roots_callback(roots)
 
-    def set_sampling_callback(self, sampling_callback: SamplingHandler) -> None:
+    def set_sampling_callback(self, sampling_callback: ClientSamplingHandler) -> None:
         """Set the sampling callback for the client."""
         self._session_kwargs["sampling_callback"] = create_sampling_callback(
             sampling_callback
@@ -328,11 +338,13 @@ class Client(Generic[ClientTransportT]):
                 await fresh_client.call_tool("some_tool", {})
             ```
         """
-
         new_client = copy.copy(self)
 
-        # Reset session state to fresh state
-        new_client._session_state = ClientSessionState()
+        if not isinstance(self.transport, StdioTransport):
+            # Reset session state to fresh state
+            new_client._session_state = ClientSessionState()
+
+        new_client.name += f":{secrets.token_hex(2)}"
 
         return new_client
 
@@ -383,6 +395,7 @@ class Client(Generic[ClientTransportT]):
                 self._session_state.session_task is None
                 or self._session_state.session_task.done()
             )
+
             if need_to_start:
                 if self._session_state.nesting_counter != 0:
                     raise RuntimeError(
@@ -408,6 +421,7 @@ class Client(Generic[ClientTransportT]):
                     ) from exception
 
             self._session_state.nesting_counter += 1
+
         return self
 
     async def _disconnect(self, force: bool = False):
@@ -533,6 +547,8 @@ class Client(Generic[ClientTransportT]):
         Raises:
             RuntimeError: If called while the client is not connected.
         """
+        logger.debug(f"[{self.name}] called list_resources")
+
         result = await self.session.list_resources()
         return result
 
@@ -560,6 +576,8 @@ class Client(Generic[ClientTransportT]):
         Raises:
             RuntimeError: If called while the client is not connected.
         """
+        logger.debug(f"[{self.name}] called list_resource_templates")
+
         result = await self.session.list_resource_templates()
         return result
 
@@ -592,6 +610,8 @@ class Client(Generic[ClientTransportT]):
         Raises:
             RuntimeError: If called while the client is not connected.
         """
+        logger.debug(f"[{self.name}] called read_resource: {uri}")
+
         if isinstance(uri, str):
             uri = AnyUrl(uri)  # Ensure AnyUrl
         result = await self.session.read_resource(uri)
@@ -646,6 +666,8 @@ class Client(Generic[ClientTransportT]):
         Raises:
             RuntimeError: If called while the client is not connected.
         """
+        logger.debug(f"[{self.name}] called list_prompts")
+
         result = await self.session.list_prompts()
         return result
 
@@ -678,6 +700,8 @@ class Client(Generic[ClientTransportT]):
         Raises:
             RuntimeError: If called while the client is not connected.
         """
+        logger.debug(f"[{self.name}] called get_prompt: {name}")
+
         # Serialize arguments for MCP protocol - convert non-string values to JSON
         serialized_arguments: dict[str, str] | None = None
         if arguments:
@@ -735,6 +759,8 @@ class Client(Generic[ClientTransportT]):
         Raises:
             RuntimeError: If called while the client is not connected.
         """
+        logger.debug(f"[{self.name}] called complete: {ref}")
+
         result = await self.session.complete(ref=ref, argument=argument)
         return result
 
@@ -770,6 +796,8 @@ class Client(Generic[ClientTransportT]):
         Raises:
             RuntimeError: If called while the client is not connected.
         """
+        logger.debug(f"[{self.name}] called list_tools")
+
         result = await self.session.list_tools()
         return result
 
@@ -812,9 +840,10 @@ class Client(Generic[ClientTransportT]):
         Raises:
             RuntimeError: If called while the client is not connected.
         """
+        logger.debug(f"[{self.name}] called call_tool: {name}")
 
         if isinstance(timeout, int | float):
-            timeout = datetime.timedelta(seconds=timeout)
+            timeout = datetime.timedelta(seconds=float(timeout))
         result = await self.session.call_tool(
             name=name,
             arguments=arguments,
@@ -884,7 +913,7 @@ class Client(Generic[ClientTransportT]):
                     else:
                         data = result.structuredContent
             except Exception as e:
-                logger.error(f"Error parsing structured content: {e}")
+                logger.error(f"[{self.name}] Error parsing structured content: {e}")
 
         return CallToolResult(
             content=result.content,
@@ -893,6 +922,14 @@ class Client(Generic[ClientTransportT]):
             is_error=result.isError,
         )
 
+    @classmethod
+    def generate_name(cls, name: str | None = None) -> str:
+        class_name = cls.__name__
+        if name is None:
+            return f"{class_name}-{secrets.token_hex(2)}"
+        else:
+            return f"{class_name}-{name}-{secrets.token_hex(2)}"
+
 
 @dataclass
 class CallToolResult:

fastmcp/client/logging.py

@@ -13,7 +13,31 @@ LogHandler: TypeAlias = Callable[[LogMessage], Awaitable[None]]
 
 
 async def default_log_handler(message: LogMessage) -> None:
-    logger.debug(f"Log received: {message}")
+    """Default handler that properly routes server log messages to appropriate log levels."""
+    msg = message.data.get("msg", str(message))
+    extra = message.data.get("extra", {})
+
+    # 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
+    }
+
+    # 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
+    if message.logger:
+        msg = f"[{message.logger}] {msg}"
+
+    # Log with appropriate level and extra data
+    log_fn(f"Server log: {msg}", extra=extra)
 
 
 def create_log_callback(handler: LogHandler | None = None) -> LoggingFnT:

fastmcp/client/oauth_callback.py

@@ -29,17 +29,32 @@ def create_callback_html(
     server_url: str | None = None,
 ) -> str:
     """Create a styled HTML response for OAuth callbacks."""
-    status_emoji = "✅" if is_success else "❌"
-    status_color = "#10b981" if is_success else "#ef4444"  # emerald-500 / red-500
-
-    # Add server info for success cases
-    server_info = ""
+    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"
+
+    # Add detail info box for both success and error cases
+    detail_info = ""
     if is_success and server_url:
-        server_info = f"""
-            <div class="server-info">
+        detail_info = f"""
+            <div class="info-box">
                 Connected to: <strong>{server_url}</strong>
             </div>
         """
+    elif not is_success:
+        detail_info = f"""
+            <div class="info-box error">
+                {message}
+            </div>
+        """
 
     return f"""
     <!DOCTYPE html>
@@ -49,127 +64,112 @@ def create_callback_html(
         <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: 'SF Mono', 'Monaco', 'Consolas', 'Roboto Mono', monospace;
+                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: linear-gradient(135deg, #0f0f23 0%, #1a1a2e 25%, #16213e 50%, #0f0f23 100%);
-                color: #e2e8f0;
-                overflow: hidden;
-            }}
-            
-            body::before {{
-                content: '';
-                position: fixed;
-                top: 0;
-                left: 0;
-                width: 100%;
-                height: 100%;
-                background: 
-                    radial-gradient(circle at 20% 80%, rgba(120, 119, 198, 0.1) 0%, transparent 50%),
-                    radial-gradient(circle at 80% 20%, rgba(16, 185, 129, 0.1) 0%, transparent 50%),
-                    radial-gradient(circle at 40% 40%, rgba(14, 165, 233, 0.1) 0%, transparent 50%);
-                pointer-events: none;
-                z-index: -1;
+                background: #ffffff;
+                color: #0a0a0a;
             }}
             
             .container {{
-                background: rgba(30, 41, 59, 0.9);
-                backdrop-filter: blur(10px);
-                border: 1px solid rgba(71, 85, 105, 0.3);
+                background: #ffffff;
+                border: 1px solid #e5e5e5;
                 padding: 3rem 2rem;
-                border-radius: 1rem;
-                box-shadow: 
-                    0 25px 50px -12px rgba(0, 0, 0, 0.7),
-                    0 0 0 1px rgba(255, 255, 255, 0.05),
-                    inset 0 1px 0 0 rgba(255, 255, 255, 0.1);
+                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: 500px;
+                max-width: 28rem;
                 margin: 1rem;
                 position: relative;
             }}
             
-            .container::before {{
-                content: '';
-                position: absolute;
-                top: 0;
-                left: 0;
-                right: 0;
-                height: 1px;
-                background: linear-gradient(90deg, transparent, rgba(16, 185, 129, 0.5), transparent);
+            .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: 4rem;
-                margin-bottom: 1rem;
-                display: block;
-                filter: drop-shadow(0 0 20px currentColor);
+                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.25rem;
-                line-height: 1.6;
-                color: {status_color};
-                margin-bottom: 1.5rem;
+                font-size: 1.125rem;
+                line-height: 1.75;
+                color: #0a0a0a;
                 font-weight: 600;
-                text-shadow: 0 0 10px rgba({
-        "16, 185, 129" if is_success else "239, 68, 68"
-    }, 0.3);
+                text-align: left;
             }}
             
-            .server-info {{
-                background: rgba(6, 182, 212, 0.1);
-                border: 1px solid rgba(6, 182, 212, 0.3);
-                border-radius: 0.75rem;
-                padding: 1rem;
-                margin: 1rem 0;
-                font-size: 0.9rem;
-                color: #67e8f9;
-                font-family: 'SF Mono', 'Monaco', 'Consolas', 'Roboto Mono', monospace;
-                text-shadow: 0 0 10px rgba(103, 232, 249, 0.3);
+            .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;
             }}
             
-            .server-info strong {{
-                color: #22d3ee;
-                font-weight: 700;
+            .info-box.error {{
+                background: #fef2f2;
+                border-color: #fecaca;
+                color: #991b1b;
             }}
             
-            .subtitle {{
-                font-size: 1rem;
-                color: #94a3b8;
-                margin-top: 1rem;
+            .info-box strong {{
+                color: #0a0a0a;
+                font-weight: 600;
             }}
             
             .close-instruction {{
-                background: rgba(51, 65, 85, 0.8);
-                border: 1px solid rgba(71, 85, 105, 0.4);
-                border-radius: 0.75rem;
-                padding: 1rem;
+                font-size: 0.875rem;
+                color: #737373;
                 margin-top: 1.5rem;
-                font-size: 0.9rem;
-                color: #cbd5e1;
-                font-family: 'SF Mono', 'Monaco', 'Consolas', 'Roboto Mono', monospace;
-            }}
-            
-            @keyframes glow {{
-                0%, 100% {{ opacity: 1; }}
-                50% {{ opacity: 0.7; }}
-            }}
-            
-            .status-icon {{
-                animation: glow 2s ease-in-out infinite;
             }}
         </style>
     </head>
     <body>
         <div class="container">
-            <span class="status-icon">{status_emoji}</span>
-            <div class="message">{message}</div>
-            {server_info}
+            <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>
+            {detail_info}
             <div class="close-instruction">
                 You can safely close this tab now.
             </div>
@@ -277,7 +277,7 @@ def create_oauth_callback_server(
             )
 
         return HTMLResponse(
-            create_callback_html("FastMCP OAuth login complete!", server_url=server_url)
+            create_callback_html("", is_success=True, server_url=server_url)
         )
 
     app = Starlette(routes=[Route(callback_path, callback_handler)])

fastmcp/client/sampling.py

@@ -3,16 +3,18 @@ from collections.abc import Awaitable, Callable
 from typing import TypeAlias
 
 import mcp.types
-from mcp import ClientSession, CreateMessageResult
-from mcp.client.session import SamplingFnT
+from mcp import CreateMessageResult
+from mcp.client.session import ClientSession, SamplingFnT
 from mcp.shared.context import LifespanContextT, RequestContext
 from mcp.types import CreateMessageRequestParams as SamplingParams
 from mcp.types import SamplingMessage
 
+from fastmcp.server.sampling.handler import ServerSamplingHandler
+
 __all__ = ["SamplingMessage", "SamplingParams", "SamplingHandler"]
 
 
-SamplingHandler: TypeAlias = Callable[
+ClientSamplingHandler: TypeAlias = Callable[
     [
         list[SamplingMessage],
         SamplingParams,
@@ -21,8 +23,14 @@ SamplingHandler: TypeAlias = Callable[
     str | CreateMessageResult | Awaitable[str | CreateMessageResult],
 ]
 
+SamplingHandler: TypeAlias = (
+    ClientSamplingHandler[LifespanContextT] | ServerSamplingHandler[LifespanContextT]
+)
+
 
-def create_sampling_callback(sampling_handler: SamplingHandler) -> SamplingFnT:
+def create_sampling_callback(
+    sampling_handler: ClientSamplingHandler[LifespanContextT],
+) -> SamplingFnT:
     async def _sampling_handler(
         context: RequestContext[ClientSession, LifespanContextT],
         params: SamplingParams,