fastmcp 2.2.1__tar.gz → 2.2.3__tar.gz

{fastmcp-2.2.1 → fastmcp-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastmcp
-Version: 2.2.1
+Version: 2.2.3
 Summary: The fast, Pythonic way to build MCP servers.
 Project-URL: Homepage, https://gofastmcp.com
 Project-URL: Repository, https://github.com/jlowin/fastmcp
@@ -361,32 +361,32 @@ The `Context` object provides:
 
 ### Images
 
-Easily handle image input and output using the `fastmcp.Image` helper class.
+Easily handle image outputs using the `fastmcp.Image` helper class.
+
+<Tip>
+The below code requires the `pillow` library to be installed.
+</Tip>
 
 ```python
-from fastmcp import FastMCP, Image
-from PIL import Image as PILImage
-import io
+from mcp.server.fastmcp import FastMCP, Image
+from io import BytesIO
+try:
+    from PIL import Image as PILImage
+except ImportError:
+    raise ImportError("Please install the `pillow` library to run this example.")
 
-mcp = FastMCP("Image Demo")
+mcp = FastMCP("My App")
 
 @mcp.tool()
-def create_thumbnail(image_data: Image) -> Image:
-    """Creates a 100x100 thumbnail from the provided image."""
-    img = PILImage.open(io.BytesIO(image_data.data)) # Assumes image_data received as Image with bytes
-    img.thumbnail((100, 100))
-    buffer = io.BytesIO()
+def create_thumbnail(image_path: str) -> Image:
+    """Create a thumbnail from an image"""
+    img = PILImage.open(image_path)
+    img.thumbnail((100, 100))    
+    buffer = BytesIO()
     img.save(buffer, format="PNG")
-    # Return a new Image object with the thumbnail data
     return Image(data=buffer.getvalue(), format="png")
-
-@mcp.tool()
-def load_image_from_disk(path: str) -> Image:
-    """Loads an image from the specified path."""
-    # Handles reading file and detecting format based on extension
-    return Image(path=path)
 ```
-FastMCP handles the conversion to/from the base64-encoded format required by the MCP protocol.
+Return the `Image` helper class from your tool to send an image to the client. The `Image` helper class handles the conversion to/from the base64-encoded format required by the MCP protocol. It works with either a path to an image file, or a bytes object.
 
 
 ### MCP Clients

{fastmcp-2.2.1 → fastmcp-2.2.3}/README.md

@@ -332,32 +332,32 @@ The `Context` object provides:
 
 ### Images
 
-Easily handle image input and output using the `fastmcp.Image` helper class.
+Easily handle image outputs using the `fastmcp.Image` helper class.
+
+<Tip>
+The below code requires the `pillow` library to be installed.
+</Tip>
 
 ```python
-from fastmcp import FastMCP, Image
-from PIL import Image as PILImage
-import io
+from mcp.server.fastmcp import FastMCP, Image
+from io import BytesIO
+try:
+    from PIL import Image as PILImage
+except ImportError:
+    raise ImportError("Please install the `pillow` library to run this example.")
 
-mcp = FastMCP("Image Demo")
+mcp = FastMCP("My App")
 
 @mcp.tool()
-def create_thumbnail(image_data: Image) -> Image:
-    """Creates a 100x100 thumbnail from the provided image."""
-    img = PILImage.open(io.BytesIO(image_data.data)) # Assumes image_data received as Image with bytes
-    img.thumbnail((100, 100))
-    buffer = io.BytesIO()
+def create_thumbnail(image_path: str) -> Image:
+    """Create a thumbnail from an image"""
+    img = PILImage.open(image_path)
+    img.thumbnail((100, 100))    
+    buffer = BytesIO()
     img.save(buffer, format="PNG")
-    # Return a new Image object with the thumbnail data
     return Image(data=buffer.getvalue(), format="png")
-
-@mcp.tool()
-def load_image_from_disk(path: str) -> Image:
-    """Loads an image from the specified path."""
-    # Handles reading file and detecting format based on extension
-    return Image(path=path)
 ```
-FastMCP handles the conversion to/from the base64-encoded format required by the MCP protocol.
+Return the `Image` helper class from your tool to send an image to the client. The `Image` helper class handles the conversion to/from the base64-encoded format required by the MCP protocol. It works with either a path to an image file, or a bytes object.
 
 
 ### MCP Clients

{fastmcp-2.2.1 → fastmcp-2.2.3}/docs/clients/client.mdx

@@ -226,6 +226,15 @@ MCP allows servers to make requests *back* to the client for certain capabilitie
     )
     ```
 
+### Utility Methods
+
+*   **`ping()`**: Sends a ping request to the server to verify connectivity.
+    ```python
+    async def check_connection():
+        async with client:
+            await client.ping()
+            print("Server is reachable")
+    ```
 
 ### Error Handling
 

{fastmcp-2.2.1 → fastmcp-2.2.3}/docs/clients/transports.mdx

@@ -5,6 +5,10 @@ description: Understand the different ways FastMCP Clients can connect to server
 icon: link
 ---
 
+import { VersionBadge } from "/snippets/version-badge.mdx"
+
+<VersionBadge version="2.0.0" />
+
 The FastMCP `Client` relies on a `ClientTransport` object to handle the specifics of connecting to and communicating with an MCP server. FastMCP provides several built-in transport implementations for common connection methods.
 
 While the `Client` often infers the correct transport automatically (see [Client Overview](/clients/client#transport-inference)), you can also instantiate transports explicitly for more control.

{fastmcp-2.2.1 → fastmcp-2.2.3}/docs/docs.json

@@ -61,7 +61,8 @@
                     "patterns/composition",
                     "patterns/decorating-methods",
                     "patterns/openapi",
-                    "patterns/fastapi"
+                    "patterns/fastapi",
+                    "patterns/contrib"
                 ]
             },
             {

fastmcp-2.2.3/docs/patterns/contrib.mdx

@@ -0,0 +1,45 @@
+---
+title: "Contrib Modules"
+description: "Community-contributed modules extending FastMCP"
+icon: "cubes"
+---
+
+import { VersionBadge } from "/snippets/version-badge.mdx"
+
+<VersionBadge version="2.2.1" />
+
+FastMCP includes a `contrib` package that holds community-contributed modules. These modules extend FastMCP's functionality but aren't officially maintained by the core team.
+
+Contrib modules provide additional features, integrations, or patterns that complement the core FastMCP library. They offer a way for the community to share useful extensions while keeping the core library focused and maintainable.
+
+The available modules can be viewed in the [contrib directory](https://github.com/jlowin/fastmcp/tree/main/src/contrib).
+
+## Usage
+
+To use a contrib module, import it from the `fastmcp.contrib` package:
+
+```python
+from fastmcp.contrib import my_module
+```
+
+## Important Considerations
+
+- **Stability**: Modules in `contrib` may have different testing requirements or stability guarantees compared to the core library.
+- **Compatibility**: Changes to core FastMCP might break modules in `contrib` without explicit warnings in the main changelog.
+- **Dependencies**: Contrib modules may have additional dependencies not required by the core library. These dependencies are typically documented in the module's README or separate requirements files.
+
+## Contributing
+
+We welcome contributions to the `contrib` package! If you have a module that extends FastMCP in a useful way, consider contributing it:
+
+1. Create a new directory in `src/fastmcp/contrib/` for your module
+3. Add proper tests for your module in `tests/contrib/`
+2. Include comprehensive documentation in a README.md file, including usage and examples, as well as any additional dependencies or installation instructions
+5. Submit a pull request
+
+The ideal contrib module:
+- Solves a specific use case or integration need
+- Follows FastMCP coding standards
+- Includes thorough documentation and examples
+- Has comprehensive tests
+- Specifies any additional dependencies

{fastmcp-2.2.1 → fastmcp-2.2.3}/docs/patterns/proxy.mdx

@@ -14,18 +14,20 @@ FastMCP provides a powerful proxying capability that allows one FastMCP server i
 
 Proxying means setting up a FastMCP server that doesn't implement its own tools or resources directly. Instead, when it receives a request (like `tools/call` or `resources/read`), it forwards that request to a *backend* MCP server, receives the response, and then relays that response back to the original client.
 
+
 ```mermaid
 sequenceDiagram
