fastmcp 2.10.6__py3-none-any.whl → 2.11.1__py3-none-any.whl

fastmcp/cli/cli.py

@@ -62,11 +62,22 @@ def _build_uv_command(
     with_editable: Path | None = None,
     with_packages: list[str] | None = None,
     no_banner: bool = False,
+    python_version: str | None = None,
+    with_requirements: Path | None = None,
+    project: Path | None = None,
 ) -> list[str]:
     """Build the uv run command that runs a MCP server through mcp run."""
-    cmd = ["uv"]
+    cmd = ["uv", "run"]
 
-    cmd.extend(["run", "--with", "fastmcp"])
+    # Add Python version if specified
+    if python_version:
+        cmd.extend(["--python", python_version])
+
+    # Add project if specified
+    if project:
+        cmd.extend(["--project", str(project)])
+
+    cmd.extend(["--with", "fastmcp"])
 
     if with_editable:
         cmd.extend(["--with-editable", str(with_editable)])
@@ -76,6 +87,9 @@ def _build_uv_command(
             if pkg:
                 cmd.extend(["--with", pkg])
 
+    if with_requirements:
+        cmd.extend(["--with-requirements", str(with_requirements)])
+
     # Add mcp run command
     cmd.extend(["fastmcp", "run", server_spec])
 
@@ -163,6 +177,27 @@ def dev(
             help="Port for the MCP Inspector Proxy server",
         ),
     ] = None,
+    python: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            "--python",
+            help="Python version to use (e.g., 3.10, 3.11)",
+        ),
+    ] = None,
+    with_requirements: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--with-requirements",
+            help="Requirements file to install dependencies from",
+        ),
+    ] = None,
+    project: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--project",
+            help="Run the command within the given project directory",
+        ),
+    ] = None,
 ) -> None:
     """Run an MCP server with the MCP Inspector for development.
 
@@ -209,7 +244,13 @@ def dev(
             inspector_cmd += f"@{inspector_version}"
 
         uv_cmd = _build_uv_command(
-            server_spec, with_editable, with_packages, no_banner=True
+            server_spec,
+            with_editable,
+            with_packages,
+            no_banner=True,
+            python_version=python,
+            with_requirements=with_requirements,
+            project=project,
         )
 
         # Run the MCP Inspector command with shell=True on Windows
@@ -244,7 +285,7 @@ def dev(
 @app.command
 def run(
     server_spec: str,
-    *,
+    *server_args: str,
     transport: Annotated[
         run_module.TransportType | None,
         cyclopts.Parameter(
@@ -288,23 +329,50 @@ def run(
             negative=False,
         ),
     ] = False,
+    python: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            "--python",
+            help="Python version to use (e.g., 3.10, 3.11)",
+        ),
+    ] = None,
+    with_packages: Annotated[
+        list[str],
+        cyclopts.Parameter(
+            "--with",
+            help="Additional packages to install (can be used multiple times)",
+            negative=False,
+        ),
+    ] = [],
+    project: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--project",
+            help="Run the command within the given project directory",
+        ),
+    ] = None,
+    with_requirements: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--with-requirements",
+            help="Requirements file to install dependencies from",
+        ),
+    ] = None,
 ) -> None:
     """Run an MCP server or connect to a remote one.
 
-    The server can be specified in three ways:
-    1. Module approach: server.py - runs the module directly, looking for an object named 'mcp', 'server', or 'app'
-    2. Import approach: server.py:app - imports and runs the specified server object
-    3. URL approach: http://server-url - connects to a remote server and creates a proxy
+    The server can be specified in four ways:
+    1. Module approach: "server.py" - runs the module directly, looking for an object named 'mcp', 'server', or 'app'
+    2. Import approach: "server.py:app" - imports and runs the specified server object
+    3. URL approach: "http://server-url" - connects to a remote server and creates a proxy
+    4. MCPConfig file: "mcp.json" - runs as a proxy server for the MCP Servers in the MCPConfig file
 
     Server arguments can be passed after -- :
     fastmcp run server.py -- --config config.json --debug
 
     Args:
