free-short-video 7.0.3 → 7.0.4

package/README.md

@@ -1,26 +1,25 @@
 ---
 
-# What's New in v7.0.3
+# What's New in v7.0.4
 
 ## What's New
 
 ### Features & Improvements
 
-* **Survive Agnes queue saturation.** When Agnes rejects submissions with `503 video_queue_full` (the free Video 2.5 Flash queue can stay full for 10+ minutes), the app now retries on a dedicated track — every 30–60s for up to 900s (`AGNES_VIDEO_QUEUE_RETRY_SECONDS`) — without consuming the normal retry budget, so you no longer get a premature "generation failed" while you were simply never queued. Nothing is consumed by a rejected submit. The progress panel shows it live: `Agnes 视频队列已满（HTTP 503 · video_queue_full），正在排队重试（第 N 次 / 已等 X 分钟）。建议错峰重试或稍后再试。`
-* **Honest error messages.** Upstream failures now surface the real reason instead of a generic `HTTP 503: server error` or a raw dict dump: the submitted error's `code` and `message` are kept end-to-end (e.g. `ComfyUI internal error: inference not finished after 15 minutes (code=500)`), so "queue full" and "queued but stuck" are no longer indistinguishable. `error_logs/` stores readable text plus the upstream code.
-* **Queue notices in your language (all 22 locales).** Queue-full progress and failure notices are now rendered by the frontend from structured i18n keys, so Japanese, Arabic, Russian, etc. users see their own language instead of a Chinese fallback. The raw upstream error (HTTP status, `video_queue_full`) is quoted untranslated, as it comes from the API.
-* **Config panels start collapsed.** All four configuration cards (provider management, model selection, workspace, privacy) now start collapsed instead of expanded; your manual expand/collapse preference is still remembered per browser.
-* **Know when a model is not adapted.** Video models that appear in the upstream model list but have no capability entry in your installed version are now marked with `⚠` plus an explicit notice, instead of being silently submitted with the old v2.0 pixel protocol. The app version is shown in the page footer and returned by `GET /api/models`.
+* **Upstream API error trends.** Errors that carry an HTTP status code are now aggregated per task — by status code, model type (chat / image / video) and API method — and returned by the task detail API. The frontend reports them anonymously as `api_error` events, and task-failure / creation-failure events now carry the extracted status code as well, so recurring upstream failures (for example `503 video_queue_full`) can be tracked as a trend over time instead of being seen as unrelated single errors. The aggregation lives in memory for the lifetime of the task and is cleared with it; `error_logs/` remains the offline source of truth.
+* **Honest "not ready yet" state while polling.** A transient `404` while waiting for a submitted video is now an expected intermediate state rather than an error. It no longer consumes the consecutive-failure budget and no longer gets flushed into `error_logs`, so the failure panel and the logs stop reporting failures for tasks that were in fact still queued upstream.
+
+### Refactoring & Optimizations
+
+* Regression coverage for the upstream error-handling path: consecutive `404`s followed by a successful completion, and a permanent `404` that correctly falls back to the overall polling timeout.
 
 ### Bug Fixes
 
-* **Switching the text model provider back to Agnes now works.** Previously the switch only changed the UI: the backend kept the previously selected third-party provider and kept calling its endpoint (an empty value was dropped by the form layer and treated as "no change"). The selection is now sent explicitly, and it persists when you click **Save**.
-* **Frontend no longer breaks after an update.** The app entry page is now served with `Cache-Control: no-cache`, so browsers can no longer keep a stale entry page that references deleted build assets — the "task list (or the whole app) silently stopped working after pulling a new version" failure mode is gone. After upgrading, do one hard refresh (`Cmd/Ctrl+Shift+R`); afterwards updates apply on normal reload.
-* Fixed the queue-full messaging to name Agnes, quote the raw upstream error, and include an actionable suggestion (retry off-peak), instead of the vague "upstream video queue is full".
+* Fixed video tasks failing with a spurious error when the upstream gateway had not made the task record visible yet — a state observed for 420s and even 1100s+ under peak load. The overall polling timeout stays as the final backstop, and it keeps the `video_id` so the task can be resumed rather than reported as a server-confirmed failure.
 
 ---
 
-No action is required after upgrading. If your tasks sit at 0% for a long time, that is the Agnes free queue — the app now retries and tells you so; off-peak retries or switching to Video 2.0 (separate queue) remain the practical workarounds.
+No action is required after upgrading. If a task still fails, the failure panel now shows the real upstream reason with its HTTP status code, and repeated upstream errors of the same kind become visible as a trend.
 
 ---
 

package/core/api/agnes_video.py

@@ -461,6 +461,12 @@ class AgnesVideoAPI:
         last_status = ""
         poll_count = 0
         consecutive_failures = 0
+        # U9（v7.0.4）：提交返回的是网关路由键，任务记录入库可见有延迟——
+        # 轮询侧 404 "task not found" 是「任务还没准备好」的中间态而非错误
+        # （实测上游高峰期可见性延迟可从历史 ~20s 劣化到 10min+），单独计数、
+        # 只做周期性 info 日志，不进 error_logs、不消耗连续失败配额；
+        # 最终兜底是循环顶部的 max_poll_duration 整体超时。
+        not_found_count = 0
         start_time = asyncio.get_event_loop().time()
         # 2.5 系列查询需带 model_name（text 模式可省略，但带上更通用）
         model_param = f"&model_name={self.model}" if is_v25_video_model(self.model) else ""
@@ -511,6 +517,18 @@ class AgnesVideoAPI:
                         logger.warning("[KeyRotation] HTTP 429 on poll, 换 Key 立即重试")
                         continue
                     break
