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
4 changed files with 1063 additions and 1057 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/mcp/server/experimental/request_context.py
View file

@ -122,7 +122,7 @@ class Experimental:
Returns:
None if valid, ErrorData if invalid and raise_error=False
"""
mode = tool.execution.taskSupport if tool.execution else None
mode = tool.execution.task_support if tool.execution else None
return self.validate_task_mode(mode, raise_error=raise_error)
def can_use_tool(self, tool_task_mode: TaskExecutionMode | None) -> bool:

26
src/mcp/server/experimental/session_features.py
View file

@ -52,7 +52,7 @@ class ExperimentalServerSessionFeatures:
GetTaskResult containing the task status
"""
return await self._session.send_request(
types.ServerRequest(types.GetTaskRequest(params=types.GetTaskRequestParams(taskId=task_id))),
types.ServerRequest(types.GetTaskRequest(params=types.GetTaskRequestParams(task_id=task_id))),
types.GetTaskResult,
)
@ -72,7 +72,7 @@ class ExperimentalServerSessionFeatures:
The task result, validated against result_type
"""
return await self._session.send_request(
types.ServerRequest(types.GetTaskPayloadRequest(params=types.GetTaskPayloadRequestParams(taskId=task_id))),
types.ServerRequest(types.GetTaskPayloadRequest(params=types.GetTaskPayloadRequestParams(task_id=task_id))),
result_type,
)
@ -97,7 +97,7 @@ class ExperimentalServerSessionFeatures:
async def elicit_as_task(
self,
message: str,
requestedSchema: types.ElicitRequestedSchema,
requested_schema: types.ElicitRequestedSchema,
*,
ttl: int = 60000,
) -> types.ElicitResult:
@ -113,7 +113,7 @@ class ExperimentalServerSessionFeatures:
Args:
message: The message to present to the user
requestedSchema: Schema defining the expected response
requested_schema: Schema defining the expected response
ttl: Task time-to-live in milliseconds
Returns:
@ -130,7 +130,7 @@ class ExperimentalServerSessionFeatures:
types.ElicitRequest(
params=types.ElicitRequestFormParams(
message=message,
requestedSchema=requestedSchema,
requested_schema=requested_schema,
task=types.TaskMetadata(ttl=ttl),
)
)
@ -138,7 +138,7 @@ class ExperimentalServerSessionFeatures:
types.CreateTaskResult,
)
task_id = create_result.task.taskId
task_id = create_result.task.task_id
async for _ in self.poll_task(task_id):
pass
@ -196,15 +196,15 @@ class ExperimentalServerSessionFeatures:
types.CreateMessageRequest(
params=types.CreateMessageRequestParams(
messages=messages,
maxTokens=max_tokens,
systemPrompt=system_prompt,
includeContext=include_context,
max_tokens=max_tokens,
system_prompt=system_prompt,
include_context=include_context,
temperature=temperature,
stopSequences=stop_sequences,
stop_sequences=stop_sequences,
metadata=metadata,
modelPreferences=model_preferences,
model_preferences=model_preferences,
tools=tools,
toolChoice=tool_choice,
tool_choice=tool_choice,
task=types.TaskMetadata(ttl=ttl),
)
)
@ -212,7 +212,7 @@ class ExperimentalServerSessionFeatures:
types.CreateTaskResult,
)
task_id = create_result.task.taskId
task_id = create_result.task.task_id
async for _ in self.poll_task(task_id):
pass

28
src/mcp/server/experimental/task_context.py
View file

@ -65,7 +65,7 @@ class ServerTaskContext:
result = await task.elicit(
message="Continue?",
requestedSchema={"type": "object", "properties": {"ok": {"type": "boolean"}}}
requested_schema={"type": "object", "properties": {"ok": {"type": "boolean"}}}
)
if result.content.get("ok"):
@ -165,13 +165,13 @@ class ServerTaskContext:
ServerNotification(
TaskStatusNotification(
params=TaskStatusNotificationParams(
taskId=task.taskId,
task_id=task.task_id,
status=task.status,
statusMessage=task.statusMessage,
createdAt=task.createdAt,
lastUpdatedAt=task.lastUpdatedAt,
status_message=task.status_message,
created_at=task.created_at,
last_updated_at=task.last_updated_at,
ttl=task.ttl,
pollInterval=task.pollInterval,
poll_interval=task.poll_interval,
)
)
)
@ -202,7 +202,7 @@ class ServerTaskContext:
async def elicit(
self,
message: str,
requestedSchema: ElicitRequestedSchema,
requested_schema: ElicitRequestedSchema,
) -> ElicitResult:
"""
Send an elicitation request via the task message queue.
@ -217,7 +217,7 @@ class ServerTaskContext:
Args:
message: The message to present to the user
requestedSchema: Schema defining the expected response structure
requested_schema: Schema defining the expected response structure
Returns:
The client's response
@ -236,7 +236,7 @@ class ServerTaskContext:
# Build the request using session's helper
request = self._session._build_elicit_form_request( # pyright: ignore[reportPrivateUsage]
message=message,
requestedSchema=requestedSchema,
requested_schema=requested_schema,
related_task_id=self.task_id,
)
request_id: RequestId = request.id
@ -430,7 +430,7 @@ class ServerTaskContext:
async def elicit_as_task(
self,
message: str,
requestedSchema: ElicitRequestedSchema,
requested_schema: ElicitRequestedSchema,
*,
ttl: int = 60000,
) -> ElicitResult:
@ -444,7 +444,7 @@ class ServerTaskContext:
Args:
message: The message to present to the user
requestedSchema: Schema defining the expected response structure
requested_schema: Schema defining the expected response structure
ttl: Task time-to-live in milliseconds for the client's task
Returns:
@ -465,7 +465,7 @@ class ServerTaskContext:
request = self._session._build_elicit_form_request( # pyright: ignore[reportPrivateUsage]
message=message,
requestedSchema=requestedSchema,
requested_schema=requested_schema,
related_task_id=self.task_id,
task=TaskMetadata(ttl=ttl),
)
@ -486,7 +486,7 @@ class ServerTaskContext:
# Wait for initial response (CreateTaskResult from client)
response_data = await resolver.wait()
create_result = CreateTaskResult.model_validate(response_data)
client_task_id = create_result.task.taskId
client_task_id = create_result.task.task_id
# Poll the client's task using session.experimental
async for _ in self._session.experimental.poll_task(client_task_id):
@ -592,7 +592,7 @@ class ServerTaskContext:
# Wait for initial response (CreateTaskResult from client)
response_data = await resolver.wait()
create_result = CreateTaskResult.model_validate(response_data)
client_task_id = create_result.task.taskId
client_task_id = create_result.task.task_id
# Poll the client's task using session.experimental
async for _ in self._session.experimental.poll_task(client_task_id):

4
src/mcp/server/experimental/task_result_handler.py
View file

@ -106,7 +106,7 @@ class TaskResultHandler:
Returns:
GetTaskPayloadResult with the task's final payload
"""
task_id = request.params.taskId
task_id = request.params.task_id
while True:
task = await self._store.get_task(task_id)
@ -126,7 +126,7 @@ class TaskResultHandler:
# GetTaskPayloadResult is a Result with extra="allow"
# The stored result contains the actual payload data
# Per spec: tasks/result MUST include _meta with related-task metadata
related_task = RelatedTaskMetadata(taskId=task_id)
related_task = RelatedTaskMetadata(task_id=task_id)
related_task_meta: dict[str, Any] = {RELATED_TASK_METADATA_KEY: related_task.model_dump(by_alias=True)}
if result is not None:
result_data = result.model_dump(by_alias=True)