Skip to content

Backport: feat(provider/google): support Google search grounding when using generateImage with Gemini#15531

Merged
felixarntz merged 5 commits into
release-v6.0from
backport-pr-15522-to-release-v6.0
May 21, 2026
Merged

Backport: feat(provider/google): support Google search grounding when using generateImage with Gemini#15531
felixarntz merged 5 commits into
release-v6.0from
backport-pr-15522-to-release-v6.0

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

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

This is an automated backport of #15522 to the release-v6.0 branch. FYI @felixarntz
This backport has conflicts that need to be resolved manually. Conflicts resolved.

git cherry-pick output

Auto-merging content/providers/01-ai-sdk-providers/15-google.mdx
Auto-merging packages/google/src/google-generative-ai-image-model.test.ts
Auto-merging packages/google/src/google-generative-ai-image-model.ts
CONFLICT (modify/delete): packages/google/src/google-image-model-options.ts deleted in HEAD and modified in b71c0d7f4 (feat(provider/google): support Google search grounding when using `generateImage` with Gemini (#15522)).  Version b71c0d7f4 (feat(provider/google): support Google search grounding when using `generateImage` with Gemini (#15522)) of packages/google/src/google-image-model-options.ts left in tree.
Auto-merging packages/google/src/tool/google-search.ts
error: could not apply b71c0d7f4... feat(provider/google): support Google search grounding when using `generateImage` with Gemini (#15522)
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"

Wire the new google-image-model-options.ts (with googleSearch field)
into the v6 image-model file by importing the schema instead of using
the stale inline copy, re-export GoogleImageModelOptions from the new
module via index.ts, and switch the example to v6's
GoogleGenerativeAIProviderMetadata type.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@felixarntz felixarntz marked this pull request as ready for review May 21, 2026 21:19
felixarntz and others added 2 commits May 21, 2026 16:22
Keep the schema co-located with GoogleGenerativeAIImageModel where it
lived on v6 instead of introducing a standalone module unrelated to
the backported feature.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@felixarntz felixarntz enabled auto-merge (squash) May 21, 2026 21:23
@felixarntz felixarntz merged commit cfa0cb2 into release-v6.0 May 21, 2026
47 checks passed
@felixarntz felixarntz deleted the backport-pr-15522-to-release-v6.0 branch May 21, 2026 21:30
@github-actions
Copy link
Copy Markdown
Contributor Author

🚀 Published in:

Package Version
@ai-sdk/google 3.0.79 github npm
@ai-sdk/google-vertex 4.0.135 github npm

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.

2 participants