Code review feedback

Author: aaronpowell

samples/QuickstartClient/Program.cs

@@ -19,7 +19,7 @@ [var script] when Directory.Exists(script) || (File.Exists(script) && script.End
     _ => ("dotnet", "run --project ../../../../QuickstartWeatherServer --no-build")
 };
 
-var mcpClient = await McpClientFactory.CreateAsync(new()
+await using var mcpClient = await McpClientFactory.CreateAsync(new()
 {
     Id = "demo-client",
     Name = "Demo Client",
@@ -37,7 +37,7 @@ [var script] when Directory.Exists(script) || (File.Exists(script) && script.End
     Console.WriteLine($"Connected to server with tools: {tool.Name}");
 }
 
-var anthropicClient = new AnthropicClient(new APIAuthentication(builder.Configuration["ANTHROPIC_API_KEY"]))
+using var anthropicClient = new AnthropicClient(new APIAuthentication(builder.Configuration["ANTHROPIC_API_KEY"]))
     .Messages
     .AsBuilder()
     .UseFunctionInvocation()
@@ -47,7 +47,7 @@ [var script] when Directory.Exists(script) || (File.Exists(script) && script.End
 {
     MaxOutputTokens = 1000,
     ModelId = "claude-3-5-sonnet-20241022",
-    Tools = [.. tools.Cast<AITool>()]
+    Tools = [.. tools]
 };
 
 while (true)
@@ -66,13 +66,11 @@ [var script] when Directory.Exists(script) || (File.Exists(script) && script.End
         break;
     }
 
-    var response = await anthropicClient.GetResponseAsync(query, options);
+    var response = anthropicClient.GetStreamingResponseAsync(query, options);
 
-    foreach (var message in response.Messages)
+    await foreach (var message in response)
     {
-        Console.WriteLine(message.Text);
+        Console.Write(message.Text);
     }
+    Console.WriteLine();
 }
-
-anthropicClient.Dispose();
-await mcpClient.DisposeAsync();

samples/QuickstartWeatherServer/Program.cs

@@ -1,16 +1,21 @@
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using ModelContextProtocol;
+using System.Net.Http.Headers;
 
 var builder = Host.CreateEmptyApplicationBuilder(settings: null);
 
-//builder.Logging.ClearProviders();
-//builder.Logging.AddFilter("Microsoft", LogLevel.Warning); // Adjust the log level as needed
-
 builder.Services.AddMcpServer()
     .WithStdioServerTransport()
     .WithToolsFromAssembly();
 
+builder.Services.AddSingleton(_ =>
+{
+    var client = new HttpClient() { BaseAddress = new Uri("https://api.weather.gov") };
+    client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("weather-tool", "1.0"));
+    return client;
+});
+
 var app = builder.Build();
 
 await app.RunAsync();

samples/QuickstartWeatherServer/Tools/WeatherTools.cs

@@ -1,6 +1,6 @@
 using ModelContextProtocol.Server;
 using System.ComponentModel;
-using System.Net.Http.Headers;
+using System.Net.Http.Json;
 using System.Text.Json;
 
 namespace QuickstartWeatherServer.Tools;
@@ -10,75 +10,44 @@ public static class WeatherTools
 {
     [McpServerTool, Description("Get weather alerts for a US state.")]
     public static async Task<string> GetAlerts(
+        HttpClient client,
         [Description("The US state to get alerts for.")] string state)
     {
-        using HttpClient client = GetWeatherClient();
-
-        var response = await client.GetAsync($"/alerts/active/area/{state}");
-
-        if (!response.IsSuccessStatusCode)
-        {
-            return "Failed to retrieve alerts.";
-        }
-
-        var json = await response.Content.ReadAsStringAsync();
-        var jsonElement = JsonSerializer.Deserialize<JsonElement>(json);
+        var jsonElement = await client.GetFromJsonAsync<JsonElement>($"/alerts/active/area/{state}");
         var alerts = jsonElement.GetProperty("features").EnumerateArray();
 
         if (!alerts.Any())
         {
             return "No active alerts for this state.";
         }
 
-        // Process the alerts and return a formatted string
-        var alertMessages = new List<string>();
-        foreach (var alert in alerts)
+        return string.Join("\n--\n", alerts.Select(alert =>
         {
             JsonElement properties = alert.GetProperty("properties");
-            alertMessages.Add($"""
+            return $"""
                     Event: {properties.GetProperty("event").GetString()}
                     Area: {properties.GetProperty("areaDesc").GetString()}
                     Severity: {properties.GetProperty("severity").GetString()}
                     Description: {properties.GetProperty("description").GetString()}
                     Instruction: {properties.GetProperty("instruction").GetString()}
-                    """);
-        }
-        return string.Join("\n---\n", alertMessages);
+                    """;
+        }));
     }
 
     [McpServerTool, Description("Get weather forecast for a location.")]
     public static async Task<string> GetForecast(
+        HttpClient client,
         [Description("Latitude of the location.")] double latitude,
         [Description("Longitude of the location.")] double longitude)
     {
-        using HttpClient client = GetWeatherClient();
-        var response = await client.GetAsync($"/points/{latitude},{longitude}");
-        if (!response.IsSuccessStatusCode)
-        {
-            return "Failed to retrieve forecast.";
-        }
-
-        var json = await response.Content.ReadAsStringAsync();
-        var jsonElement = JsonSerializer.Deserialize<JsonElement>(json);
+        var jsonElement = await client.GetFromJsonAsync<JsonElement>($"/points/{latitude},{longitude}");
         var periods = jsonElement.GetProperty("properties").GetProperty("periods").EnumerateArray();
-        // Process the forecast and return a formatted string
-        var forecastMessages = new List<string>();
-        foreach (var period in periods)
-        {
-            forecastMessages.Add($"""
-                    {period.GetProperty("name").GetString()}
-                    Temperature: {period.GetProperty("temperature").GetInt32()}°F
-                    Wind: {period.GetProperty("windSpeed").GetString()} {period.GetProperty("windDirection").GetString()}
-                    Forecast: {period.GetProperty("detailedForecast").GetString()}
-                    """);
-        }
-        return string.Join("\n---\n", forecastMessages);
-    }
 
-    private static HttpClient GetWeatherClient()
-    {
-        var client = new HttpClient() { BaseAddress = new Uri("https://api.weather.gov") };
-        client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("weather-tool", "1.0"));
-        return client;
+        return string.Join("\n---\n", periods.Select(period => $"""
+                {period.GetProperty("name").GetString()}
+                Temperature: {period.GetProperty("temperature").GetInt32()}°F
+                Wind: {period.GetProperty("windSpeed").GetString()} {period.GetProperty("windDirection").GetString()}
+                Forecast: {period.GetProperty("detailedForecast").GetString()}
+                """));
     }
 }