Backport: fix(provider/google): support functionCall.id when returned by Gemini API and provide matching functionResponse.id#15318
Merged
Conversation
5 tasks
felixarntz
approved these changes
May 15, 2026
felixarntz
added
the
backport
github-actions
Bot
removed
the
backport
Contributor
Author
|
|
felixarntz
added a commit
that referenced
this pull request
May 15, 2026
…hen returned by Gemini API and provide matching `functionResponse.id` (#15323) 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 3ca0daa (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 3ca0daa (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 3ca0daa... 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" ``` --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Felix Arntz <felix.arntz@vercel.com>
Contributor
Author
|
🚀 Published in:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automated backport of #15317 to the release-v6.0 branch. FYI @felixarntz
This backport has conflicts that need to be resolved manually.Conflicts resolved.git cherry-pickoutput