Skip to content
Merged
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
2 changes: 1 addition & 1 deletion src/ModelContextProtocol.Core/Server/McpServer.Methods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public async Task<ChatResponse> SampleAsync(
var result = await SampleAsync(new()
{
Messages = samplingMessages,
MaxTokens = options?.MaxOutputTokens ?? int.MaxValue,
MaxTokens = options?.MaxOutputTokens ?? ServerOptions.DefaultSamplingMaxTokens,
StopSequences = options?.StopSequences?.ToArray(),
SystemPrompt = systemPrompt?.ToString(),
Temperature = options?.Temperature,
Expand Down
13 changes: 13 additions & 0 deletions src/ModelContextProtocol.Core/Server/McpServerOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,17 @@ public McpServerHandlers Handlers
/// </para>
/// </remarks>
public McpServerPrimitiveCollection<McpServerPrompt>? PromptCollection { get; set; }

/// <summary>
/// Gets or sets the default maximum number of tokens to use for sampling requests when not explicitly specified.
/// </summary>
/// <remarks>
/// <para>
/// This value is used when <see cref="Microsoft.Extensions.AI.ChatOptions.MaxOutputTokens"/> is not set in the request options.
/// </para>
/// <para>
/// The default value is 1000 tokens.
/// </para>
/// </remarks>
public int DefaultSamplingMaxTokens { get; set; } = 1000;
}
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,25 @@ public async Task SampleAsync_Messages_Forwards_To_McpServer_SendRequestAsync()
StopReason = "endTurn",
};

const int customDefaultMaxTokens = 500;

mockServer
.Setup(s => s.ClientCapabilities)
.Returns(new ClientCapabilities() { Sampling = new() });

mockServer
.Setup(s => s.ServerOptions)
.Returns(new McpServerOptions { DefaultSamplingMaxTokens = customDefaultMaxTokens });

CreateMessageRequestParams? capturedRequest = null;
mockServer
.Setup(s => s.SendRequestAsync(It.IsAny<JsonRpcRequest>(), It.IsAny<CancellationToken>()))
.Callback<JsonRpcRequest, CancellationToken>((request, _) =>
{
capturedRequest = JsonSerializer.Deserialize<CreateMessageRequestParams>(
request.Params ?? throw new InvalidOperationException(),
McpJsonUtilities.DefaultOptions);
})
.ReturnsAsync(new JsonRpcResponse
{
Id = default,
Expand All @@ -146,6 +159,10 @@ public async Task SampleAsync_Messages_Forwards_To_McpServer_SendRequestAsync()
Assert.Equal(ChatRole.Assistant, last.Role);
Assert.Equal("resp", last.Text);
mockServer.Verify(s => s.SendRequestAsync(It.IsAny<JsonRpcRequest>(), It.IsAny<CancellationToken>()), Times.Once);

// Verify that the default value was used
Assert.NotNull(capturedRequest);
Assert.Equal(customDefaultMaxTokens, capturedRequest.MaxTokens);
}

[Fact]
Expand Down