Resolve merge conflicts

Author: crickman

dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/ClientCore.cs

@@ -699,16 +699,20 @@ internal async IAsyncEnumerable<OpenAIStreamingChatMessageContent> GetStreamingC
                             role = new AuthorRole(streamedRole.Value.ToString());
                         }
 
-                        OpenAIStreamingChatMessageContent openAIStreamingChatMessageContent = new(update, update.ChoiceIndex ?? 0, this.DeploymentOrModelName, metadata) { AuthorName = streamedName, Role = role, };
+                        OpenAIStreamingChatMessageContent openAIStreamingChatMessageContent =
+                            new(update, update.ChoiceIndex ?? 0, this.DeploymentOrModelName, metadata)
+                            {
+                                AuthorName = streamedName,
+                                Role = role,
+                            };
 
                         if (update.ToolCallUpdate is StreamingFunctionToolCallUpdate functionCallUpdate)
                         {
-                            openAIStreamingChatMessageContent.Items.Add(
-                                new StreamingFunctionCallUpdateContent(
-                                    callId: functionCallUpdate.Id,
-                                    name: functionCallUpdate.Name,
-                                    arguments: functionCallUpdate.ArgumentsUpdate,
-                                    functionCallIndex: functionCallUpdate.ToolCallIndex));
+                            openAIStreamingChatMessageContent.Items.Add(new StreamingFunctionCallUpdateContent(
+                                callId: functionCallUpdate.Id,
+                                name: functionCallUpdate.Name,
+                                arguments: functionCallUpdate.ArgumentsUpdate,
+                                functionCallIndex: functionCallUpdate.ToolCallIndex));
                         }
 
                         streamedContents?.Add(openAIStreamingChatMessageContent);

dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAICompletionTests.cs

@@ -128,6 +128,11 @@ public async Task AzureOpenAIStreamingTestAsync(bool useChatModel, string prompt
         // Act
         await foreach (var content in target.InvokeStreamingAsync<StreamingKernelContent>(plugins["ChatPlugin"]["Chat"], new() { [InputParameterName] = prompt }))
         {
+            if (content is StreamingChatMessageContent messageContent)
+            {
+                Assert.NotNull(messageContent.Role);
+            }
+
             fullResult.Append(content);
         }
 

python/DEV_SETUP.md

@@ -157,7 +157,7 @@ Read more about the extension here: https://github.com/astral-sh/ruff-vscode
 You can run the unit tests under the [tests/unit](tests/unit/) folder.
 
 ```bash
-    poetry install
+    poetry install --with unit-tests
     poetry run pytest tests/unit
 ```
 
@@ -167,7 +167,7 @@ Alternatively, you can run them using VSCode Tasks. Open the command palette
 You can run the integration tests under the [tests/integration](tests/integration/) folder.
 
 ```bash
-    poetry install
+    poetry install --with tests
     poetry run pytest tests/integration
 ```