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: use snake case instead of camel case in types (#1894)

Browse source
This commit is contained in:
Marcelo Trylesinski 2026-01-16 15:51:27 +01:00 • committed by GitHub
commit e94b386a13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 1063 additions and 1057 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/mcp/client/experimental/task_handlers.py
View file

@ -225,7 +225,7 @@ class ExperimentalTaskHandlers:
requests_capability: types.ClientTasksRequestsCapability | None = None
if has_sampling or has_elicitation:
requests_capability = types.ClientTasksRequestsCapability(
sampling=types.TasksSamplingCapability(createMessage=types.TasksCreateMessageCapability())
sampling=types.TasksSamplingCapability(create_message=types.TasksCreateMessageCapability())
if has_sampling
else None,
elicitation=types.TasksElicitationCapability(create=types.TasksCreateElicitationCapability())

10
src/mcp/client/experimental/tasks.py
View file

@ -8,7 +8,7 @@ WARNING: These APIs are experimental and may change without notice.
Example:
# Call a tool as a task
result = await session.experimental.call_tool_as_task("tool_name", {"arg": "value"})
task_id = result.task.taskId
task_id = result.task.task_id
# Get task status
status = await session.experimental.get_task(task_id)
@ -77,7 +77,7 @@ class ExperimentalClientFeatures:
result = await session.experimental.call_tool_as_task(
"long_running_tool", {"input": "data"}
)
task_id = result.task.taskId
task_id = result.task.task_id
# Poll for completion
while True:
@ -120,7 +120,7 @@ class ExperimentalClientFeatures:
return await self._session.send_request(
types.ClientRequest(
types.GetTaskRequest(
params=types.GetTaskRequestParams(taskId=task_id),
params=types.GetTaskRequestParams(task_id=task_id),
)
),
types.GetTaskResult,
@ -148,7 +148,7 @@ class ExperimentalClientFeatures:
return await self._session.send_request(
types.ClientRequest(
types.GetTaskPayloadRequest(
params=types.GetTaskPayloadRequestParams(taskId=task_id),
params=types.GetTaskPayloadRequestParams(task_id=task_id),
)
),
result_type,
@ -188,7 +188,7 @@ class ExperimentalClientFeatures:
return await self._session.send_request(
types.ClientRequest(
types.CancelTaskRequest(
params=types.CancelTaskRequestParams(taskId=task_id),
params=types.CancelTaskRequestParams(task_id=task_id),
)
),
types.CancelTaskResult,

20
src/mcp/client/session.py
View file

@ -161,7 +161,7 @@ class ClientSession(
# TODO: Should this be based on whether we
# _will_ send notifications, or only whether
# they're supported?
types.RootsCapability(listChanged=True)
types.RootsCapability(list_changed=True)
if self._list_roots_callback is not _default_list_roots_callback
else None
)
@ -170,7 +170,7 @@ class ClientSession(
types.ClientRequest(
types.InitializeRequest(
params=types.InitializeRequestParams(
protocolVersion=types.LATEST_PROTOCOL_VERSION,
protocol_version=types.LATEST_PROTOCOL_VERSION,
capabilities=types.ClientCapabilities(
sampling=sampling,
elicitation=elicitation,
@ -178,15 +178,15 @@ class ClientSession(
roots=roots,
tasks=self._task_handlers.build_capability(),
),
clientInfo=self._client_info,
client_info=self._client_info,
),
)
),
types.InitializeResult,
)
if result.protocolVersion not in SUPPORTED_PROTOCOL_VERSIONS:
raise RuntimeError(f"Unsupported protocol version from the server: {result.protocolVersion}")
if result.protocol_version not in SUPPORTED_PROTOCOL_VERSIONS:
raise RuntimeError(f"Unsupported protocol version from the server: {result.protocol_version}")
self._server_capabilities = result.capabilities
@ -235,7 +235,7 @@ class ClientSession(
types.ClientNotification(
types.ProgressNotification(
params=types.ProgressNotificationParams(
progressToken=progress_token,
progress_token=progress_token,
progress=progress,
total=total,
message=message,
@ -326,7 +326,7 @@ class ClientSession(
progress_callback=progress_callback,
)
if not result.isError:
if not result.is_error:
await self._validate_tool_result(name, result)
return result
@ -346,12 +346,12 @@ class ClientSession(
if output_schema is not None:
from jsonschema import SchemaError, ValidationError, validate
if result.structuredContent is None:
if result.structured_content is None:
raise RuntimeError(
f"Tool {name} has an output schema but did not return structured content"
) # pragma: no cover
try:
validate(result.structuredContent, output_schema)
validate(result.structured_content, output_schema)
except ValidationError as e:
raise RuntimeError(f"Invalid structured content returned by tool {name}: {e}") # pragma: no cover
except SchemaError as e: # pragma: no cover
@ -418,7 +418,7 @@ class ClientSession(
# Cache tool output schemas for future validation
# Note: don't clear the cache, as we may be using a cursor
for tool in result.tools:
self._tool_output_schemas[tool.name] = tool.outputSchema
self._tool_output_schemas[tool.name] = tool.output_schema
return result

6
src/mcp/client/session_group.py
View file

@ -119,9 +119,9 @@ class ClientSessionGroup:
_exit_stack: contextlib.AsyncExitStack
_session_exit_stacks: dict[mcp.ClientSession, contextlib.AsyncExitStack]
# Optional fn consuming (component_name, serverInfo) for custom names.
# Optional fn consuming (component_name, server_info) for custom names.
# This is provide a means to mitigate naming conflicts across servers.
# Example: (tool_name, serverInfo) => "{result.serverInfo.name}.{tool_name}"
# Example: (tool_name, server_info) => "{result.server_info.name}.{tool_name}"
_ComponentNameHook: TypeAlias = Callable[[str, types.Implementation], str]
_component_name_hook: _ComponentNameHook | None
@ -324,7 +324,7 @@ class ClientSessionGroup:
# main _exit_stack.
await self._exit_stack.enter_async_context(session_stack)
return result.serverInfo, session
return result.server_info, session
except Exception: # pragma: no cover
# If anything during this setup fails, ensure the session-specific
# stack is closed.

2
src/mcp/client/sse.py
View file

@ -110,7 +110,7 @@ async def sse_client(
continue
try:
message = types.JSONRPCMessage.model_validate_json( # noqa: E501
sse.data
sse.data, by_name=False
)
logger.debug(f"Received server message: {message}")
except Exception as exc: # pragma: no cover

2
src/mcp/client/stdio/__init__.py
View file

@ -152,7 +152,7 @@ async def stdio_client(server: StdioServerParameters, errlog: TextIO = sys.stder
for line in lines:
try:
message = types.JSONRPCMessage.model_validate_json(line)
message = types.JSONRPCMessage.model_validate_json(line, by_name=False)
except Exception as exc: # pragma: no cover
logger.exception("Failed to parse JSONRPC message from server")
await read_stream_writer.send(exc)

8
src/mcp/client/streamable_http.py
View file

@ -113,8 +113,8 @@ class StreamableHTTPTransport:
if isinstance(message.root, JSONRPCResponse) and message.root.result: # pragma: no branch
try:
# Parse the result as InitializeResult for type safety
init_result = InitializeResult.model_validate(message.root.result)
self.protocol_version = str(init_result.protocolVersion)
init_result = InitializeResult.model_validate(message.root.result, by_name=False)
self.protocol_version = str(init_result.protocol_version)
logger.info(f"Negotiated protocol version: {self.protocol_version}")
except Exception: # pragma: no cover
logger.warning("Failed to parse initialization response as InitializeResult", exc_info=True)
@ -137,7 +137,7 @@ class StreamableHTTPTransport:
await resumption_callback(sse.id)
return False
try:
message = JSONRPCMessage.model_validate_json(sse.data)
message = JSONRPCMessage.model_validate_json(sse.data, by_name=False)
logger.debug(f"SSE message: {message}")
# Extract protocol version from initialization response
@ -291,7 +291,7 @@ class StreamableHTTPTransport:
"""Handle JSON response from the server."""
try:
content = await response.aread()
message = JSONRPCMessage.model_validate_json(content)
message = JSONRPCMessage.model_validate_json(content, by_name=False)
# Extract protocol version from initialization response
if is_initialization:

2
src/mcp/client/websocket.py
View file

@ -53,7 +53,7 @@ async def websocket_client(
async with read_stream_writer:
async for raw_text in ws:
try:
message = types.JSONRPCMessage.model_validate_json(raw_text)
message = types.JSONRPCMessage.model_validate_json(raw_text, by_name=False)
session_message = SessionMessage(message)
await read_stream_writer.send(session_message)
except ValidationError as exc: # pragma: no cover