fastmcp 2.0.0__py3-none-any.whl → 2.1.0__py3-none-any.whl

fastmcp/tools/tool_manager.py

@@ -6,7 +6,8 @@ from typing import TYPE_CHECKING, Any
 from mcp.shared.context import LifespanContextT
 
 from fastmcp.exceptions import ToolError
-from fastmcp.tools.base import Tool
+from fastmcp.settings import DuplicateBehavior
+from fastmcp.tools.tool import Tool
 from fastmcp.utilities.logging import get_logger
 
 if TYPE_CHECKING:
@@ -20,9 +21,9 @@ logger = get_logger(__name__)
 class ToolManager:
     """Manages FastMCP tools."""
 
-    def __init__(self, warn_on_duplicate_tools: bool = True):
+    def __init__(self, duplicate_behavior: DuplicateBehavior = DuplicateBehavior.WARN):
         self._tools: dict[str, Tool] = {}
-        self.warn_on_duplicate_tools = warn_on_duplicate_tools
+        self.duplicate_behavior = duplicate_behavior
 
     def get_tool(self, name: str) -> Tool | None:
         """Get tool by name."""
@@ -32,19 +33,30 @@ class ToolManager:
         """List all registered tools."""
         return list(self._tools.values())
 
-    def add_tool(
+    def add_tool_from_fn(
         self,
         fn: Callable[..., Any],
         name: str | None = None,
         description: str | None = None,
+        tags: set[str] | None = None,
     ) -> Tool:
         """Add a tool to the server."""
-        tool = Tool.from_function(fn, name=name, description=description)
+        tool = Tool.from_function(fn, name=name, description=description, tags=tags)
+        return self.add_tool(tool)
+
+    def add_tool(self, tool: Tool) -> Tool:
+        """Register a tool with the server."""
         existing = self._tools.get(tool.name)
         if existing:
-            if self.warn_on_duplicate_tools:
+            if self.duplicate_behavior == DuplicateBehavior.WARN:
                 logger.warning(f"Tool already exists: {tool.name}")
-            return existing
+                self._tools[tool.name] = tool
+            elif self.duplicate_behavior == DuplicateBehavior.REPLACE:
+                self._tools[tool.name] = tool
+            elif self.duplicate_behavior == DuplicateBehavior.ERROR:
+                raise ValueError(f"Tool already exists: {tool.name}")
+            elif self.duplicate_behavior == DuplicateBehavior.IGNORE:
+                pass
         self._tools[tool.name] = tool
         return tool
 
@@ -78,13 +90,7 @@ class ToolManager:
         for name, tool in tool_manager._tools.items():
             prefixed_name = f"{prefix}{name}" if prefix else name
 
-            # Create a shallow copy of the tool with the prefixed name
-            copied_tool = Tool.from_function(
-                tool.fn,
-                name=prefixed_name,
-                description=tool.description,
-            )
-
+            new_tool = tool.copy(updates=dict(name=prefixed_name))
             # Store the copied tool
-            self._tools[prefixed_name] = copied_tool
-            logger.debug(f"Imported tool: {name} as {prefixed_name}")
+            self.add_tool(new_tool)
+            logger.debug(f'Imported tool "{name}" as "{prefixed_name}"')

fastmcp/utilities/types.py

@@ -2,9 +2,21 @@
 
 import base64
 from pathlib import Path
+from typing import TypeVar
 
 from mcp.types import ImageContent
 
+T = TypeVar("T")
+
+
+def _convert_set_defaults(maybe_set: set[T] | list[T] | None) -> set[T]:
+    """Convert a set or list to a set, defaulting to an empty set if None."""
+    if maybe_set is None:
+        return set()
+    if isinstance(maybe_set, set):
+        return maybe_set
+    return set(maybe_set)
+
 
 class Image:
     """Helper class for returning images from tools."""

{fastmcp-2.0.0.dist-info → fastmcp-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastmcp
-Version: 2.0.0
+Version: 2.1.0
 Summary: An ergonomic MCP interface
 Author: Jeremiah Lowin
 License: Apache-2.0

fastmcp-2.1.0.dist-info/RECORD

@@ -0,0 +1,39 @@
+fastmcp/__init__.py,sha256=2bwhjiyLJisyobp1O9tVYMjriHZAx_f4bIKJYOL-Rpk,399
+fastmcp/exceptions.py,sha256=q9djUDmpwmGEWcHI8q4UzJBtf7s7UtgL--OB7OaGzyQ,435
+fastmcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fastmcp/settings.py,sha256=r5LT5yAZmwS1Lppro_fzdrCUJ0otnAmgtjsNgDdQIvs,1980
+fastmcp/cli/__init__.py,sha256=Ii284TNoG5lxTP40ETMGhHEq3lQZWxu9m9JuU57kUpQ,87
+fastmcp/cli/claude.py,sha256=IAlcZ4qZKBBj09jZUMEx7EANZE_IR3vcu7zOBJmMOuU,4567
+fastmcp/cli/cli.py,sha256=L1git_8u-OvVCSEtwztHhmJ6WwlFhlvK4gEIAWgrMMM,13933
+fastmcp/client/__init__.py,sha256=BXO9NUhntZ5GnUACfaRCzDJ5IzxqFJs8qKG-CRMSco4,490
+fastmcp/client/base.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+fastmcp/client/client.py,sha256=OMJ1FzrlcRRYKQg3DFxiQpaNDo4uYK3Acs23rxPyE-g,7941
+fastmcp/client/roots.py,sha256=IxI_bHwHTmg6c2H-s1av1ZgrRnNDieHtYwdGFbzXT5c,2471
+fastmcp/client/sampling.py,sha256=WdRhIZbWv54rXYI8lWHv0thXmGCloZYPFpwJK9El_sQ,1613
+fastmcp/client/transports.py,sha256=gA_aGjgPY2q_PqaURkes_vUKtuUicViTHYEe4TAkDmU,13864
+fastmcp/prompts/__init__.py,sha256=wTtTHaYiH-IArcumPSxM1-8V2EGzClVVIP76vwcWsFQ,108
+fastmcp/prompts/prompt.py,sha256=br_o7eaLg9j04jqCKxRwnrzkcNxe7rtsScB2qUSh_a8,6445
+fastmcp/prompts/prompt_manager.py,sha256=1kWgdTH7WE36F5j-B7cP3q81XxguXiOxpNIi9FANUIg,3461
+fastmcp/resources/__init__.py,sha256=ImyPi5xICGW8nN634fP82PzU0SsKCPeJXU-WopVOu6Y,467
+fastmcp/resources/resource.py,sha256=MrfRdLA2FEglvRJP7KgduG7na_qgkBo-_iXTzRbil6c,2038
+fastmcp/resources/resource_manager.py,sha256=AsK3hxorGbWC04fWGTH0QMqQvOLJDauWdckZiA-DC1E,7849
+fastmcp/resources/template.py,sha256=Fpjb51_ktWFpS1aQ5CFCt1SFuPe6S7CPuyzQCz7c3Mg,3742
+fastmcp/resources/types.py,sha256=tigil7z-SUJMakGXzDLIGSqTepPrAsRpwqwtBA4yoUY,6168
+fastmcp/server/__init__.py,sha256=pdkghG11VLMZiluQ-4_rl2JK1LMWmV003m9dDRUN8W4,92
+fastmcp/server/context.py,sha256=SPYr3KUBG9MmKRh6Y6tfzPNgdxR5TmPGfnVwcEMqwMM,7115
+fastmcp/server/openapi.py,sha256=J7HrAlRziaB2a6pwB0wStbjRJ1E5Lf818yMqD762s5U,22693
+fastmcp/server/proxy.py,sha256=YKSPG2uwmUwHxw9brHmKD-i8noxq0FG4Loln7WGflgc,8019
+fastmcp/server/server.py,sha256=B9swucn_1H5Z8Gd_JMG8fvcF8hb5r4C3Kpp7bXoY9LI,26328
+fastmcp/tools/__init__.py,sha256=ocw-SFTtN6vQ8fgnlF8iNAOflRmh79xS1xdO0Bc3QPE,96
+fastmcp/tools/tool.py,sha256=_BN0ZIMP0NKkRD_9_t_eNWHP6xRfEoSSl-9ZI3V337k,3753
+fastmcp/tools/tool_manager.py,sha256=oUT8ExxIKKpJnFxCUDwThRxdK7WADD40e6yjGBYDPmI,3498
+fastmcp/utilities/__init__.py,sha256=-imJ8S-rXmbXMWeDamldP-dHDqAPg_wwmPVz-LNX14E,31
+fastmcp/utilities/func_metadata.py,sha256=ODD9ds7bGXED27rx4MiMim1EBPnjNHIcXabJhynVKBA,7739
+fastmcp/utilities/logging.py,sha256=1ipiOXzgWUp3Vih_JtEiLX7aAFmrUDZNr4KrZbofZTM,818
+fastmcp/utilities/openapi.py,sha256=yl83QsOcLZc00vScdL2LpEopzVCv32gDpC5da9NGkTM,30351
+fastmcp/utilities/types.py,sha256=m2rPYMzO-ZFvvZ46N-1-Xqyw693K7yq9Z2xR4pVELyk,2091
+fastmcp-2.1.0.dist-info/METADATA,sha256=hNrhsqF-IhAt5ExONGcyXbgFTCRV8aVqzVtJl0hTeeA,26270
+fastmcp-2.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fastmcp-2.1.0.dist-info/entry_points.txt,sha256=ff8bMtKX1JvXyurMibAacMSKbJEPmac9ffAKU9mLnM8,44
+fastmcp-2.1.0.dist-info/licenses/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+fastmcp-2.1.0.dist-info/RECORD,,

fastmcp-2.0.0.dist-info/RECORD

@@ -1,39 +0,0 @@
-fastmcp/__init__.py,sha256=2bwhjiyLJisyobp1O9tVYMjriHZAx_f4bIKJYOL-Rpk,399
-fastmcp/exceptions.py,sha256=q9djUDmpwmGEWcHI8q4UzJBtf7s7UtgL--OB7OaGzyQ,435
-fastmcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastmcp/settings.py,sha256=jpmSeDMcak_2ozVm0xkm4aUeGBGcShEvBWz3HtORkCg,1763
-fastmcp/cli/__init__.py,sha256=Ii284TNoG5lxTP40ETMGhHEq3lQZWxu9m9JuU57kUpQ,87
-fastmcp/cli/claude.py,sha256=IAlcZ4qZKBBj09jZUMEx7EANZE_IR3vcu7zOBJmMOuU,4567
-fastmcp/cli/cli.py,sha256=0k1zyTNFPjTe8zdqMhUY8MGAfJIPPoz-Zwylf3uhSCk,13925
-fastmcp/client/__init__.py,sha256=BXO9NUhntZ5GnUACfaRCzDJ5IzxqFJs8qKG-CRMSco4,490
-fastmcp/client/base.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fastmcp/client/client.py,sha256=hiCc7PAPzHhhLW-L5yQhVMn390nthQESh_PyH7k_gck,6650
-fastmcp/client/roots.py,sha256=IxI_bHwHTmg6c2H-s1av1ZgrRnNDieHtYwdGFbzXT5c,2471
-fastmcp/client/sampling.py,sha256=WdRhIZbWv54rXYI8lWHv0thXmGCloZYPFpwJK9El_sQ,1613
-fastmcp/client/transports.py,sha256=gA_aGjgPY2q_PqaURkes_vUKtuUicViTHYEe4TAkDmU,13864
-fastmcp/prompts/__init__.py,sha256=23GNQg1AYPGnz0AfNa0IK7NCpzDOr-arHze-ldWvAg4,106
-fastmcp/prompts/base.py,sha256=sPkax0-LZu8EJ__aiD8ZWhCK4Af9j6NPJilH7ZwG_7E,5718
-fastmcp/prompts/prompt_manager.py,sha256=lKo6WWeWnAmCpkzXzAMf2jUttwrXKlElPEEKudaAgww,2574
-fastmcp/resources/__init__.py,sha256=e4S369jBoJt07ez9_ZaJefzGfz4kr9nGwG4KPMzMHc8,464
-fastmcp/resources/base.py,sha256=UFl1SalsiRsicCUw_ItTUl4BnSW4WeV-aMIr0BI7spY,1355
-fastmcp/resources/resource_manager.py,sha256=zgEKSbNKDmlsnbnckd76IXFDvEmwxh0AtW2_uAQ8Ij0,5889
-fastmcp/resources/templates.py,sha256=EocMjazS0TT7Ef9JO0_QtAjgpFjzH5OQzs1Md17DIic,2961
-fastmcp/resources/types.py,sha256=-53oBf9C0wyaHq_Dqos6B1CR_MF0Crv6sFFn0uq2zzM,6186
-fastmcp/server/__init__.py,sha256=pdkghG11VLMZiluQ-4_rl2JK1LMWmV003m9dDRUN8W4,92
-fastmcp/server/context.py,sha256=SPYr3KUBG9MmKRh6Y6tfzPNgdxR5TmPGfnVwcEMqwMM,7115
-fastmcp/server/openapi.py,sha256=6b10nnaaZxGoSyPxQyqLDX7NmcHMlbPms1zQudnbets,22268
-fastmcp/server/proxy.py,sha256=Ry3fmIwd6eiOd1rjzgLFMKGIjq-uvLDVdiqpS1G4Wfw,8018
-fastmcp/server/server.py,sha256=Qh_pCNKQLFqjEbl9DMMvBMUD5cuktQoQSNjPDF1jrkc,23937
-fastmcp/tools/__init__.py,sha256=ZboxhyMJDl87Svjov8YwNYwNZi55P9VhmpTjBZLesnk,96
-fastmcp/tools/base.py,sha256=DvHEWuQxBfp8e_FRWS8_oBSq7JL7m2Gm9gkaivk-eb8,3033
-fastmcp/tools/tool_manager.py,sha256=zDWeuWAev1uyWO95GkXbRx9sXfJ3Iom7CyVHz0bs5GY,3051
-fastmcp/utilities/__init__.py,sha256=-imJ8S-rXmbXMWeDamldP-dHDqAPg_wwmPVz-LNX14E,31
-fastmcp/utilities/func_metadata.py,sha256=ODD9ds7bGXED27rx4MiMim1EBPnjNHIcXabJhynVKBA,7739
-fastmcp/utilities/logging.py,sha256=1ipiOXzgWUp3Vih_JtEiLX7aAFmrUDZNr4KrZbofZTM,818
-fastmcp/utilities/openapi.py,sha256=yl83QsOcLZc00vScdL2LpEopzVCv32gDpC5da9NGkTM,30351
-fastmcp/utilities/types.py,sha256=rsNHw-O0IfZrCPkSQbmM-hJ2We8lnqra834HbtD2Clo,1760
-fastmcp-2.0.0.dist-info/METADATA,sha256=0-fdfOLJbdvUw-mXCW1Ol_dP4CMyh7-YneErxG3-vdI,26270
-fastmcp-2.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fastmcp-2.0.0.dist-info/entry_points.txt,sha256=ff8bMtKX1JvXyurMibAacMSKbJEPmac9ffAKU9mLnM8,44
-fastmcp-2.0.0.dist-info/licenses/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-fastmcp-2.0.0.dist-info/RECORD,,