-    participant Client
-    participant ProxyServer as FastMCP Proxy Server
-    participant BackendServer as Backend MCP Server
-
-    Client->>ProxyServer: Request (e.g., stdio)
-    ProxyServer->>BackendServer: Request (e.g., sse)
-    BackendServer-->>ProxyServer: Response (e.g., sse)
-    ProxyServer-->>Client: Response (e.g., stdio)
+    participant ClientApp as Your Client (e.g., Claude Desktop)
+    participant FastMCPProxy as FastMCP Proxy Server
+    participant BackendServer as Backend MCP Server (e.g., remote SSE)
+
+    ClientApp->>FastMCPProxy: MCP Request (e.g. stdio)
+    Note over FastMCPProxy, BackendServer: Proxy forwards the request
+    FastMCPProxy->>BackendServer: MCP Request (e.g. sse)
+    BackendServer-->>FastMCPProxy: MCP Response (e.g. sse)
+    Note over ClientApp, FastMCPProxy: Proxy relays the response
+    FastMCPProxy-->>ClientApp: MCP Response (e.g. stdio)
 ```
-
 ### Use Cases
 
 -   **Transport Bridging**: Expose a server running on one transport (e.g., a remote SSE server) via a different transport (e.g., local Stdio for Claude Desktop).

{fastmcp-2.2.1 → fastmcp-2.2.3}/docs/servers/fastmcp.mdx

@@ -5,6 +5,8 @@ description: Learn about the core FastMCP server class and how to run it.
 icon: server
 ---
 
+import { VersionBadge } from "/snippets/version-badge.mdx"
+
 The central piece of a FastMCP application is the `FastMCP` server class. This class acts as the main container for your application's tools, resources, and prompts, and manages communication with MCP clients.
 
 ## Creating a Server
@@ -225,6 +227,8 @@ The CLI can dynamically find and run FastMCP server objects in your files, but i
 
 ## Composing Servers
 
+<VersionBadge version="2.2.0" />
+
 FastMCP supports composing multiple servers together using `import_server` (static copy) and `mount` (live link). This allows you to organize large applications into modular components or reuse existing servers.
 
 See the [Server Composition](/patterns/composition) guide for full details, best practices, and examples.
@@ -246,6 +250,8 @@ main.mount("sub", sub)
 
 ## Proxying Servers
 
+<VersionBadge version="2.0.0" />
+
 FastMCP can act as a proxy for any MCP server (local or remote) using `FastMCP.from_client`, letting you bridge transports or add a frontend to existing servers. For example, you can expose a remote SSE server locally via stdio, or vice versa.
 
 See the [Proxying Servers](/patterns/proxy) guide for details and advanced usage.

{fastmcp-2.2.1 → fastmcp-2.2.3}/docs/servers/prompts.mdx

@@ -5,6 +5,8 @@ description: Create reusable, parameterized prompt templates for MCP clients.
 icon: message-lines
 ---
 
+import { VersionBadge } from "/snippets/version-badge.mdx"
+
 Prompts are reusable message templates that help LLMs generate structured, purposeful responses. FastMCP simplifies defining these templates, primarily using the `@mcp.prompt` decorator.
 
 ## What Are Prompts?
@@ -201,6 +203,8 @@ Refer to the [Context documentation](/servers/context) for more details on these
 
 ### Duplicate Prompts
 
+<VersionBadge version="2.1.0" />
+
 You can configure how the FastMCP server handles attempts to register multiple prompts with the same name. Use the `on_duplicate_prompts` setting during `FastMCP` initialization.
 
 ```python

