Skip to content

.Net: Add activities to MistralClient #6297

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

Merged
merged 1 commit into from
May 16, 2024
Merged

.Net: Add activities to MistralClient #6297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions dotnet/src/Connectors/Connectors.Google/Core/Gemini/Clients/GeminiChatCompletionClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ public async Task<IReadOnlyList<ChatMessageContent>> GenerateChatMessageAsync(
.ConfigureAwait(false);
chatResponses = this.ProcessChatResponse(geminiResponse);
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
throw;
}

Expand Down Expand Up @@ -259,9 +259,9 @@ public async IAsyncEnumerable<StreamingChatMessageContent> StreamGenerateChatMes
break;
}
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
throw;
}

Expand Down
8 changes: 4 additions & 4 deletions dotnet/src/Connectors/Connectors.HuggingFace/Core/HuggingFaceClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ public async Task<IReadOnlyList<TextContent>> GenerateTextAsync(

response = DeserializeResponse<TextGenerationResponse>(body);
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
throw;
}

Expand Down Expand Up @@ -200,9 +200,9 @@ public async IAsyncEnumerable<StreamingTextContent> StreamGenerateTextAsync(
break;
}
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
throw;
}

Expand Down
8 changes: 4 additions & 4 deletions dotnet/src/Connectors/Connectors.HuggingFace/Core/HuggingFaceMessageApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ internal async IAsyncEnumerable<StreamingChatMessageContent> StreamCompleteChatM
break;
}
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
throw;
}

Expand Down Expand Up @@ -155,9 +155,9 @@ internal async Task<IReadOnlyList<ChatMessageContent>> CompleteChatMessageAsync(

response = HuggingFaceClient.DeserializeResponse<ChatCompletionResponse>(body);
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
throw;
}

Expand Down
139 changes: 110 additions & 29 deletions dotnet/src/Connectors/Connectors.MistralAI/Client/MistralClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.SemanticKernel.ChatCompletion;
using Microsoft.SemanticKernel.Diagnostics;
using Microsoft.SemanticKernel.Http;
using Microsoft.SemanticKernel.Text;

