Add resources parameter to MCPServer

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

@@ -22,28 +22,26 @@
 class ResourceManager:
     """Manages MCPServer resources."""
 
-    def __init__(self, warn_on_duplicate_resources: bool = True):
+    def __init__(self, warn_on_duplicate_resources: bool = True, *, resources: list[Resource] | None = None):
         self._resources: dict[str, Resource] = {}
         self._templates: dict[str, ResourceTemplate] = {}
         self.warn_on_duplicate_resources = warn_on_duplicate_resources
 
+        for resource in resources or ():
+            self.add_resource(resource)
+
     def add_resource(self, resource: Resource) -> Resource:
         """Add a resource to the manager.
 
         Args:
-            resource: A Resource instance to add
+            resource: A Resource instance to add.
 
         Returns:
-            The added resource. If a resource with the same URI already exists,
-            returns the existing resource.
+            The added resource. If a resource with the same URI already exists, returns the existing resource.
         """
         logger.debug(
             "Adding resource",
-            extra={
-                "uri": resource.uri,
-                "type": type(resource).__name__,
-                "resource_name": resource.name,
-            },
+            extra={"uri": resource.uri, "type": type(resource).__name__, "resource_name": resource.name},
         )
         existing = self._resources.get(str(resource.uri))
         if existing:

src/mcp/server/mcpserver/server.py

