Skip to content

Fix test validation of aggregate usage counts #6401

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 9, 2025
Merged

Fix test validation of aggregate usage counts #6401

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
34 changes: 11 additions & 23 deletions test/Libraries/Microsoft.Extensions.AI.Integration.Tests/ChatClientIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,16 +229,7 @@ public virtual async Task FunctionInvocation_AutomaticallyInvokeFunction_Paramet
});

Assert.Contains(secretNumber.ToString(), response.Text);

// If the underlying IChatClient provides usage data, function invocation should aggregate the
// usage data across all calls to produce a single Usage value on the final response
if (response.Usage is { } finalUsage)
{
var totalInputTokens = activities.Sum(a => (int?)a.GetTagItem("gen_ai.response.input_tokens")!);
var totalOutputTokens = activities.Sum(a => (int?)a.GetTagItem("gen_ai.response.output_tokens")!);
Assert.Equal(totalInputTokens, finalUsage.InputTokenCount);
Assert.Equal(totalOutputTokens, finalUsage.OutputTokenCount);
}
AssertUsageAgainstActivities(response, activities);
}

[ConditionalFact]
Expand Down Expand Up @@ -306,16 +297,7 @@ public virtual async Task FunctionInvocation_OptionalParameter()
});

Assert.Contains(secretNumber.ToString(), response.Text);

// If the underlying IChatClient provides usage data, function invocation should aggregate the
// usage data across all calls to produce a single Usage value on the final response
if (response.Usage is { } finalUsage)
{
var totalInputTokens = activities.Sum(a => (int?)a.GetTagItem("gen_ai.response.input_tokens")!);
var totalOutputTokens = activities.Sum(a => (int?)a.GetTagItem("gen_ai.response.output_tokens")!);
Assert.Equal(totalInputTokens, finalUsage.InputTokenCount);
Assert.Equal(totalOutputTokens, finalUsage.OutputTokenCount);
}
AssertUsageAgainstActivities(response, activities);
}

[ConditionalFact]
Expand Down Expand Up @@ -347,15 +329,21 @@ public virtual async Task FunctionInvocation_NestedParameters()
});

Assert.Contains((secretNumber + 19).ToString(), response.Text);
AssertUsageAgainstActivities(response, activities);
}

private static void AssertUsageAgainstActivities(ChatResponse response, List<Activity> activities)
{
// If the underlying IChatClient provides usage data, function invocation should aggregate the
// usage data across all calls to produce a single Usage value on the final response
// usage data across all calls to produce a single Usage value on the final response.
// The FunctionInvokingChatClient then itself creates a span that will also be tagged with a sum
// across all consituent calls, which means our final answer will be double.
if (response.Usage is { } finalUsage)
{
var totalInputTokens = activities.Sum(a => (int?)a.GetTagItem("gen_ai.response.input_tokens")!);
var totalOutputTokens = activities.Sum(a => (int?)a.GetTagItem("gen_ai.response.output_tokens")!);
Assert.Equal(totalInputTokens, finalUsage.InputTokenCount);
Assert.Equal(totalOutputTokens, finalUsage.OutputTokenCount);
Assert.Equal(totalInputTokens, finalUsage.InputTokenCount * 2);
Assert.Equal(totalOutputTokens, finalUsage.OutputTokenCount * 2);
}
}

Expand Down
Loading