Skip to content

Commit 0ee75e7

Browse files
sylviezhang37vercel-ai-sdk[bot]
authored andcommitted
Backport conflicts for PR #12711 to release-v5.0
1 parent db2667c commit 0ee75e7

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

.changeset/happy-boxes-lick.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@ai-sdk/gateway': patch
3+
---
4+
5+
chore(provider/gateway): update gateway model settings files

packages/gateway/src/gateway-language-model-settings.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,13 @@ export type GatewayModelId =
5656
| 'google/gemini-2.5-flash-preview-09-2025'
5757
| 'google/gemini-2.5-pro'
5858
| 'google/gemini-3-flash'
59+
<<<<<<< HEAD
5960
| 'google/gemini-3-pro-preview'
6061
| 'google/gemini-3-pro-image'
62+
=======
63+
| 'google/gemini-3-pro-image'
64+
| 'google/gemini-3-pro-preview'
65+
>>>>>>> 363fa4428 (chore(provider/gateway): update gateway model settings files (#12711))
6166
| 'google/gemini-3.1-pro-preview'
6267
| 'inception/mercury-coder-small'
6368
| 'meituan/longcat-flash-chat'
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
export type GatewayVideoModelId =
2+
| 'alibaba/wan-v2.5-t2v-preview'
3+
| 'alibaba/wan-v2.6-i2v'
4+
| 'alibaba/wan-v2.6-i2v-flash'
5+
| 'alibaba/wan-v2.6-r2v'
6+
| 'alibaba/wan-v2.6-r2v-flash'
7+
| 'alibaba/wan-v2.6-t2v'
8+
| 'google/veo-3.0-fast-generate-001'
9+
| 'google/veo-3.0-generate-001'
10+
| 'google/veo-3.1-fast-generate-001'
11+
| 'google/veo-3.1-generate-001'
12+
| 'klingai/kling-v2.5-turbo-i2v'
13+
| 'klingai/kling-v2.5-turbo-t2v'
14+
| 'klingai/kling-v2.6-i2v'
15+
| 'klingai/kling-v2.6-t2v'
16+
| 'klingai/kling-v3.0-i2v'
17+
| 'klingai/kling-v3.0-t2v'
18+
| 'xai/grok-imagine-video'
19+
| (string & {});

0 commit comments

Comments
 (0)