-        server_spec: Python file, object specification (file:obj), or URL
+        server_spec: Python file, object specification (file:obj), MCPConfig file, or URL
     """
-    # TODO: Handle server_args from extra context
-    server_args = []  # Will need to handle this with Cyclopts context
-
     logger.debug(
         "Running server or client",
         extra={
@@ -314,30 +382,57 @@ def run(
             "port": port,
             "path": path,
             "log_level": log_level,
-            "server_args": server_args,
+            "server_args": list(server_args),
         },
     )
 
-    try:
-        run_module.run_command(
-            server_spec=server_spec,
-            transport=transport,
-            host=host,
-            port=port,
-            path=path,
-            log_level=log_level,
-            server_args=server_args,
-            show_banner=not no_banner,
-        )
-    except Exception as e:
-        logger.error(
-            f"Failed to run: {e}",
-            extra={
-                "server_spec": server_spec,
-                "error": str(e),
-            },
-        )
-        sys.exit(1)
+    # If any uv-specific options are provided, use uv run
+    if python or with_packages or with_requirements or project:
+        try:
+            run_module.run_with_uv(
+                server_spec=server_spec,
+                python_version=python,
+                with_packages=with_packages,
+                with_requirements=with_requirements,
+                project=project,
+                transport=transport,
+                host=host,
+                port=port,
+                path=path,
+                log_level=log_level,
+                show_banner=not no_banner,
+            )
+        except Exception as e:
+            logger.error(
+                f"Failed to run: {e}",
+                extra={
+                    "server_spec": server_spec,
+                    "error": str(e),
+                },
+            )
+            sys.exit(1)
+    else:
+        # Use direct import for backwards compatibility
+        try:
+            run_module.run_command(
+                server_spec=server_spec,
+                transport=transport,
+                host=host,
+                port=port,
+                path=path,
+                log_level=log_level,
+                server_args=list(server_args),
+                show_banner=not no_banner,
+            )
+        except Exception as e:
+            logger.error(
+                f"Failed to run: {e}",
+                extra={
+                    "server_spec": server_spec,
+                    "error": str(e),
+                },
+            )
+            sys.exit(1)
 
 
 @app.command

fastmcp/cli/install/claude_code.py

@@ -77,6 +77,9 @@ def install_claude_code(
     with_editable: Path | None = None,
     with_packages: list[str] | None = None,
     env_vars: dict[str, str] | None = None,
+    python_version: str | None = None,
+    with_requirements: Path | None = None,
+    project: Path | None = None,
 ) -> bool:
     """Install FastMCP server in Claude Code.
 
@@ -87,6 +90,9 @@ def install_claude_code(
         with_editable: Optional directory to install in editable mode
         with_packages: Optional list of additional packages to install
         env_vars: Optional dictionary of environment variables
+        python_version: Optional Python version to use
+        with_requirements: Optional requirements file to install from
+        project: Optional project directory to run within
 
     Returns:
         True if installation was successful, False otherwise
@@ -103,6 +109,14 @@ def install_claude_code(
     # Build uv run command
     args = ["run"]
 
+    # Add Python version if specified
+    if python_version:
+        args.extend(["--python", python_version])
+
+    # Add project if specified
+    if project:
+        args.extend(["--project", str(project)])
+
     # Collect all packages in a set to deduplicate
     packages = {"fastmcp"}
     if with_packages:
@@ -115,6 +129,9 @@ def install_claude_code(
     if with_editable:
         args.extend(["--with-editable", str(with_editable)])
 
+    if with_requirements:
+        args.extend(["--with-requirements", str(with_requirements)])
+
     # Build server spec from parsed components
     if server_object:
         server_spec = f"{file.resolve()}:{server_object}"
@@ -156,7 +173,7 @@ def claude_code_command(
     server_name: Annotated[
         str | None,
         cyclopts.Parameter(
-            name=["--server-name", "-n"],
+            name=["--name", "-n"],
             help="Custom name for the server in Claude Code",
         ),
     ] = None,
@@ -190,6 +207,27 @@ def claude_code_command(
             help="Load environment variables from .env file",
         ),
     ] = None,
+    python: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            "--python",
+            help="Python version to use (e.g., 3.10, 3.11)",
+        ),
+    ] = None,
+    with_requirements: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--with-requirements",
+            help="Requirements file to install dependencies from",
+        ),
+    ] = None,
+    project: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--project",
+            help="Run the command within the given project directory",
+        ),
+    ] = None,
 ) -> None:
     """Install an MCP server in Claude Code.
 
@@ -207,6 +245,9 @@ def claude_code_command(
         with_editable=with_editable,
         with_packages=packages,
         env_vars=env_dict,
+        python_version=python,
+        with_requirements=with_requirements,
+        project=project,
     )
 
     if success:

fastmcp/cli/install/claude_desktop.py

@@ -42,6 +42,9 @@ def install_claude_desktop(
     with_editable: Path | None = None,
     with_packages: list[str] | None = None,
     env_vars: dict[str, str] | None = None,
+    python_version: str | None = None,
+    with_requirements: Path | None = None,
+    project: Path | None = None,
 ) -> bool:
     """Install FastMCP server in Claude Desktop.
 
