free-short-video 6.1.0 → 6.2.1

package/README.md

@@ -1,40 +1,12 @@
 ---
 
-# What's New in v6.1.0
+# What's New in v6.2.1
 
 ## What's New
 
-### Retry-First Guidance on Task Failure
+### Bug Fixes
 
-The failed-task panel now gives you a clear action path instead of a dead-end error line:
-
-- **Retry Task button** — resumes the task from the failed step via the existing checkpoint resume (no new backend endpoint, no full resubmit).
-- **Retry count tracking** — retries are counted per task and persist across refreshes; the count resets when the task succeeds.
-- **Transient-failure copy** — the panel explains that most failures come from temporary rate limiting / network timeouts / model-service fluctuation and are worth retrying before reporting.
-
-### One-Click Issue Feedback with Progressive Expansion
-
-When retries don't help, the feedback area helps you report efficiently:
-
-- **Progressive expansion** — the feedback area stays a low-key hint line under the retry guidance; after **2 failed retries** it auto-expands, switching the copy to "still failing after N retries, please report with diagnostic info." You can open it manually at any time (your choice is remembered per task).
-- **Deterministic-failure pre-screen** — parameter/content errors (HTTP 400, content policy, invalid API key) are detected from the error text, skip the retry guidance, and expand the feedback area directly with a "retrying may not help" hint and a de-emphasized retry button.
-- **Diagnostic info preview** — a collapsible structured report: app version, task type, mode, failed step, error message, retry count, and key generation configs (no prompt text included).
-- **Copy diagnostic info** — one click copies the full report for pasting anywhere.
-- **Check the FAQ first** — a direct link to the official FAQ page for self-service troubleshooting.
-- **Open a GitHub Issue** — jumps to the project issue tracker with title and body pre-filled from the diagnostic report (long bodies are safely truncated); a bug-report issue template is available in the repo.
-
-### Diagnostics Endpoint (Phase 2)
-
-- **`GET /api/tasks/{id}/diagnostics`** — returns a task summary plus the model-call error details associated with that task (exact task match first, time-window fallback), sourced from the existing `error_logs/` collector.
-- **Task-linked error collection** — model errors are now written with their `task_id`, so a failure can be traced back to the exact API calls that caused it.
-- **Privacy by design** — the endpoint never returns prompt text, response bodies, or system prompts; error messages are truncated. The feedback report is fully client-side and **nothing is uploaded automatically**.
-
-### Other Features & Improvements
-
-- **App version in diagnostics** — `APP_VERSION` is now exposed via `GET /api/config`, so every report carries the exact version that failed (kept in sync by the release process).
-- **Official FAQ updated** — new entries explain what to do when generation fails (retry first, then report with diagnostic info) and how to get help / report issues; synced across the official site and wiki.
-
----
+- **Localized feedback & diagnostic report** — the diagnostic report header, field names and the generated issue (GitHub) template are no longer hard-coded in Chinese. They now respect your UI language (22 languages), so fields, titles and truncation hints in the feedback panel render correctly for non-Chinese users.
 
 ---
 

package/core/api/agnes_video.py

@@ -14,7 +14,12 @@ import requests
 from core.api.error_collector import collect_error, collect_error_from_exception
 from core.api.key_manager import get_key_ring
 from core.api.rate_limiter import get_rate_limiter, get_video_submit_limiter
-from core.config import get_agnes_base_url, get_agnes_api_root
+from core.config import (
+    VIDEO_ASPECT_RATIOS,
+    get_agnes_api_root,
+    get_agnes_base_url,
+    is_v25_video_model,
+)
 from utils.image_normalizer import normalize_reference_path
 from utils.video import download_video
 
@@ -236,9 +241,11 @@ class AgnesVideoAPI:
         poll_count = 0
         consecutive_failures = 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 ""
         curl_cmd = (
             f'curl -s -H "Authorization: Bearer $AGNES_API_KEY" '
-            f'"{get_agnes_api_root()}/agnesapi?video_id={video_id}"'
+            f'"{get_agnes_api_root()}/agnesapi?video_id={video_id}{model_param}"'
         )
         while True:
             # M2: 每次轮询前检查停止信号
