From 547ac4c47fd568ad80e13be1fad2eca9766dfe3f Mon Sep 17 00:00:00 2001 From: Esteban Solano Granados Date: Fri, 28 Mar 2025 12:27:52 -0700 Subject: [PATCH 1/3] Fix WeatherTools to use /forecast --- .../Tools/WeatherTools.cs | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/samples/QuickstartWeatherServer/Tools/WeatherTools.cs b/samples/QuickstartWeatherServer/Tools/WeatherTools.cs index 697b8095..a366b137 100644 --- a/samples/QuickstartWeatherServer/Tools/WeatherTools.cs +++ b/samples/QuickstartWeatherServer/Tools/WeatherTools.cs @@ -41,13 +41,22 @@ public static async Task GetForecast( [Description("Longitude of the location.")] double longitude) { var jsonElement = await client.GetFromJsonAsync($"/points/{latitude},{longitude}"); + var forecastUrl = jsonElement.GetProperty("properties").GetProperty("forecast").GetString(); + jsonElement = await client.GetFromJsonAsync(forecastUrl); var periods = jsonElement.GetProperty("properties").GetProperty("periods").EnumerateArray(); - 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()} - """)); + return periods.Select(period => + { + return $""" + Name: {period.GetProperty("name").GetString()} + Start Time: {period.GetProperty("startTime").GetString()} + End Time: {period.GetProperty("endTime").GetString()} + Temperature: {period.GetProperty("temperature").GetInt32()}°F + Wind Speed: {period.GetProperty("windSpeed").GetString()} + Wind Direction: {period.GetProperty("windDirection").GetString()} + Short Forecast: {period.GetProperty("shortForecast").GetString()} + Detailed Forecast: {period.GetProperty("detailedForecast").GetString()} + """; + }).Aggregate((current, next) => current + "\n--\n" + next); } -} \ No newline at end of file +} From 0a831d064efee4b02b0cde842e034fc2925fe37e Mon Sep 17 00:00:00 2001 From: Esteban Solano Granados Date: Fri, 28 Mar 2025 14:21:31 -0700 Subject: [PATCH 2/3] Revert to string.Join --- samples/QuickstartWeatherServer/Tools/WeatherTools.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/samples/QuickstartWeatherServer/Tools/WeatherTools.cs b/samples/QuickstartWeatherServer/Tools/WeatherTools.cs index a366b137..a4c3bc94 100644 --- a/samples/QuickstartWeatherServer/Tools/WeatherTools.cs +++ b/samples/QuickstartWeatherServer/Tools/WeatherTools.cs @@ -45,9 +45,10 @@ public static async Task GetForecast( jsonElement = await client.GetFromJsonAsync(forecastUrl); var periods = jsonElement.GetProperty("properties").GetProperty("periods").EnumerateArray(); - return periods.Select(period => - { - return $""" + return string.Join("\n---\n", + periods.Select(period => + { + return $""" Name: {period.GetProperty("name").GetString()} Start Time: {period.GetProperty("startTime").GetString()} End Time: {period.GetProperty("endTime").GetString()} @@ -57,6 +58,6 @@ public static async Task GetForecast( Short Forecast: {period.GetProperty("shortForecast").GetString()} Detailed Forecast: {period.GetProperty("detailedForecast").GetString()} """; - }).Aggregate((current, next) => current + "\n--\n" + next); + })); } } From ff74a1ea0c4e6bd876e564f274aa70da64a4c4cb Mon Sep 17 00:00:00 2001 From: Esteban Solano Granados Date: Thu, 3 Apr 2025 19:09:56 -0700 Subject: [PATCH 3/3] Updated code --- .../Tools/WeatherTools.cs | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/samples/QuickstartWeatherServer/Tools/WeatherTools.cs b/samples/QuickstartWeatherServer/Tools/WeatherTools.cs index 0dccb1f7..1927dd34 100644 --- a/samples/QuickstartWeatherServer/Tools/WeatherTools.cs +++ b/samples/QuickstartWeatherServer/Tools/WeatherTools.cs @@ -1,7 +1,6 @@ using ModelContextProtocol; using ModelContextProtocol.Server; using System.ComponentModel; -using System.Net.Http.Json; using System.Text.Json; namespace QuickstartWeatherServer.Tools; @@ -43,22 +42,17 @@ public static async Task GetForecast( [Description("Longitude of the location.")] double longitude) { using var jsonDocument = await client.ReadJsonDocumentAsync($"/points/{latitude},{longitude}"); - var jsonElement = jsonDocument.RootElement; - var periods = jsonElement.GetProperty("properties").GetProperty("periods").EnumerateArray(); + var properties = jsonDocument.RootElement.GetProperty("properties"); + var forecastUrl = properties.GetProperty("forecast").GetString(); - return string.Join("\n---\n", - periods.Select(period => - { - return $""" - Name: {period.GetProperty("name").GetString()} - Start Time: {period.GetProperty("startTime").GetString()} - End Time: {period.GetProperty("endTime").GetString()} - Temperature: {period.GetProperty("temperature").GetInt32()}°F - Wind Speed: {period.GetProperty("windSpeed").GetString()} - Wind Direction: {period.GetProperty("windDirection").GetString()} - Short Forecast: {period.GetProperty("shortForecast").GetString()} - Detailed Forecast: {period.GetProperty("detailedForecast").GetString()} - """; - })); + using var forecastDocument = await client.ReadJsonDocumentAsync(forecastUrl ?? $"/{properties.GetProperty("gridId")}/{properties.GetProperty("gridX")},{properties.GetProperty("gridY")}/forecast"); + var periods = forecastDocument.RootElement.GetProperty("properties").GetProperty("periods").EnumerateArray(); + + 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()} + """)); } }