diff --git a/dotnet/agent-framework-dotnet.slnx b/dotnet/agent-framework-dotnet.slnx index 3ce847dc6a..569edd6ec0 100644 --- a/dotnet/agent-framework-dotnet.slnx +++ b/dotnet/agent-framework-dotnet.slnx @@ -23,6 +23,8 @@ + + @@ -110,29 +112,6 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/AGUIDojoClient.csproj b/dotnet/samples/AGUIDojo/AGUIDojoClient/AGUIDojoClient.csproj index ade81ba321..2af4e403fc 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/AGUIDojoClient.csproj +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/AGUIDojoClient.csproj @@ -1,17 +1,12 @@ - net9.0 + net10.0 enable enable true - - - - - diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/AgentSuggestions.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/AgentSuggestions.cs index b1e0a066df..2214f52de0 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/AgentSuggestions.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/AgentSuggestions.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using Microsoft.Extensions.AI; @@ -16,8 +16,8 @@ public readonly struct Suggestion : IEquatable /// The message to send when the suggestion is selected. public Suggestion(string text, ChatMessage message) { - Text = text; - Message = message; + this.Text = text; + this.Message = message; } /// @@ -26,8 +26,8 @@ public readonly struct Suggestion : IEquatable /// The display text for the suggestion, also used as the message content. public Suggestion(string text) { - Text = text; - Message = new ChatMessage(ChatRole.User, text); + this.Text = text; + this.Message = new ChatMessage(ChatRole.User, text); } /// @@ -41,13 +41,13 @@ public readonly struct Suggestion : IEquatable public ChatMessage Message { get; } /// - public override bool Equals(object? obj) => obj is Suggestion other && Equals(other); + public override bool Equals(object? obj) => obj is Suggestion other && this.Equals(other); /// - public bool Equals(Suggestion other) => Text == other.Text; + public bool Equals(Suggestion other) => this.Text == other.Text; /// - public override int GetHashCode() => Text?.GetHashCode() ?? 0; + public override int GetHashCode() => this.Text?.GetHashCode() ?? 0; /// /// Determines whether two instances are equal. diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/Contents/FunctionCallTemplate.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/Contents/FunctionCallTemplate.cs index b4b94ee32a..663c9d42ca 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/Contents/FunctionCallTemplate.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/Contents/FunctionCallTemplate.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using Microsoft.Extensions.AI; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/Contents/InvocationContext.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/Contents/InvocationContext.cs index df56b12795..be5ad87f1c 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/Contents/InvocationContext.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/Contents/InvocationContext.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json; using Microsoft.Extensions.AI; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/MessageHelpers.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/MessageHelpers.cs index fce41e9d6c..326a7ce55b 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/MessageHelpers.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/AI/Messages/MessageHelpers.cs @@ -4,7 +4,6 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Text; using Microsoft.Extensions.AI; -using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Components.AI; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/JsonPatchOperation.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/JsonPatchOperation.cs index 7db6f578b9..c179f83830 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/JsonPatchOperation.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/JsonPatchOperation.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/Plan.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/Plan.cs index 3255e00c16..e3894d6186 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/Plan.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/Plan.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/PlanPatcher.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/PlanPatcher.cs index cdd3798e5d..e226c11391 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/PlanPatcher.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/PlanPatcher.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json; using System.Text.RegularExpressions; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/Step.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/Step.cs index 179b81c9ee..ab2e7cbfee 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/Step.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/AgenticGenerativeUI/Step.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/BackendToolRendering/WeatherCallTemplate.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/BackendToolRendering/WeatherCallTemplate.cs index 3d38a28402..e9ed8ab989 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/BackendToolRendering/WeatherCallTemplate.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/BackendToolRendering/WeatherCallTemplate.cs @@ -1,6 +1,5 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. -using AGUIDojoClient.Components.Shared; using Microsoft.Extensions.AI; namespace Microsoft.AspNetCore.Components.AI; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/CreatePlanCallTemplate.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/CreatePlanCallTemplate.cs index e96181fd7f..4d32cc2a79 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/CreatePlanCallTemplate.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/CreatePlanCallTemplate.cs @@ -1,8 +1,7 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.AI; -using Microsoft.AspNetCore.Components.Rendering; using Microsoft.Extensions.AI; namespace AGUIDojoClient.Components.Demos.HumanInTheLoop; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/HumanInTheLoopAgent.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/HumanInTheLoopAgent.cs index a3c671f4c9..3253a11585 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/HumanInTheLoopAgent.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/HumanInTheLoopAgent.cs @@ -1,6 +1,5 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. -using System.Runtime.CompilerServices; using Microsoft.Agents.AI; using Microsoft.Extensions.AI; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/JsonPatchOperation.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/JsonPatchOperation.cs index db154e4fd5..8d3c6c27ed 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/JsonPatchOperation.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/JsonPatchOperation.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/Plan.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/Plan.cs index a5bfbc6591..fafaa12b22 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/Plan.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/Plan.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/PlanConfirmationResult.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/PlanConfirmationResult.cs index 6af0bf3486..d7d82c49cb 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/PlanConfirmationResult.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/PlanConfirmationResult.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. namespace AGUIDojoClient.Components.Demos.HumanInTheLoop; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/PlanPatcher.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/PlanPatcher.cs index 074c152801..35dd1ee2e4 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/PlanPatcher.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/PlanPatcher.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using System.Text.RegularExpressions; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/Step.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/Step.cs index 38348f9859..9117f5cf68 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/Step.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/HumanInTheLoop/Step.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/PredictiveStateUpdates/ConfirmChangesResult.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/PredictiveStateUpdates/ConfirmChangesResult.cs index 4b94f13a05..46d97d9667 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/PredictiveStateUpdates/ConfirmChangesResult.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/PredictiveStateUpdates/ConfirmChangesResult.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. namespace AGUIDojoClient.Components.Demos.PredictiveStateUpdates; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/PredictiveStateUpdates/DocumentState.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/PredictiveStateUpdates/DocumentState.cs index 96efae04e6..1cdcdd4681 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/PredictiveStateUpdates/DocumentState.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/PredictiveStateUpdates/DocumentState.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/Ingredient.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/Ingredient.cs index f86a8c14fd..7d97e6c9ca 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/Ingredient.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/Ingredient.cs @@ -1,5 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/Recipe.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/Recipe.cs index a054d096ea..511b47b4d6 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/Recipe.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/Recipe.cs @@ -1,5 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/RecipeResponse.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/RecipeResponse.cs index 6b95d838aa..828b248469 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/RecipeResponse.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/SharedState/RecipeResponse.cs @@ -1,5 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/ToolBasedGenerativeUI/Haiku.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/ToolBasedGenerativeUI/Haiku.cs index df361dea39..bb31489c00 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/ToolBasedGenerativeUI/Haiku.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/ToolBasedGenerativeUI/Haiku.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. namespace AGUIDojoClient.Components.Demos.ToolBasedGenerativeUI; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/ToolBasedGenerativeUI/HaikuCallTemplate.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/ToolBasedGenerativeUI/HaikuCallTemplate.cs index 6106bbe9c5..3a5f0345a2 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/ToolBasedGenerativeUI/HaikuCallTemplate.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Demos/ToolBasedGenerativeUI/HaikuCallTemplate.cs @@ -1,8 +1,7 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.AI; -using Microsoft.AspNetCore.Components.Rendering; using Microsoft.Extensions.AI; namespace AGUIDojoClient.Components.Demos.ToolBasedGenerativeUI; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/DemoScenario.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/DemoScenario.cs index 7fcf24b51f..87ee6b6e8b 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/DemoScenario.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/DemoScenario.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. namespace AGUIDojoClient.Components.Shared; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/DemoService.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/DemoService.cs index a5c51ec02b..7b213f033e 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/DemoService.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/DemoService.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using Microsoft.Agents.AI.AGUI; using Microsoft.Extensions.AI; @@ -19,8 +19,8 @@ public sealed class DemoService /// Factory for creating HTTP clients. public DemoService(IHttpClientFactory httpClientFactory) { - _httpClientFactory = httpClientFactory; - _scenarios = InitializeScenarios(); + this._httpClientFactory = httpClientFactory; + this._scenarios = InitializeScenarios(); } /// diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/WeatherInfo.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/WeatherInfo.cs index b540a5de7f..c7336ce987 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/WeatherInfo.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Components/Shared/WeatherInfo.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; @@ -27,37 +27,61 @@ public sealed class WeatherInfo /// /// Gets the temperature in Fahrenheit. /// - public double TemperatureFahrenheit => (Temperature * 9.0 / 5.0) + 32; + public double TemperatureFahrenheit => (this.Temperature * 9.0 / 5.0) + 32; /// /// Gets an emoji icon based on weather conditions. /// - public string ConditionIcon => GetConditionIcon(Conditions); + public string ConditionIcon => GetConditionIcon(this.Conditions); private static string GetConditionIcon(string conditions) { if (string.Equals(conditions, "sunny", StringComparison.OrdinalIgnoreCase) || string.Equals(conditions, "clear", StringComparison.OrdinalIgnoreCase)) + { return "☀️"; + } + if (string.Equals(conditions, "cloudy", StringComparison.OrdinalIgnoreCase) || string.Equals(conditions, "overcast", StringComparison.OrdinalIgnoreCase)) + { return "☁️"; + } + if (string.Equals(conditions, "rainy", StringComparison.OrdinalIgnoreCase) || string.Equals(conditions, "rain", StringComparison.OrdinalIgnoreCase)) + { return "🌧️"; + } + if (string.Equals(conditions, "stormy", StringComparison.OrdinalIgnoreCase) || string.Equals(conditions, "thunderstorm", StringComparison.OrdinalIgnoreCase)) + { return "⛈️"; + } + if (string.Equals(conditions, "snowy", StringComparison.OrdinalIgnoreCase) || string.Equals(conditions, "snow", StringComparison.OrdinalIgnoreCase)) + { return "❄️"; + } + if (string.Equals(conditions, "foggy", StringComparison.OrdinalIgnoreCase) || string.Equals(conditions, "fog", StringComparison.OrdinalIgnoreCase)) + { return "🌫️"; + } + if (string.Equals(conditions, "windy", StringComparison.OrdinalIgnoreCase)) + { return "💨"; + } + if (string.Equals(conditions, "partly cloudy", StringComparison.OrdinalIgnoreCase)) + { return "⛅"; + } + return "🌡️"; } } diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Program.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Program.cs index 090a041b86..970e6d21bf 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Program.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Program.cs @@ -35,7 +35,7 @@ builder.Services.AddChatClient(sp => builder.Services.AddKeyedSingleton("agentic-chat", (sp, key) => { HttpClient httpClient = sp.GetRequiredService().CreateClient("aguiserver"); - AGUIChatClient aguiChatClient = new AGUIChatClient(httpClient, "agentic_chat"); + AGUIChatClient aguiChatClient = new(httpClient, "agentic_chat"); // Get the background color service for the frontend tool IBackgroundColorService backgroundService = sp.GetRequiredService(); @@ -61,7 +61,7 @@ builder.Services.AddKeyedSingleton("agentic-chat", (sp, key) => builder.Services.AddKeyedSingleton("backend-tool-rendering", (sp, key) => { HttpClient httpClient = sp.GetRequiredService().CreateClient("aguiserver"); - AGUIChatClient aguiChatClient = new AGUIChatClient(httpClient, "backend_tool_rendering"); + AGUIChatClient aguiChatClient = new(httpClient, "backend_tool_rendering"); return aguiChatClient.CreateAIAgent( name: "BackendToolRenderingAssistant", @@ -72,7 +72,7 @@ builder.Services.AddKeyedSingleton("backend-tool-rendering", (sp, key) builder.Services.AddKeyedSingleton("human-in-the-loop", (sp, key) => { HttpClient httpClient = sp.GetRequiredService().CreateClient("aguiserver"); - AGUIChatClient aguiChatClient = new AGUIChatClient(httpClient, "human_in_the_loop"); + AGUIChatClient aguiChatClient = new(httpClient, "human_in_the_loop"); // Create the base agent and wrap it with a delegating agent that adds instructions AIAgent baseAgent = aguiChatClient.CreateAIAgent( @@ -86,7 +86,7 @@ builder.Services.AddKeyedSingleton("human-in-the-loop", (sp, key) => builder.Services.AddKeyedSingleton("tool-based-generative-ui", (sp, key) => { HttpClient httpClient = sp.GetRequiredService().CreateClient("aguiserver"); - AGUIChatClient aguiChatClient = new AGUIChatClient(httpClient, "tool_based_generative_ui"); + AGUIChatClient aguiChatClient = new(httpClient, "tool_based_generative_ui"); return aguiChatClient.CreateAIAgent( name: "ToolBasedGenerativeUIAssistant", @@ -97,7 +97,7 @@ builder.Services.AddKeyedSingleton("tool-based-generative-ui", (sp, key builder.Services.AddKeyedSingleton("agentic-generative-ui", (sp, key) => { HttpClient httpClient = sp.GetRequiredService().CreateClient("aguiserver"); - AGUIChatClient aguiChatClient = new AGUIChatClient(httpClient, "agentic_generative_ui"); + AGUIChatClient aguiChatClient = new(httpClient, "agentic_generative_ui"); return aguiChatClient.CreateAIAgent( name: "AgenticGenerativeUIAssistant", @@ -108,7 +108,7 @@ builder.Services.AddKeyedSingleton("agentic-generative-ui", (sp, key) = builder.Services.AddKeyedSingleton("shared-state", (sp, key) => { HttpClient httpClient = sp.GetRequiredService().CreateClient("aguiserver"); - AGUIChatClient aguiChatClient = new AGUIChatClient(httpClient, "shared_state"); + AGUIChatClient aguiChatClient = new(httpClient, "shared_state"); return aguiChatClient.CreateAIAgent( name: "SharedStateAssistant", @@ -119,7 +119,7 @@ builder.Services.AddKeyedSingleton("shared-state", (sp, key) => builder.Services.AddKeyedSingleton("predictive-state-updates", (sp, key) => { HttpClient httpClient = sp.GetRequiredService().CreateClient("aguiserver"); - AGUIChatClient aguiChatClient = new AGUIChatClient(httpClient, "predictive_state_updates"); + AGUIChatClient aguiChatClient = new(httpClient, "predictive_state_updates"); return aguiChatClient.CreateAIAgent( name: "PredictiveStateUpdatesAssistant", diff --git a/dotnet/samples/AGUIDojo/AGUIDojoClient/Services/BackgroundColorService.cs b/dotnet/samples/AGUIDojo/AGUIDojoClient/Services/BackgroundColorService.cs index 558284cd3b..ff2a63a338 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoClient/Services/BackgroundColorService.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoClient/Services/BackgroundColorService.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft. All rights reserved. +// Copyright (c) Microsoft. All rights reserved. namespace AGUIDojoClient.Services; @@ -13,7 +13,7 @@ public class BackgroundColorChangedEventArgs : EventArgs /// The new background color. public BackgroundColorChangedEventArgs(string color) { - Color = color; + this.Color = color; } /// @@ -59,7 +59,7 @@ public class BackgroundColorService : IBackgroundColorService /// public void SetColor(string color) { - CurrentColor = color; + this.CurrentColor = color; ColorChanged?.Invoke(this, new BackgroundColorChangedEventArgs(color)); } } diff --git a/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/AgenticPlanningTools.cs b/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/AgenticPlanningTools.cs index 3ce79cc53b..98fe96b442 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/AgenticPlanningTools.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/AgenticPlanningTools.cs @@ -1,12 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD // Copyright (c) Microsoft. All rights reserved. -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> beabff3e (Update the dojo samples) -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> 660dee85 (cleanups) using System.ComponentModel; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/JsonPatchOperation.cs b/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/JsonPatchOperation.cs index 0f2a36c6e1..1cd8f5dcd2 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/JsonPatchOperation.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/JsonPatchOperation.cs @@ -1,12 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD // Copyright (c) Microsoft. All rights reserved. -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> beabff3e (Update the dojo samples) -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> 660dee85 (cleanups) using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/Plan.cs b/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/Plan.cs index 9a5eed9ef6..a8ffcc6c37 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/Plan.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/Plan.cs @@ -1,12 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD // Copyright (c) Microsoft. All rights reserved. -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> beabff3e (Update the dojo samples) -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> 660dee85 (cleanups) using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/Step.cs b/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/Step.cs index 6a638a506b..26bc9860a5 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/Step.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/Step.cs @@ -1,12 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD // Copyright (c) Microsoft. All rights reserved. -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> beabff3e (Update the dojo samples) -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> 660dee85 (cleanups) using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/StepStatus.cs b/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/StepStatus.cs index a5e57e2632..f88d71bef0 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/StepStatus.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoServer/AgenticUI/StepStatus.cs @@ -1,12 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD // Copyright (c) Microsoft. All rights reserved. -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> beabff3e (Update the dojo samples) -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> 660dee85 (cleanups) using System.Text.Json.Serialization; diff --git a/dotnet/samples/AGUIDojo/AGUIDojoServer/ChatClientAgentFactory.cs b/dotnet/samples/AGUIDojo/AGUIDojoServer/ChatClientAgentFactory.cs index 376bc0109b..bdbd4cd2d3 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoServer/ChatClientAgentFactory.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoServer/ChatClientAgentFactory.cs @@ -10,7 +10,6 @@ using Azure.AI.OpenAI; using Azure.Identity; using Microsoft.Agents.AI; using Microsoft.Extensions.AI; -using OpenAI; using ChatClient = OpenAI.Chat.ChatClient; namespace AGUIDojoServer; @@ -78,7 +77,6 @@ internal static class ChatClientAgentFactory { Name = "AgenticUIAgent", Description = "An agent that generates agentic user interfaces using Azure OpenAI", -<<<<<<< HEAD ChatOptions = new ChatOptions { Instructions = """ @@ -95,24 +93,6 @@ internal static class ChatClientAgentFactory Only one plan can be active at a time, so do not call the `create_plan` tool again until all the steps in current plan are completed. """, -======= - Instructions = """ - When planning use tools only, without any other messages. - IMPORTANT: - - Use the `create_plan` tool to set the initial state of the steps - - Use the `update_plan_step` tool to update the status of each step - - Do NOT repeat the plan or summarise it in a message - - Do NOT confirm the creation or updates in a message - - Do NOT ask the user for additional information or next steps - - Do NOT leave a plan hanging, always complete the plan via `update_plan_step` if one is ongoing. - - Continue calling update_plan_step until all steps are marked as completed. - - Only one plan can be active at a time, so do not call the `create_plan` tool - again until all the steps in current plan are completed. - """, - ChatOptions = new ChatOptions - { ->>>>>>> beabff3e (Update the dojo samples) Tools = [ AIFunctionFactory.Create( AgenticPlanningTools.CreatePlan, @@ -151,12 +131,11 @@ internal static class ChatClientAgentFactory { Name = "PredictiveStateUpdatesAgent", Description = "An agent that demonstrates predictive state updates using Azure OpenAI", -<<<<<<< HEAD ChatOptions = new ChatOptions { Instructions = """ You are a document editor assistant. When asked to write or edit content: - + IMPORTANT: - Use the `write_document` tool with the full document text in Markdown format - Format the document extensively so it's easy to read @@ -166,28 +145,9 @@ internal static class ChatClientAgentFactory - When making edits to the document, try to make them minimal - do not change every word - Keep stories SHORT! - After you are done writing the document you MUST call a confirm_changes tool after you call write_document - + After the user confirms the changes, provide a brief summary of what you wrote. """, -======= - Instructions = """ - You are a document editor assistant. When asked to write or edit content: - - IMPORTANT: - - Use the `write_document` tool with the full document text in Markdown format - - Format the document extensively so it's easy to read - - You can use all kinds of markdown (headings, lists, bold, etc.) - - However, do NOT use italic or strike-through formatting - - You MUST write the full document, even when changing only a few words - - When making edits to the document, try to make them minimal - do not change every word - - Keep stories SHORT! - - After you are done writing the document you MUST call a confirm_changes tool after you call write_document - - After the user confirms the changes, provide a brief summary of what you wrote. - """, - ChatOptions = new ChatOptions - { ->>>>>>> beabff3e (Update the dojo samples) Tools = [ AIFunctionFactory.Create( WriteDocument, diff --git a/dotnet/samples/AGUIDojo/AGUIDojoServer/PredictiveStateUpdates/DocumentState.cs b/dotnet/samples/AGUIDojo/AGUIDojoServer/PredictiveStateUpdates/DocumentState.cs index 32e63d239d..ad053fe4a2 100644 --- a/dotnet/samples/AGUIDojo/AGUIDojoServer/PredictiveStateUpdates/DocumentState.cs +++ b/dotnet/samples/AGUIDojo/AGUIDojoServer/PredictiveStateUpdates/DocumentState.cs @@ -1,12 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD // Copyright (c) Microsoft. All rights reserved. -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> beabff3e (Update the dojo samples) -======= -// Copyright (c) Microsoft. All rights reserved. ->>>>>>> 660dee85 (cleanups) using System.Text.Json.Serialization;