fastmcp 2.13.3__py3-none-any.whl → 2.14.1__py3-none-any.whl

fastmcp/__init__.py

@@ -27,30 +27,9 @@ if settings.deprecation_warnings:
     warnings.simplefilter("default", DeprecationWarning)
 
 
-def __getattr__(name: str):
-    """
-    Used to deprecate the module-level Image class; can be removed once it is no longer imported to root.
-    """
-    if name == "Image":
-        # Deprecated in 2.8.1
-        if settings.deprecation_warnings:
-            warnings.warn(
-                "The top-level `fastmcp.Image` import is deprecated "
-                "and will be removed in a future version. "
-                "Please use `fastmcp.utilities.types.Image` instead.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-        from fastmcp.utilities.types import Image
-
-        return Image
-    raise AttributeError(f"module '{__name__}' has no attribute '{name}'")
-
-
 __all__ = [
     "Client",
     "Context",
     "FastMCP",
-    "client",
     "settings",
 ]

fastmcp/cli/__init__.py

@@ -1,6 +1,3 @@
 """FastMCP CLI package."""
 
 from .cli import app
-
-if __name__ == "__main__":
-    app()

fastmcp/cli/__main__.py

@@ -0,0 +1,5 @@
+"""FastMCP CLI as a runnable package"""
+
+from .cli import app
+
+app()

fastmcp/cli/cli.py

@@ -19,7 +19,7 @@ from rich.table import Table
 import fastmcp
 from fastmcp.cli import run as run_module
 from fastmcp.cli.install import install_app
-from fastmcp.server.server import FastMCP
+from fastmcp.cli.tasks import tasks_app
 from fastmcp.utilities.cli import is_already_in_uv_subprocess, load_and_merge_config
 from fastmcp.utilities.inspect import (
     InspectFormat,
@@ -28,7 +28,6 @@ from fastmcp.utilities.inspect import (
 )
 from fastmcp.utilities.logging import get_logger
 from fastmcp.utilities.mcp_server_config import MCPServerConfig
-from fastmcp.utilities.mcp_server_config.v1.environments.uv import UVEnvironment
 
 logger = get_logger("cli")
 console = Console()
@@ -104,7 +103,7 @@ def version(
         "MCP version": importlib.metadata.version("mcp"),
         "Python version": platform.python_version(),
         "Platform": platform.platform(),
-        "FastMCP root path": Path(fastmcp.__file__).resolve().parents[1],
+        "FastMCP root path": Path(fastmcp.__file__ or ".").resolve().parents[1],
     }
 
     g = Table.grid(padding=(0, 1))
@@ -224,29 +223,11 @@ async def dev(
     )
 
     try:
-        # Load server to check for deprecated dependencies
         if not config:
             logger.error("No configuration available")
             sys.exit(1)
         assert config is not None  # For type checker
-        server: FastMCP = await config.source.load_server()
-        if server.dependencies:
-            import warnings
-
-            warnings.warn(
-                f"Server '{server.name}' uses deprecated 'dependencies' parameter (deprecated in FastMCP 2.11.4). "
-                "Please migrate to fastmcp.json configuration file. "
-                "See https://gofastmcp.com/docs/deployment/server-configuration for details.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            # Merge server dependencies with environment dependencies
-            env_deps = config.environment.dependencies or []
-            all_deps = list(set(env_deps + server.dependencies))
-            if not config.environment:
-                config.environment = UVEnvironment(dependencies=all_deps)
-            else:
-                config.environment.dependencies = all_deps
+        await config.source.load_server()
 
         env_vars = {}
         if ui_port:
@@ -838,11 +819,13 @@ async def prepare(
             )
             sys.exit(1)
 
+    assert config_path is not None
     config_file = Path(config_path)
     if not config_file.exists():
         logger.error(f"Configuration file not found: {config_path}")
         sys.exit(1)
 
+    assert output_dir is not None
     output_path = Path(output_dir)
 
     try:
@@ -873,6 +856,9 @@ app.command(project_app)
 # Add install subcommands using proper Cyclopts pattern
 app.command(install_app)
 
+# Add tasks subcommand group
+app.command(tasks_app)
+
 
 if __name__ == "__main__":
     app()

fastmcp/cli/install/shared.py

@@ -105,21 +105,6 @@ async def process_common_args(
             )
             name = file.stem
 
-    # Get server dependencies if available
-    # TODO: Remove dependencies handling (deprecated in v2.11.4)
-    server_dependencies = getattr(server, "dependencies", []) if server else []
-    if server_dependencies:
-        import warnings
-
-        warnings.warn(
-            "Server uses deprecated 'dependencies' parameter (deprecated in FastMCP 2.11.4). "
-            "Please migrate to fastmcp.json configuration file. "
-            "See https://gofastmcp.com/docs/deployment/server-configuration for details.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        with_packages = list(set(with_packages + server_dependencies))
-
     # Process environment variables if provided
     env_dict: dict[str, str] | None = None
     if env_file or env_vars:

fastmcp/cli/tasks.py

@@ -0,0 +1,110 @@
+"""FastMCP tasks CLI for Docket task management."""
+
+import asyncio
+import sys
+from typing import Annotated
+
+import cyclopts
+from rich.console import Console
+
+from fastmcp.utilities.cli import load_and_merge_config
+from fastmcp.utilities.logging import get_logger
+
+logger = get_logger("cli.tasks")
+console = Console()
+
+tasks_app = cyclopts.App(
+    name="tasks",
+    help="Manage FastMCP background tasks using Docket",
+)
+
+
+def check_distributed_backend() -> None:
+    """Check if Docket is configured with a distributed backend.
+
+    The CLI worker runs as a separate process, so it needs Redis/Valkey
+    to coordinate with the main server process.
+
+    Raises:
+        SystemExit: If using memory:// URL
+    """
+    import fastmcp
+
+    docket_url = fastmcp.settings.docket.url
+
+    # Check for memory:// URL and provide helpful error
+    if docket_url.startswith("memory://"):
+        console.print(
+            "[bold red]✗ In-memory backend not supported by CLI[/bold red]\n\n"
+            "Your Docket configuration uses an in-memory backend (memory://) which\n"
+            "only works within a single process.\n\n"
+            "To use [cyan]fastmcp tasks[/cyan] CLI commands (which run in separate\n"
+            "processes), you need a distributed backend:\n\n"
+            "[bold]1. Install Redis or Valkey:[/bold]\n"
+            "   [dim]macOS:[/dim]     brew install redis\n"
+            "   [dim]Ubuntu:[/dim]    apt install redis-server\n"
+            "   [dim]Valkey:[/dim]    See https://valkey.io/\n\n"
+            "[bold]2. Start the service:[/bold]\n"
+            "   redis-server\n\n"
+            "[bold]3. Configure Docket URL:[/bold]\n"
+            "   [dim]Environment variable:[/dim]\n"
+            "   export FASTMCP_DOCKET_URL=redis://localhost:6379/0\n\n"
+            "[bold]4. Try again[/bold]\n\n"
+            "The memory backend works great for single-process servers, but the CLI\n"
+            "commands need a distributed backend to coordinate across processes.\n\n"
+            "Need help? See: [cyan]https://gofastmcp.com/docs/tasks[/cyan]"
+        )
+        sys.exit(1)
+
+
+@tasks_app.command
+def worker(
+    server_spec: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            help="Python file to run, optionally with :object suffix, or None to auto-detect fastmcp.json"
+        ),
+    ] = None,
+) -> None:
+    """Start an additional worker to process background tasks.
+
+    Connects to your Docket backend and processes tasks in parallel with
+    any other running workers. Configure via environment variables
+    (FASTMCP_DOCKET_*).
+
+    Example:
+        fastmcp tasks worker server.py
+        fastmcp tasks worker examples/tasks/server.py
+    """
+    import fastmcp
+
+    check_distributed_backend()
+
+    # Load server to get task functions
+    try:
+        config, _resolved_spec = load_and_merge_config(server_spec)
+    except FileNotFoundError:
+        sys.exit(1)
+
+    # Load the server
+    server = asyncio.run(config.source.load_server())
+
+    async def run_worker():
+        """Enter server lifespan and camp forever."""
+        async with server._lifespan_manager():
+            console.print(
+                f"[bold green]✓[/bold green] Starting worker for [cyan]{server.name}[/cyan]"
+            )
+            console.print(f"  Docket: {fastmcp.settings.docket.name}")
+            console.print(f"  Backend: {fastmcp.settings.docket.url}")
+            console.print(f"  Concurrency: {fastmcp.settings.docket.concurrency}")
+
+            # Server's lifespan has started its worker - just camp here forever
+            while True:
+                await asyncio.sleep(3600)
+
+    try:
+        asyncio.run(run_worker())
+    except KeyboardInterrupt:
+        console.print("\n[yellow]Worker stopped[/yellow]")
+        sys.exit(0)

fastmcp/client/auth/oauth.py

@@ -4,7 +4,6 @@ import time
 import webbrowser
 from collections.abc import AsyncGenerator
 from typing import Any
-from urllib.parse import urlparse
 
 import anyio
 import httpx
@@ -162,8 +161,8 @@ class OAuth(OAuthClientProvider):
             additional_client_metadata: Extra fields for OAuthClientMetadata
             callback_port: Fixed port for OAuth callback (default: random available port)
         """
-        parsed_url = urlparse(mcp_url)
-        server_base_url = f"{parsed_url.scheme}://{parsed_url.netloc}"
+        # Normalize the MCP URL (strip trailing slashes for consistency)
+        mcp_url = mcp_url.rstrip("/")
 
         # Setup OAuth client
         self.httpx_client_factory = httpx_client_factory or httpx.AsyncClient
@@ -201,16 +200,17 @@ class OAuth(OAuthClientProvider):
                 stacklevel=2,
             )
 
+        # Use full URL for token storage to properly separate tokens per MCP endpoint
         self.token_storage_adapter: TokenStorageAdapter = TokenStorageAdapter(
-            async_key_value=token_storage, server_url=server_base_url
+            async_key_value=token_storage, server_url=mcp_url
         )
 
-        # Store server_base_url for use in callback_handler
-        self.server_base_url = server_base_url
+        # Store full MCP URL for use in callback_handler display
+        self.mcp_url = mcp_url
 
-        # Initialize parent class
+        # Initialize parent class with full URL for proper OAuth metadata discovery
         super().__init__(
-            server_url=server_base_url,
+            server_url=mcp_url,
             client_metadata=client_metadata,
             storage=self.token_storage_adapter,
             redirect_handler=self.redirect_handler,
@@ -256,7 +256,7 @@ class OAuth(OAuthClientProvider):
         # Create server with result tracking
         server: Server = create_oauth_callback_server(
             port=self.redirect_port,
-            server_url=self.server_base_url,
+            server_url=self.mcp_url,
             result_container=result,
             result_ready=result_ready,
         )