Skip to content

Commit c51e941

Browse files
committed
Address PR feedback
1 parent a780bc1 commit c51e941

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ FunctionResultContent CreateFunctionResultContent(FunctionInvocationResult resul
584584
startingTimestamp = Stopwatch.GetTimestamp();
585585
if (_logger.IsEnabled(LogLevel.Trace))
586586
{
587-
LogInvokingSensitive(context.Function.Metadata.Name, LoggingHelpers.AsJson(context.CallContent.Arguments));
587+
LogInvokingSensitive(context.Function.Metadata.Name, LoggingHelpers.AsJson(context.CallContent.Arguments, context.Function.Metadata.JsonSerializerOptions));
588588
}
589589
else
590590
{
@@ -629,7 +629,7 @@ FunctionResultContent CreateFunctionResultContent(FunctionInvocationResult resul
629629

630630
if (result is not null && _logger.IsEnabled(LogLevel.Trace))
631631
{
632-
LogInvocationCompletedSensitive(context.Function.Metadata.Name, elapsed, LoggingHelpers.AsJson(result));
632+
LogInvocationCompletedSensitive(context.Function.Metadata.Name, elapsed, LoggingHelpers.AsJson(result, context.Function.Metadata.JsonSerializerOptions));
633633
}
634634
else
635635
{

src/Libraries/Microsoft.Extensions.AI/LoggingHelpers.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ internal static class LoggingHelpers
1111
/// <summary>Serializes <paramref name="value"/> as JSON for logging purposes.</summary>
1212
public static string AsJson<T>(T value, JsonSerializerOptions? options = null)
1313
{
14-
options ??= AIJsonUtilities.DefaultOptions;
15-
16-
if (options.TryGetTypeInfo(typeof(T), out var typeInfo))
14+
if (options?.TryGetTypeInfo(typeof(T), out var typeInfo) is true ||
15+
AIJsonUtilities.DefaultOptions.TryGetTypeInfo(typeof(T), out typeInfo))
1716
{
1817
return JsonSerializer.Serialize(value, typeInfo);
1918
}

0 commit comments

Comments
 (0)