Commit 00a1e93
Backport: Backport: feat(provider/google): add
This is an automated backport of #15436 to the release-v5.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-generative-ai.mdx
Auto-merging content/providers/01-ai-sdk-providers/16-google-vertex.mdx
CONFLICT (content): Merge conflict in content/providers/01-ai-sdk-providers/16-google-vertex.mdx
CONFLICT (file location): examples/ai-functions/src/generate-text/google/gemini-3-5-flash.ts added in 756fec1 (Backport: feat(provider/google): add `gemini-3.5-flash` (#15436)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/generate-text/gemini-3-5-flash.ts.
Auto-merging examples/ai-core/src/generate-text/google-function-call-id.ts
CONFLICT (file location): examples/ai-functions/src/generate-text/google/interactions-gemini-3-5-flash.ts added in 756fec1 (Backport: feat(provider/google): add `gemini-3.5-flash` (#15436)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/generate-text/interactions-gemini-3-5-flash.ts.
CONFLICT (file location): examples/ai-functions/src/stream-text/google/gemini-3-5-flash.ts added in 756fec1 (Backport: feat(provider/google): add `gemini-3.5-flash` (#15436)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/stream-text/gemini-3-5-flash.ts.
Auto-merging examples/ai-core/src/stream-text/google-function-call-id.ts
CONFLICT (file location): examples/ai-functions/src/stream-text/google/interactions-gemini-3-5-flash.ts added in 756fec1 (Backport: feat(provider/google): add `gemini-3.5-flash` (#15436)) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to examples/ai-core/src/stream-text/interactions-gemini-3-5-flash.ts.
Auto-merging packages/google-vertex/src/google-vertex-options.ts
Auto-merging packages/google/src/google-generative-ai-options.ts
CONFLICT (modify/delete): packages/google/src/interactions/google-interactions-language-model-options.ts deleted in HEAD and modified in 756fec1 (Backport: feat(provider/google): add `gemini-3.5-flash` (#15436)). Version 756fec1 (Backport: feat(provider/google): add `gemini-3.5-flash` (#15436)) of packages/google/src/interactions/google-interactions-language-model-options.ts left in tree.
error: could not apply 756fec1... Backport: feat(provider/google): add `gemini-3.5-flash` (#15436)
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>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>gemini-3.5-flash (#15439)1 parent 253b1f6 commit 00a1e93
10 files changed
Lines changed: 47 additions & 2 deletions
File tree
- .changeset
- content/providers/01-ai-sdk-providers
- examples/ai-core/src
- generate-text
- stream-text
- packages
- gateway/src
- google-vertex/src
- google/src
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1003 | 1003 | | |
1004 | 1004 | | |
1005 | 1005 | | |
| 1006 | + | |
1006 | 1007 | | |
1007 | 1008 | | |
1008 | 1009 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
621 | 621 | | |
622 | 622 | | |
623 | 623 | | |
| 624 | + | |
624 | 625 | | |
625 | 626 | | |
626 | 627 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| |||
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
Lines changed: 18 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
| 66 | + | |
66 | 67 | | |
67 | 68 | | |
68 | 69 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| |||
0 commit comments