Moving to using the PromptType attribute

aaronpowell · aaronpowell · commit cab54dd94804 · 2025-04-01T11:16:49.000+11:00
diff --git a/samples/EverythingServer/Program.cs b/samples/EverythingServer/Program.cs
@@ -1,11 +1,11 @@
-﻿using ModelContextProtocol;
-using Microsoft.Extensions.Hosting;
+﻿using Microsoft.Extensions.Hosting;
 using ModelContextProtocol.Protocol.Types;
-using EverythingServer.Tools;
 using EverythingServer;
 using ModelContextProtocol.Server;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
+using EverythingServer.Prompts;
+using EverythingServer.Tools;
 
 var builder = Host.CreateEmptyApplicationBuilder(settings: null);
 
@@ -14,41 +14,15 @@
 builder.Services
     .AddMcpServer()
     .WithStdioServerTransport()
-    .WithToolsFromAssembly()
-    .WithListPromptsHandler((ctx, ct) =>
-    {
-        return Task.FromResult(new ListPromptsResult
-        {
-            Prompts =
-            [
-                new Prompt { Name= "simple_prompt", Description = "A prompt without arguments" },
-                new Prompt { Name= "complex_prompt", Description = "A prompt with arguments", Arguments = [
-                    new PromptArgument { Name = "temperature", Description = "Temperature setting", Required = true },
-                    new PromptArgument { Name = "style", Description = "Output style", Required = false }
-                ]
-                }
-            ]
-        });
-    })
-    .WithGetPromptHandler((args, ct) =>
-    {
-        List<PromptMessage> messages = args.Params?.Name switch
-        {
-            "simple_prompt" => [new PromptMessage { Role = Role.User, Content = new Content { Type = "text", Text = "This is a simple prompt without arguments" } }],
-            "complex_prompt" => [
-                new PromptMessage { Role = Role.User, Content = new Content { Type = "text", Text = $"This is a complex prompt with arguments: temperature={args.Params?.Arguments?["temperature"]}, style={(args.Params?.Arguments?.ContainsKey("style") == true ? args.Params?.Arguments?["style"] : "")}" } },
-                new PromptMessage { Role = Role.Assistant, Content = new Content { Type = "text", Text = "I understand. You've provided a complex prompt with temperature and style arguments. How would you like me to proceed?" } },
-                new PromptMessage { Role = Role.User, Content = new Content { Type = "image", Data = TinyImageTool.MCP_TINY_IMAGE.Split(",").Last(), MimeType = "image/png" } }
-                ]
-            ,
-            _ => throw new NotSupportedException($"Unknown prompt name: {args.Params?.Name}")
-        };
-
-        return Task.FromResult(new GetPromptResult
-        {
-            Messages = messages
-        });
-    })
+    .WithTools<AddTool>()
+    .WithTools<AnnotatedMessageTool>()
+    .WithTools<EchoTool>()
+    .WithTools<LongRunningTool>()
+    .WithTools<PrintEnvTool>()
+    .WithTools<SampleLlmTool>()
+    .WithTools<TinyImageTool>()
+    .WithPrompts<ComplexPromptType>()
+    .WithPrompts<SimplePromptType>()
     .WithListResourceTemplatesHandler((ctx, ct) =>
     {
         return Task.FromResult(new ListResourceTemplatesResult
diff --git a/samples/EverythingServer/Prompts/ComplexPromptType.cs b/samples/EverythingServer/Prompts/ComplexPromptType.cs
@@ -0,0 +1,22 @@
+﻿using EverythingServer.Tools;
+using Microsoft.Extensions.AI;
+using ModelContextProtocol.Server;
+using System.ComponentModel;
+
+namespace EverythingServer.Prompts;
+
+[McpServerPromptType]
+public class ComplexPromptType
+{
+    [McpServerPrompt(Name = "complex_prompt"), Description("A prompt with arguments")]
+    public static IEnumerable<ChatMessage> ComplexPrompt(
+        [Description("Temperature setting")] int temperature,
+        [Description("Output style")] string? style = null)
+    {
+        return [
+            new ChatMessage(ChatRole.User,$"This is a complex prompt with arguments: temperature={temperature}, style={style}"),
+            new ChatMessage(ChatRole.Assistant, "I understand. You've provided a complex prompt with temperature and style arguments. How would you like me to proceed?"),
+            new ChatMessage(ChatRole.User, [new DataContent(TinyImageTool.MCP_TINY_IMAGE)])
+        ];
+    }
+}
diff --git a/samples/EverythingServer/Prompts/SimplePromptType.cs b/samples/EverythingServer/Prompts/SimplePromptType.cs
@@ -0,0 +1,11 @@
+﻿using ModelContextProtocol.Server;
+using System.ComponentModel;
+
+namespace EverythingServer.Prompts;
+
+[McpServerPromptType]
+public class SimplePromptType
+{
+    [McpServerPrompt(Name = "simple_prompt"), Description("A prompt without arguments")]
+    public static string SimplePrompt() => "This is a simple prompt without arguments";
+}
diff --git a/samples/EverythingServer/Tools/AddTool.cs b/samples/EverythingServer/Tools/AddTool.cs
@@ -4,7 +4,7 @@
 namespace EverythingServer.Tools;
 
 [McpServerToolType]
-public static class AddTool
+public class AddTool
 {
     [McpServerTool(Name = "add"), Description("Adds two numbers.")]
     public static string Add(int a, int b) => $"The sum of {a} and {b} is {a + b}";
diff --git a/samples/EverythingServer/Tools/AnnotatedMessageTool.cs b/samples/EverythingServer/Tools/AnnotatedMessageTool.cs
@@ -4,7 +4,7 @@
 namespace EverythingServer.Tools;
 
 [McpServerToolType]
-public static class AnnotatedMessageTool
+public class AnnotatedMessageTool
 {
     public enum MessageType
     {
diff --git a/samples/EverythingServer/Tools/EchoTool.cs b/samples/EverythingServer/Tools/EchoTool.cs
@@ -4,7 +4,7 @@
 namespace EverythingServer.Tools;
 
 [McpServerToolType]
-public static class EchoTool
+public class EchoTool
 {
     [McpServerTool(Name = "echo"), Description("Echoes the message back to the client.")]
     public static string Echo(string message) => $"Echo: {message}";
diff --git a/samples/EverythingServer/Tools/LongRunningTool.cs b/samples/EverythingServer/Tools/LongRunningTool.cs
@@ -6,7 +6,7 @@
 namespace EverythingServer.Tools;
 
 [McpServerToolType]
-public static class LongRunningTool
+public class LongRunningTool
 {
     [McpServerTool(Name = "longRunningOperation"), Description("Demonstrates a long running operation with progress updates")]
     public static async Task<string> LongRunningOperation(
diff --git a/samples/EverythingServer/Tools/PrintEnvTool.cs b/samples/EverythingServer/Tools/PrintEnvTool.cs
@@ -1,23 +1,18 @@
 ﻿using ModelContextProtocol.Server;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Text.Json;
 
 namespace EverythingServer.Tools;
 
 [McpServerToolType]
-public static class PrintEnvTool
+public class PrintEnvTool
 {
     private static readonly JsonSerializerOptions options = new()
     {
         WriteIndented = true
     };
 
     [McpServerTool(Name = "printEnv"), Description("Prints all environment variables, helpful for debugging MCP server configuration")]
-    public static string PrintEnv()
-    {
-        Debugger.Launch();
-        var envVars = Environment.GetEnvironmentVariables();
-        return JsonSerializer.Serialize(envVars, options);
-    }
+    public static string PrintEnv() =>
+        JsonSerializer.Serialize(Environment.GetEnvironmentVariables(), options);
 }
diff --git a/samples/EverythingServer/Tools/SampleLlmTool.cs b/samples/EverythingServer/Tools/SampleLlmTool.cs
@@ -5,18 +5,17 @@
 namespace EverythingServer.Tools;
 
 [McpServerToolType]
-public class SampleLlmTool(IMcpServer server)
+public class SampleLlmTool
 {
-    private readonly IMcpServer _server = server ?? throw new ArgumentNullException(nameof(server));
-
     [McpServerTool(Name = "sampleLLM"), Description("Samples from an LLM using MCP's sampling feature")]
-    public async Task<string> SampleLLM(
+    public static async Task<string> SampleLLM(
+        IMcpServer server,
         [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);
+        var sampleResult = await server.RequestSamplingAsync(samplingParams, cancellationToken);
 
         return $"LLM sampling result: {sampleResult.Content.Text}";
     }
diff --git a/samples/EverythingServer/Tools/TinyImageTool.cs b/samples/EverythingServer/Tools/TinyImageTool.cs
@@ -1,23 +1,18 @@
 ﻿using Microsoft.Extensions.AI;
 using ModelContextProtocol.Server;
 using System.ComponentModel;
-using System.Diagnostics;
 
 namespace EverythingServer.Tools;
 
 [McpServerToolType]
-public static class TinyImageTool
+public class TinyImageTool
 {
     [McpServerTool(Name = "getTinyImage"), Description("Get a tiny image from the server")]
-    public static IEnumerable<AIContent> GetTinyImage()
-    {
-        Debugger.Launch();
-        return [
+    public static IEnumerable<AIContent> GetTinyImage() => [
             new TextContent("This is a tiny image:"),
             new DataContent(MCP_TINY_IMAGE),
             new TextContent("The image above is the MCP tiny image.")
         ];
-    }
 
     internal const string MCP_TINY_IMAGE =
       "data:image/png;base64,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";
diff --git a/src/ModelContextProtocol/Configuration/McpServerBuilderExtensions.cs b/src/ModelContextProtocol/Configuration/McpServerBuilderExtensions.cs
@@ -176,7 +176,7 @@ public static IMcpServerBuilder WithPrompts(this IMcpServerBuilder builder, para
     }
 
     /// <summary>
-    /// Adds types marked with the <see cref="McpServerToolTypeAttribute"/> attribute from the given assembly as prompts to the server.
+    /// Adds types marked with the <see cref="McpServerPromptTypeAttribute"/> attribute from the given assembly as prompts to the server.
     /// </summary>
     /// <param name="builder">The builder instance.</param>
     /// <param name="promptAssembly">The assembly to load the types from. Null to get the current assembly</param>
@@ -190,7 +190,7 @@ public static IMcpServerBuilder WithPromptsFromAssembly(this IMcpServerBuilder b
 
         return builder.WithPrompts(
             from t in promptAssembly.GetTypes()
-            where t.GetCustomAttribute<McpServerToolTypeAttribute>() is not null
+            where t.GetCustomAttribute<McpServerPromptTypeAttribute>() is not null
             select t);
     }
     #endregion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`namespace EverythingServer.Tools;`
`5`	`5`
`6`	`6`	`[McpServerToolType]`
`7`		`-public static class AddTool`
	`7`	`+public class AddTool`
`8`	`8`	`{`
`9`	`9`	`[McpServerTool(Name = "add"), Description("Adds two numbers.")]`
`10`	`10`	`public static string Add(int a, int b) => $"The sum of {a} and {b} is {a + b}";`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace EverythingServer.Tools;`
`7`	`7`
`8`	`8`	`[McpServerToolType]`
`9`		`-public static class LongRunningTool`
	`9`	`+public class LongRunningTool`
`10`	`10`	`{`
`11`	`11`	`[McpServerTool(Name = "longRunningOperation"), Description("Demonstrates a long running operation with progress updates")]`
`12`	`12`	`public static async Task<string> LongRunningOperation(`