Skip to content
Closed
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
15 changes: 14 additions & 1 deletion src/mcp/server/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ async def handle_list_prompts(ctx: RequestContext, params) -> ListPromptsResult:
from mcp.shared.message import ServerMessageMetadata, SessionMessage
from mcp.shared.session import (
BaseSession,
ProgressFnT,
RequestResponder,
)
from mcp.shared.version import SUPPORTED_PROTOCOL_VERSIONS
Expand Down Expand Up @@ -245,6 +246,7 @@ async def create_message(
tools: None = None,
tool_choice: types.ToolChoice | None = None,
related_request_id: types.RequestId | None = None,
progress_callback: ProgressFnT | None = None,
) -> types.CreateMessageResult:
"""Overload: Without tools, returns single content."""
...
Expand All @@ -264,6 +266,7 @@ async def create_message(
tools: list[types.Tool],
tool_choice: types.ToolChoice | None = None,
related_request_id: types.RequestId | None = None,
progress_callback: ProgressFnT | None = None,
) -> types.CreateMessageResultWithTools:
"""Overload: With tools, returns array-capable content."""
...
Expand All @@ -282,6 +285,7 @@ async def create_message(
tools: list[types.Tool] | None = None,
tool_choice: types.ToolChoice | None = None,
related_request_id: types.RequestId | None = None,
progress_callback: ProgressFnT | None = None,
) -> types.CreateMessageResult | types.CreateMessageResultWithTools:
"""Send a sampling/create_message request.

Expand Down Expand Up @@ -338,11 +342,13 @@ async def create_message(
request=request,
result_type=types.CreateMessageResultWithTools,
metadata=metadata_obj,
progress_callback=progress_callback,
)
return await self.send_request(
request=request,
result_type=types.CreateMessageResult,
metadata=metadata_obj,
progress_callback=progress_callback,
)

async def list_roots(self) -> types.ListRootsResult:
Expand All @@ -359,6 +365,7 @@ async def elicit(
message: str,
requested_schema: types.ElicitRequestedSchema,
related_request_id: types.RequestId | None = None,
progress_callback: ProgressFnT | None = None,
) -> types.ElicitResult:
"""Send a form mode elicitation/create request.

Expand All @@ -374,13 +381,16 @@ async def elicit(
This method is deprecated in favor of elicit_form(). It remains for
backward compatibility but new code should use elicit_form().
"""
return await self.elicit_form(message, requested_schema, related_request_id)
return await self.elicit_form(
message, requested_schema, related_request_id, progress_callback=progress_callback
)

async def elicit_form(
self,
message: str,
requested_schema: types.ElicitRequestedSchema,
related_request_id: types.RequestId | None = None,
progress_callback: ProgressFnT | None = None,
) -> types.ElicitResult:
"""Send a form mode elicitation/create request.

Expand All @@ -406,6 +416,7 @@ async def elicit_form(
),
types.ElicitResult,
metadata=ServerMessageMetadata(related_request_id=related_request_id),
progress_callback=progress_callback,
)

async def elicit_url(
Expand All @@ -414,6 +425,7 @@ async def elicit_url(
url: str,
elicitation_id: str,
related_request_id: types.RequestId | None = None,
progress_callback: ProgressFnT | None = None,
) -> types.ElicitResult:
"""Send a URL mode elicitation/create request.

Expand Down Expand Up @@ -444,6 +456,7 @@ async def elicit_url(
),
types.ElicitResult,
metadata=ServerMessageMetadata(related_request_id=related_request_id),
progress_callback=progress_callback,
)

async def send_ping(self) -> types.EmptyResult: # pragma: no cover
Expand Down