@@ -140,6 +140,7 @@ def __init__(
         token_verifier: TokenVerifier | None = None,
         *,
         tools: list[Tool] | None = None,
+        resources: list[Resource] | None = None,
         debug: bool = False,
         log_level: Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"] = "INFO",
         warn_on_duplicate_resources: bool = True,
@@ -162,7 +163,9 @@ def __init__(
         self.dependencies = self.settings.dependencies
 
         self._tool_manager = ToolManager(tools=tools, warn_on_duplicate_tools=self.settings.warn_on_duplicate_tools)
-        self._resource_manager = ResourceManager(warn_on_duplicate_resources=self.settings.warn_on_duplicate_resources)
+        self._resource_manager = ResourceManager(
+            resources=resources, warn_on_duplicate_resources=self.settings.warn_on_duplicate_resources
+        )
         self._prompt_manager = PromptManager(warn_on_duplicate_prompts=self.settings.warn_on_duplicate_prompts)
         self._lowlevel_server = Server(
             name=name or "mcp-server",

src/mcp/server/mcpserver/tools/tool_manager.py

@@ -18,18 +18,12 @@
 class ToolManager:
     """Manages MCPServer tools."""
 
-    def __init__(
-        self,
-        warn_on_duplicate_tools: bool = True,
-        *,
-        tools: list[Tool] | None = None,
-    ):
+    def __init__(self, warn_on_duplicate_tools: bool = True, *, tools: list[Tool] | None = None):
         self._tools: dict[str, Tool] = {}
-        if tools is not None:
-            for tool in tools:
-                if warn_on_duplicate_tools and tool.name in self._tools:
-                    logger.warning(f"Tool already exists: {tool.name}")
-                self._tools[tool.name] = tool
+        for tool in tools or ():
+            if warn_on_duplicate_tools and tool.name in self._tools:
+                logger.warning(f"Tool already exists: {tool.name}")
+            self._tools[tool.name] = tool
 
         self.warn_on_duplicate_tools = warn_on_duplicate_tools
 

tests/server/mcpserver/resources/test_resource_manager.py

@@ -1,5 +1,5 @@
+import logging
 from pathlib import Path
-from tempfile import NamedTemporaryFile
 
 import pytest
 from pydantic import AnyUrl
@@ -8,170 +8,134 @@
 from mcp.server.mcpserver.resources import FileResource, FunctionResource, ResourceManager, ResourceTemplate
 
 
-@pytest.fixture
-def temp_file():
+@pytest.fixture()
+def temp_file(tmp_path: Path):
     """Create a temporary file for testing.
 
     File is automatically cleaned up after the test if it still exists.
     """
-    content = "test content"
-    with NamedTemporaryFile(mode="w", delete=False) as f:
-        f.write(content)
-        path = Path(f.name).resolve()
-    yield path
-    try:  # pragma: lax no cover
-        path.unlink()
-    except FileNotFoundError:  # pragma: lax no cover
-        pass  # File was already deleted by the test
-
-
-class TestResourceManager:
-    """Test ResourceManager functionality."""
-
-    def test_add_resource(self, temp_file: Path):
-        """Test adding a resource."""
-        manager = ResourceManager()
-        resource = FileResource(
-            uri=f"file://{temp_file}",
-            name="test",
-            path=temp_file,
-        )
-        added = manager.add_resource(resource)
-        assert added == resource
-        assert manager.list_resources() == [resource]
-
-    def test_add_duplicate_resource(self, temp_file: Path):
-        """Test adding the same resource twice."""
-        manager = ResourceManager()
-        resource = FileResource(
-            uri=f"file://{temp_file}",
-            name="test",
-            path=temp_file,
-        )
-        first = manager.add_resource(resource)
-        second = manager.add_resource(resource)
-        assert first == second
-        assert manager.list_resources() == [resource]
-
-    def test_warn_on_duplicate_resources(self, temp_file: Path, caplog: pytest.LogCaptureFixture):
-        """Test warning on duplicate resources."""
-        manager = ResourceManager()
-        resource = FileResource(
-            uri=f"file://{temp_file}",
-            name="test",
-            path=temp_file,
-        )
-        manager.add_resource(resource)
-        manager.add_resource(resource)
-        assert "Resource already exists" in caplog.text
-
-    def test_disable_warn_on_duplicate_resources(self, temp_file: Path, caplog: pytest.LogCaptureFixture):
-        """Test disabling warning on duplicate resources."""
-        manager = ResourceManager(warn_on_duplicate_resources=False)
-        resource = FileResource(
-            uri=f"file://{temp_file}",
-            name="test",
-            path=temp_file,
-        )
-        manager.add_resource(resource)
-        manager.add_resource(resource)
-        assert "Resource already exists" not in caplog.text
-
-    @pytest.mark.anyio
-    async def test_get_resource(self, temp_file: Path):
-        """Test getting a resource by URI."""
-        manager = ResourceManager()
-        resource = FileResource(
-            uri=f"file://{temp_file}",
-            name="test",
-            path=temp_file,
-        )
-        manager.add_resource(resource)
-        retrieved = await manager.get_resource(resource.uri, Context())
-        assert retrieved == resource
-
-    @pytest.mark.anyio
-    async def test_get_resource_from_template(self):
-        """Test getting a resource through a template."""
-        manager = ResourceManager()
-
-        def greet(name: str) -> str:
-            return f"Hello, {name}!"
-
-        template = ResourceTemplate.from_function(
-            fn=greet,
-            uri_template="greet://{name}",
-            name="greeter",
-        )
-        manager._templates[template.uri_template] = template
-
-        resource = await manager.get_resource(AnyUrl("greet://world"), Context())
-        assert isinstance(resource, FunctionResource)
-        content = await resource.read()
-        assert content == "Hello, world!"
-
-    @pytest.mark.anyio
-    async def test_get_unknown_resource(self):
-        """Test getting a non-existent resource."""
-        manager = ResourceManager()
-        with pytest.raises(ValueError, match="Unknown resource"):
-            await manager.get_resource(AnyUrl("unknown://test"), Context())
-
-    def test_list_resources(self, temp_file: Path):
-        """Test listing all resources."""
-        manager = ResourceManager()
-        resource1 = FileResource(
-            uri=f"file://{temp_file}",
-            name="test1",
-            path=temp_file,
-        )
-        resource2 = FileResource(
-            uri=f"file://{temp_file}2",
-            name="test2",
-            path=temp_file,
-        )
-        manager.add_resource(resource1)
-        manager.add_resource(resource2)
-        resources = manager.list_resources()
-        assert len(resources) == 2
-        assert resources == [resource1, resource2]
-
-
-class TestResourceManagerMetadata:
-    """Test ResourceManager Metadata"""
-
-    def test_add_template_with_metadata(self):
-        """Test that ResourceManager.add_template() accepts and passes meta parameter."""
-
-        manager = ResourceManager()
-
-        def get_item(id: str) -> str:  # pragma: no cover
-            return f"Item {id}"
-
-        metadata = {"source": "database", "cached": True}
-
-        template = manager.add_template(
-            fn=get_item,
-            uri_template="resource://items/{id}",
-            meta=metadata,
-        )
-
-        assert template.meta is not None
-        assert template.meta == metadata
-        assert template.meta["source"] == "database"
-        assert template.meta["cached"] is True
-
-    def test_add_template_without_metadata(self):
-        """Test that ResourceManager.add_template() works without meta parameter."""
-
-        manager = ResourceManager()
-
-        def get_item(id: str) -> str:  # pragma: no cover
-            return f"Item {id}"
-
-        template = manager.add_template(
-            fn=get_item,
-            uri_template="resource://items/{id}",
-        )
-
-        assert template.meta is None
+    tmp_file = tmp_path / "file"
+    tmp_file.touch()
+    yield tmp_file
+
+
+def test_init_with_resources(temp_file: Path, caplog: pytest.LogCaptureFixture):
+    resource = FileResource(uri=f"file://{temp_file}", name="test", path=temp_file)
+    manager = ResourceManager(resources=[resource])
+    assert manager.list_resources() == [resource]
+
+    duplicate_resource = FileResource(uri=f"file://{temp_file}", name="duplicate", path=temp_file)
+
+    with caplog.at_level(logging.WARNING):
+        manager = ResourceManager(True, resources=[resource, duplicate_resource])
+
+    assert "Resource already exists" in caplog.text
+    assert manager.list_resources() == [resource]
+
+
+def test_add_resource(temp_file: Path):
+    """Test adding a resource."""
+    manager = ResourceManager()
+    resource = FileResource(uri=f"file://{temp_file}", name="test", path=temp_file)
+    added = manager.add_resource(resource)
+    assert added == resource
+    assert manager.list_resources() == [resource]
+
+
+def test_add_duplicate_resource(temp_file: Path):
+    """Test adding the same resource twice."""
+    manager = ResourceManager()
+    resource = FileResource(uri=f"file://{temp_file}", name="test", path=temp_file)
+    first = manager.add_resource(resource)
+    second = manager.add_resource(resource)
+    assert first == second
+    assert manager.list_resources() == [resource]
+
+
+def test_warn_on_duplicate_resources(temp_file: Path, caplog: pytest.LogCaptureFixture):
+    """Test warning on duplicate resources."""
+    manager = ResourceManager()
+    resource = FileResource(uri=f"file://{temp_file}", name="test", path=temp_file)
+    manager.add_resource(resource)
+    manager.add_resource(resource)
+    assert "Resource already exists" in caplog.text
+
+
+def test_disable_warn_on_duplicate_resources(temp_file: Path, caplog: pytest.LogCaptureFixture):
+    """Test disabling warning on duplicate resources."""
+    manager = ResourceManager(warn_on_duplicate_resources=False)
+    resource = FileResource(uri=f"file://{temp_file}", name="test", path=temp_file)
+    manager.add_resource(resource)
+    manager.add_resource(resource)
+    assert "Resource already exists" not in caplog.text
+
+
+@pytest.mark.anyio
+async def test_get_resource(temp_file: Path):
+    """Test getting a resource by URI."""
+    manager = ResourceManager()
+    resource = FileResource(uri=f"file://{temp_file}", name="test", path=temp_file)
+    manager.add_resource(resource)
+    retrieved = await manager.get_resource(resource.uri, Context())
+    assert retrieved == resource
+
+
+@pytest.mark.anyio
+async def test_get_resource_from_template():
+    """Test getting a resource through a template."""
+    manager = ResourceManager()
+
+    def greet(name: str) -> str:
+        return f"Hello, {name}!"
+
+    template = ResourceTemplate.from_function(fn=greet, uri_template="greet://{name}", name="greeter")
+    manager._templates[template.uri_template] = template
+
+    resource = await manager.get_resource(AnyUrl("greet://world"), Context())
+    assert isinstance(resource, FunctionResource)
+    content = await resource.read()
+    assert content == "Hello, world!"
+
+
+@pytest.mark.anyio
+async def test_get_unknown_resource():
+    """Test getting a non-existent resource."""
+    manager = ResourceManager()
+    with pytest.raises(ValueError, match="Unknown resource"):
+        await manager.get_resource(AnyUrl("unknown://test"), Context())
+
+
+def test_list_resources(temp_file: Path):
+    """Test listing all resources."""
+    manager = ResourceManager()
+    resource1 = FileResource(uri=f"file://{temp_file}", name="test1", path=temp_file)
+    resource2 = FileResource(uri=f"file://{temp_file}2", name="test2", path=temp_file)
+
+    manager.add_resource(resource1)
+    manager.add_resource(resource2)
+
+    resources = manager.list_resources()
+    assert len(resources) == 2
+    assert resources == [resource1, resource2]
+
+
+def get_item(id: str) -> str: ...
+
+
+def test_add_template_with_metadata():
+    """Test that ResourceManager.add_template() accepts and passes meta parameter."""
+    manager = ResourceManager()
+    metadata = {"source": "database", "cached": True}
+    template = manager.add_template(fn=get_item, uri_template="resource://items/{id}", meta=metadata)
+
+    assert template.meta is not None
+    assert template.meta == metadata
+    assert template.meta["source"] == "database"
+    assert template.meta["cached"] is True
+
+
+def test_add_template_without_metadata():
+    """Test that ResourceManager.add_template() works without meta parameter."""
+    manager = ResourceManager()
+    template = manager.add_template(fn=get_item, uri_template="resource://items/{id}")
+    assert template.meta is None