{fastmcp-2.2.1 → fastmcp-2.2.3}/docs/servers/resources.mdx

@@ -5,6 +5,8 @@ description: Expose data sources and dynamic content generators to your MCP clie
 icon: database
 ---
 
+import { VersionBadge } from "/snippets/version-badge.mdx"
+
 Resources represent data or files that an MCP client can read, and resource templates extend this concept by allowing clients to request dynamically generated resources based on parameters passed in the URI.
 
 FastMCP simplifies defining both static and dynamic resources, primarily using the `@mcp.resource` decorator.
@@ -183,6 +185,8 @@ Use these when the content is static or sourced directly from a file/URL, bypass
 
 #### Custom Resource Keys
 
+<VersionBadge version="2.2.0" />
+
 When adding resources directly with `mcp.add_resource()`, you can optionally provide a custom storage key:
 
 ```python
@@ -201,6 +205,10 @@ Note that this parameter is only available when using `add_resource()` directly
 
 Resource Templates allow clients to request resources whose content depends on parameters embedded in the URI. Define a template using the **same `@mcp.resource` decorator**, but include `{parameter_name}` placeholders in the URI string and add corresponding arguments to your function signature.
 
+Resource templates generate a new resource for each unique set of parameters, which means that resources can be dynamically created on-demand. For example, if the resource template `"user://profile/{name}"` is registered, MCP clients could request `"user://profile/ford"` or `"user://profile/marvin"` to retrieve either of those two user profiles as resources, without having to register each resource individually.
+
+Here is a complete example that shows how to define two resource templates:
+
 ```python
 from fastmcp import FastMCP
 
