modelcontextprotocol/python-sdk
Watch
1
0
Fork
You've already forked python-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: remove request_ctx ContextVar, thread Context explicitly (#2203)

Browse source 
Co-authored-by: Marcelo Trylesinski <marcelotryle@gmail.com>
This commit is contained in:
Max Isbey 2026-03-04 13:23:02 +00:00 • committed by GitHub
commit cc22bf5464
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 484 additions and 413 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/server/mcpserver/resources/test_resource_manager.py
View file

@ -4,6 +4,7 @@ from tempfile import NamedTemporaryFile
import pytest
from pydantic import AnyUrl
from mcp.server.mcpserver import Context
from mcp.server.mcpserver.resources import FileResource, FunctionResource, ResourceManager, ResourceTemplate
@ -86,7 +87,7 @@ class TestResourceManager:
path=temp_file,
)
manager.add_resource(resource)
retrieved = await manager.get_resource(resource.uri)
retrieved = await manager.get_resource(resource.uri, Context())
assert retrieved == resource
@pytest.mark.anyio
@ -104,7 +105,7 @@ class TestResourceManager:
)
manager._templates[template.uri_template] = template
resource = await manager.get_resource(AnyUrl("greet://world"))
resource = await manager.get_resource(AnyUrl("greet://world"), Context())
assert isinstance(resource, FunctionResource)
content = await resource.read()
assert content == "Hello, world!"
@ -114,7 +115,7 @@ class TestResourceManager:
"""Test getting a non-existent resource."""
manager = ResourceManager()
with pytest.raises(ValueError, match="Unknown resource"):
await manager.get_resource(AnyUrl("unknown://test"))
await manager.get_resource(AnyUrl("unknown://test"), Context())
def test_list_resources(self, temp_file: Path):
"""Test listing all resources."""

13
tests/server/mcpserver/resources/test_resource_template.py
View file

@ -4,7 +4,7 @@ from typing import Any
import pytest
from pydantic import BaseModel
from mcp.server.mcpserver import MCPServer
from mcp.server.mcpserver import Context, MCPServer
from mcp.server.mcpserver.resources import FunctionResource, ResourceTemplate
from mcp.types import Annotations
@ -64,6 +64,7 @@ class TestResourceTemplate:
resource = await template.create_resource(
"test://foo/123",
{"key": "foo", "value": 123},
Context(),
)
assert isinstance(resource, FunctionResource)
@ -86,7 +87,7 @@ class TestResourceTemplate:
)
with pytest.raises(ValueError, match="Error creating resource from template"):
await template.create_resource("fail://test", {"x": "test"})
await template.create_resource("fail://test", {"x": "test"}, Context())
@pytest.mark.anyio
async def test_async_text_resource(self):
@ -104,6 +105,7 @@ class TestResourceTemplate:
resource = await template.create_resource(
"greet://world",
{"name": "world"},
Context(),
)
assert isinstance(resource, FunctionResource)
@ -126,6 +128,7 @@ class TestResourceTemplate:
resource = await template.create_resource(
"bytes://test",
{"value": "test"},
Context(),
)
assert isinstance(resource, FunctionResource)
@ -152,6 +155,7 @@ class TestResourceTemplate:
resource = await template.create_resource(
"test://foo/123",
{"key": "foo", "value": 123},
Context(),
)
assert isinstance(resource, FunctionResource)
@ -183,6 +187,7 @@ class TestResourceTemplate:
resource = await template.create_resource(
"test://hello",
{"value": "hello"},
Context(),
)
assert isinstance(resource, FunctionResource)
@ -249,7 +254,7 @@ class TestResourceTemplateAnnotations:
)
# Create a resource from the template
resource = await template.create_resource("resource://items/123", {"item_id": "123"})
resource = await template.create_resource("resource://items/123", {"item_id": "123"}, Context())
# The resource should inherit the template's annotations
assert resource.annotations is not None
@ -298,7 +303,7 @@ class TestResourceTemplateMetadata:
)
# Create a resource from the template
resource = await template.create_resource("resource://items/123", {"item_id": "123"})
resource = await template.create_resource("resource://items/123", {"item_id": "123"}, Context())
# The resource should inherit the template's metadata
assert resource.meta is not None