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

Work around fixed bug in System.Memory.Data #5569

Merged
merged 2 commits into from
Oct 24, 2024
Merged

Work around fixed bug in System.Memory.Data #5569

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f78bc7
Workaround fixed bug in System.Memory.Data
stephentoub Oct 24, 2024
a48b840
Add pragma warning and update condition check
stephentoub Oct 24, 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
8 changes: 5 additions & 3 deletions src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
Expand All @@ -17,6 +17,7 @@
#pragma warning disable S1135 // Track uses of "TODO" tags
#pragma warning disable S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
#pragma warning disable SA1204 // Static elements should appear before instance elements
#pragma warning disable SA1108 // Block statements should not contain embedded comments

namespace Microsoft.Extensions.AI;

Expand Down Expand Up @@ -264,9 +265,10 @@ public async IAsyncEnumerable<StreamingChatCompletionUpdate> CompleteStreamingAs

existing.CallId ??= toolCallUpdate.ToolCallId;
existing.Name ??= toolCallUpdate.FunctionName;
if (toolCallUpdate.FunctionArgumentsUpdate is not null)
if (toolCallUpdate.FunctionArgumentsUpdate is { } update &&
!update.ToMemory().IsEmpty) // workaround for https://github.com/dotnet/runtime/issues/68262 in 6.0.0 package
{
_ = (existing.Arguments ??= new()).Append(toolCallUpdate.FunctionArgumentsUpdate);
_ = (existing.Arguments ??= new()).Append(update.ToString());
}
}
}
Expand Down
Loading