@@ -233,11 +241,61 @@ def get_repo_info(owner: str, repo: str) -> dict:
     }
 ```
 
-With these templates defined, clients can request:
+With these two templates defined, clients can request a variety of resources:
 - `weather://london/current` → Returns weather for London
-- `repos://fastmcp/docs/info` → Returns info about the fastmcp/docs repository
+- `weather://paris/current` → Returns weather for Paris
+- `repos://jlowin/fastmcp/info` → Returns info about the jlowin/fastmcp repository
+- `repos://prefecthq/prefect/info` → Returns info about the prefecthq/prefect repository
+
+### Wildcard Parameters
+
+<VersionBadge version="2.2.3" />
 
-### Parameters and Default Values
+Resource templates support wildcard parameters that can match multiple path segments. While standard parameters (`{param}`) only match a single path segment and don't cross "/" boundaries, wildcard parameters (`{param*}`) can capture multiple segments including slashes. Wildcards capture all subsequent path segments *up until* the defined part of the URI template (whether literal or another parameter). This allows you to have multiple wildcard parameters in a single URI template.
+
+```python
+from fastmcp import FastMCP
+
+mcp = FastMCP(name="DataServer")
+
+# Standard parameter only matches one segment
+@mcp.resource("files://{filename}")
+def get_file(filename: str) -> str:
+    """Retrieves a file by name."""
+    # Will only match files://<single-segment>
+    return f"File content for: {filename}"
+
+# Wildcard parameter can match multiple segments
+@mcp.resource("path://{filepath*}")
+def get_path_content(filepath: str) -> str:
+    """Retrieves content at a specific path."""
+    # Can match path://docs/server/resources.mdx
+    return f"Content at path: {filepath}"
+
+# Mixing standard and wildcard parameters
+@mcp.resource("repo://{owner}/{path*}/template.py")
+def get_template_file(owner: str, path: str) -> dict:
+    """Retrieves a file from a specific repository and path, but 
+    only if the resource ends with `template.py`"""
+    # Can match repo://jlowin/fastmcp/src/resources/template.py
+    return {
+        "owner": owner,
+        "path": path + "/template.py",
+        "content": f"File at {path}/template.py in {owner}'s repository"
+    }
+```
+
+Wildcard parameters are useful when:
+
+- Working with file paths or hierarchical data
+- Creating APIs that need to capture variable-length path segments
+- Building URL-like patterns similar to REST APIs
+
+Note that like regular parameters, each wildcard parameter must still be a named parameter in your function signature, and all required function parameters must appear in the URI template.
+
+### Default Values
+
+<VersionBadge version="2.2.0" />
 
 When creating resource templates, FastMCP enforces two rules for the relationship between URI template parameters and function parameters:
 