+                # U9：404（task not found）= 记录尚未在网关任务库可见，中间态
+                if resp.status_code == 404:
+                    not_found_count += 1
+                    poll_count += 1  # 计入自适应间隔与周期日志的推进
+                    if not_found_count == 1 or not_found_count % 10 == 0:
+                        logger.info(
+                            f"[AgnesVideo] Video {video_id[:16]}... not yet visible "
+                            f"(404 task not found), poll #{not_found_count}, "
+                            f"elapsed {elapsed:.0f}s"
+                        )
+                    await asyncio.sleep(_adaptive_poll_interval(interval, poll_count))
+                    continue
                 resp.raise_for_status()
                 result = resp.json()
                 status = result.get("status", "")

package/core/api/error_collector.py

@@ -33,6 +33,63 @@ _WORKSPACE_ROOT: Optional[Path] = None
 # 用 contextvar 而非逐层传参，将改动面收敛到 API 模块内部（PRD FR9）。
 _TASK_ID_CTX: ContextVar[str] = ContextVar("error_collector_task_id", default="")
 
+# ── GA 埋点：上游接口报错聚合（内存态，按 task_id 分组）──
+# 结构：{task_id: {"{status_code}|{model_type}|{api_method}": {
+#     "status_code": int, "model_type": str, "api_method": str,
+#     "count": int, "first_ts": iso, "last_ts": iso}}}
+#
+# 设计说明：故意**不写入 task_state.json**——流水线持有自己的 TaskManager
+# 缓存实例，每次 update_state 都会拿缓存快照整份覆盖落盘，error_collector
+# 若单独写盘会被下一次流水线落盘冲掉。改为内存聚合 +
+# GET /api/tasks/{id}（web/routes/task_routes.py）读取时合并下发，
+# 前端轮询到新增量即上报 GA `api_error` 事件（503 趋势分析用）。
+# 进程重启后内存聚合清零属预期：前端埋点本身只覆盖"页面开着"的窗口，
+# 完整离线趋势仍以 error_logs/ 落盘文件为准。
+_TASK_ERROR_AGG: dict = {}
+_MAX_AGG_ENTRIES_PER_TASK = 32  # 按维度聚合后条目数上限，防异常状态码刷爆
+
+
+def _bump_upstream_error(task_id: str, status_code: int, model_type: str, api_method: str) -> None:
+    """累加一次带 HTTP 状态码的上游报错（内存聚合，失败静默不影响主流程）。"""
+    try:
+        now = datetime.now().isoformat(timespec="seconds")
+        per_task = _TASK_ERROR_AGG.setdefault(task_id, {})
+        key = f"{status_code}|{model_type}|{api_method}"
+        entry = per_task.get(key)
+        if entry is None:
+            if len(per_task) >= _MAX_AGG_ENTRIES_PER_TASK:
+                logger.warning(
+                    f"[ErrorCollector] Upstream error agg cap "
+                    f"({_MAX_AGG_ENTRIES_PER_TASK}) reached for task {task_id}, dropping"
+                )
+                return
+            per_task[key] = {
+                "status_code": status_code,
+                "model_type": model_type,
+                "api_method": api_method,
+                "count": 1,
+                "first_ts": now,
+                "last_ts": now,
+            }
+        else:
+            entry["count"] += 1
+            entry["last_ts"] = now
+    except Exception as e:
+        logger.debug(f"[ErrorCollector] Failed to bump upstream error agg: {e}")
+
+
+def get_task_upstream_errors(task_id: str) -> list:
+    """返回某任务聚合后的上游报错列表（按首次发生时间排序，供任务详情端点合并下发）。"""
+    per_task = _TASK_ERROR_AGG.get(task_id or "")
+    if not per_task:
+        return []
+    return sorted(per_task.values(), key=lambda e: e.get("first_ts", ""))
+
+
+def clear_task_upstream_errors(task_id: str) -> None:
+    """任务删除时清理对应聚合（防内存缓慢增长）。"""
+    _TASK_ERROR_AGG.pop(task_id or "", None)
+
 
 def set_workspace_root(path: str) -> None:
     """设置错误日志存储的根目录（通常为激活的工作空间路径）。
@@ -198,6 +255,12 @@ def collect_error(
         with open(filepath, "w", encoding="utf-8") as f:
             json.dump(error_data, f, ensure_ascii=False, indent=2)
 
+        # GA 埋点：带 HTTP 状态码的报错同步累加进任务级内存聚合
+        if status_code and error_data["task_id"]:
+            _bump_upstream_error(
+                error_data["task_id"], status_code, model_type, api_method
+            )
+
         # 优化路线图 1.5b：按数量轮转，防止 error_logs 无限膨胀
         _rotate_error_logs(log_dir)
 

package/core/config.py

@@ -18,7 +18,7 @@ CONFIG_FILE = os.path.join(CONFIG_DIR, "config.json")
 # ═══════════════════════════════════════════════════
 # 应用版本号（v6.1 新增：发版时同步更新，见 docs/dev/release_process.md）
 # ═══════════════════════════════════════════════════
-APP_VERSION = "7.0.3"
+APP_VERSION = "7.0.4"
 
 # 未配置 API Key 时的统一报错文案（含免费获取与在线体验兜底，全站路由共用）
 #

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-short-video",
-  "version": "7.0.3",
+  "version": "7.0.4",
   "description": "Free AI short-video generator — run the full free-short-video service locally with one command. Text-to-video, image generation, Edge-TTS narration, subtitles, and compositing, all free. Official site: https://video.lichuanyang.top",
   "bin": {
     "free-short-video": "bin/cli.js",