xiaoxia/xiaoxia-saas

feat(viral-video): 动态积分定价（按tokens×单价×1.3，保留两位小数） #2152

Merged

auto-approve-bot merged 5 commits from feat/2151-viral-video-dynamic-pricing into develop

2026-10-03 00:20:22 +08:00

Author	SHA1	Message	Date
CI Bot	8bf287e93e	style: auto-format with black + isort + ruff + prettier [skip ci-format-check] CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped Details CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 2s Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 51s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 1m22s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 1m48s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 4m51s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 5m18s Details CI/CD Pipeline / Validate - Style (pull_request) Successful in 6m1s Details CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 6m1s Details AI Code Review / AI Code Review (pull_request) Successful in 6m42s Details CI/CD Pipeline / Validate - Security (pull_request) Successful in 13m1s Details CI/CD Pipeline / Unit Tests (pull_request) Successful in 13m27s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / CI Gate (pull_request) Successful in 2s Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 9m20s Details ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 29s Details Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 49s Details	2026-10-02 16:06:05 +00:00
xiaoxia	9ee55dd695	test(viral-video): 补单测覆盖动态积分定价全部分支（diff覆盖率46%→78%） CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 0s Details CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m13s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 3m26s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 3m37s Details AI Code Review / AI Code Review (pull_request) Successful in 4m5s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 4m46s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 10m15s Details CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 10m34s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details CI/CD Pipeline / Validate - Style (pull_request) Has been cancelled Details CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled Details CI/CD Pipeline / Validate - Security (pull_request) Has been cancelled Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Has been cancelled Details - points_rules: resolve_video_dimensions/_match_model_prefix/_infer_resolution_key /calculate_viral_video_credits 覆盖别名/has_video_input/actual_tokens/兜底/防御分支（+28 tests，覆盖94%） - points_service: deduct/settle/refund_viral_video 覆盖none/refund/deduct/余额不足/异常分支（+11 tests，覆盖71%） - viral_video routes: confirm-copy 预扣/402/already_paid/estimate-credits端点（+8 tests，覆盖53%，全部缺失行已覆盖）	2026-10-02 23:54:24 +08:00
xiaoxia	b2241d0e21	fix(test): 修复 test_2035_coverage 因移除 points_gate import 导致的锚点失效 CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped Details CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 1s Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 2s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 51s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 2m26s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m1s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 3m9s Details AI Code Review / AI Code Review (pull_request) Successful in 6m59s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 10m40s Details CI/CD Pipeline / Validate - Style (pull_request) Successful in 15m31s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 16m36s Details CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 19m15s Details CI/CD Pipeline / Unit Tests (pull_request) Failing after 22m23s Details CI/CD Pipeline / Validate - Security (pull_request) Successful in 39m8s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / CI Gate (pull_request) Failing after 1s Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details 原测试用 'from packages.middleware' 作为代码片段结束锚点，PR #2150 移除 generation_tasks 中未使用的 points_gate import 后，该字符串消失导致 collection 阶段 ValueError: substring not found。改用紧跟 _infer_expected_categories 后的 'logger = logging.getLogger' 行作为更稳定的结束锚点。	2026-10-02 23:12:09 +08:00
CI Bot	adf0cc5c48	style: auto-format with black + isort + ruff + prettier [skip ci-format-check] CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 2s Details CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 2s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m1s Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m57s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 3m25s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 4m42s Details AI Code Review / AI Code Review (pull_request) Successful in 6m57s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 10m42s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 13m49s Details CI/CD Pipeline / Validate - Style (pull_request) Successful in 15m30s Details CI/CD Pipeline / Unit Tests (pull_request) Failing after 16m28s Details CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 17m34s Details CI/CD Pipeline / Validate - Security (pull_request) Successful in 37m57s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Production (pull_request) Has been skipped Details CI/CD Pipeline / CI Gate (pull_request) Failing after 1s Details	2026-10-02 14:29:35 +00:00
saas-backend-agent	667f5350f8	feat(viral-video): 动态积分定价（按tokens×单价×1.3利润率，保留两位小数） CI/CD Pipeline / Check push changed paths (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (pull_request) Successful in 2s Details CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 3s Details CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped Details CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped Details CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging API Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Worker Image (pull_request) Has been skipped Details CI/CD Pipeline / Retag skipped Staging Web Image (pull_request) Has been skipped Details CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped Details CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped Details CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped Details CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped Details CI/CD Pipeline / PR Build API Image (pull_request) Successful in 51s Details PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m1s Details CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 3m37s Details Preview Deploy / Deploy Preview Environment (pull_request) Successful in 4m43s Details AI Code Review / AI Code Review (pull_request) Successful in 7m6s Details PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 12m44s Details CI/CD Pipeline / Integration Tests (pull_request) Successful in 18m54s Details CI/CD Pipeline / Unit Tests (pull_request) Failing after 21m50s Details CI/CD Pipeline / Validate - Python (mypy + alembic) (pull_request) Successful in 23m57s Details CI/CD Pipeline / Build Production API Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Web Image (pull_request) Has been cancelled Details CI/CD Pipeline / Build Production Worker Image (pull_request) Has been cancelled Details CI/CD Pipeline / Deploy Production (pull_request) Has been cancelled Details CI/CD Pipeline / Production Browser E2E (pull_request) Has been cancelled Details CI/CD Pipeline / Canary Release to Production (pull_request) Has been cancelled Details CI/CD Pipeline / CI Gate (pull_request) Has been cancelled Details CI/CD Pipeline / Validate - Style (pull_request) Has been cancelled Details CI/CD Pipeline / Validate - Security (pull_request) Has been cancelled Details - 新增定价配置 VIRAL_VIDEO_MODEL_PRICES（Seedance 2.5/2.0 × 480p/720p/1080p × 是否含视频输入） - 公式：tokens = duration×width×height×fps/1024; video_cost=tokens/1M×price; total=round((video_cost+0.15)×1.3,2) - 积分字段全部改 Float 支持小数（points_accounts/points_transactions/users.points_balance/viral_video_jobs.credits_cost） - 新增 POST /api/v1/viral-video/estimate-credits 预估积分接口 - confirm-copy 阶段预扣积分（余额不足402），失败全额退款，完成后按真实usage.completion_tokens多退少补 - retry 重试不重复扣费（检测credits_prepaid/credits_cost跳过预扣） - ai_client.video_generation 返回 {video_path, usage} 供结算使用真实tokens - video_resolution字段透传（支持480p/720p/1080p及别名普清/高清/超清） - 新增093数据库迁移（Float类型转换+3个新列） - CREDITS_VIRAL_VIDEO_COST固定50常量删除 - 125个核心单测全绿，样例：15s/720p/9:16≈9.52积分, 30s/1080p≈46.34积分	2026-10-02 21:59:14 +08:00