@@ -315,6 +373,8 @@ Templates provide a powerful way to expose parameterized data access points foll
 
 ### Custom Template Keys
 
+<VersionBadge version="2.2.0" />
+
 Similar to resources, you can provide custom keys when directly adding templates:
 
 ```python
@@ -337,6 +397,8 @@ This allows accessing the same template implementation through different URI pat
 
 ### Duplicate Resources
 
+<VersionBadge version="2.1.0" />
+
 You can configure how the FastMCP server handles attempts to register multiple resources or templates with the same URI. Use the `on_duplicate_resources` setting during `FastMCP` initialization.
 
 ```python

{fastmcp-2.2.1 → fastmcp-2.2.3}/docs/servers/tools.mdx

@@ -209,13 +209,18 @@ FastMCP automatically converts the value returned by your function into the appr
 - **`str`**: Sent as `TextContent`.
 - **`dict`, `list`, Pydantic `BaseModel`**: Serialized to a JSON string and sent as `TextContent`.
 - **`bytes`**: Base64 encoded and sent as `BlobResourceContents` (often within an `EmbeddedResource`).
-- **`fastmcp.utilities.types.Image`**: A helper class to easily return image data. Sent as `ImageContent`.
+- **`fastmcp.Image`**: A helper class for easily returning image data. Sent as `ImageContent`.
 - **`None`**: Results in an empty response (no content is sent back to the client).
 
 ```python
-from fastmcp.utilities.types import Image
-from PIL import Image as PILImage
+from fastmcp import FastMCP, Image
 import io
+try:
+    from PIL import Image as PILImage
+except ImportError:
+    raise ImportError("Please install the `pillow` library to run this example.")
+
+mcp = FastMCP("Image Demo")
 
 @mcp.tool()
 def generate_image(width: int, height: int, color: str) -> Image:
@@ -306,6 +311,8 @@ For full documentation on the Context object and all its capabilities, see the [
 
 ### Duplicate Tools
 
+<VersionBadge version="2.1.0" />
+
 You can control how the FastMCP server behaves if you try to register multiple tools with the same name. This is configured using the `on_duplicate_tools` argument when creating the `FastMCP` instance.
 
 ```python

fastmcp-2.2.3/docs/snippets/version-badge.mdx

@@ -0,0 +1,13 @@
+export const VersionBadge = ({ version }) => {
+    return (
+        <code className="version-badge-container">
+            <div className="version-badge">
+                <span className="version-badge-label">New in version:</span>&nbsp;
+                <span className="version-badge-version">{version}</span>
+            </div>
+        </code>
+
+
+
+    );
+};

{fastmcp-2.2.1 → fastmcp-2.2.3}/docs/style.css