@@ -52,6 +55,9 @@ def install_claude_desktop(
         with_editable: Optional directory to install in editable mode
         with_packages: Optional list of additional packages to install
         env_vars: Optional dictionary of environment variables
+        python_version: Optional Python version to use
+        with_requirements: Optional requirements file to install from
+        project: Optional project directory to run within
 
     Returns:
         True if installation was successful, False otherwise
@@ -69,6 +75,14 @@ def install_claude_desktop(
     # Build uv run command
     args = ["run"]
 
+    # Add Python version if specified
+    if python_version:
+        args.extend(["--python", python_version])
+
+    # Add project if specified
+    if project:
+        args.extend(["--project", str(project)])
+
     # Collect all packages in a set to deduplicate
     packages = {"fastmcp"}
     if with_packages:
@@ -81,6 +95,9 @@ def install_claude_desktop(
     if with_editable:
         args.extend(["--with-editable", str(with_editable)])
 
+    if with_requirements:
+        args.extend(["--with-requirements", str(with_requirements)])
+
     # Build server spec from parsed components
     if server_object:
         server_spec = f"{file.resolve()}:{server_object}"
@@ -129,7 +146,7 @@ def claude_desktop_command(
     server_name: Annotated[
         str | None,
         cyclopts.Parameter(
-            name=["--server-name", "-n"],
+            name=["--name", "-n"],
             help="Custom name for the server in Claude Desktop's config",
         ),
     ] = None,
@@ -163,6 +180,27 @@ def claude_desktop_command(
             help="Load environment variables from .env file",
         ),
     ] = None,
+    python: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            "--python",
+            help="Python version to use (e.g., 3.10, 3.11)",
+        ),
+    ] = None,
+    with_requirements: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--with-requirements",
+            help="Requirements file to install dependencies from",
+        ),
+    ] = None,
+    project: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--project",
+            help="Run the command within the given project directory",
+        ),
+    ] = None,
 ) -> None:
     """Install an MCP server in Claude Desktop.
 
@@ -180,6 +218,9 @@ def claude_desktop_command(
         with_editable=with_editable,
         with_packages=with_packages,
         env_vars=env_dict,
+        python_version=python,
+        with_requirements=with_requirements,
+        project=project,
     )
 
     if not success:

fastmcp/cli/install/cursor.py

@@ -72,6 +72,9 @@ def install_cursor(
     with_editable: Path | None = None,
     with_packages: list[str] | None = None,
     env_vars: dict[str, str] | None = None,
+    python_version: str | None = None,
+    with_requirements: Path | None = None,
+    project: Path | None = None,
 ) -> bool:
     """Install FastMCP server in Cursor.
 
