Merge branch 'main' into taochen/python-document-generator-demo

Author: TaoChenOSU

.editorconfig

@@ -136,6 +136,7 @@ dotnet_diagnostic.IDE0005.severity = warning # Remove unnecessary using directiv
 dotnet_diagnostic.IDE0009.severity = warning # Add this or Me qualification
 dotnet_diagnostic.IDE0011.severity = warning # Add braces
 dotnet_diagnostic.IDE0018.severity = warning # Inline variable declaration
+
 dotnet_diagnostic.IDE0032.severity = warning # Use auto-implemented property
 dotnet_diagnostic.IDE0034.severity = warning # Simplify 'default' expression
 dotnet_diagnostic.IDE0035.severity = warning # Remove unreachable code
@@ -221,20 +222,29 @@ dotnet_diagnostic.RCS1241.severity = none # Implement IComparable when implement
 dotnet_diagnostic.IDE0001.severity = none # Simplify name
 dotnet_diagnostic.IDE0002.severity = none # Simplify member access
 dotnet_diagnostic.IDE0004.severity = none # Remove unnecessary cast
+dotnet_diagnostic.IDE0010.severity = none # Populate switch
+dotnet_diagnostic.IDE0021.severity = none # Use block body for constructors
+dotnet_diagnostic.IDE0022.severity = none # Use block body for methods
+dotnet_diagnostic.IDE0024.severity = none # Use block body for operator
 dotnet_diagnostic.IDE0035.severity = none # Remove unreachable code
 dotnet_diagnostic.IDE0051.severity = none # Remove unused private member
 dotnet_diagnostic.IDE0052.severity = none # Remove unread private member
 dotnet_diagnostic.IDE0058.severity = none # Remove unused expression value
 dotnet_diagnostic.IDE0059.severity = none # Unnecessary assignment of a value
 dotnet_diagnostic.IDE0060.severity = none # Remove unused parameter
+dotnet_diagnostic.IDE0061.severity = none # Use block body for local function
 dotnet_diagnostic.IDE0079.severity = none # Remove unnecessary suppression.
 dotnet_diagnostic.IDE0080.severity = none # Remove unnecessary suppression operator.
 dotnet_diagnostic.IDE0100.severity = none # Remove unnecessary equality operator
 dotnet_diagnostic.IDE0110.severity = none # Remove unnecessary discards
 dotnet_diagnostic.IDE0130.severity = none # Namespace does not match folder structure
+dotnet_diagnostic.IDE0290.severity = none # Use primary constructor
 dotnet_diagnostic.IDE0032.severity = none # Use auto property
 dotnet_diagnostic.IDE0160.severity = none # Use block-scoped namespace
 dotnet_diagnostic.IDE1006.severity = warning # Naming rule violations
+dotnet_diagnostic.IDE0046.severity = suggestion # If statement can be simplified
+dotnet_diagnostic.IDE0056.severity = suggestion # Indexing can be simplified
+dotnet_diagnostic.IDE0057.severity = suggestion # Substring can be simplified
 
 ###############################
 # Naming Conventions          #

dotnet/samples/Concepts/FunctionCalling/FunctionCalling.cs

@@ -72,7 +72,7 @@ public async Task RunPromptWithAutoFunctionChoiceBehaviorAdvertisingAllKernelFun
 
         OpenAIPromptExecutionSettings settings = new() { FunctionChoiceBehavior = FunctionChoiceBehavior.Auto() };
 
-        Console.WriteLine(await kernel.InvokePromptAsync("Given the current time of day and weather, what is the likely color of the sky in Boston?", new(settings)));
+        Console.WriteLine(await kernel.InvokePromptAsync("What is the likely color of the sky in Boston today?", new(settings)));
 
         // Expected output: "Boston is currently experiencing a rainy day, hence, the likely color of the sky in Boston is grey."
     }
@@ -104,7 +104,7 @@ public async Task RunPromptWithNoneFunctionChoiceBehaviorAdvertisingAllKernelFun
 
         OpenAIPromptExecutionSettings settings = new() { FunctionChoiceBehavior = FunctionChoiceBehavior.None() };
 
-        Console.WriteLine(await kernel.InvokePromptAsync("Tell me which provided functions I would need to call to get the color of the sky in Boston on a specified date.", new(settings)));
+        Console.WriteLine(await kernel.InvokePromptAsync("Tell me which provided functions I would need to call to get the color of the sky in Boston for today.", new(settings)));
 
         // Expected output: "You would first call the `HelperFunctions-GetCurrentUtcDateTime` function to get the current date time in UTC. Then, you would use the `HelperFunctions-GetWeatherForCity` function,
         //                   passing in the city name as 'Boston' and the retrieved UTC date time. Note, however, that these functions won't directly tell you the color of the sky.