@@ -14,16 +14,18 @@ h6 code:not(pre code) {
 
 /* Version badge -- display a badge with the current version of the documentation */
 .version-badge {
-  display: inline-flex;
+  display: inline-block;
   align-items: center;
   gap: 0.3em;
-  padding: 0.32em 1em;
-  font-size: 0.92em;
-  font-weight: 600;
-  letter-spacing: 0.01em;
-  color: #7417e5;
-  background: #f3e8ff;
-  border: 1.5px solid #c084fc;
+  padding: 0.2em 0.8em;
+  font-size: 1.1em;
+  font-weight: 400;
+
+  font-family: "Inter", sans-serif;
+  letter-spacing: 0.025em;
+  color: #ff5400;
+  background: #ffeee6;
+  border: 1px solid rgb(255, 84, 0, 0.5);
   border-radius: 6px;
   box-shadow: none;
   vertical-align: middle;
@@ -31,6 +33,11 @@ h6 code:not(pre code) {
   transition: box-shadow 0.2s, transform 0.15s;
 }
 
+.version-badge-container {
+  margin: 0;
+  padding: 0;
+}
+
 .version-badge:hover {
   box-shadow: 0 2px 8px 0 rgba(160, 132, 252, 0.1);
   transform: translateY(-1px) scale(1.03);
@@ -41,13 +48,3 @@ h6 code:not(pre code) {
   background: #312e81;
   border: 1.5px solid #a78bfa;
 }
-
-.badge-emoji {
-  font-size: 1.15em;
-  line-height: 1;
-  text-shadow: 0 1px 2px #fff, 0 0px 2px #c084fc;
-}
-
-.dark .badge-emoji {
-  text-shadow: 0 1px 2px #312e81, 0 0px 2px #a78bfa;
-}

{fastmcp-2.2.1 → fastmcp-2.2.3}/src/fastmcp/cli/cli.py

@@ -186,7 +186,7 @@ def version(ctx: Context):
         "MCP version": importlib.metadata.version("mcp"),
         "Python version": platform.python_version(),
         "Platform": platform.platform(),
-        "FastMCP root path": f"~/{Path(__file__).resolve().parents[3].relative_to(Path.home())}",
+        "FastMCP root path": Path(fastmcp.__file__).resolve().parents[1],
     }
 
     g = Table.grid(padding=(0, 1))

{fastmcp-2.2.1 → fastmcp-2.2.3}/src/fastmcp/client/client.py

@@ -45,7 +45,8 @@ class Client:
     ):
         self.transport = infer_transport(transport)
         self._session: ClientSession | None = None
-        self._session_cms: list[AbstractAsyncContextManager[ClientSession]] = []
+        self._session_cm: AbstractAsyncContextManager[ClientSession] | None = None
+        self._nesting_counter: int = 0
 
         self._session_kwargs: SessionKwargs = {
             "sampling_callback": None,
@@ -85,29 +86,21 @@ class Client:
         return self._session is not None
 
     async def __aenter__(self):
-        if self.is_connected():
-            # We're already connected, no need to add None to the session_cms list
-            return self
-
-        try:
-            session_cm = self.transport.connect_session(**self._session_kwargs)
-            self._session_cms.append(session_cm)
-            self._session = await self._session_cms[-1].__aenter__()
-            return self
-        except Exception as e:
-            # Ensure cleanup if __aenter__ fails partially
-            self._session = None
-            if self._session_cms:
-                self._session_cms.pop()
-            raise ConnectionError(
-                f"Failed to connect using {self.transport}: {e}"
-            ) from e
+        if self._nesting_counter == 0:
+            # create new session
+            self._session_cm = self.transport.connect_session(**self._session_kwargs)
+            self._session = await self._session_cm.__aenter__()
+
+        self._nesting_counter += 1
+        return self
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
-        if self._session_cms:
-            await self._session_cms[-1].__aexit__(exc_type, exc_val, exc_tb)
+        self._nesting_counter -= 1
+
+        if self._nesting_counter == 0 and self._session_cm is not None:
+            await self._session_cm.__aexit__(exc_type, exc_val, exc_tb)
+            self._session_cm = None
             self._session = None
-            self._session_cms.pop()
 
     # --- MCP Client Methods ---
     async def ping(self) -> None:

{fastmcp-2.2.1 → fastmcp-2.2.3}/src/fastmcp/client/transports.py

@@ -3,6 +3,7 @@ import contextlib
 import datetime
 import os
 import shutil
+import sys
 from collections.abc import AsyncIterator
 from pathlib import Path
 from typing import (
@@ -185,7 +186,7 @@ class PythonStdioTransport(StdioTransport):
         args: list[str] | None = None,
         env: dict[str, str] | None = None,
         cwd: str | None = None,
-        python_cmd: str = "python",
+        python_cmd: str = sys.executable,
     ):
         """
         Initialize a Python transport.

{fastmcp-2.2.1/src → fastmcp-2.2.3/src/fastmcp}/contrib/README.md

@@ -6,4 +6,14 @@ This directory holds community-contributed modules for FastMCP. These modules ex
 *   Modules in `contrib` may have different testing requirements or stability guarantees compared to the core library.
 *   Changes to the core FastMCP library might break modules in `contrib` without explicit warnings in the main changelog.
 
-Use these modules at your own discretion. Contributions are welcome, but please include tests and documentation.
+Use these modules at your own discretion. Contributions are welcome, but please include tests and documentation.
+
+## Usage
+
+To use a contrib module, import it from the `fastmcp.contrib` package.
+
+```python
+from fastmcp.contrib import my_module
+```
+
+Note that the contrib modules may have different dependencies than the core library, which can be noted in their respective README's or even separate requirements / dependency files.

{fastmcp-2.2.1/src → fastmcp-2.2.3/src/fastmcp}/contrib/bulk_tool_caller/bulk_tool_caller.py

@@ -3,10 +3,14 @@ from typing import Any
 from mcp.types import CallToolResult
 from pydantic import BaseModel, Field
 
-from contrib.mcp_mixin.mcp_mixin import _DEFAULT_SEPARATOR_TOOL, MCPMixin, mcp_tool
 from fastmcp import FastMCP
 from fastmcp.client import Client
 from fastmcp.client.transports import FastMCPTransport
+from fastmcp.contrib.mcp_mixin.mcp_mixin import (
+    _DEFAULT_SEPARATOR_TOOL,
+    MCPMixin,
+    mcp_tool,
+)
 
 
 class CallToolRequest(BaseModel):

{fastmcp-2.2.1/src → fastmcp-2.2.3/src/fastmcp}/contrib/bulk_tool_caller/example.py

@@ -1,7 +1,7 @@
 """Sample code for FastMCP using MCPMixin."""
 
-from contrib.bulk_tool_caller import BulkToolCaller
 from fastmcp import FastMCP
+from fastmcp.contrib.bulk_tool_caller import BulkToolCaller
 
 mcp = FastMCP()
 

{fastmcp-2.2.1/src → fastmcp-2.2.3/src/fastmcp}/contrib/mcp_mixin/README.md

@@ -10,7 +10,7 @@ Inherit from `MCPMixin` and use the decorators on the methods you want to regist
 
 ```python
 from fastmcp import FastMCP
-from contrib.mcp_mixin import MCPMixin, mcp_tool, mcp_resource
+from fastmcp.contrib.mcp_mixin import MCPMixin, mcp_tool, mcp_resource
 
 class MyComponent(MCPMixin):
     @mcp_tool(name="my_tool", description="Does something cool.")

{fastmcp-2.2.1/src → fastmcp-2.2.3/src/fastmcp}/contrib/mcp_mixin/example.py

@@ -2,13 +2,13 @@
 
 import asyncio
 
-from contrib.mcp_mixin import (
+from fastmcp import FastMCP
+from fastmcp.contrib.mcp_mixin import (
     MCPMixin,
     mcp_prompt,
     mcp_resource,
     mcp_tool,
 )
-from fastmcp import FastMCP
 
 mcp = FastMCP()
 

{fastmcp-2.2.1 → fastmcp-2.2.3}/src/fastmcp/resources/template.py

@@ -24,13 +24,16 @@ from fastmcp.utilities.types import _convert_set_defaults
 
 
 def build_regex(template: str) -> re.Pattern:
-    # Escape all non-brace characters, then restore {var} placeholders
     parts = re.split(r"(\{[^}]+\})", template)
     pattern = ""
     for part in parts:
         if part.startswith("{") and part.endswith("}"):
             name = part[1:-1]
-            pattern += f"(?P<{name}>[^/]+)"
+            if name.endswith("*"):
+                name = name[:-1]
+                pattern += f"(?P<{name}>.+)"
+            else:
+                pattern += f"(?P<{name}>[^/]+)"
         else:
             pattern += re.escape(part)
     return re.compile(f"^{pattern}$")