Skip to content

πŸš€ The fast, Pythonic way to build MCP servers and clients.

Return the existing component when an ignored duplicate is added (#5617)

Asem ahmed237efdfbab40
diff --git a/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/prompts.py b/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/prompts.py
index d0816325d..726a0f0e3 100644
--- a/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/prompts.py
+++ b/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/prompts.py
@@ -61,7 +61,10 @@ class PromptDecoratorMixin:
f"Expected Prompt or @prompt-decorated function, got {type(prompt).__name__}. "
"Use @prompt decorator or pass a Prompt instance."
)
- self._add_component(prompt)
+ added = self._add_component(prompt)
+ if added is not prompt:
+ # on_duplicate="ignore" kept the existing prompt.
+ return added
if not enabled:
self.disable(keys={prompt.key})
return prompt
diff --git a/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/resources.py b/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/resources.py
index f1f7b106b..d87792ea6 100644
--- a/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/resources.py
+++ b/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/resources.py
@@ -94,7 +94,10 @@ class ResourceDecoratorMixin:
f"Expected Resource, ResourceTemplate, or @resource-decorated function, got {type(resource).__name__}. "
"Use @resource('uri') decorator or pass a Resource/ResourceTemplate instance."
)
- self._add_component(resource)
+ added = self._add_component(resource)
+ if added is not resource:
+ # on_duplicate="ignore" kept the existing resource.
+ return added
if not enabled:
self.disable(keys={resource.key})
return resource
diff --git a/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/tools.py b/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/tools.py
index 3f4b322a5..6a3689562 100644
--- a/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/tools.py
+++ b/fastmcp_slim/fastmcp/server/providers/local_provider/decorators/tools.py
@@ -153,7 +153,11 @@ class ToolDecoratorMixin:
)
else:
tool = Tool.from_function(tool)
- self._add_component(tool)
+ added = self._add_component(tool)
+ if added is not tool:
+ # on_duplicate="ignore" kept the existing tool; the new one was
+ # not registered, so its enabled state and UI marker don't apply.
+ return added
if not enabled:
self.disable(keys={tool.key})
_maybe_apply_prefab_ui(self, tool)
diff --git a/tests/server/providers/test_local_provider.py b/tests/server/providers/test_local_provider.py
index 1de87c04d..283375b09 100644
--- a/tests/server/providers/test_local_provider.py
+++ b/tests/server/providers/test_local_provider.py
@@ -16,6 +16,7 @@ import pytest
from fastmcp import FastMCP
from fastmcp.client import Client
from fastmcp.prompts.base import Prompt
+from fastmcp.resources import Resource, ResourceTemplate
from fastmcp.server.providers.local_provider import LocalProvider
from fastmcp.server.transforms import Namespace
from fastmcp.tools.base import Tool, ToolResult
@@ -591,6 +592,114 @@ class TestLocalProviderDecorators:
assert "Hello, World!" in str(result)
+class TestLocalProviderOnDuplicate:
+ """Tests for what add_* returns and does when a component already exists."""
+
+ @staticmethod
+ def _tool(description: str) -> Tool:
+ return Tool(
+ name="dup",
+ description=description,
+ parameters={"type": "object", "properties": {}},
+ )
+
+ @pytest.mark.parametrize("on_duplicate", ["warn", "replace"])
+ def test_replacing_duplicate_returns_the_new_component(self, on_duplicate):
+ provider = LocalProvider(on_duplicate=on_duplicate)
+ provider.add_tool(self._tool("first"))
+ second = self._tool("second")
+
+ assert provider.add_tool(second) is second
+ assert provider._components["tool:dup@"] is second
+
+ def test_ignored_duplicate_tool_returns_the_existing_tool(self):
+ provider = LocalProvider(on_duplicate="ignore")
+ first = provider.add_tool(self._tool("first"))
+
+ assert provider.add_tool(self._tool("second")) is first
+ assert provider._components["tool:dup@"] is first
+
+ def test_ignored_duplicate_resource_returns_the_existing_resource(self):
+ provider = LocalProvider(on_duplicate="ignore")
+ first = provider.add_resource(Resource.from_function(lambda: "1", uri="r://x"))
+
+ second = provider.add_resource(Resource.from_function(lambda: "2", uri="r://x"))
+
+ assert second is first
+ assert provider._components["resource:r://x@"] is first
+
+ def test_ignored_duplicate_prompt_returns_the_existing_prompt(self):
+ provider = LocalProvider(on_duplicate="ignore")
+ first = provider.add_prompt(Prompt(name="dup", description="first"))
+
+ assert provider.add_prompt(Prompt(name="dup", description="second")) is first
+ assert provider._components["prompt:dup@"] is first
+
+ def test_ignored_duplicate_template_returns_the_existing_template(self):
+ provider = LocalProvider(on_duplicate="ignore")
+ first = provider.add_template(
+ ResourceTemplate.from_function(
+ lambda a: "1", uri_template="t://{a}", name="dup"
+ )
+ )
+
+ second = provider.add_template(
+ ResourceTemplate.from_function(
+ lambda a: "2", uri_template="t://{a}", name="dup"
+ )
+ )
+
+ assert second is first
+
+ def test_server_add_tool_returns_the_existing_tool_when_ignoring(self):
+ mcp = FastMCP("Test", on_duplicate="ignore")
+ first = mcp.add_tool(self._tool("first"))
+
+ assert mcp.add_tool(self._tool("second")) is first
+
+ async def test_ignored_duplicate_tool_does_not_disable_the_existing_tool(self):
+ provider = LocalProvider(on_duplicate="ignore")
+
+ @provider.tool(name="dup")
+ def first() -> str:
+ return "first"
+
+ @provider.tool(name="dup", enabled=False)
+ def second() -> str:
+ return "second"
+
+ tools = await FastMCP("Test", providers=[provider]).list_tools()
+ assert [t.name for t in tools] == ["dup"]
+
+ async def test_ignored_duplicate_resource_does_not_disable_the_existing_one(self):
+ provider = LocalProvider(on_duplicate="ignore")
+
+ @provider.resource("r://x")
+ def first() -> str:
+ return "first"
+
+ @provider.resource("r://x", enabled=False)
+ def second() -> str:
+ return "second"
+
+ resources = await FastMCP("Test", providers=[provider]).list_resources()
+ assert [str(r.uri) for r in resources] == ["r://x"]
+
+ async def test_ignored_duplicate_prompt_does_not_disable_the_existing_one(self):
+ provider = LocalProvider(on_duplicate="ignore")
+
+ @provider.prompt(name="dup")
+ def first() -> str:
+ return "first"
+
+ @provider.prompt(name="dup", enabled=False)
+ def second() -> str:
+ return "second"
+
+ prompts = await FastMCP("Test", providers=[provider]).list_prompts()
+ assert [p.name for p in prompts] == ["dup"]
+
+
class TestProviderToolTransformations:
"""Tests for tool transformations via add_transform()."""