Expand All @@ -25,6 +26,8 @@ namespace Microsoft.SemanticKernel.Connectors.MistralAI.Client;
/// </summary>
internal sealed class MistralClient
{
private const string ModelProvider = "mistralai";

internal MistralClient(
string modelId,
HttpClient httpClient,
Expand Down Expand Up @@ -56,18 +59,56 @@ internal async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsy

for (int requestIndex = 1; ; requestIndex++)
{
using var httpRequestMessage = this.CreatePost(chatRequest, endpoint, this._apiKey, stream: false);
var responseData = await this.SendRequestAsync<ChatCompletionResponse>(httpRequestMessage, cancellationToken).ConfigureAwait(false);
if (responseData is null || responseData.Choices is null || responseData.Choices.Count == 0)
ChatCompletionResponse? responseData = null;
List<ChatMessageContent> responseContent;
using (var activity = ModelDiagnostics.StartCompletionActivity(this._endpoint, this._modelId, ModelProvider, chatHistory, mistralExecutionSettings))
{
throw new KernelException("Chat completions not found");
try
{
using var httpRequestMessage = this.CreatePost(chatRequest, endpoint, this._apiKey, stream: false);
responseData = await this.SendRequestAsync<ChatCompletionResponse>(httpRequestMessage, cancellationToken).ConfigureAwait(false);
if (responseData is null || responseData.Choices is null || responseData.Choices.Count == 0)
{
throw new KernelException("Chat completions not found");
}
}
catch (Exception ex) when (activity is not null)
{
activity.SetError(ex);

// Capture available metadata even if the operation failed.
if (responseData is not null)
{
if (responseData.Id is string id)
{
activity.SetResponseId(id);
}

if (responseData.Usage is MistralUsage usage)
{
if (usage.PromptTokens is int promptTokens)
{
activity.SetPromptTokenUsage(promptTokens);
}
if (usage.CompletionTokens is int completionTokens)
{
activity.SetCompletionTokenUsage(completionTokens);
}
}
}

throw;
}

responseContent = this.ToChatMessageContent(modelId, responseData);
activity?.SetCompletionResponse(responseContent, responseData.Usage?.PromptTokens, responseData.Usage?.CompletionTokens);
}

// If we don't want to attempt to invoke any functions, just return the result.
// Or if we are auto-invoking but we somehow end up with other than 1 choice even though only 1 was requested, similarly bail.
if (!autoInvoke || responseData.Choices.Count != 1)
{
return this.ToChatMessageContent(modelId, responseData);
return responseContent;
}

// Get our single result and extract the function call information. If this isn't a function call, or if it is
Expand All @@ -78,7 +119,7 @@ internal async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsy
MistralChatChoice chatChoice = responseData.Choices[0]; // TODO Handle multiple choices
if (!chatChoice.IsToolCall)
{
return this.ToChatMessageContent(modelId, responseData);
return responseContent;
}

if (this._logger.IsEnabled(LogLevel.Debug))
Expand Down Expand Up @@ -237,35 +278,75 @@ internal async IAsyncEnumerable<StreamingChatMessageContent> GetStreamingChatMes
toolCalls?.Clear();

// Stream the responses
var response = this.StreamChatMessageContentsAsync(chatHistory, mistralExecutionSettings, chatRequest, modelId, cancellationToken);
string? streamedRole = null;
await foreach (var update in response.ConfigureAwait(false))
using (var activity = ModelDiagnostics.StartCompletionActivity(this._endpoint, this._modelId, ModelProvider, chatHistory, mistralExecutionSettings))
{
// If we're intending to invoke function calls, we need to consume that function call information.
if (autoInvoke)
// Make the request.
IAsyncEnumerable<StreamingChatMessageContent> response;
try
{
if (update.InnerContent is not MistralChatCompletionChunk completionChunk || completionChunk.Choices is null || completionChunk.Choices?.Count == 0)
{
continue;
}
response = this.StreamChatMessageContentsAsync(chatHistory, mistralExecutionSettings, chatRequest, modelId, cancellationToken);
}
catch (Exception e) when (activity is not null)
{
activity.SetError(e);
throw;
}

MistralChatCompletionChoice chatChoice = completionChunk!.Choices![0]; // TODO Handle multiple choices
streamedRole ??= chatChoice.Delta!.Role;
if (chatChoice.IsToolCall)
var responseEnumerator = response.ConfigureAwait(false).GetAsyncEnumerator();
List<StreamingKernelContent>? streamedContents = activity is not null ? [] : null;
string? streamedRole = null;
try
{
while (true)
{
// Create a copy of the tool calls to avoid modifying the original list
toolCalls = new List<MistralToolCall>(chatChoice.ToolCalls!);

// Add the original assistant message to the chatRequest; this is required for the service
// to understand the tool call responses. Also add the result message to the caller's chat
// history: if they don't want it, they can remove it, but this makes the data available,
// including metadata like usage.
chatRequest.AddMessage(new MistralChatMessage(streamedRole, completionChunk.GetContent(0)) { ToolCalls = chatChoice.ToolCalls });
chatHistory.Add(this.ToChatMessageContent(modelId, streamedRole!, completionChunk, chatChoice));
try
{
if (!await responseEnumerator.MoveNextAsync())
{
break;
}
}
catch (Exception ex) when (activity is not null)
{
activity.SetError(ex);
throw;
}

StreamingChatMessageContent update = responseEnumerator.Current;

// If we're intending to invoke function calls, we need to consume that function call information.
if (autoInvoke)
{
if (update.InnerContent is not MistralChatCompletionChunk completionChunk || completionChunk.Choices is null || completionChunk.Choices?.Count == 0)
{
continue;
}

MistralChatCompletionChoice chatChoice = completionChunk!.Choices![0]; // TODO Handle multiple choices
streamedRole ??= chatChoice.Delta!.Role;
if (chatChoice.IsToolCall)
{
// Create a copy of the tool calls to avoid modifying the original list
toolCalls = new List<MistralToolCall>(chatChoice.ToolCalls!);

// Add the original assistant message to the chatRequest; this is required for the service
// to understand the tool call responses. Also add the result message to the caller's chat
// history: if they don't want it, they can remove it, but this makes the data available,
// including metadata like usage.
chatRequest.AddMessage(new MistralChatMessage(streamedRole, completionChunk.GetContent(0)) { ToolCalls = chatChoice.ToolCalls });
chatHistory.Add(this.ToChatMessageContent(modelId, streamedRole!, completionChunk, chatChoice));
}
}

streamedContents?.Add(update);
yield return update;
}
}

yield return update;
finally
{
activity?.EndStreaming(streamedContents);
await responseEnumerator.DisposeAsync();
}
}

// If we don't have a function to invoke, we're done.
Expand Down
28 changes: 14 additions & 14 deletions dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/ClientCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,13 @@ internal async Task<IReadOnlyList<TextContent>> GetTextResultsAsync(
throw new KernelException("Text completions not found");
}
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
if (responseData != null)
{
// Capture available metadata even if the operation failed.
activity?
activity
.SetResponseId(responseData.Id)
.SetPromptTokenUsage(responseData.Usage.PromptTokens)
.SetCompletionTokenUsage(responseData.Usage.CompletionTokens);
Expand Down Expand Up @@ -190,9 +190,9 @@ internal async IAsyncEnumerable<StreamingTextContent> GetStreamingTextContentsAs
{
response = await RunRequestAsync(() => this.Client.GetCompletionsStreamingAsync(options, cancellationToken)).ConfigureAwait(false);
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
throw;
}

Expand All @@ -209,9 +209,9 @@ internal async IAsyncEnumerable<StreamingTextContent> GetStreamingTextContentsAs
break;
}
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
throw;
}

Expand Down Expand Up @@ -402,13 +402,13 @@ internal async Task<IReadOnlyList<ChatMessageContent>> GetChatMessageContentsAsy
throw new KernelException("Chat completions not found");
}
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
if (responseData != null)
{
// Capture available metadata even if the operation failed.
activity?
activity
.SetResponseId(responseData.Id)
.SetPromptTokenUsage(responseData.Usage.PromptTokens)
.SetCompletionTokenUsage(responseData.Usage.CompletionTokens);
Expand Down Expand Up @@ -671,9 +671,9 @@ internal async IAsyncEnumerable<OpenAIStreamingChatMessageContent> GetStreamingC
{
response = await RunRequestAsync(() => this.Client.GetChatCompletionsStreamingAsync(chatOptions, cancellationToken)).ConfigureAwait(false);
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
throw;
}

Expand All @@ -690,9 +690,9 @@ internal async IAsyncEnumerable<OpenAIStreamingChatMessageContent> GetStreamingC
break;
}
}
catch (Exception ex)
catch (Exception ex) when (activity is not null)
{
activity?.SetError(ex);
activity.SetError(ex);
throw;
}

Expand Down
Loading