Add methods to retrieve all resources and prompts in Bundler and managers

Author: DamyanBG

src/mcp/server/fastmcp/prompts/manager.py

@@ -18,6 +18,9 @@ def __init__(self, warn_on_duplicate_prompts: bool = True):
     def get_prompt(self, name: str) -> Prompt | None:
         """Get prompt by name."""
         return self._prompts.get(name)
+    
+    def get_all_prompts(self) -> dict[str, Prompt]:
+        return self._prompts
 
     def list_prompts(self) -> list[Prompt]:
         """List all registered prompts."""

src/mcp/server/fastmcp/resources/resource_manager.py

@@ -20,6 +20,9 @@ def __init__(self, warn_on_duplicate_resources: bool = True):
         self._templates: dict[str, ResourceTemplate] = {}
         self.warn_on_duplicate_resources = warn_on_duplicate_resources
 
+    def get_all_resources(self) -> tuple[dict[str, Resource], dict[str, ResourceTemplate]]:
+        return self._resources, self._templates
+
     def add_resource(self, resource: Resource) -> Resource:
         """Add a resource to the manager.
 

src/mcp/server/fastmcp/server.py

@@ -587,13 +587,28 @@ def decorator(
             return func
 
         return decorator
-    
+
     def include_bundler(self, bundler: Bundler) -> None:
         """Add bundler of resources, tools and prompts to the server."""
         bundler_tools = bundler.get_tools()
-        for name, tool in bundler_tools.items():
-            self.add_tool(tool.fn, name, tool.description, tool.annotations)
-        # TODO finish code for resources and prompts
+        for tool_name, tool in bundler_tools.items():
+            self.add_tool(tool.fn, tool_name, tool.description, tool.annotations)
+
+        bundler_resources, bundler_templates = bundler.get_resources()
+        for resource in bundler_resources.values():
+            self.add_resource(resource)
+        for template_name, template in bundler_templates.items():
+            self._resource_manager.add_template(
+                template.fn,
+                template.uri_template,
+                template_name,
+                template.description,
+                template.mime_type,
+            )
+
+        bundler_prompts = bundler.get_prompts()
+        for prompt in bundler_prompts.values():
+            self.add_prompt(prompt)
 
     async def run_stdio_async(self) -> None:
         """Run the server using stdio transport."""

src/mcp/server/fastmcp/utilities/bundler.py

@@ -3,7 +3,12 @@
 from collections.abc import Callable
 
 from mcp.server.fastmcp.prompts import Prompt, PromptManager
-from mcp.server.fastmcp.resources import FunctionResource, Resource, ResourceManager
+from mcp.server.fastmcp.resources import (
+    FunctionResource,
+    Resource,
+    ResourceManager,
+    ResourceTemplate,
+)
 from mcp.server.fastmcp.tools import Tool, ToolManager
 from mcp.types import (
     AnyFunction,
@@ -12,16 +17,13 @@
 
 
 class Bundler:
-    def __init__(self, tools: list[Tool] | None = None,):
-        self._tool_manager = ToolManager(
-            tools=tools, warn_on_duplicate_tools=True
-        )
-        self._resource_manager = ResourceManager(
-            warn_on_duplicate_resources=True
-        )
-        self._prompt_manager = PromptManager(
-            warn_on_duplicate_prompts=True
-        )
+    def __init__(
+        self,
+        tools: list[Tool] | None = None,
+    ):
+        self._tool_manager = ToolManager(tools=tools, warn_on_duplicate_tools=True)
+        self._resource_manager = ResourceManager(warn_on_duplicate_resources=True)
+        self._prompt_manager = PromptManager(warn_on_duplicate_prompts=True)
 
     def add_tool(
         self,
@@ -91,10 +93,10 @@ def decorator(fn: AnyFunction) -> AnyFunction:
             return fn
 
         return decorator
-    
+
     def get_tools(self) -> dict[str, Tool]:
         return self._tool_manager.get_all_tools()
-    
+
     def add_resource(self, resource: Resource) -> None:
         """Add a resource to the server.
 
@@ -192,6 +194,9 @@ def decorator(fn: AnyFunction) -> AnyFunction:
 
         return decorator
 
+    def get_resources(self) -> tuple[dict[str, Resource], dict[str, ResourceTemplate]]:
+        return self._resource_manager.get_all_resources()
+
     def add_prompt(self, prompt: Prompt) -> None:
         """Add a prompt to the server.
 
@@ -249,3 +254,6 @@ def decorator(func: AnyFunction) -> AnyFunction:
             return func
 
         return decorator
+    
+    def get_prompts(self) -> dict[str, Prompt]:
+        return self._prompt_manager.get_all_prompts()