@@ -122,7 +122,7 @@ public async Task RunPromptTemplateConfigWithAutoFunctionChoiceBehaviorAdvertisi
         // The `function_choice_behavior.functions` property is omitted which is equivalent to providing all kernel functions to the AI model.
         string promptTemplateConfig = """
             template_format: semantic-kernel
-            template: Given the current time of day and weather, what is the likely color of the sky in Boston?
+            template: What is the likely color of the sky in Boston today?
             execution_settings:
               default:
                 function_choice_behavior:
@@ -177,7 +177,7 @@ public async Task RunNonStreamingChatCompletionApiWithAutomaticFunctionInvocatio
         IChatCompletionService chatCompletionService = kernel.GetRequiredService<IChatCompletionService>();
 
         ChatMessageContent result = await chatCompletionService.GetChatMessageContentAsync(
-            "Given the current time of day and weather, what is the likely color of the sky in Boston?",
+            "What is the likely color of the sky in Boston today?",
             settings,
             kernel);
 
@@ -204,7 +204,7 @@ public async Task RunStreamingChatCompletionApiWithAutomaticFunctionInvocationAs
 
         // Act
         await foreach (var update in chatCompletionService.GetStreamingChatMessageContentsAsync(
-            "Given the current time of day and weather, what is the likely color of the sky in Boston?",
+            "What is the likely color of the sky in Boston today?",
             settings,
             kernel))
         {
@@ -231,7 +231,7 @@ public async Task RunNonStreamingChatCompletionApiWithManualFunctionInvocationAs
         OpenAIPromptExecutionSettings settings = new() { FunctionChoiceBehavior = Microsoft.SemanticKernel.FunctionChoiceBehavior.Auto(autoInvoke: false) };
 
         ChatHistory chatHistory = [];
-        chatHistory.AddUserMessage("Given the current time of day and weather, what is the likely color of the sky in Boston?");
+        chatHistory.AddUserMessage("What is the likely color of the sky in Boston today?");
 
         while (true)
         {
@@ -293,7 +293,7 @@ public async Task RunStreamingChatCompletionApiWithManualFunctionCallingAsync()
 
         // Create chat history with the initial user message
         ChatHistory chatHistory = [];
-        chatHistory.AddUserMessage("Given the current time of day and weather, what is the likely color of the sky in Boston?");
+        chatHistory.AddUserMessage("What is the likely color of the sky in Boston today?");
 
         while (true)
         {
@@ -360,7 +360,7 @@ public async Task RunNonStreamingPromptWithSimulatedFunctionAsync()
         OpenAIPromptExecutionSettings settings = new() { FunctionChoiceBehavior = Microsoft.SemanticKernel.FunctionChoiceBehavior.Auto(autoInvoke: false) };
 
         ChatHistory chatHistory = [];
-        chatHistory.AddUserMessage("Given the current time of day and weather, what is the likely color of the sky in Boston?");
+        chatHistory.AddUserMessage("What is the likely color of the sky in Boston today?");
 
         while (true)
         {
@@ -411,7 +411,7 @@ public async Task DisableFunctionCallingAsync()
         // Alternatively, either omit assigning anything to the `FunctionChoiceBehavior` property or assign null to it to also disable function calling.  
         OpenAIPromptExecutionSettings settings = new() { FunctionChoiceBehavior = FunctionChoiceBehavior.Auto(functions: []) };
 
-        Console.WriteLine(await kernel.InvokePromptAsync("Given the current time of day and weather, what is the likely color of the sky in Boston?", new(settings)));
+        Console.WriteLine(await kernel.InvokePromptAsync("What is the likely color of the sky in Boston today?", new(settings)));
 
         // Expected output: "Sorry, I cannot answer this question as it requires real-time information which I, as a text-based model, cannot access."
     }
@@ -538,8 +538,8 @@ private static Kernel CreateKernel()
         kernel.ImportPluginFromFunctions("HelperFunctions",
         [
             kernel.CreateFunctionFromMethod(() => new List<string> { "Squirrel Steals Show", "Dog Wins Lottery" }, "GetLatestNewsTitles", "Retrieves latest news titles."),
-            kernel.CreateFunctionFromMethod(() => DateTime.UtcNow.ToString("R"), "GetCurrentUtcDateTime", "Retrieves the current date time in UTC."),
-            kernel.CreateFunctionFromMethod((string cityName, string currentDateTime) =>
+            kernel.CreateFunctionFromMethod(() => DateTime.UtcNow.ToString("R"), "GetCurrentDateTimeInUtc", "Retrieves the current date time in UTC."),
+            kernel.CreateFunctionFromMethod((string cityName, string currentDateTimeInUtc) =>
                 cityName switch
                 {
                     "Boston" => "61 and rainy",
@@ -550,7 +550,7 @@ private static Kernel CreateKernel()
                     "Sydney" => "75 and sunny",
                     "Tel Aviv" => "80 and sunny",
                     _ => "31 and snowing",
-                }, "GetWeatherForCity", "Gets the current weather for the specified city"),
+                }, "GetWeatherForCity", "Gets the current weather for the specified city and specified date time."),
         ]);
 
         return kernel;