项目/AI生成链路合并

video-gen-api/app/config.py

@@ -117,6 +117,9 @@ class Settings(BaseSettings):
     VIDEO_UPSCALE_RETRY_BACKOFF_SECONDS: int = 60
     VIDEO_UPSCALE_RECOVERY_BATCH_SIZE: int = 50
     VIDEO_UPSCALE_RECOVERY_LOCK_KEY: str = "vg:celery:video_upscale_recovery_lock"
+    VIDEO_UPSCALE_EXECUTION_LOCK_KEY_PREFIX: str = "vg:lock:upscale:execute"
+    VIDEO_UPSCALE_EXECUTION_LOCK_TTL_SECONDS: int = 30 * 60
+    VIDEO_UPSCALE_STAGE_HANDOFF_DELAY_SECONDS: int = 2
 
     VIDEO_COVER_SEEK_TIME: str = "00:00:01"
     VIDEO_COVER_FALLBACK_SEEK_TIME: str = "00:00:00"
@@ -149,7 +152,7 @@ class Settings(BaseSettings):
     CHATAPI_ASYNC_MAX_RETRIES: int = 3
     CHATAPI_ASYNC_RETRY_BACKOFF_SECONDS: int = 30
     CHATAPI_ASYNC_POLL_INTERVAL_SECONDS: int = 30
-    CHATAPI_ASYNC_IMAGE_DEADLINE_MINUTES: int = 10
+    CHATAPI_ASYNC_IMAGE_DEADLINE_MINUTES: int = 30
     # 视频异步生成不再使用 30 分钟最终超时；前 10 分钟高频轮询，之后降频，24 小时最后判定失败才退款。
     CHATAPI_ASYNC_VIDEO_FINAL_DEADLINE_HOURS: int = 24
     CHATAPI_ASYNC_VIDEO_HIGH_FREQ_MINUTES: int = 10
@@ -228,6 +231,22 @@ class Settings(BaseSettings):
     POLL_DUE_DISPATCH_LOCK_KEY: str = "vg:celery:poll_due_dispatch_lock"
     POLL_DUE_DISPATCH_LOCK_TTL_SECONDS: int = 55
 
+    # Redis execution locks. These locks are fail-closed: when Redis is
+    # unavailable, the current Celery task retries and does not fall back to an
+    # unlocked database-only execution path.
+    GENERATION_CREATE_LOCK_KEY_PREFIX: str = "vg:lock:generation:create"
+    GENERATION_POLL_LOCK_KEY_PREFIX: str = "vg:lock:generation:poll"
+    GENERATION_DOWNLOAD_LOCK_KEY_PREFIX: str = "vg:lock:generation:download"
+    GENERATION_CREATE_LOCK_TTL_SECONDS: int = 10 * 60
+    GENERATION_POLL_LOCK_TTL_SECONDS: int = 5 * 60
+    GENERATION_DOWNLOAD_LOCK_TTL_SECONDS: int = 10 * 60
+    REDIS_EXECUTION_LOCK_RENEW_INTERVAL_SECONDS: int = 30
+
+    # PostgreSQL short row-lock wait and whole ordinary download timeout.
+    # The lock timeout is transaction-local (SET LOCAL), not a global DB setting.
+    GENERATION_DB_LOCK_TIMEOUT_SECONDS: int = 5
+    GENERATION_DOWNLOAD_TOTAL_TIMEOUT_SECONDS: int = 8 * 60
+
     # 模块异步任务容灾配置。
     # 覆盖 ModuleGenerationStep 提词任务、shot 原视频/片段分析、shot ffmpeg 切割 active 注册。
     # 恢复扫描走 CELERY_RECOVERY_QUEUE，真实业务任务回到原始队列。