Skip to content

Backport: Backport: feat(@ai-sdk/google): preserve per-modality token details in usage data#14113

Merged
felixarntz merged 3 commits intorelease-v5.0from
backport-pr-14110-to-release-v5.0
Apr 3, 2026
Merged

Backport: Backport: feat(@ai-sdk/google): preserve per-modality token details in usage data#14113
felixarntz merged 3 commits intorelease-v5.0from
backport-pr-14110-to-release-v5.0

Conversation

@vercel-ai-sdk
Copy link
Copy Markdown
Contributor

@vercel-ai-sdk vercel-ai-sdk bot commented Apr 3, 2026

This is an automated backport of #14110 to the release-v5.0 branch. FYI @vercel-ai-sdk[bot]
This backport has conflicts that need to be resolved manually. Conflicts resolved.

git cherry-pick output

CONFLICT (file location): examples/ai-functions/src/generate-text/google/modality-token-details.ts added in f20ba7728 (Backport: feat(@ai-sdk/google): preserve per-modality token details in usage data (#14110)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/generate-text/modality-token-details.ts.
CONFLICT (file location): examples/ai-functions/src/stream-text/google/modality-token-details.ts added in f20ba7728 (Backport: feat(@ai-sdk/google): preserve per-modality token details in usage data (#14110)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/stream-text/modality-token-details.ts.
CONFLICT (modify/delete): packages/google/src/__snapshots__/google-generative-ai-language-model.test.ts.snap deleted in HEAD and modified in f20ba7728 (Backport: feat(@ai-sdk/google): preserve per-modality token details in usage data (#14110)).  Version f20ba7728 (Backport: feat(@ai-sdk/google): preserve per-modality token details in usage data (#14110)) of packages/google/src/__snapshots__/google-generative-ai-language-model.test.ts.snap left in tree.
CONFLICT (modify/delete): packages/google/src/convert-google-generative-ai-usage.ts deleted in HEAD and modified in f20ba7728 (Backport: feat(@ai-sdk/google): preserve per-modality token details in usage data (#14110)).  Version f20ba7728 (Backport: feat(@ai-sdk/google): preserve per-modality token details in usage data (#14110)) of packages/google/src/convert-google-generative-ai-usage.ts left in tree.
Auto-merging packages/google/src/google-generative-ai-language-model.ts
error: could not apply f20ba7728... Backport: feat(@ai-sdk/google): preserve per-modality token details in usage data (#14110)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

@tigent tigent bot added ai/provider related to a provider package. Must be assigned together with at least one `provider/*` label feature New feature or request maintenance CI, internal documentation, automations, etc provider/google Issues related to the @ai-sdk/google provider labels Apr 3, 2026
@felixarntz felixarntz marked this pull request as ready for review April 3, 2026 19:22
Copy link
Copy Markdown
Contributor

@vercel vercel bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Additional Suggestion:

In the non-streaming doGenerate path, usageMetadata is not included in providerMetadata.google, making the new promptTokensDetails and candidatesTokensDetails fields inaccessible to generateText consumers.

Fix on Vercel

@felixarntz felixarntz merged commit 84bbfee into release-v5.0 Apr 3, 2026
19 checks passed
@felixarntz felixarntz deleted the backport-pr-14110-to-release-v5.0 branch April 3, 2026 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai/provider related to a provider package. Must be assigned together with at least one `provider/*` label feature New feature or request maintenance CI, internal documentation, automations, etc provider/google Issues related to the @ai-sdk/google provider

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant