Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

.Net: AzureOpenAIChatCompletionService Functionality Cleanup #7024

Merged
merged 3 commits into from
Jul 1, 2024
Merged

.Net: AzureOpenAIChatCompletionService Functionality Cleanup #7024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9521c2f
fix: clean up code of azure chat completion service:
SergeyMenshykh Jul 1, 2024
41660a5
fix: address pr comments
SergeyMenshykh Jul 1, 2024
0cf100a
fix: rollback renaming of the AzureOpenAIPromptExecutionSettings class.
SergeyMenshykh Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../src/Connectors/Connectors.AzureOpenAI.UnitTests/Core/AzureOpenAIFunctionToolCallTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void ConvertToolCallUpdatesWithEmptyIndexesReturnsEmptyToolCalls()
var functionArgumentBuildersByIndex = new Dictionary<int, StringBuilder>();

// Act
var toolCalls = AzureOpenAIFunctionToolCall.ConvertToolCallUpdatesToChatCompletionsFunctionToolCalls(
var toolCalls = AzureOpenAIFunctionToolCall.ConvertToolCallUpdatesToFunctionToolCalls(
ref toolCallIdsByIndex,
ref functionNamesByIndex,
ref functionArgumentBuildersByIndex);
Expand All @@ -64,7 +64,7 @@ public void ConvertToolCallUpdatesWithNotEmptyIndexesReturnsNotEmptyToolCalls()
var functionArgumentBuildersByIndex = new Dictionary<int, StringBuilder> { { 3, new("test-argument") } };

// Act
var toolCalls = AzureOpenAIFunctionToolCall.ConvertToolCallUpdatesToChatCompletionsFunctionToolCalls(
var toolCalls = AzureOpenAIFunctionToolCall.ConvertToolCallUpdatesToFunctionToolCalls(
ref toolCallIdsByIndex,
ref functionNamesByIndex,
ref functionArgumentBuildersByIndex);
Expand Down
41 changes: 0 additions & 41 deletions .../Connectors/Connectors.AzureOpenAI.UnitTests/Core/AzureOpenAIStreamingTextContentTests.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions dotnet/src/Connectors/Connectors.AzureOpenAI/ChatHistoryExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static async IAsyncEnumerable<StreamingChatMessageContent> AddStreamingMe
(contentBuilder ??= new()).Append(contentUpdate);
}

AzureOpenAIFunctionToolCall.TrackStreamingToolingUpdate(chatMessage.ToolCallUpdate, ref toolCallIdsByIndex, ref functionNamesByIndex, ref functionArgumentBuildersByIndex);
AzureOpenAIFunctionToolCall.TrackStreamingToolingUpdate(chatMessage.ToolCallUpdates, ref toolCallIdsByIndex, ref functionNamesByIndex, ref functionArgumentBuildersByIndex);

// Is always expected to have at least one chunk with the role provided from a streaming message
streamedRole ??= chatMessage.Role;
Expand All @@ -62,7 +62,7 @@ public static async IAsyncEnumerable<StreamingChatMessageContent> AddStreamingMe
role,
contentBuilder?.ToString() ?? string.Empty,
messageContents[0].ModelId!,
AzureOpenAIFunctionToolCall.ConvertToolCallUpdatesToChatCompletionsFunctionToolCalls(ref toolCallIdsByIndex, ref functionNamesByIndex, ref functionArgumentBuildersByIndex),
AzureOpenAIFunctionToolCall.ConvertToolCallUpdatesToFunctionToolCalls(ref toolCallIdsByIndex, ref functionNamesByIndex, ref functionArgumentBuildersByIndex),
metadata)
{ AuthorName = streamedName });
}
Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/Connectors/Connectors.AzureOpenAI/Core/AzureOpenAIClientCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ internal AzureOpenAIClientCore(
Verify.StartsWith(endpoint, "https://", "The Azure OpenAI endpoint must start with 'https://'");
Verify.NotNullOrWhiteSpace(apiKey);

var options = GetOpenAIClientOptions(httpClient);
var options = GetAzureOpenAIClientOptions(httpClient);

this.DeploymentOrModelName = deploymentName;
this.Endpoint = new Uri(endpoint);
Expand All @@ -70,7 +70,7 @@ internal AzureOpenAIClientCore(
Verify.NotNullOrWhiteSpace(endpoint);
Verify.StartsWith(endpoint, "https://", "The Azure OpenAI endpoint must start with 'https://'");

var options = GetOpenAIClientOptions(httpClient);
var options = GetAzureOpenAIClientOptions(httpClient);

this.DeploymentOrModelName = deploymentName;
this.Endpoint = new Uri(endpoint);
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/Connectors/Connectors.AzureOpenAI/Core/AzureOpenAIFunctionToolCall.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ internal static void TrackStreamingToolingUpdate(
/// <param name="toolCallIdsByIndex">Dictionary mapping indices to IDs.</param>
/// <param name="functionNamesByIndex">Dictionary mapping indices to names.</param>
/// <param name="functionArgumentBuildersByIndex">Dictionary mapping indices to arguments.</param>
internal static ChatToolCall[] ConvertToolCallUpdatesToChatCompletionsFunctionToolCalls(
internal static ChatToolCall[] ConvertToolCallUpdatesToFunctionToolCalls(
ref Dictionary<int, string>? toolCallIdsByIndex,
ref Dictionary<int, string>? functionNamesByIndex,
ref Dictionary<int, StringBuilder>? functionArgumentBuildersByIndex)
Expand Down
10 changes: 5 additions & 5 deletions dotnet/src/Connectors/Connectors.AzureOpenAI/Core/AzureOpenAIStreamingChatMessageContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ internal AzureOpenAIStreamingChatMessageContent(
Encoding.UTF8,
metadata)
{
this.ToolCallUpdate = chatUpdate.ToolCallUpdates;
this.ToolCallUpdates = chatUpdate.ToolCallUpdates;
this.FinishReason = chatUpdate.FinishReason;
this.Items = CreateContentItems(chatUpdate.ContentUpdate);
}
Expand All @@ -51,15 +51,15 @@ internal AzureOpenAIStreamingChatMessageContent(
/// </summary>
/// <param name="authorRole">Author role of the message</param>
/// <param name="content">Content of the message</param>
/// <param name="tootToolCallUpdate">Tool call update</param>
/// <param name="toolCallUpdates">Tool call updates</param>
/// <param name="completionsFinishReason">Completion finish reason</param>
/// <param name="choiceIndex">Index of the choice</param>
/// <param name="modelId">The model ID used to generate the content</param>
/// <param name="metadata">Additional metadata</param>
internal AzureOpenAIStreamingChatMessageContent(
AuthorRole? authorRole,
string? content,
IReadOnlyList<StreamingChatToolCallUpdate>? tootToolCallUpdate = null,
IReadOnlyList<StreamingChatToolCallUpdate>? toolCallUpdates = null,
ChatFinishReason? completionsFinishReason = null,
int choiceIndex = 0,
string? modelId = null,
Expand All @@ -73,12 +73,12 @@ internal AzureOpenAIStreamingChatMessageContent(
Encoding.UTF8,
metadata)
{
this.ToolCallUpdate = tootToolCallUpdate;
this.ToolCallUpdates = toolCallUpdates;
this.FinishReason = completionsFinishReason;
}

/// <summary>Gets any update information in the message about a tool call.</summary>
public IReadOnlyList<StreamingChatToolCallUpdate>? ToolCallUpdate { get; }
public IReadOnlyList<StreamingChatToolCallUpdate>? ToolCallUpdates { get; }

/// <inheritdoc/>
public override byte[] ToByteArray() => this.Encoding.GetBytes(this.ToString());
Expand Down
51 changes: 0 additions & 51 deletions dotnet/src/Connectors/Connectors.AzureOpenAI/Core/AzureOpenAIStreamingTextContent.cs
View file
Open in desktop

This file was deleted.

Loading
Loading