genz27 Warp commited on
Commit
deb4314
·
1 Parent(s): c42cf8e

fix: 统一视频模型命名为官方格式

Browse files

- 修正 model_id (字典 key) 和 model_key 为统一的官方命名
- 竖屏 ultra: portrait 在 ultra 之前 (如 veo_3_1_t2v_fast_portrait_ultra)
- 横屏 ultra: 没有 landscape 后缀 (如 veo_3_1_t2v_fast_ultra)
- 适用于所有 T2V、I2V、R2V 模型及其 4K/1080P 放大版本

Co-Authored-By: Warp <agent@warp.dev>

Files changed (1) hide show
  1. src/services/generation_handler.py +38 -38
src/services/generation_handler.py CHANGED
@@ -182,14 +182,14 @@ MODEL_CONFIG = {
182
  },
183
 
184
  # veo_3_1_t2v_fast_ultra (横竖屏)
185
- "veo_3_1_t2v_fast_ultra_portrait": {
186
  "type": "video",
187
  "video_type": "t2v",
188
  "model_key": "veo_3_1_t2v_fast_portrait_ultra",
189
  "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
190
  "supports_images": False
191
  },
192
- "veo_3_1_t2v_fast_ultra_landscape": {
193
  "type": "video",
194
  "video_type": "t2v",
195
  "model_key": "veo_3_1_t2v_fast_ultra",
@@ -198,14 +198,14 @@ MODEL_CONFIG = {
198
  },
199
 
200
  # veo_3_1_t2v_fast_ultra_relaxed (横竖屏)
201
- "veo_3_1_t2v_fast_ultra_relaxed_portrait": {
202
  "type": "video",
203
  "video_type": "t2v",
204
  "model_key": "veo_3_1_t2v_fast_portrait_ultra_relaxed",
205
  "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
206
  "supports_images": False
207
  },
208
- "veo_3_1_t2v_fast_ultra_relaxed_landscape": {
209
  "type": "video",
210
  "video_type": "t2v",
211
  "model_key": "veo_3_1_t2v_fast_ultra_relaxed",
@@ -233,19 +233,19 @@ MODEL_CONFIG = {
233
  # 支持1-2张图片:1张作为首帧,2张作为首尾帧
234
 
235
  # veo_3_1_i2v_s_fast_fl (需要新增横竖屏)
236
- "veo_3_1_i2v_s_fast_fl_portrait": {
237
  "type": "video",
238
  "video_type": "i2v",
239
- "model_key": "veo_3_1_i2v_s_fast_portrait_fl_ultra_relaxed",
240
  "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
241
  "supports_images": True,
242
  "min_images": 1,
243
  "max_images": 2
244
  },
245
- "veo_3_1_i2v_s_fast_fl_landscape": {
246
  "type": "video",
247
  "video_type": "i2v",
248
- "model_key": "veo_3_1_i2v_s_fast_fl_ultra_relaxed",
249
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
250
  "supports_images": True,
251
  "min_images": 1,
@@ -293,7 +293,7 @@ MODEL_CONFIG = {
293
  },
294
 
295
  # veo_3_1_i2v_s_fast_ultra (横竖屏)
296
- "veo_3_1_i2v_s_fast_ultra_portrait": {
297
  "type": "video",
298
  "video_type": "i2v",
299
  "model_key": "veo_3_1_i2v_s_fast_portrait_ultra_fl",
@@ -302,7 +302,7 @@ MODEL_CONFIG = {
302
  "min_images": 1,
303
  "max_images": 2
304
  },
305
- "veo_3_1_i2v_s_fast_ultra_landscape": {
306
  "type": "video",
307
  "video_type": "i2v",
308
  "model_key": "veo_3_1_i2v_s_fast_ultra_fl",
@@ -313,16 +313,16 @@ MODEL_CONFIG = {
313
  },
314
 
315
  # veo_3_1_i2v_s_fast_ultra_relaxed (需要新增横竖屏)
316
- "veo_3_1_i2v_s_fast_ultra_relaxed_portrait": {
317
  "type": "video",
318
  "video_type": "i2v",
319
- "model_key": "veo_3_1_i2v_s_fast_ultra_relaxed",
320
  "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
321
  "supports_images": True,
322
  "min_images": 1,
323
  "max_images": 2
324
  },
325
- "veo_3_1_i2v_s_fast_ultra_relaxed_landscape": {
326
  "type": "video",
327
  "video_type": "i2v",
328
  "model_key": "veo_3_1_i2v_s_fast_ultra_relaxed",
@@ -359,16 +359,16 @@ MODEL_CONFIG = {
359
  "veo_3_1_r2v_fast_portrait": {
360
  "type": "video",
361
  "video_type": "r2v",
362
- "model_key": "veo_3_1_r2v_fast_portrait_ultra_relaxed",
363
  "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
364
  "supports_images": True,
365
  "min_images": 0,
366
  "max_images": None # 不限制
367
  },
368
- "veo_3_1_r2v_fast_landscape": {
369
  "type": "video",
370
  "video_type": "r2v",
371
- "model_key": "veo_3_1_r2v_fast_landscape_ultra_relaxed",
372
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
373
  "supports_images": True,
374
  "min_images": 0,
@@ -376,7 +376,7 @@ MODEL_CONFIG = {
376
  },
377
 
378
  # veo_3_1_r2v_fast_ultra (横竖屏)
379
- "veo_3_1_r2v_fast_ultra_portrait": {
380
  "type": "video",
381
  "video_type": "r2v",
382
  "model_key": "veo_3_1_r2v_fast_portrait_ultra",
@@ -385,10 +385,10 @@ MODEL_CONFIG = {
385
  "min_images": 0,
386
  "max_images": None # 不限制
387
  },
388
- "veo_3_1_r2v_fast_ultra_landscape": {
389
  "type": "video",
390
  "video_type": "r2v",
391
- "model_key": "veo_3_1_r2v_fast_landscape_ultra",
392
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
393
  "supports_images": True,
394
  "min_images": 0,
@@ -396,7 +396,7 @@ MODEL_CONFIG = {
396
  },
397
 
398
  # veo_3_1_r2v_fast_ultra_relaxed (横竖屏)
399
- "veo_3_1_r2v_fast_ultra_relaxed_portrait": {
400
  "type": "video",
401
  "video_type": "r2v",
402
  "model_key": "veo_3_1_r2v_fast_portrait_ultra_relaxed",
@@ -405,10 +405,10 @@ MODEL_CONFIG = {
405
  "min_images": 0,
406
  "max_images": None # 不限制
407
  },
408
- "veo_3_1_r2v_fast_ultra_relaxed_landscape": {
409
  "type": "video",
410
  "video_type": "r2v",
411
- "model_key": "veo_3_1_r2v_fast_landscape_ultra_relaxed",
412
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
413
  "supports_images": True,
414
  "min_images": 0,
@@ -427,7 +427,7 @@ MODEL_CONFIG = {
427
  "supports_images": False,
428
  "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
429
  },
430
- "veo_3_1_t2v_fast_landscape_4k": {
431
  "type": "video",
432
  "video_type": "t2v",
433
  "model_key": "veo_3_1_t2v_fast",
@@ -435,7 +435,7 @@ MODEL_CONFIG = {
435
  "supports_images": False,
436
  "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
437
  },
438
- "veo_3_1_t2v_fast_ultra_portrait_4k": {
439
  "type": "video",
440
  "video_type": "t2v",
441
  "model_key": "veo_3_1_t2v_fast_portrait_ultra",
@@ -443,7 +443,7 @@ MODEL_CONFIG = {
443
  "supports_images": False,
444
  "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
445
  },
446
- "veo_3_1_t2v_fast_ultra_landscape_4k": {
447
  "type": "video",
448
  "video_type": "t2v",
449
  "model_key": "veo_3_1_t2v_fast_ultra",
@@ -461,7 +461,7 @@ MODEL_CONFIG = {
461
  "supports_images": False,
462
  "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
463
  },
464
- "veo_3_1_t2v_fast_landscape_1080p": {
465
  "type": "video",
466
  "video_type": "t2v",
467
  "model_key": "veo_3_1_t2v_fast",
@@ -469,7 +469,7 @@ MODEL_CONFIG = {
469
  "supports_images": False,
470
  "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
471
  },
472
- "veo_3_1_t2v_fast_ultra_portrait_1080p": {
473
  "type": "video",
474
  "video_type": "t2v",
475
  "model_key": "veo_3_1_t2v_fast_portrait_ultra",
@@ -477,7 +477,7 @@ MODEL_CONFIG = {
477
  "supports_images": False,
478
  "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
479
  },
480
- "veo_3_1_t2v_fast_ultra_landscape_1080p": {
481
  "type": "video",
482
  "video_type": "t2v",
483
  "model_key": "veo_3_1_t2v_fast_ultra",
@@ -487,7 +487,7 @@ MODEL_CONFIG = {
487
  },
488
 
489
  # I2V 4K 放大版
490
- "veo_3_1_i2v_s_fast_ultra_portrait_4k": {
491
  "type": "video",
492
  "video_type": "i2v",
493
  "model_key": "veo_3_1_i2v_s_fast_portrait_ultra_fl",
@@ -497,7 +497,7 @@ MODEL_CONFIG = {
497
  "max_images": 2,
498
  "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
499
  },
500
- "veo_3_1_i2v_s_fast_ultra_landscape_4k": {
501
  "type": "video",
502
  "video_type": "i2v",
503
  "model_key": "veo_3_1_i2v_s_fast_ultra_fl",
@@ -509,7 +509,7 @@ MODEL_CONFIG = {
509
  },
510
 
511
  # I2V 1080P 放大版
512
- "veo_3_1_i2v_s_fast_ultra_portrait_1080p": {
513
  "type": "video",
514
  "video_type": "i2v",
515
  "model_key": "veo_3_1_i2v_s_fast_portrait_ultra_fl",
@@ -519,7 +519,7 @@ MODEL_CONFIG = {
519
  "max_images": 2,
520
  "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
521
  },
522
- "veo_3_1_i2v_s_fast_ultra_landscape_1080p": {
523
  "type": "video",
524
  "video_type": "i2v",
525
  "model_key": "veo_3_1_i2v_s_fast_ultra_fl",
@@ -531,7 +531,7 @@ MODEL_CONFIG = {
531
  },
532
 
533
  # R2V 4K 放大版
534
- "veo_3_1_r2v_fast_ultra_portrait_4k": {
535
  "type": "video",
536
  "video_type": "r2v",
537
  "model_key": "veo_3_1_r2v_fast_portrait_ultra",
@@ -541,10 +541,10 @@ MODEL_CONFIG = {
541
  "max_images": None,
542
  "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
543
  },
544
- "veo_3_1_r2v_fast_ultra_landscape_4k": {
545
  "type": "video",
546
  "video_type": "r2v",
547
- "model_key": "veo_3_1_r2v_fast_landscape_ultra",
548
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
549
  "supports_images": True,
550
  "min_images": 0,
@@ -553,7 +553,7 @@ MODEL_CONFIG = {
553
  },
554
 
555
  # R2V 1080P 放大版
556
- "veo_3_1_r2v_fast_ultra_portrait_1080p": {
557
  "type": "video",
558
  "video_type": "r2v",
559
  "model_key": "veo_3_1_r2v_fast_portrait_ultra",
@@ -563,10 +563,10 @@ MODEL_CONFIG = {
563
  "max_images": None,
564
  "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
565
  },
566
- "veo_3_1_r2v_fast_ultra_landscape_1080p": {
567
  "type": "video",
568
  "video_type": "r2v",
569
- "model_key": "veo_3_1_r2v_fast_landscape_ultra",
570
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
571
  "supports_images": True,
572
  "min_images": 0,
 
182
  },
183
 
184
  # veo_3_1_t2v_fast_ultra (横竖屏)
185
+ "veo_3_1_t2v_fast_portrait_ultra": {
186
  "type": "video",
187
  "video_type": "t2v",
188
  "model_key": "veo_3_1_t2v_fast_portrait_ultra",
189
  "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
190
  "supports_images": False
191
  },
192
+ "veo_3_1_t2v_fast_ultra": {
193
  "type": "video",
194
  "video_type": "t2v",
195
  "model_key": "veo_3_1_t2v_fast_ultra",
 
198
  },
199
 
200
  # veo_3_1_t2v_fast_ultra_relaxed (横竖屏)
201
+ "veo_3_1_t2v_fast_portrait_ultra_relaxed": {
202
  "type": "video",
203
  "video_type": "t2v",
204
  "model_key": "veo_3_1_t2v_fast_portrait_ultra_relaxed",
205
  "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
206
  "supports_images": False
207
  },
208
+ "veo_3_1_t2v_fast_ultra_relaxed": {
209
  "type": "video",
210
  "video_type": "t2v",
211
  "model_key": "veo_3_1_t2v_fast_ultra_relaxed",
 
233
  # 支持1-2张图片:1张作为首帧,2张作为首尾帧
234
 
235
  # veo_3_1_i2v_s_fast_fl (需要新增横竖屏)
236
+ "veo_3_1_i2v_s_fast_portrait_fl": {
237
  "type": "video",
238
  "video_type": "i2v",
239
+ "model_key": "veo_3_1_i2v_s_fast_portrait_fl",
240
  "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
241
  "supports_images": True,
242
  "min_images": 1,
243
  "max_images": 2
244
  },
245
+ "veo_3_1_i2v_s_fast_fl": {
246
  "type": "video",
247
  "video_type": "i2v",
248
+ "model_key": "veo_3_1_i2v_s_fast_fl",
249
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
250
  "supports_images": True,
251
  "min_images": 1,
 
293
  },
294
 
295
  # veo_3_1_i2v_s_fast_ultra (横竖屏)
296
+ "veo_3_1_i2v_s_fast_portrait_ultra_fl": {
297
  "type": "video",
298
  "video_type": "i2v",
299
  "model_key": "veo_3_1_i2v_s_fast_portrait_ultra_fl",
 
302
  "min_images": 1,
303
  "max_images": 2
304
  },
305
+ "veo_3_1_i2v_s_fast_ultra_fl": {
306
  "type": "video",
307
  "video_type": "i2v",
308
  "model_key": "veo_3_1_i2v_s_fast_ultra_fl",
 
313
  },
314
 
315
  # veo_3_1_i2v_s_fast_ultra_relaxed (需要新增横竖屏)
316
+ "veo_3_1_i2v_s_fast_portrait_ultra_relaxed": {
317
  "type": "video",
318
  "video_type": "i2v",
319
+ "model_key": "veo_3_1_i2v_s_fast_portrait_ultra_relaxed",
320
  "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
321
  "supports_images": True,
322
  "min_images": 1,
323
  "max_images": 2
324
  },
325
+ "veo_3_1_i2v_s_fast_ultra_relaxed": {
326
  "type": "video",
327
  "video_type": "i2v",
328
  "model_key": "veo_3_1_i2v_s_fast_ultra_relaxed",
 
359
  "veo_3_1_r2v_fast_portrait": {
360
  "type": "video",
361
  "video_type": "r2v",
362
+ "model_key": "veo_3_1_r2v_fast_portrait",
363
  "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
364
  "supports_images": True,
365
  "min_images": 0,
366
  "max_images": None # 不限制
367
  },
368
+ "veo_3_1_r2v_fast": {
369
  "type": "video",
370
  "video_type": "r2v",
371
+ "model_key": "veo_3_1_r2v_fast",
372
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
373
  "supports_images": True,
374
  "min_images": 0,
 
376
  },
377
 
378
  # veo_3_1_r2v_fast_ultra (横竖屏)
379
+ "veo_3_1_r2v_fast_portrait_ultra": {
380
  "type": "video",
381
  "video_type": "r2v",
382
  "model_key": "veo_3_1_r2v_fast_portrait_ultra",
 
385
  "min_images": 0,
386
  "max_images": None # 不限制
387
  },
388
+ "veo_3_1_r2v_fast_ultra": {
389
  "type": "video",
390
  "video_type": "r2v",
391
+ "model_key": "veo_3_1_r2v_fast_ultra",
392
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
393
  "supports_images": True,
394
  "min_images": 0,
 
396
  },
397
 
398
  # veo_3_1_r2v_fast_ultra_relaxed (横竖屏)
399
+ "veo_3_1_r2v_fast_portrait_ultra_relaxed": {
400
  "type": "video",
401
  "video_type": "r2v",
402
  "model_key": "veo_3_1_r2v_fast_portrait_ultra_relaxed",
 
405
  "min_images": 0,
406
  "max_images": None # 不限制
407
  },
408
+ "veo_3_1_r2v_fast_ultra_relaxed": {
409
  "type": "video",
410
  "video_type": "r2v",
411
+ "model_key": "veo_3_1_r2v_fast_ultra_relaxed",
412
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
413
  "supports_images": True,
414
  "min_images": 0,
 
427
  "supports_images": False,
428
  "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
429
  },
430
+ "veo_3_1_t2v_fast_4k": {
431
  "type": "video",
432
  "video_type": "t2v",
433
  "model_key": "veo_3_1_t2v_fast",
 
435
  "supports_images": False,
436
  "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
437
  },
438
+ "veo_3_1_t2v_fast_portrait_ultra_4k": {
439
  "type": "video",
440
  "video_type": "t2v",
441
  "model_key": "veo_3_1_t2v_fast_portrait_ultra",
 
443
  "supports_images": False,
444
  "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
445
  },
446
+ "veo_3_1_t2v_fast_ultra_4k": {
447
  "type": "video",
448
  "video_type": "t2v",
449
  "model_key": "veo_3_1_t2v_fast_ultra",
 
461
  "supports_images": False,
462
  "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
463
  },
464
+ "veo_3_1_t2v_fast_1080p": {
465
  "type": "video",
466
  "video_type": "t2v",
467
  "model_key": "veo_3_1_t2v_fast",
 
469
  "supports_images": False,
470
  "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
471
  },
472
+ "veo_3_1_t2v_fast_portrait_ultra_1080p": {
473
  "type": "video",
474
  "video_type": "t2v",
475
  "model_key": "veo_3_1_t2v_fast_portrait_ultra",
 
477
  "supports_images": False,
478
  "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
479
  },
480
+ "veo_3_1_t2v_fast_ultra_1080p": {
481
  "type": "video",
482
  "video_type": "t2v",
483
  "model_key": "veo_3_1_t2v_fast_ultra",
 
487
  },
488
 
489
  # I2V 4K 放大版
490
+ "veo_3_1_i2v_s_fast_portrait_ultra_fl_4k": {
491
  "type": "video",
492
  "video_type": "i2v",
493
  "model_key": "veo_3_1_i2v_s_fast_portrait_ultra_fl",
 
497
  "max_images": 2,
498
  "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
499
  },
500
+ "veo_3_1_i2v_s_fast_ultra_fl_4k": {
501
  "type": "video",
502
  "video_type": "i2v",
503
  "model_key": "veo_3_1_i2v_s_fast_ultra_fl",
 
509
  },
510
 
511
  # I2V 1080P 放大版
512
+ "veo_3_1_i2v_s_fast_portrait_ultra_fl_1080p": {
513
  "type": "video",
514
  "video_type": "i2v",
515
  "model_key": "veo_3_1_i2v_s_fast_portrait_ultra_fl",
 
519
  "max_images": 2,
520
  "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
521
  },
522
+ "veo_3_1_i2v_s_fast_ultra_fl_1080p": {
523
  "type": "video",
524
  "video_type": "i2v",
525
  "model_key": "veo_3_1_i2v_s_fast_ultra_fl",
 
531
  },
532
 
533
  # R2V 4K 放大版
534
+ "veo_3_1_r2v_fast_portrait_ultra_4k": {
535
  "type": "video",
536
  "video_type": "r2v",
537
  "model_key": "veo_3_1_r2v_fast_portrait_ultra",
 
541
  "max_images": None,
542
  "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
543
  },
544
+ "veo_3_1_r2v_fast_ultra_4k": {
545
  "type": "video",
546
  "video_type": "r2v",
547
+ "model_key": "veo_3_1_r2v_fast_ultra",
548
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
549
  "supports_images": True,
550
  "min_images": 0,
 
553
  },
554
 
555
  # R2V 1080P 放大版
556
+ "veo_3_1_r2v_fast_portrait_ultra_1080p": {
557
  "type": "video",
558
  "video_type": "r2v",
559
  "model_key": "veo_3_1_r2v_fast_portrait_ultra",
 
563
  "max_images": None,
564
  "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
565
  },
566
+ "veo_3_1_r2v_fast_ultra_1080p": {
567
  "type": "video",
568
  "video_type": "r2v",
569
+ "model_key": "veo_3_1_r2v_fast_ultra",
570
  "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
571
  "supports_images": True,
572
  "min_images": 0,