Fix samples again post merge

Author: halter73

samples/AspNetCoreMcpServer/Program.cs

@@ -3,14 +3,15 @@
 using OpenTelemetry.Trace;
 using AspNetCoreMcpServer.Tools;
 using AspNetCoreMcpServer.Resources;
+using System.Net.Http.Headers;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddMcpServer()
     .WithHttpTransport()
     .WithTools<EchoTool>()
     .WithTools<SampleLlmTool>()
-    .WithResources<SimpleResourceType>()
-    .WithTools<WeatherTools>();
+    .WithTools<WeatherTools>()
+    .WithResources<SimpleResourceType>();
 
 builder.Services.AddOpenTelemetry()
     .WithTracing(b => b.AddSource("*")
@@ -21,7 +22,14 @@
         .AddHttpClientInstrumentation())
     .WithLogging()
     .UseOtlpExporter();
-builder.Services.AddHttpClient();
+
+// Configure HttpClientFactory for weather.gov API
+builder.Services.AddHttpClient("WeatherApi", client =>
+{
+    client.BaseAddress = new Uri("https://api.weather.gov");
+    client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("weather-tool", "1.0"));
+});
+
 var app = builder.Build();
 
 app.MapMcp();

samples/AspNetCoreMcpServer/Tools/WeatherTools.cs

@@ -0,0 +1,73 @@
+using ModelContextProtocol;
+using ModelContextProtocol.Server;
+using System.ComponentModel;
+using System.Globalization;
+using System.Text.Json;
+
+namespace AspNetCoreMcpServer.Tools;
+
+[McpServerToolType]
+public sealed class WeatherTools
+{
+    private readonly IHttpClientFactory _httpClientFactory;
+
+    public WeatherTools(IHttpClientFactory httpClientFactory)
+    {
+        _httpClientFactory = httpClientFactory;
+    }
+
+    [McpServerTool, Description("Get weather alerts for a US state.")]
+    public async Task<string> GetAlerts(
+        [Description("The US state to get alerts for. Use the 2 letter abbreviation for the state (e.g. NY).")] string state)
+    {
+        var client = _httpClientFactory.CreateClient("WeatherApi");
+        using var responseStream = await client.GetStreamAsync($"/alerts/active/area/{state}");
+        using var jsonDocument = await JsonDocument.ParseAsync(responseStream)
+            ?? throw new McpException("No JSON returned from alerts endpoint");
+
+        var alerts = jsonDocument.RootElement.GetProperty("features").EnumerateArray();
+
+        if (!alerts.Any())
+        {
+            return "No active alerts for this state.";
+        }
+
+        return string.Join("\n--\n", alerts.Select(alert =>
+        {
+            JsonElement properties = alert.GetProperty("properties");
+            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()}
+                    """;
+        }));
+    }
+
+    [McpServerTool, Description("Get weather forecast for a location.")]
+    public async Task<string> GetForecast(
+        [Description("Latitude of the location.")] double latitude,
+        [Description("Longitude of the location.")] double longitude)
+    {
+        var client = _httpClientFactory.CreateClient("WeatherApi");
+        var pointUrl = string.Create(CultureInfo.InvariantCulture, $"/points/{latitude},{longitude}");
+
+        using var locationResponseStream = await client.GetStreamAsync(pointUrl);
+        using var locationDocument = await JsonDocument.ParseAsync(locationResponseStream);
+        var forecastUrl = locationDocument?.RootElement.GetProperty("properties").GetProperty("forecast").GetString()
+            ?? throw new McpException($"No forecast URL provided by {client.BaseAddress}points/{latitude},{longitude}");
+
+        using var forecastResponseStream = await client.GetStreamAsync(forecastUrl);
+        using var forecastDocument = await JsonDocument.ParseAsync(forecastResponseStream);
+        var periods = forecastDocument?.RootElement.GetProperty("properties").GetProperty("periods").EnumerateArray()
+            ?? throw new McpException("No JSON returned from forecast endpoint");
+
+        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()}
+                """));
+    }
+}

samples/QuickstartClient/Program.cs

@@ -17,8 +17,8 @@
 IClientTransport? clientTransport = null;
 if (command == "http")
 {
-    // make sure AspNetCoreSseServer is running
-    clientTransport = new SseClientTransport(new SseClientTransportOptions { Endpoint = new Uri("https://localhost:7133"), TransportMode = HttpTransportMode.StreamableHttp});
+    // make sure AspNetCoreMcpServer is running
+    clientTransport = new SseClientTransport(new SseClientTransportOptions { Endpoint = new Uri("http://localhost:3001"), TransportMode = HttpTransportMode.StreamableHttp});
 }
 else
 {
@@ -73,7 +73,6 @@
     Console.WriteLine();
 
     PromptForInput();
-    
 }
 
 static void PromptForInput()
@@ -91,9 +90,9 @@ static void PromptForInput()
 /// <remarks>
 /// This method uses the file extension of the first argument to determine the command, if it's py, it'll run python,
 /// if it's js, it'll run node, if it's a directory or a csproj file, it'll run dotnet.
-/// 
+///
 /// If no arguments are provided, it defaults to running the QuickstartWeatherServer project from the current repo.
-/// 
+///
 /// This method would only be required if you're creating a generic client, such as we use for the quickstart.
 /// </remarks>
 static (string command, string[] arguments) GetCommandAndArguments(string[] args)

samples/QuickstartClient/Properties/launchSettings.json

@@ -15,11 +15,8 @@
     options.LogToStandardErrorThreshold = LogLevel.Trace;
 });
 
-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;
-});
+using var httpClient = new HttpClient { BaseAddress = new Uri("https://api.weather.gov") };
+httpClient.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("weather-tool", "1.0"));
+builder.Services.AddSingleton(httpClient);
 
 await builder.Build().RunAsync();