* Add structured output to the Python weather server and client
Both tools declare an output schema - the return type annotation - and return
structured_content alongside the text.
get_alerts answers with a top-level JSON array rather than an array nested in
an object, which protocol revision 2026-07-28 is the first to allow. "No
alerts" is simply []. get_forecast returns an object, for contrast.
The detail worth reading the source for: Alerts is a RootModel[list[Alert]],
not a plain list[Alert]. A list is not a JSON object, so the SDK wraps it as
{"result": [...]} and advertises an object-rooted schema to match, with no
opt-out. A RootModel is a BaseModel, so it is taken as the schema exactly as
written, and a RootModel over a list serializes as the bare list.
Error paths raise: a tool declaring an output schema MUST return conforming
structured content, so a path with no data has to fail.
The client moves to the 2.0 Client API with mode="auto" and prints the
negotiated version on connect. call_tool already revalidates every non-error
result against the declared schema, so the client-side SHOULD needs no code.
Each channel goes to its stated reader: content is forwarded to the model,
structured_content is used as data, reporting how many items came back.
This clears the staleness modelcontextprotocol#3124 flags against this
repository - weather.py imported mcp.server.fastmcp, client.py held the
ClientSession version - and matches that PR's idioms: the short
"from mcp.server import MCPServer" spelling, httpx2 with httpx dropped from
the dependencies since httpx2>=2.5.0 is a hard dependency of mcp,
result.content narrowed to TextContent, and input() on a worker thread.
Requires mcp 2.0.0b2; pyproject.toml sets [tool.uv] prerelease = "allow" so
plain uv run and uv sync work without flags. Model identifier moves to
claude-sonnet-5.
Note that an array-rooted schema only works on a 2026-07-28 connection. This
SDK does not project it down for older clients; it raises server-side instead.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Update to mcp 2.0.0
The SDK left beta on 2026-07-28, so the pins move off 2.0.0b2 and both
projects drop `[tool.uv] prerelease = allow` — plain `uv run` works now.
Also from review: declare the imports rather than lean on transitive
resolution. weather.py imports httpx2 and client.py imports mcp_types, so
both are listed explicitly. The client README no longer implies every
structured result is counted — only array-rooted ones are.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Fix get_alerts failing when NWS sends a null field
`dict.get(key, default)` returns the default only when the key is absent. The
NWS API sends these fields as explicit nulls instead of omitting them, so
`props.get(instruction, ...)` passed None straight into a `str` field and
Pydantic rejected the whole result.
One alert in eight for TX is a Special Weather Statement with a null
instruction, which was enough to fail the entire call:
Error executing tool get_alerts: 1 validation error for Alert
instructions
Input should be a valid string [type=string_type, input_value=None]
The smoke test missed it twice over: it calls get_alerts with CA, whose
alerts happen to have no nulls today, and it reports an isError result as a
skip rather than a failure.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* Say "structured content", not "structured output"
The spec never uses the phrase "structured output". It defines two separate
things under Tool Result: "Structured Content" (the `structuredContent` field)
and "Output Schema" (the `outputSchema` field). Collapsing them into
"structured output" conflates the two.
It is also actively confusing here. In LLM tooling "structured output" means
constrained decoding — making the *model* emit conforming JSON. These clients
call a model API, so a reader could reasonably take the phrase to mean the
tool constrains the model's response, which is the opposite of what is going
on: the tool describes the shape of its own result.
Headings and prose now say "structured content". References to real
identifiers are left alone: the Python SDK's own docs page is called
Structured Output and lives at docs/servers/structured-output.md, and its
decorator parameter is `structured_output`.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
179 lines
6.2 KiB
Python
179 lines
6.2 KiB
Python
import asyncio
|
|
import os
|
|
from contextlib import AsyncExitStack
|
|
from pathlib import Path
|
|
|
|
from anthropic import Anthropic
|
|
from dotenv import load_dotenv
|
|
from mcp import Client, StdioServerParameters
|
|
from mcp.client.stdio import stdio_client
|
|
from mcp_types import TextContent
|
|
|
|
load_dotenv() # load environment variables from .env
|
|
|
|
# Claude model constant
|
|
ANTHROPIC_MODEL = "claude-sonnet-5"
|
|
# Sonnet 5 thinks adaptively unless told otherwise, and max_tokens caps thinking
|
|
# plus the reply, so leave room for both.
|
|
MAX_TOKENS = 10000
|
|
MAX_TOOL_TURNS = 10
|
|
|
|
|
|
class MCPClient:
|
|
def __init__(self):
|
|
# Initialize session and client objects
|
|
self.client: Client | None = None
|
|
self.exit_stack = AsyncExitStack()
|
|
self._anthropic: Anthropic | None = None
|
|
|
|
@property
|
|
def anthropic(self) -> Anthropic:
|
|
"""Lazy-initialize Anthropic client when needed"""
|
|
if self._anthropic is None:
|
|
self._anthropic = Anthropic(api_key=os.getenv("ANTHROPIC_API_KEY"))
|
|
return self._anthropic
|
|
|
|
async def connect_to_server(self, server_script_path: str):
|
|
"""Connect to an MCP server
|
|
|
|
Args:
|
|
server_script_path: Path to the server script (.py or .js)
|
|
"""
|
|
is_python = server_script_path.endswith(".py")
|
|
is_js = server_script_path.endswith(".js")
|
|
if not (is_python or is_js):
|
|
raise ValueError("Server script must be a .py or .js file")
|
|
|
|
if is_python:
|
|
path = Path(server_script_path).resolve()
|
|
server_params = StdioServerParameters(
|
|
command="uv",
|
|
args=["--directory", str(path.parent), "run", path.name],
|
|
env=None,
|
|
)
|
|
else:
|
|
server_params = StdioServerParameters(command="node", args=[server_script_path], env=None)
|
|
|
|
# "auto" probes server/discover, falling back to the 2025-11-25 handshake.
|
|
self.client = await self.exit_stack.enter_async_context(
|
|
Client(stdio_client(server_params), mode="auto")
|
|
)
|
|
|
|
# List available tools
|
|
response = await self.client.list_tools()
|
|
tools = response.tools
|
|
print(f"\nConnected over protocol {self.client.protocol_version} with tools:", [tool.name for tool in tools])
|
|
|
|
async def process_query(self, query: str) -> str:
|
|
"""Process a query using Claude and available tools"""
|
|
messages = [{"role": "user", "content": query}]
|
|
|
|
tools_response = await self.client.list_tools()
|
|
available_tools = [
|
|
{"name": tool.name, "description": tool.description, "input_schema": tool.input_schema}
|
|
for tool in tools_response.tools
|
|
]
|
|
|
|
final_text = []
|
|
|
|
response = self.anthropic.messages.create(
|
|
model=ANTHROPIC_MODEL, max_tokens=MAX_TOKENS, messages=messages, tools=available_tools
|
|
)
|
|
|
|
for _ in range(MAX_TOOL_TURNS):
|
|
tool_uses = []
|
|
for content in response.content:
|
|
if content.type == "text":
|
|
final_text.append(content.text)
|
|
elif content.type == "tool_use":
|
|
tool_uses.append(content)
|
|
|
|
if not tool_uses:
|
|
return "\n".join(final_text)
|
|
|
|
tool_results = []
|
|
for tool_use in tool_uses:
|
|
# call_tool validates the result against the declared schema.
|
|
result = await self.client.call_tool(tool_use.name, tool_use.input)
|
|
final_text.append(f"[Calling tool {tool_use.name} with args {tool_use.input}]")
|
|
|
|
# structured_content is data the application can use directly.
|
|
if isinstance(result.structured_content, list):
|
|
final_text.append(f"[{tool_use.name} returned {len(result.structured_content)} items]")
|
|
|
|
# content is a list of block types; forward only the text ones.
|
|
tool_results.append(
|
|
{
|
|
"type": "tool_result",
|
|
"tool_use_id": tool_use.id,
|
|
"content": "\n".join(
|
|
block.text for block in result.content if isinstance(block, TextContent)
|
|
),
|
|
"is_error": bool(result.is_error),
|
|
}
|
|
)
|
|
|
|
messages.append({"role": "assistant", "content": response.content})
|
|
messages.append({"role": "user", "content": tool_results})
|
|
|
|
response = self.anthropic.messages.create(
|
|
model=ANTHROPIC_MODEL,
|
|
max_tokens=MAX_TOKENS,
|
|
messages=messages,
|
|
tools=available_tools,
|
|
)
|
|
|
|
final_text.append(f"[Stopped after {MAX_TOOL_TURNS} tool-use turns]")
|
|
return "\n".join(final_text)
|
|
|
|
async def chat_loop(self):
|
|
"""Run an interactive chat loop"""
|
|
print("\nMCP Client Started!")
|
|
print("Type your queries or 'quit' to exit.")
|
|
|
|
while True:
|
|
# input() blocks, so keep it off the event loop.
|
|
try:
|
|
query = (await asyncio.to_thread(input, "\nQuery: ")).strip()
|
|
except (EOFError, KeyboardInterrupt):
|
|
break
|
|
|
|
if query.lower() == "quit":
|
|
break
|
|
|
|
try:
|
|
response = await self.process_query(query)
|
|
print("\n" + response)
|
|
except Exception as e:
|
|
print(f"\nError: {str(e)}")
|
|
|
|
async def cleanup(self):
|
|
"""Clean up resources"""
|
|
await self.exit_stack.aclose()
|
|
|
|
|
|
async def main():
|
|
if len(sys.argv) < 2:
|
|
print("Usage: python client.py <path_to_server_script>")
|
|
sys.exit(1)
|
|
|
|
client = MCPClient()
|
|
try:
|
|
await client.connect_to_server(sys.argv[1])
|
|
|
|
# Check if we have a valid API key to continue
|
|
api_key = os.getenv("ANTHROPIC_API_KEY")
|
|
if not api_key:
|
|
print("\nNo ANTHROPIC_API_KEY found. To query these tools with Claude, set your API key:")
|
|
print(" export ANTHROPIC_API_KEY=your-api-key-here")
|
|
return
|
|
|
|
await client.chat_loop()
|
|
finally:
|
|
await client.cleanup()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
import sys
|
|
|
|
asyncio.run(main())
|