π The fast, Pythonic way to build MCP servers and clients.
Fix tool_choice reset for structured output sampling
claude[bot]cfba4394174c
diff --git a/src/fastmcp/server/sampling/run.py b/src/fastmcp/server/sampling/run.pyindex f5c73afef..729968916 100644--- a/src/fastmcp/server/sampling/run.py+++ b/src/fastmcp/server/sampling/run.py@@ -634,7 +634,8 @@ async def sample_impl(# Continue with the updated historycurrent_messages = step.history- # After first iteration, reset tool_choice to auto- tool_choice = None+ # After first iteration, reset tool_choice to auto (unless structured output is required)+ if result_type is None or result_type is str:+ tool_choice = Noneraise RuntimeError(f"Sampling exceeded maximum iterations ({max_iterations})")