mirror of
https://github.com/PrefectHQ/fastmcp.git
synced 2026-08-14 17:49:11 +02:00
* MCP → SDK (vocab change only)
* WIP: Sampling API with SamplingResult[T] and result_type
* SEP-1577: Sampling with tools
- Add tools and result_type parameters to ctx.sample()
- Update OpenAI handler for tool content types
- Client advertises sampling.tools capability by default
- Collect tool results into single message with list content
* Fix tool result content handling in OpenAI handler
* Remove @sampling_tool decorator - pass functions directly to sample()
Functions passed to ctx.sample(tools=[...]) are now auto-converted
via SamplingTool.from_function(). Users can still use that method
directly for custom name/description overrides.
* Remove auto-conversion of MCP tools to sampling tools
Users want MCP tools passed to ctx.sample() to go through the full MCP
machinery (middleware, native responses) rather than being auto-converted
to direct function calls. Now only SamplingTool and plain callables are
accepted - passing a FastMCP Tool raises a clear TypeError.
Also bumps mcp dependency to >=1.24.0 for required sampling features.
* Refactor sampling API: replace sample_iter() with sample_step()
Replace the mutable SampleRun/sample_iter() pattern with a simpler stateless
sample_step() function. sample_step() makes a single LLM call and returns a
SampleStep with the response and history. sample() now loops sample_step()
internally.
Key changes:
- Add sample_step() for fine-grained control over the sampling loop
- Remove SampleRun class and sample_iter() method
- Structured output uses tool description only (no prompt modification)
- execute_tools parameter controls automatic vs manual tool execution
* Address CodeRabbit nitpicks
* Address CodeRabbit review feedback for sampling tools
- Fix temperature=0.0 being dropped due to falsy evaluation
- Add ToolChoice.name support for forcing specific tools
- Replace assert statements with explicit RuntimeError checks
- Add mask_error_details parameter to sample()/sample_step() with ToolError escape hatch
- Fix hasattr patterns with proper isinstance checks
- Document mask_error_details and add OpenAI prerequisites to docs
* Address additional CodeRabbit review feedback
- Catch ValidationError specifically instead of bare Exception
- Update result_type docs to mention dataclasses and basic types
- Raise ValueError for unknown tool_choice modes
- Validate sampling_handler_behavior to catch typos
- Remove ToolChoice.name handling (not part of MCP spec)
- Validate tool_choice string in sample_step()
* Review fixes for sampling tools PR
- Remove internal functions from sampling __init__.py exports
- Remove fragile is_text property, use not is_tool_use instead
- Inline call_client into context.py, remove from run.py
- Fix SamplingMessage docs to use TextContent
- Handle result.text being None in doc examples
- Simplify client sampling docs to recommend OpenAISamplingHandler
- Add sampling_capabilities override documentation
- Raise iteration limit from 50 to 100
- Remove _parse_model_preferences duplication
- Use AsyncOpenAI in OpenAISamplingHandler
- Fix tool_choice docstring
* Fix OpenAI handler tests to use AsyncOpenAI
* Address remaining CodeRabbit review comments
- Fix message ordering in OpenAI handler: tool results now correctly
follow assistant message with tool_calls
- sample_step() now always includes assistant message in history
- Raise ValueError on JSON parse errors instead of silent {}
- Add has_sampling capability check when behavior is None
- Raise RuntimeError when structured output receives text response
- Wrap primitive result_type schemas in object wrapper
- Fix docs example using invalid SamplingMessage construction
- Add comprehensive client_sampling_test.py example
* Add return type annotation to OpenAISamplingHandler.__init__
* Use explicit 'is not None' check for sampling_capabilities defaulting
---------
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: Bill Easton <strawgate@users.noreply.github.com>
182 lines
6.5 KiB
Python
182 lines
6.5 KiB
Python
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
from mcp.types import ModelPreferences
|
|
|
|
from fastmcp.server.context import (
|
|
Context,
|
|
_parse_model_preferences,
|
|
)
|
|
from fastmcp.server.server import FastMCP
|
|
|
|
|
|
@pytest.fixture
|
|
def context():
|
|
return Context(fastmcp=FastMCP())
|
|
|
|
|
|
class TestParseModelPreferences:
|
|
def test_parse_model_preferences_string(self, context):
|
|
mp = _parse_model_preferences("claude-haiku-4-5")
|
|
assert isinstance(mp, ModelPreferences)
|
|
assert mp.hints is not None
|
|
assert mp.hints[0].name == "claude-haiku-4-5"
|
|
|
|
def test_parse_model_preferences_list(self, context):
|
|
mp = _parse_model_preferences(["claude-haiku-4-5", "claude"])
|
|
assert isinstance(mp, ModelPreferences)
|
|
assert mp.hints is not None
|
|
assert [h.name for h in mp.hints] == ["claude-haiku-4-5", "claude"]
|
|
|
|
def test_parse_model_preferences_object(self, context):
|
|
obj = ModelPreferences(hints=[])
|
|
assert _parse_model_preferences(obj) is obj
|
|
|
|
def test_parse_model_preferences_invalid_type(self, context):
|
|
with pytest.raises(ValueError):
|
|
_parse_model_preferences(model_preferences=123) # pyright: ignore[reportArgumentType] # type: ignore[invalid-argument-type]
|
|
|
|
|
|
class TestSessionId:
|
|
def test_session_id_with_http_headers(self, context):
|
|
"""Test that session_id returns the value from mcp-session-id header."""
|
|
from mcp.server.lowlevel.server import request_ctx
|
|
from mcp.shared.context import RequestContext
|
|
|
|
mock_headers = {"mcp-session-id": "test-session-123"}
|
|
|
|
token = request_ctx.set(
|
|
RequestContext( # type: ignore[arg-type]
|
|
request_id=0,
|
|
meta=None,
|
|
session=MagicMock(wraps={}),
|
|
lifespan_context=MagicMock(),
|
|
request=MagicMock(headers=mock_headers),
|
|
)
|
|
)
|
|
|
|
assert context.session_id == "test-session-123"
|
|
|
|
request_ctx.reset(token)
|
|
|
|
def test_session_id_without_http_headers(self, context):
|
|
"""Test that session_id returns a UUID string when no HTTP headers are available."""
|
|
import uuid
|
|
|
|
from mcp.server.lowlevel.server import request_ctx
|
|
from mcp.shared.context import RequestContext
|
|
|
|
token = request_ctx.set(
|
|
RequestContext( # type: ignore[arg-type]
|
|
request_id=0,
|
|
meta=None,
|
|
session=MagicMock(wraps={}),
|
|
lifespan_context=MagicMock(),
|
|
)
|
|
)
|
|
|
|
assert uuid.UUID(context.session_id)
|
|
|
|
request_ctx.reset(token)
|
|
|
|
|
|
class TestContextState:
|
|
"""Test suite for Context state functionality."""
|
|
|
|
async def test_context_state(self):
|
|
"""Test that state modifications in child contexts don't affect parent."""
|
|
mock_fastmcp = MagicMock()
|
|
|
|
async with Context(fastmcp=mock_fastmcp) as context:
|
|
assert context.get_state("test1") is None
|
|
assert context.get_state("test2") is None
|
|
context.set_state("test1", "value")
|
|
context.set_state("test2", 2)
|
|
assert context.get_state("test1") == "value"
|
|
assert context.get_state("test2") == 2
|
|
context.set_state("test1", "new_value")
|
|
assert context.get_state("test1") == "new_value"
|
|
|
|
async def test_context_state_inheritance(self):
|
|
"""Test that child contexts inherit parent state."""
|
|
mock_fastmcp = MagicMock()
|
|
|
|
async with Context(fastmcp=mock_fastmcp) as context1:
|
|
context1.set_state("key1", "key1-context1")
|
|
context1.set_state("key2", "key2-context1")
|
|
async with Context(fastmcp=mock_fastmcp) as context2:
|
|
# Override one key
|
|
context2.set_state("key1", "key1-context2")
|
|
assert context2.get_state("key1") == "key1-context2"
|
|
assert context1.get_state("key1") == "key1-context1"
|
|
assert context2.get_state("key2") == "key2-context1"
|
|
|
|
async with Context(fastmcp=mock_fastmcp) as context3:
|
|
# Verify state was inherited
|
|
assert context3.get_state("key1") == "key1-context2"
|
|
assert context3.get_state("key2") == "key2-context1"
|
|
|
|
# Add a new key and verify parents were not affected
|
|
context3.set_state("key-context3-only", 1)
|
|
assert context1.get_state("key-context3-only") is None
|
|
assert context2.get_state("key-context3-only") is None
|
|
assert context3.get_state("key-context3-only") == 1
|
|
|
|
assert context1.get_state("key1") == "key1-context1"
|
|
assert context1.get_state("key-context3-only") is None
|
|
|
|
|
|
class TestContextMeta:
|
|
"""Test suite for Context meta functionality."""
|
|
|
|
def test_request_context_meta_access(self, context):
|
|
"""Test that meta can be accessed from request context."""
|
|
from mcp.server.lowlevel.server import request_ctx
|
|
from mcp.shared.context import RequestContext
|
|
|
|
# Create a mock meta object with attributes
|
|
class MockMeta:
|
|
def __init__(self):
|
|
self.user_id = "user-123"
|
|
self.trace_id = "trace-456"
|
|
self.custom_field = "custom-value"
|
|
|
|
mock_meta = MockMeta()
|
|
|
|
token = request_ctx.set(
|
|
RequestContext( # type: ignore[arg-type]
|
|
request_id=0,
|
|
meta=mock_meta, # type: ignore[arg-type]
|
|
session=MagicMock(wraps={}),
|
|
lifespan_context=MagicMock(),
|
|
)
|
|
)
|
|
|
|
# Access meta through context
|
|
retrieved_meta = context.request_context.meta
|
|
assert retrieved_meta is not None
|
|
assert retrieved_meta.user_id == "user-123"
|
|
assert retrieved_meta.trace_id == "trace-456"
|
|
assert retrieved_meta.custom_field == "custom-value"
|
|
|
|
request_ctx.reset(token)
|
|
|
|
def test_request_context_meta_none(self, context):
|
|
"""Test that context handles None meta gracefully."""
|
|
from mcp.server.lowlevel.server import request_ctx
|
|
from mcp.shared.context import RequestContext
|
|
|
|
token = request_ctx.set(
|
|
RequestContext( # type: ignore[arg-type]
|
|
request_id=0,
|
|
meta=None,
|
|
session=MagicMock(wraps={}),
|
|
lifespan_context=MagicMock(),
|
|
)
|
|
)
|
|
|
|
# Access meta through context
|
|
retrieved_meta = context.request_context.meta
|
|
assert retrieved_meta is None
|
|
|
|
request_ctx.reset(token)
|