Skip to content

Fix task result payload null fields #2597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
he-yufeng wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −1
Open

Fix task result payload null fields #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mcp/server/experimental/task_result_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ async def handle(
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)
result_data = result.model_dump(by_alias=True, mode="json", exclude_none=True)
existing_meta: dict[str, Any] = result_data.get("_meta") or {}
result_data["_meta"] = {**existing_meta, **related_task_meta}
return GetTaskPayloadResult.model_validate(result_data)
Expand Down
19 changes: 19 additions & 0 deletions tests/experimental/tasks/server/test_task_result_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,25 @@ async def test_handle_returns_result_for_completed_task(
assert "io.modelcontextprotocol/related-task" in response.meta


@pytest.mark.anyio
async def test_handle_omits_none_fields_from_result_payload(
store: InMemoryTaskStore, queue: InMemoryTaskMessageQueue, handler: TaskResultHandler
) -> None:
task = await store.create_task(TaskMetadata(ttl=60000), task_id="test-task")
await store.store_result(task.task_id, CallToolResult(content=[TextContent(type="text", text="Done!")]))
await store.update_task(task.task_id, status="completed")

mock_session = Mock()
mock_session.send_message = AsyncMock()

request = GetTaskPayloadRequest(params=GetTaskPayloadRequestParams(task_id=task.task_id))
response = await handler.handle(request, mock_session, "req-1")

payload = response.model_dump(by_alias=True, mode="json")
assert payload["content"] == [{"type": "text", "text": "Done!"}]
assert "structuredContent" not in payload


@pytest.mark.anyio
async def test_handle_raises_for_nonexistent_task(
store: InMemoryTaskStore, queue: InMemoryTaskMessageQueue, handler: TaskResultHandler
Expand Down
Loading