* Overhaul tool handling
- Renames [McpTool{Type}] to [McpServerTool{Type}], in order to distinguish representations of tools on the server from tools on the client.
- Enables [McpServerTool] methods to have arguments injected from DI, as well as a specific set of types from the implementation directly, like IMcpServer.
- Renames WithTools to WithToolsFromAssembly.
- All of the WithToolsXx methods now publish each individual McpServerTool into DI; other code can do so as well. The options setup code gathers all of the tools from DI and combines them into a collection which is then stored in McpServerOptions and used to construct the server.
- The server tools specified via DI as well as manually-provided handlers, using CallToolHandler as a fallback in case the requested tool doesn't exist in the tools collection, and ListToolsHandler augments the information for whatever tools exist.
- The tools are stored in McpServerOptions in a new McpServerToolCollection type, which is a thread-safe container that exposes add/removal notification. Adding/removing tools triggers a change notification that in turn sends a notification to the client about a tools update.
- The ServerOptions are exposed from the server instance.
- Removed cursor-based APIs from McpClientExtensions.
- Changed McpClientExtensions APIs to return `Task<IList<...>` rather than `IAsyncEnumerable<...>`.
I'm sure this will need to evolve further before we're "done", but it's a significant improvement from where we are now. One area I'm not super happy with is the notifying collection; that might work ok for a stdio server, where you can grab the created collection from the server's options and mutate it, but I don't know how well that's going to work for sse servers.
* Make McpServerTool{Collection} extensible
* Fix README.md example
* Add notifications test
* Address feedback
51 lines
1.7 KiB
C#
51 lines
1.7 KiB
C#
using ModelContextProtocol.Protocol.Types;
|
|
using ModelContextProtocol.Server;
|
|
using System.ComponentModel;
|
|
|
|
namespace TestServerWithHosting.Tools;
|
|
|
|
/// <summary>
|
|
/// This tool uses depenency injection and async method
|
|
/// </summary>
|
|
[McpServerToolType]
|
|
public class SampleLlmTool
|
|
{
|
|
private readonly IMcpServer _server;
|
|
|
|
public SampleLlmTool(IMcpServer server)
|
|
{
|
|
_server = server ?? throw new ArgumentNullException(nameof(server));
|
|
}
|
|
|
|
[McpServerTool("sampleLLM"), Description("Samples from an LLM using MCP's sampling feature")]
|
|
public async Task<string> SampleLLM(
|
|
[Description("The prompt to send to the LLM")] string prompt,
|
|
[Description("Maximum number of tokens to generate")] int maxTokens,
|
|
CancellationToken cancellationToken)
|
|
{
|
|
var samplingParams = CreateRequestSamplingParams(prompt ?? string.Empty, "sampleLLM", maxTokens);
|
|
var sampleResult = await _server.RequestSamplingAsync(samplingParams, cancellationToken);
|
|
|
|
return $"LLM sampling result: {sampleResult.Content.Text}";
|
|
}
|
|
|
|
private static CreateMessageRequestParams CreateRequestSamplingParams(string context, string uri, int maxTokens = 100)
|
|
{
|
|
return new CreateMessageRequestParams()
|
|
{
|
|
Messages = [new SamplingMessage()
|
|
{
|
|
Role = Role.User,
|
|
Content = new Content()
|
|
{
|
|
Type = "text",
|
|
Text = $"Resource {uri} context: {context}"
|
|
}
|
|
}],
|
|
SystemPrompt = "You are a helpful test server.",
|
|
MaxTokens = maxTokens,
|
|
Temperature = 0.7f,
|
|
IncludeContext = ContextInclusion.ThisServer
|
|
};
|
|
}
|
|
}
|