fastmcp 2.14.4__py3-none-any.whl → 3.0.0b1__py3-none-any.whl

fastmcp/cli/run.py

@@ -1,14 +1,18 @@
 """FastMCP run command implementation with enhanced type hints."""
 
+import asyncio
+import contextlib
 import json
 import re
+import signal
 import sys
 from pathlib import Path
 from typing import Any, Literal
 
 from mcp.server.fastmcp import FastMCP as FastMCP1x
+from watchfiles import Change, awatch
 
-from fastmcp.server.server import FastMCP
+from fastmcp.server.server import FastMCP, create_proxy
 from fastmcp.utilities.logging import get_logger
 from fastmcp.utilities.mcp_server_config import (
     MCPServerConfig,
@@ -41,7 +45,7 @@ def create_client_server(url: str) -> Any:
         import fastmcp
 
         client = fastmcp.Client(url)
-        server = fastmcp.FastMCP.as_proxy(client)
+        server = create_proxy(client)
         return server
     except Exception as e:
         logger.error(f"Failed to create client for URL {url}: {e}")
@@ -50,12 +54,10 @@ def create_client_server(url: str) -> Any:
 
 def create_mcp_config_server(mcp_config_path: Path) -> FastMCP[None]:
     """Create a FastMCP server from a MCPConfig."""
-    from fastmcp import FastMCP
-
     with mcp_config_path.open() as src:
         mcp_config = json.load(src)
 
-    server = FastMCP.as_proxy(mcp_config)
+    server = create_proxy(mcp_config)
     return server
 
 
@@ -87,6 +89,7 @@ async def run_command(
     show_banner: bool = True,
     use_direct_import: bool = False,
     skip_source: bool = False,
+    stateless: bool = False,
 ) -> None:
     """Run a MCP server or connect to a remote one.
 
@@ -101,6 +104,7 @@ async def run_command(
         show_banner: Whether to show the server banner
         use_direct_import: Whether to use direct import instead of subprocess
         skip_source: Whether to skip source preparation step
+        stateless: Whether to run in stateless mode (no session)
     """
     # Special case: URLs
     if is_url(server_spec):
@@ -186,6 +190,8 @@ async def run_command(
         kwargs["path"] = path
     if log_level:
         kwargs["log_level"] = log_level
+    if stateless:
+        kwargs["stateless"] = True
 
     if not show_banner:
         kwargs["show_banner"] = False
@@ -223,3 +229,138 @@ async def run_v1_server_async(
             await server.run_streamable_http_async()
         case "sse":
             await server.run_sse_async()
+
+
+def _python_file_filter(change: Change, path: str) -> bool:
+    """Filter for Python files only."""
+    return path.endswith(".py")
+
+
+async def _terminate_process(process: asyncio.subprocess.Process) -> None:
+    """Terminate a subprocess immediately."""
+    if process.returncode is not None:
+        return
+    process.kill()
+    await process.wait()
+
+
+async def run_with_reload(
+    cmd: list[str],
+    reload_dirs: list[Path] | None = None,
+    is_stdio: bool = False,
+) -> None:
+    """Run a command with file watching and auto-reload.
+
+    Args:
+        cmd: Command to run as subprocess (should include --no-reload)
+        reload_dirs: Directories to watch for changes (default: cwd)
+        is_stdio: Whether this is stdio transport
+    """
+    watch_paths = reload_dirs or [Path.cwd()]
+    process: asyncio.subprocess.Process | None = None
+    first_run = True
+
+    if is_stdio:
+        logger.info("Reload mode enabled (using stateless sessions)")
+    else:
+        logger.info(
+            "Reload mode enabled (using stateless HTTP). "
+            "Some features requiring bidirectional communication "
+            "(like elicitation) are not available."
+        )
+
+    # Handle SIGTERM/SIGINT gracefully with proper asyncio integration
+    shutdown_event = asyncio.Event()
+    loop = asyncio.get_running_loop()
+
+    def signal_handler() -> None:
+        logger.info("Received shutdown signal, stopping...")
+        shutdown_event.set()
+
+    # Windows doesn't support add_signal_handler
+    if sys.platform != "win32":
+        loop.add_signal_handler(signal.SIGTERM, signal_handler)
+        loop.add_signal_handler(signal.SIGINT, signal_handler)
+
+    try:
+        while not shutdown_event.is_set():
+            # Build command - add --no-banner on restarts to reduce noise
+            if first_run or "--no-banner" in cmd:
+                run_cmd = cmd
+            else:
+                run_cmd = [*cmd, "--no-banner"]
+            first_run = False
+
+            process = await asyncio.create_subprocess_exec(
+                *run_cmd,
+                stdin=None,
+                stdout=None,
+                stderr=None,
+            )
+
+            # Watch for either: file changes OR process death
+            watch_task = asyncio.create_task(
+                anext(aiter(awatch(*watch_paths, watch_filter=_python_file_filter)))
+            )
+            wait_task = asyncio.create_task(process.wait())
+            shutdown_task = asyncio.create_task(shutdown_event.wait())
+
+            done, pending = await asyncio.wait(
+                [watch_task, wait_task, shutdown_task],
+                return_when=asyncio.FIRST_COMPLETED,
+            )
+
+            for task in pending:
+                task.cancel()
+                with contextlib.suppress(asyncio.CancelledError):
+                    await task
+
+            if shutdown_task in done:
+                # User requested shutdown
+                break
+
+            if wait_task in done:
+                # Server died on its own - wait for file change before restart
+                code = wait_task.result()
+                if code != 0:
+                    logger.error(
+                        f"Server exited with code {code}, waiting for file change..."
+                    )
+                else:
+                    logger.info("Server exited, waiting for file change...")
+
+                # Wait for file change or shutdown (avoid hot loop on crash)
+                watch_task = asyncio.create_task(
+                    anext(aiter(awatch(*watch_paths, watch_filter=_python_file_filter)))
+                )
+                shutdown_task = asyncio.create_task(shutdown_event.wait())
+                done, pending = await asyncio.wait(
+                    [watch_task, shutdown_task],
+                    return_when=asyncio.FIRST_COMPLETED,
+                )
+                for task in pending:
+                    task.cancel()
+                    with contextlib.suppress(asyncio.CancelledError):
+                        await task
+                if shutdown_task in done:
+                    break
+                logger.info("Detected changes, restarting...")
+            else:
+                # File changed - restart server
+                changes = watch_task.result()
+                logger.info(
+                    f"Detected changes in {len(changes)} file(s), restarting..."
+                )
+                await _terminate_process(process)
+
+    except KeyboardInterrupt:
+        # Handle Ctrl+C on Windows (where add_signal_handler isn't available)
+        logger.info("Received shutdown signal, stopping...")
+
+    finally:
+        # Clean up signal handlers
+        if sys.platform != "win32":
+            loop.remove_signal_handler(signal.SIGTERM)
+            loop.remove_signal_handler(signal.SIGINT)
+        if process and process.returncode is None:
+            await _terminate_process(process)

fastmcp/client/__init__.py

@@ -1,18 +1,17 @@
+from .auth import OAuth, BearerAuth
 from .client import Client
 from .transports import (
     ClientTransport,
-    WSTransport,
-    SSETransport,
-    StdioTransport,
-    PythonStdioTransport,
+    FastMCPTransport,
     NodeStdioTransport,
-    UvxStdioTransport,
-    UvStdioTransport,
     NpxStdioTransport,
-    FastMCPTransport,
+    PythonStdioTransport,
+    SSETransport,
+    StdioTransport,
     StreamableHttpTransport,
+    UvStdioTransport,
+    UvxStdioTransport,
 )
-from .auth import OAuth, BearerAuth
 
 __all__ = [
     "BearerAuth",
@@ -28,5 +27,4 @@ __all__ = [
     "StreamableHttpTransport",
     "UvStdioTransport",
     "UvxStdioTransport",
-    "WSTransport",
 ]

fastmcp/client/auth/oauth.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import time
 import webbrowser
 from collections.abc import AsyncGenerator
+from contextlib import aclosing
 from typing import Any
 
 import anyio
@@ -299,15 +300,15 @@ class OAuth(OAuthClientProvider):
         """
         try:
             # First attempt with potentially cached credentials
-            gen = super().async_auth_flow(request)
-            response = None
-            while True:
-                try:
-                    # First iteration sends None, subsequent iterations send response
-                    yielded_request = await gen.asend(response)  # ty: ignore[invalid-argument-type]
-                    response = yield yielded_request
-                except StopAsyncIteration:
-                    break
+            async with aclosing(super().async_auth_flow(request)) as gen:
+                response = None
+                while True:
+                    try:
+                        # First iteration sends None, subsequent iterations send response
+                        yielded_request = await gen.asend(response)  # ty: ignore[invalid-argument-type]
+                        response = yield yielded_request
+                    except StopAsyncIteration:
+                        break
 
         except ClientNotFoundError:
             logger.debug(
@@ -318,11 +319,11 @@ class OAuth(OAuthClientProvider):
             await self.token_storage_adapter.clear()
 
             # Retry with fresh registration
-            gen = super().async_auth_flow(request)
-            response = None
-            while True:
-                try:
-                    yielded_request = await gen.asend(response)  # ty: ignore[invalid-argument-type]
-                    response = yield yielded_request
-                except StopAsyncIteration:
-                    break
+            async with aclosing(super().async_auth_flow(request)) as gen:
+                response = None
+                while True:
+                    try:
+                        yielded_request = await gen.asend(response)  # ty: ignore[invalid-argument-type]
+                        response = yield yielded_request
+                    except StopAsyncIteration:
+                        break