@@ -82,6 +85,9 @@ def install_cursor(
         with_editable: Optional directory to install in editable mode
         with_packages: Optional list of additional packages to install
         env_vars: Optional dictionary of environment variables
+        python_version: Optional Python version to use
+        with_requirements: Optional requirements file to install from
+        project: Optional project directory to run within
 
     Returns:
         True if installation was successful, False otherwise
@@ -89,6 +95,14 @@ def install_cursor(
     # Build uv run command
     args = ["run"]
 
+    # Add Python version if specified
+    if python_version:
+        args.extend(["--python", python_version])
+
+    # Add project if specified
+    if project:
+        args.extend(["--project", str(project)])
+
     # Collect all packages in a set to deduplicate
     packages = {"fastmcp"}
     if with_packages:
@@ -101,6 +115,9 @@ def install_cursor(
     if with_editable:
         args.extend(["--with-editable", str(with_editable)])
 
+    if with_requirements:
+        args.extend(["--with-requirements", str(with_requirements)])
+
     # Build server spec from parsed components
     if server_object:
         server_spec = f"{file.resolve()}:{server_object}"
@@ -139,7 +156,7 @@ def cursor_command(
     server_name: Annotated[
         str | None,
         cyclopts.Parameter(
-            name=["--server-name", "-n"],
+            name=["--name", "-n"],
             help="Custom name for the server in Cursor",
         ),
     ] = None,
@@ -173,6 +190,27 @@ def cursor_command(
             help="Load environment variables from .env file",
         ),
     ] = None,
+    python: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            "--python",
+            help="Python version to use (e.g., 3.10, 3.11)",
+        ),
+    ] = None,
+    with_requirements: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--with-requirements",
+            help="Requirements file to install dependencies from",
+        ),
+    ] = None,
+    project: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--project",
+            help="Run the command within the given project directory",
+        ),
+    ] = None,
 ) -> None:
     """Install an MCP server in Cursor.
 
@@ -190,6 +228,9 @@ def cursor_command(
         with_editable=with_editable,
         with_packages=with_packages,
         env_vars=env_dict,
+        python_version=python,
+        with_requirements=with_requirements,
+        project=project,
     )
 
     if not success:

fastmcp/cli/install/mcp_json.py

@@ -25,6 +25,9 @@ def install_mcp_json(
     with_packages: list[str] | None = None,
     env_vars: dict[str, str] | None = None,
     copy: bool = False,
+    python_version: str | None = None,
+    with_requirements: Path | None = None,
+    project: Path | None = None,
 ) -> bool:
     """Generate MCP configuration JSON for manual installation.
 
@@ -36,6 +39,9 @@ def install_mcp_json(
         with_packages: Optional list of additional packages to install
         env_vars: Optional dictionary of environment variables
         copy: If True, copy to clipboard instead of printing to stdout
+        python_version: Optional Python version to use
+        with_requirements: Optional requirements file to install from
+        project: Optional project directory to run within
 
     Returns:
         True if generation was successful, False otherwise
@@ -44,6 +50,14 @@ def install_mcp_json(
         # Build uv run command
         args = ["run"]
 
+        # Add Python version if specified
+        if python_version:
+            args.extend(["--python", python_version])
+
+        # Add project if specified
+        if project:
+            args.extend(["--project", str(project)])
+
         # Collect all packages in a set to deduplicate
         packages = {"fastmcp"}
         if with_packages:
@@ -56,6 +70,9 @@ def install_mcp_json(
         if with_editable:
             args.extend(["--with-editable", str(with_editable)])
 
+        if with_requirements:
+            args.extend(["--with-requirements", str(with_requirements)])
+
         # Build server spec from parsed components
         if server_object:
             server_spec = f"{file.resolve()}:{server_object}"
@@ -144,6 +161,27 @@ def mcp_json_command(
             negative=False,
         ),
     ] = False,
+    python: Annotated[
+        str | None,
+        cyclopts.Parameter(
+            "--python",
+            help="Python version to use (e.g., 3.10, 3.11)",
+        ),
+    ] = None,
+    with_requirements: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--with-requirements",
+            help="Requirements file to install dependencies from",
+        ),
+    ] = None,
+    project: Annotated[
+        Path | None,
+        cyclopts.Parameter(
+            "--project",
+            help="Run the command within the given project directory",
+        ),
+    ] = None,
 ) -> None:
     """Generate MCP configuration JSON for manual installation.
 
@@ -162,6 +200,9 @@ def mcp_json_command(
         with_packages=packages,
         env_vars=env_dict,
         copy=copy,
+        python_version=python,
+        with_requirements=with_requirements,
+        project=project,
     )
 
     if not success: