Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/mcp/server/mcpserver/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -1052,6 +1052,7 @@ async def report_progress(self, progress: float, total: float | None = None, mes
progress=progress,
total=total,
message=message,
related_request_id=self.request_id,
)

async def read_resource(self, uri: str | AnyUrl) -> Iterable[ReadResourceContents]:
Expand Down
39 changes: 36 additions & 3 deletions tests/issues/test_176_progress_token.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,39 @@ async def test_progress_token_zero_first_call():

# Verify progress notifications
assert mock_session.send_progress_notification.call_count == 3, "All progress notifications should be sent"
mock_session.send_progress_notification.assert_any_call(progress_token=0, progress=0.0, total=10.0, message=None)
mock_session.send_progress_notification.assert_any_call(progress_token=0, progress=5.0, total=10.0, message=None)
mock_session.send_progress_notification.assert_any_call(progress_token=0, progress=10.0, total=10.0, message=None)
mock_session.send_progress_notification.assert_any_call(
progress_token=0, progress=0.0, total=10.0, message=None, related_request_id="test-request"
)
mock_session.send_progress_notification.assert_any_call(
progress_token=0, progress=5.0, total=10.0, message=None, related_request_id="test-request"
)
mock_session.send_progress_notification.assert_any_call(
progress_token=0, progress=10.0, total=10.0, message=None, related_request_id="test-request"
)


async def test_report_progress_passes_related_request_id():
"""Test that report_progress passes the request_id as related_request_id."""

mock_session = AsyncMock()
mock_session.send_progress_notification = AsyncMock()

request_context = ServerRequestContext(
request_id="req-abc-123",
session=mock_session,
meta={"progress_token": "tok-1"},
lifespan_context=None,
experimental=Experimental(),
)

ctx = Context(request_context=request_context, mcp_server=MagicMock())

await ctx.report_progress(50, 100, message="halfway")

mock_session.send_progress_notification.assert_awaited_once_with(
progress_token="tok-1",
progress=50,
total=100,
message="halfway",
related_request_id="req-abc-123",
)