@@ -271,7 +278,7 @@ class AgnesVideoAPI:
                     resp = await asyncio.wait_for(
                         asyncio.to_thread(
                             requests.get,
-                            f"{get_agnes_api_root()}/agnesapi?video_id={video_id}",
+                            f"{get_agnes_api_root()}/agnesapi?video_id={video_id}{model_param}",
                             headers=self._auth_headers(),
                             timeout=15,
                         ),
@@ -525,6 +532,17 @@ class AgnesVideoAPI:
         negative_prompt: Optional[str] = None,
         **kwargs,
     ) -> str:
+        # 2.5 系列模型（v6.2）：新参数协议（mode/seconds/size/aspect_ratio）
+        if is_v25_video_model(self.model):
+            return await self._submit_video_v25(
+                prompt=prompt,
+                reference_image_paths=reference_image_paths,
+                duration=duration,
+                width=width,
+                height=height,
+                seed=seed,
+                **kwargs,
+            )
         num_frames, frame_rate = self._get_frame_config(duration, width, height)
 
         payload: dict = {
@@ -568,6 +586,90 @@ class AgnesVideoAPI:
         logger.info(f"[AgnesVideo] Video submitted: {video_id[:20]}...")
         return video_id
 
+    @staticmethod
+    def _width_height_to_aspect_ratio(width: int, height: int) -> str:
+        """将像素宽高映射到最接近的 2.5 系列 aspect_ratio 枚举。
+
+        找不到精确比例时取误差最小的档位（默认 16:9）。
+        """
+        if not width or not height:
+            return "16:9"
+        ratio = width / height
+        best = "16:9"
+        best_dist = float("inf")
+        for ar in VIDEO_ASPECT_RATIOS:
+            w, h = ar.split(":")
+            target = int(w) / int(h)
+            dist = abs(ratio - target)
+            if dist < best_dist:
+                best_dist = dist
+                best = ar
+        return best
+
+    async def _submit_video_v25(
+        self,
+        prompt: str,
+        reference_image_paths: List[str],
+        duration: Optional[int] = None,
+        width: int = 1152,
+        height: int = 768,
+        seed: Optional[int] = None,
+        **kwargs,
+    ) -> str:
+        """2.5 / 2.5-flash 新协议提交：mode / seconds / size / aspect_ratio。
+
+        与 v2.0 的关键差异：
+        - size 固定 720P（flash）或 720P/960P/2K（2.5）；不传 width/height/num_frames
+        - seconds 为字符串 "4"–"12"
+        - 单参考图 → reference(images)；多图 → keyframe(first_frame + last_frame)
+        - 不支持 negative_prompt（忽略）
+        """
+        # 时长：duration(秒) → seconds 字符串（4–12，超界截断）
+        secs = int(duration) if duration else 5
+        seconds = str(max(4, min(secs, 12)))
+        # 分辨率：flash 固定 720P；2.5 用 video_size 参数（缺省 720P）
+        size = kwargs.get("video_size") or "720P"
+        if self.model == "agnes-video-2.5-flash":
+            size = "720P"
+        aspect_ratio = self._width_height_to_aspect_ratio(width, height)
+
+        payload: dict = {
+            "model": self.model,
+            "prompt": prompt,
+            "mode": "text",
+            "seconds": seconds,
+            "size": size,
+            "aspect_ratio": aspect_ratio,
+        }
+        if seed is not None:
+            payload["seed"] = seed
+
+        # 参考图解析（与 v2.0 一致：归一化 + 上传为公开 URL）
+        resolved_refs = []
+        for p in reference_image_paths:
+            norm = await asyncio.to_thread(normalize_reference_path, p, width, height)
+            resolved_refs.append(await self._resolve_image_ref(norm))
+        n_refs = len(resolved_refs)
+
+        if n_refs == 1:
+            payload["mode"] = "reference"
+            payload["images"] = resolved_refs
+            mode_desc = "reference (1 image)"
+        elif n_refs >= 2:
+            # v6.2.1: Agnes 2.5 系列 keyframe 模式固定输出 704x704 正方形
+            # （忽略 aspect_ratio，竖屏/横屏画面会被拉伸，人物显宽）。
+            # 降级为 reference 模式（多图参考，≤5 张），输出遵循 aspect_ratio。
+            payload["mode"] = "reference"
+            payload["images"] = resolved_refs[:5]
+            mode_desc = f"reference ({n_refs} images, keyframe fallback)"
+        else:
+            mode_desc = "text-to-video"
+
+        logger.info(f"[AgnesVideo] {mode_desc}: {prompt[:80]}...")
+        video_id = await self._submit_with_retry(payload, mode_desc)
+        logger.info(f"[AgnesVideo] Video submitted: {video_id[:20]}...")
+        return video_id
+
     async def wait_for_video(self, video_id: str, progress_callback=None) -> VideoOutput:
         final = await self._poll_task(video_id, progress_callback=progress_callback)
 

package/core/artifacts.py

@@ -1082,7 +1082,7 @@ def write_manifest_md(state: BaseTaskState, task_dir: str) -> str:
         lines += [
             "## 协作提示",
             "",
-            "- 文本 / JSON / SRT 产物可直接用编辑器或外部 AI Agent（如 opencode、workbuddy）修改。",
+            "- 文本 / JSON / SRT 产物可直接用编辑器或外部 AI Agent（如 TraeWork、opencode、workbuddy）修改。",
             "- 图片 / 视频产物可用 ffmpeg、Python 等外部工具处理后覆盖同名文件。",
             "- 产物字段说明见 `docs/dev/artifact_standard.md`。",
             "",

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 = "6.1.0"
+APP_VERSION = "6.2.1"
 
 # 未配置 API Key 时的统一报错文案（含免费获取与在线体验兜底，全站路由共用）
 API_KEY_MISSING_MSG = (
@@ -739,6 +739,110 @@ def set_selected_models(text: str = None, image: str = None, video: str = None)
     return get_selected_models()
 
 
+# ═══════════════════════════════════════════════════
+# 视频模型能力元数据（v6.2：选模型阶段差异说明 + 表单选项归拢）
+# ═══════════════════════════════════════════════════
+
+# 2.5 系列模型 ID（新参数协议：mode/seconds/size/aspect_ratio，与 v2.0 不兼容）
+VIDEO_MODEL_25_PREFIX = "agnes-video-2.5"
+
+
+def is_v25_video_model(model: str) -> bool:
+    """判断是否为 2.5 系列视频模型（新参数协议）。"""
+    return bool(model) and model.startswith(VIDEO_MODEL_25_PREFIX)
+
+
+# 支持的画幅比例（2.5 系列 aspect_ratio 枚举）
+VIDEO_ASPECT_RATIOS = ["21:9", "16:9", "4:3", "1:1", "3:4", "9:16"]
+
+# 2.5 系列时长档位（seconds 字符串 "4"–"12"）
+VIDEO_25_DURATIONS = [4, 5, 6, 8, 10, 12]
+
+# 视频模型能力元数据：供前端「选模型阶段」展示差异 + 按模型归拢表单选项
+VIDEO_MODEL_CAPABILITIES = {
+    DEFAULT_VIDEO_MODEL: {  # agnes-video-v2.0（免费旧版）
+        "label": "Video 2.0",
+        "price": "free",
+        "price_text": {"zh": "免费", "en": "Free"},
+        "modes": [
+            {"id": "t2v", "label": {"zh": "文生视频", "en": "Text to video"}},
+            {"id": "i2v", "label": {"zh": "图生视频（1 张参考图）", "en": "Image to video (1 ref)"}},
+            {"id": "keyframes", "label": {"zh": "关键帧动画（首尾帧）", "en": "Keyframes (first+last)"}},
+        ],
+        "durations": [5, 10, 15, 18, 20],
+        "resolution": {
+            "type": "pixels",
+            "options": [
+                {"value": "768x1152", "label": {"zh": "竖屏 768x1152", "en": "Portrait 768x1152"}},
+                {"value": "1152x768", "label": {"zh": "横屏 1152x768", "en": "Landscape 1152x768"}},
+                {"value": "1024x1024", "label": {"zh": "方形 1024x1024", "en": "Square 1024x1024"}},
+            ],
+        },
+        "supports_negative": True,
+        "max_ref_images": None,  # 不限
+        "supports_ref_video": False,
+        "desc": {
+            "zh": "免费旧版。支持任意像素分辨率、最长约 17 秒、多参考图关键帧；有负面提示词。",
+            "en": "Free legacy model. Arbitrary pixel resolution, up to ~17s, multi-image keyframes; supports negative prompt.",
+        },
+    },
+    "agnes-video-2.5": {  # 付费模型
+        "label": "Video 2.5",
+        "price": "paid",
+        "price_text": {
+            "zh": "付费：720P $0.025/s · 960P $0.04/s · 2K $0.055/s；图片前 5 张免费",
+            "en": "Paid: 720P $0.025/s · 960P $0.04/s · 2K $0.055/s; first 5 images free",
+        },
+        "modes": [
+            {"id": "text", "label": {"zh": "文生视频", "en": "Text to video"}},
+            {"id": "keyframe", "label": {"zh": "首尾帧（自动降级图片参考）", "en": "First/last frame (auto fallback)"}},
+            {"id": "reference", "label": {"zh": "图片/音频参考", "en": "Image/audio reference"}},
+        ],
+        "durations": VIDEO_25_DURATIONS,
+        "resolution": {
+            "type": "ratio_size",
+            "ratios": VIDEO_ASPECT_RATIOS,
+            "sizes": ["720P", "960P", "2K"],
+        },
+        "supports_negative": False,
+        "max_ref_images": 5,  # 第 6 张起 $0.005/张
+        "supports_ref_video": True,
+        "desc": {
+            "zh": "新一代付费模型。最高 2K 分辨率、4–12 秒、支持参考视频；不支持负面提示词。",
+            "en": "New paid model. Up to 2K, 4–12s, supports reference videos; no negative prompt.",
+        },
+    },
+    "agnes-video-2.5-flash": {  # 免费新版（限时免费）
+        "label": "Video 2.5 Flash",
+        "price": "free",
+        "price_text": {"zh": "免费（限时）", "en": "Free (limited time)"},
+        "modes": [
+            {"id": "text", "label": {"zh": "文生视频", "en": "Text to video"}},
+            {"id": "keyframe", "label": {"zh": "首尾帧（自动降级图片参考）", "en": "First/last frame (auto fallback)"}},
+            {"id": "reference", "label": {"zh": "图片参考（≤5 张）", "en": "Image reference (≤5)"}},
+        ],
+        "durations": VIDEO_25_DURATIONS,
+        "resolution": {
+            "type": "ratio_size",
+            "ratios": VIDEO_ASPECT_RATIOS,
+            "sizes": ["720P"],  # 固定 720P
+        },
+        "supports_negative": False,
+        "max_ref_images": 5,
+        "supports_ref_video": False,
+        "desc": {
+            "zh": "免费新版（限时免费）。固定 720P、4–12 秒、图片参考最多 5 张；不支持负面提示词与参考视频。",
+            "en": "Free new model (limited time). Fixed 720P, 4–12s, up to 5 ref images; no negative prompt or ref video.",
+        },
+    },
+}
+
+
+def get_video_model_capabilities() -> dict:
+    """返回全部视频模型能力元数据（含未知模型的兜底默认）。"""
+    return dict(VIDEO_MODEL_CAPABILITIES)
+
+
 # ═══════════════════════════════════════════════════
 # Agnes API 域名配置（v6.0）
 # ═══════════════════════════════════════════════════

package/core/pipelines/simple_video.py

@@ -135,6 +135,7 @@ class SimpleVideoPipeline(BasePipeline):
             height=self._state.video_height,
             seed=self._state.seed,
             negative_prompt=self._state.negative_prompt,
+            video_size=getattr(self._state, "video_size", None) or "720P",
         )
 
         # 持久化 video_id + curl 命令

package/models/task.py

@@ -213,6 +213,8 @@ class SimpleVideoTask(BaseTaskState):
     reference_image: str = ""
     end_frame_image: str = ""
     duration: int = 5
+    # v6.2：2.5 系列模型分辨率档位（720P/960P/2K；v2.0 忽略，默认 720P）
+    video_size: str = "720P"
     seed: Optional[int] = None
     negative_prompt: Optional[str] = None
     system_prompt: str = ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-short-video",
-  "version": "6.1.0",
+  "version": "6.2.1",
   "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",