Skip to content

Backport: Backport: fix(provider/google): support functionCall.id when returned by Gemini API and provide matching functionResponse.id#15323

Merged
felixarntz merged 3 commits into
release-v5.0from
backport-pr-15318-to-release-v5.0
May 15, 2026
Merged

Backport: Backport: fix(provider/google): support functionCall.id when returned by Gemini API and provide matching functionResponse.id#15323
felixarntz merged 3 commits into
release-v5.0from
backport-pr-15318-to-release-v5.0

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot commented May 15, 2026

This is an automated backport of #15318 to the release-v5.0 branch. FYI @github-actions[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/function-call-id.ts added in 3ca0daa8e (Backport: fix(provider/google): support `functionCall.id` when returned by Gemini API and provide matching `functionResponse.id` (#15318)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/generate-text/function-call-id.ts.
CONFLICT (file location): examples/ai-functions/src/stream-text/google/function-call-id.ts added in 3ca0daa8e (Backport: fix(provider/google): support `functionCall.id` when returned by Gemini API and provide matching `functionResponse.id` (#15318)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/stream-text/function-call-id.ts.
Auto-merging packages/google/src/convert-to-google-generative-ai-messages.test.ts
CONFLICT (content): Merge conflict in packages/google/src/convert-to-google-generative-ai-messages.test.ts
Auto-merging packages/google/src/convert-to-google-generative-ai-messages.ts
CONFLICT (content): Merge conflict in packages/google/src/convert-to-google-generative-ai-messages.ts
Auto-merging packages/google/src/google-generative-ai-language-model.ts
CONFLICT (content): Merge conflict in packages/google/src/google-generative-ai-language-model.ts
Auto-merging packages/google/src/google-generative-ai-prompt.ts
error: could not apply 3ca0daa8e... Backport: fix(provider/google): support `functionCall.id` when returned by Gemini API and provide matching `functionResponse.id` (#15318)
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"

@felixarntz felixarntz marked this pull request as ready for review May 15, 2026 17:26
@felixarntz felixarntz enabled auto-merge (squash) May 15, 2026 18:41
@felixarntz felixarntz merged commit f081ba8 into release-v5.0 May 15, 2026
18 checks passed
@felixarntz felixarntz deleted the backport-pr-15318-to-release-v5.0 branch May 15, 2026 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant