39667ff19c
火山 Seedance 2.0 于 2026-04-16 上线 1080P 支持。本次实现前端 UI、
后端校验/计费、数据库迁移，并严格遵守三原则：
1. 禁止兜底/静默降级 — Fast+1080P 组合在 UI/store/serializer/view/计价
五层防御，任一层穿透都 fail loud，不悄悄按 720P 扣费
2. 钱的计算绝对准确 — 前端预估公式与后端 estimate_tokens 完全一致
`(输入时长+输出时长) × 宽 × 高 × fps / 1024`；实际扣费按火山返回
total_tokens × 官方单价；预估端不维护最低 token 修正表
3. 不隐藏 bug — 无 `or '720p'` / `|| '720p'` 兜底；类型严格；异常暴露
## 后端（7 处 + 1 次迁移）
- models.py: QuotaConfig 加 base_token_price_1080p(51)/base_token_price_1080p_video(31)；
GenerationRecord.resolution 加 RESOLUTION_CHOICES 约束 + default='720p'
- migrations/0020: 含 RunPython data migration 回填历史 resolution='' → '720p'
- utils/billing.py:
* RESOLUTION_MAP 加 1080P 六种宽高比（21:9 是 2206×946，不是 seedance 1.0 值）
* get_resolution 去掉 tier 默认值，非法组合 raise KeyError 不静默降级
* estimate_tokens 纯官方公式，加 input_video_duration 参数（公式完整）
- utils/airdrama_client.py: create_task 加 resolution 必填参数（无默认值）
- apps/generation/serializers.py:
* VideoGenerateSerializer 加 resolution ChoiceField
* aspect_ratio 改 ChoiceField 显式拒绝 adaptive
* SystemSettingsSerializer 加 2 个 1080P 单价
- apps/generation/views.py:
* _get_token_price 加 resolution 必填参数，Fast+1080P raise ValueError
* _sum_video_duration 累加视频参考时长
* video_generate_view 读 resolution、400 拒绝 Fast+1080P 组合、
传给 get_resolution/estimate_tokens/_get_token_price/create_task/
GenerationRecord.resolution（移除 L450 硬编码 '720p'）
* _settle_payment 按 record.resolution 取单价（1080P 结算按 1080P 价）
* _serialize_task + 5 处手工序列化加 resolution 字段（无 `or '720p'`）
- apps/accounts/views.py: team 接口返回 token_price_1080p/_video
## 前端（10 处）
- types/index.ts: Resolution 类型；GenerationTask/BackendTask/Team/
QuotaConfig/AssetVideo 加字段（全部必填，无 optional）
- store/inputBar.ts: resolution state；setModel/setResolution 双向拦截
Fast+1080P 组合，toast 提示引导，不静默降级
- store/generation.ts: addTask/backendToFrontend/reEdit/regenerate 全链路
携带 resolution；mapErrorMessage 改 '今日生成次数或团队余额不足'
- components/Toolbar.tsx:
* 加分辨率选择器 Dropdown（位置：比例和时长之间）
* modelItems/resolutionItems 双向 disabled（Fast 下 1080P 灰 / 1080P 下 Fast 灰）
* estimatedTokens 对齐后端公式（含输入视频时长 + assetMentions 视频时长）
* estimatedCost 按 resolution 选单价（Fast→fast_*、1080p→1080p_*、其他→基础）
* tooltip 明示"实际费用以火山 API 返回的 token 数为准"
- components/Dropdown.tsx: 加 disabled 属性支持
- components/VideoDetailModal.tsx: 重新编辑恢复 resolution
- components/GenerationCard.tsx: 动态显示 task.resolution.toUpperCase()
- pages/SettingsPage.tsx: 加 2 个 1080P 单价输入框（独立分组）
- pages/AdminAssetsPage.tsx / TeamAssetsPage.tsx: 去 || '720p' 兜底
- lib/api.ts: videoApi.generate 参数 resolution 必填
## 测试（47 个用例）
### 后端（28 个）
- tests/test_1080p_billing.py（23）: RESOLUTION_MAP 像素、estimate_tokens
公式（含/不含输入视频、不做最低 token 修正）、_get_token_price 六种
组合、Fast+1080P 抛异常、calculate_cost 对齐官方示例 4.97 / 12.39 元
- tests/test_1080p_api.py（5）: video_generate_view 拒绝 Fast+1080P (400)
+ 拒绝 adaptive + 拒绝非法 resolution + 默认值兼容 + 合法组合通过
### 前端（19 个）
- test/unit/resolution1080p.test.ts（14）: store 状态、双向拦截
(1080P 下切 Fast 被阻止 model 不变、反向同样)、官方像素契约测试、
价格示例对齐（720P 4.97 / 1080P 12.39）
- test/e2e/resolution-1080p.spec.ts（5）: 真实浏览器验证默认 720P、
Dropdown 双向置灰、tooltip 明示以火山为准
## 与官方文档对齐
- 参数：resolution (480p/720p/1080p 小写)、ratio、duration、generate_audio
- 像素：来自 docs/API文档/创建视频生成任务API.md Seedance 2.0 & 2.0 fast 列
- 单价：来自 docs/API文档/seedance模型价格.md (46/28/51/31/37/22)
- Fast 不支持 1080P：来自 docs/API文档/Seedance 2.0 1080P.md
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
136 lines
8.8 KiB
Python
136 lines
8.8 KiB
Python
from rest_framework import serializers
|
||
|
||
|
||
class VideoGenerateSerializer(serializers.Serializer):
|
||
prompt = serializers.CharField(required=False, allow_blank=True, default='')
|
||
mode = serializers.ChoiceField(choices=['universal', 'keyframe'])
|
||
model = serializers.ChoiceField(choices=['seedance_2.0', 'seedance_2.0_fast'])
|
||
# 显式枚举拒绝 adaptive（火山默认值）— 估算/计费需要明确宽高
|
||
aspect_ratio = serializers.ChoiceField(choices=['16:9', '9:16', '4:3', '1:1', '3:4', '21:9'])
|
||
duration = serializers.IntegerField()
|
||
# 1080p 仅 Seedance 2.0 支持，Fast 不支持 — 上层 video_generate_view 会做 model/resolution 组合校验
|
||
resolution = serializers.ChoiceField(choices=['480p', '720p', '1080p'], required=False, default='720p')
|
||
references = serializers.ListField(child=serializers.DictField(), required=False, default=list)
|
||
|
||
|
||
class QuotaUpdateSerializer(serializers.Serializer):
|
||
daily_generation_limit = serializers.IntegerField(min_value=-1)
|
||
monthly_generation_limit = serializers.IntegerField(min_value=-1)
|
||
spending_limit = serializers.DecimalField(max_digits=12, decimal_places=2, required=False)
|
||
|
||
|
||
class UserStatusSerializer(serializers.Serializer):
|
||
is_active = serializers.BooleanField()
|
||
|
||
|
||
class AdminCreateUserSerializer(serializers.Serializer):
|
||
username = serializers.CharField(max_length=150)
|
||
email = serializers.EmailField()
|
||
password = serializers.CharField(min_length=6)
|
||
daily_seconds_limit = serializers.IntegerField(min_value=-1, required=False, default=600)
|
||
monthly_seconds_limit = serializers.IntegerField(min_value=-1, required=False, default=6000)
|
||
daily_generation_limit = serializers.IntegerField(min_value=-1, required=False, default=50)
|
||
monthly_generation_limit = serializers.IntegerField(min_value=-1, required=False, default=1500)
|
||
is_staff = serializers.BooleanField(required=False, default=False)
|
||
|
||
|
||
class SystemSettingsSerializer(serializers.Serializer):
|
||
default_daily_seconds_limit = serializers.IntegerField(min_value=0, required=False)
|
||
default_monthly_seconds_limit = serializers.IntegerField(min_value=0, required=False)
|
||
default_daily_generation_limit = serializers.IntegerField(min_value=0, required=False)
|
||
default_monthly_generation_limit = serializers.IntegerField(min_value=0, required=False)
|
||
base_token_price = serializers.DecimalField(max_digits=10, decimal_places=2, min_value=0, required=False)
|
||
base_token_price_video = serializers.DecimalField(max_digits=10, decimal_places=2, min_value=0, required=False)
|
||
base_token_price_fast = serializers.DecimalField(max_digits=10, decimal_places=2, min_value=0, required=False)
|
||
base_token_price_fast_video = serializers.DecimalField(max_digits=10, decimal_places=2, min_value=0, required=False)
|
||
base_token_price_1080p = serializers.DecimalField(max_digits=10, decimal_places=2, min_value=0, required=False)
|
||
base_token_price_1080p_video = serializers.DecimalField(max_digits=10, decimal_places=2, min_value=0, required=False)
|
||
announcement = serializers.CharField(required=False, allow_blank=True, default='')
|
||
announcement_enabled = serializers.BooleanField(required=False, default=False)
|
||
max_desktop_sessions = serializers.IntegerField(min_value=1, required=False, default=1)
|
||
max_mobile_sessions = serializers.IntegerField(min_value=0, required=False, default=0)
|
||
# 异常检测配置
|
||
anomaly_detection_enabled = serializers.BooleanField(required=False, default=False)
|
||
r1_enabled_default = serializers.BooleanField(required=False, default=True)
|
||
r2_enabled_default = serializers.BooleanField(required=False, default=True)
|
||
r2_window_seconds = serializers.IntegerField(min_value=60, required=False, default=3600)
|
||
r3_enabled_default = serializers.BooleanField(required=False, default=True)
|
||
r3_window_seconds = serializers.IntegerField(min_value=60, required=False, default=3600)
|
||
r3_max_count = serializers.IntegerField(min_value=1, required=False, default=10)
|
||
r4_enabled_default = serializers.BooleanField(required=False, default=True)
|
||
r4_window_seconds = serializers.IntegerField(min_value=60, required=False, default=3600)
|
||
r4_city_count = serializers.IntegerField(min_value=1, required=False, default=5)
|
||
r5_enabled_default = serializers.BooleanField(required=False, default=True)
|
||
r5_days = serializers.IntegerField(min_value=1, required=False, default=7)
|
||
r5_country_count = serializers.IntegerField(min_value=1, required=False, default=10)
|
||
feishu_alert_mobiles = serializers.CharField(required=False, allow_blank=True, default='')
|
||
sms_alert_mobiles = serializers.CharField(required=False, allow_blank=True, default='')
|
||
alert_cooldown_seconds = serializers.IntegerField(min_value=0, required=False, default=1800)
|
||
|
||
|
||
# ── Team serializers ──
|
||
|
||
class TeamCreateSerializer(serializers.Serializer):
|
||
name = serializers.CharField(max_length=100)
|
||
monthly_seconds_limit = serializers.IntegerField(min_value=0, required=False, default=6000)
|
||
daily_member_limit_default = serializers.IntegerField(min_value=0, required=False, default=600)
|
||
markup_percentage = serializers.DecimalField(max_digits=5, decimal_places=2, min_value=0, required=True)
|
||
monthly_spending_limit = serializers.DecimalField(max_digits=12, decimal_places=2, required=False, default=-1)
|
||
daily_member_spending_default = serializers.DecimalField(max_digits=12, decimal_places=2, required=False, default=50)
|
||
max_concurrent_tasks = serializers.IntegerField(min_value=0, required=False, default=5)
|
||
expected_regions = serializers.CharField(max_length=500, required=True)
|
||
|
||
|
||
class TeamUpdateSerializer(serializers.Serializer):
|
||
name = serializers.CharField(max_length=100, required=False)
|
||
monthly_seconds_limit = serializers.IntegerField(min_value=0, required=False)
|
||
daily_member_limit_default = serializers.IntegerField(min_value=0, required=False)
|
||
markup_percentage = serializers.DecimalField(max_digits=5, decimal_places=2, min_value=0, required=False)
|
||
monthly_spending_limit = serializers.DecimalField(max_digits=12, decimal_places=2, required=False)
|
||
daily_member_spending_default = serializers.DecimalField(max_digits=12, decimal_places=2, required=False)
|
||
max_concurrent_tasks = serializers.IntegerField(min_value=0, required=False)
|
||
is_active = serializers.BooleanField(required=False)
|
||
expected_regions = serializers.CharField(max_length=500, required=False, allow_blank=True)
|
||
|
||
|
||
class TeamAnomalyConfigSerializer(serializers.Serializer):
|
||
r1_enabled = serializers.BooleanField(required=False, allow_null=True, default=None)
|
||
r2_enabled = serializers.BooleanField(required=False, allow_null=True, default=None)
|
||
r2_window_seconds = serializers.IntegerField(min_value=60, required=False, allow_null=True, default=None)
|
||
r3_enabled = serializers.BooleanField(required=False, allow_null=True, default=None)
|
||
r3_window_seconds = serializers.IntegerField(min_value=60, required=False, allow_null=True, default=None)
|
||
r3_max_count = serializers.IntegerField(min_value=1, required=False, allow_null=True, default=None)
|
||
r4_enabled = serializers.BooleanField(required=False, allow_null=True, default=None)
|
||
r4_window_seconds = serializers.IntegerField(min_value=60, required=False, allow_null=True, default=None)
|
||
r4_city_count = serializers.IntegerField(min_value=1, required=False, allow_null=True, default=None)
|
||
r5_enabled = serializers.BooleanField(required=False, allow_null=True, default=None)
|
||
r5_days = serializers.IntegerField(min_value=1, required=False, allow_null=True, default=None)
|
||
r5_country_count = serializers.IntegerField(min_value=1, required=False, allow_null=True, default=None)
|
||
|
||
|
||
class TeamTopUpSerializer(serializers.Serializer):
|
||
amount = serializers.DecimalField(max_digits=12, decimal_places=2, min_value=0.01)
|
||
|
||
|
||
class TeamAdminCreateSerializer(serializers.Serializer):
|
||
"""Create a team admin account for a specific team."""
|
||
username = serializers.CharField(max_length=150)
|
||
email = serializers.EmailField()
|
||
password = serializers.CharField(min_length=6)
|
||
|
||
|
||
class TeamMemberCreateSerializer(serializers.Serializer):
|
||
"""Team admin creates a member."""
|
||
username = serializers.CharField(max_length=150)
|
||
password = serializers.CharField(min_length=6)
|
||
daily_seconds_limit = serializers.IntegerField(min_value=-1, required=False)
|
||
monthly_seconds_limit = serializers.IntegerField(min_value=-1, required=False)
|
||
daily_generation_limit = serializers.IntegerField(min_value=-1, required=False)
|
||
monthly_generation_limit = serializers.IntegerField(min_value=-1, required=False)
|
||
|
||
|
||
class MemberQuotaSerializer(serializers.Serializer):
|
||
daily_generation_limit = serializers.IntegerField(min_value=-1)
|
||
monthly_generation_limit = serializers.IntegerField(min_value=-1)
|
||
spending_limit = serializers.DecimalField(max_digits=12, decimal_places=2, required=False)
|