fixed and small additions (Azure#47520)

Author: KrzysztofCwalina

sdk/cloudmachine/Azure.CloudMachine.OpenAI/api/Azure.CloudMachine.OpenAI.net8.0.cs

@@ -9,6 +9,7 @@ public static partial class AzureOpenAIExtensions
     {
         public static void Add(this System.Collections.Generic.List<OpenAI.Chat.ChatMessage> messages, OpenAI.Chat.ChatCompletion completion) { }
         public static void Add(this System.Collections.Generic.List<OpenAI.Chat.ChatMessage> messages, System.Collections.Generic.IEnumerable<Azure.CloudMachine.OpenAI.VectorbaseEntry> entries) { }
+        public static void Add(this System.Collections.Generic.List<OpenAI.Chat.ChatMessage> messages, System.Collections.Generic.IEnumerable<OpenAI.Chat.ToolChatMessage> toolCallResults) { }
         public static string AsText(this OpenAI.Chat.ChatCompletion completion) { throw null; }
         public static string AsText(this OpenAI.Chat.ChatMessageContent content) { throw null; }
         public static string AsText(this System.ClientModel.ClientResult<OpenAI.Chat.ChatCompletion> completionResult) { throw null; }

sdk/cloudmachine/Azure.CloudMachine.OpenAI/api/Azure.CloudMachine.OpenAI.netstandard2.0.cs

@@ -9,6 +9,7 @@ public static partial class AzureOpenAIExtensions
     {
         public static void Add(this System.Collections.Generic.List<OpenAI.Chat.ChatMessage> messages, OpenAI.Chat.ChatCompletion completion) { }
         public static void Add(this System.Collections.Generic.List<OpenAI.Chat.ChatMessage> messages, System.Collections.Generic.IEnumerable<Azure.CloudMachine.OpenAI.VectorbaseEntry> entries) { }
+        public static void Add(this System.Collections.Generic.List<OpenAI.Chat.ChatMessage> messages, System.Collections.Generic.IEnumerable<OpenAI.Chat.ToolChatMessage> toolCallResults) { }
         public static string AsText(this OpenAI.Chat.ChatCompletion completion) { throw null; }
         public static string AsText(this OpenAI.Chat.ChatMessageContent content) { throw null; }
         public static string AsText(this System.ClientModel.ClientResult<OpenAI.Chat.ChatCompletion> completionResult) { throw null; }

sdk/cloudmachine/Azure.CloudMachine.OpenAI/src/AzureOpenAIExtensions.cs

@@ -142,4 +142,12 @@ public static void Add(this List<ChatMessage> messages, IEnumerable<VectorbaseEn
     /// <param name="completion"></param>
     public static void Add(this List<ChatMessage> messages, ChatCompletion completion)
         => messages.Add(ChatMessage.CreateAssistantMessage(completion));
+
+    /// <summary>
+    /// Adds a list of tool chat messages to the list of chat messages.
+    /// </summary>
+    /// <param name="messages"></param>
+    /// <param name="toolCallResults"></param>
+    public static void Add(this List<ChatMessage> messages, IEnumerable<ToolChatMessage> toolCallResults)
+        => messages.AddRange(toolCallResults);
 }

sdk/cloudmachine/Azure.CloudMachine/src/AppConfigHelpers.cs

@@ -33,7 +33,12 @@ internal static string ReadOrCreateCloudMachineId()
         }
 
         using FileStream json = new FileStream(appsettings, FileMode.Open, FileAccess.Read, FileShare.Read);
-        using JsonDocument jd = JsonDocument.Parse(json);
+        JsonDocumentOptions jsonDocumentOptions = new()
+        {
+            AllowTrailingCommas = true,
+            CommentHandling = JsonCommentHandling.Skip,
+        };
+        using JsonDocument jd = JsonDocument.Parse(json, jsonDocumentOptions);
         JsonElement je = jd.RootElement;
         // attempt to read CM configuration from existing configuration file
         if (je.TryGetProperty("CloudMachine"u8, out JsonElement cm))

sdk/cloudmachine/Azure.Provisioning.CloudMachine/src/CloudMachineInfrastructure/CloudMachineInfrastructure.cs

@@ -159,7 +159,6 @@ public static IConfigurationBuilder AddCloudMachineConfiguration(this IConfigura
     /// <returns></returns>
     public static IHostApplicationBuilder AddCloudMachine(this IHostApplicationBuilder builder, CloudMachineInfrastructure cm)
     {
-        builder.Configuration.AddCloudMachineConfiguration(cm);
         builder.Services.AddSingleton(new CloudMachineClient(cm.Connections));
         return builder;
     }