free-short-video 6.4.4 → 6.4.6

package/.env.example

@@ -16,22 +16,32 @@
 
 # ── 1. API Key（必填）──────────────────────────────────────────────
 # 从 https://platform.agnes-ai.com 获取免费 Key
+# ⚠️ 主 Key 的变量名不带序号（就是 AGNES_API_KEY，没有 AGNES_API_KEY_1 这个槽位）
 AGNES_API_KEY=your-api-key-here
 
 
 # ── 2. 多 Key 轮询（可选，推荐）────────────────────────────────────
 # 每个 Key 的配额独立，总量 ≈ 20 × Key 数 / 分钟。
-# 命名规则：AGNES_API_KEY_2、AGNES_API_KEY_3 ... 序号依次递增，中间不可断号
-# （断号之后的 Key 不会被加载）。
+# 命名规则：主 Key 用 AGNES_API_KEY，额外 Key 从 AGNES_API_KEY_2 起序号依次递增
+# （_2、_3、_4 ...），中间不可断号（断号之后的 Key 不会被加载）。
 # 遇到 429 会自动轮换到下一个 Key；限速配额与并发上限随 Key 数线性放大。
 # AGNES_API_KEY_2=your-second-api-key
 # AGNES_API_KEY_3=your-third-api-key
+# AGNES_API_KEY_4=your-fourth-api-key
+# AGNES_API_KEY_5=your-fifth-api-key
 
 
-# ── 3. 服务地址 ────────────────────────────────────────────────────
+# ── 3. 本地服务监听地址（非 Agnes API 地址）─────────────────────────
 HOST=0.0.0.0
 PORT=8765
 
+# 注：Agnes API 走哪个站点（国际站 / 国内站）**不通过环境变量配置**
+# （AGNES_BASE_URL 已废弃，代码中不再读取）。请在 Web 设置页的 API Key 面板
+# 选择域名，或用「自动探测域名」逐 Key 补全匹配域名（每个 Key 可绑定各自域名）。
+# 可选域名：com = apihub.agnes-ai.com（国际站）、cn = api.agnes-ai.cn（国内站，
+# 需国内站专属 Key）、cn_bak = apihub.agnes-ai.cn（备用，国际站 Key 亦可用）。
+# 跨站使用 Key 会得到 HTTP 401 / 无效的令牌。
+
 
 # ── 4. 限速（可选）─────────────────────────────────────────────────
 # 共享桶：Chat / 图片生成 / 图片上传 / 结果轮询 共用
@@ -54,8 +64,10 @@ PORT=8765
 
 
 # ── 5. 图生图模型（可选）───────────────────────────────────────────
-# i2i 默认与 t2i 同模型（agnes-image-2.1-flash）；如需回退到 2.0：
-# AGNES_IMAGE_I2I_MODEL=agnes-image-2.0
+# i2i 默认与 t2i 同模型（当前默认 agnes-image-2.5-flash）；如需为 i2i 固定旧版：
+# AGNES_IMAGE_I2I_MODEL=agnes-image-2.1-flash
+# （真实模型 ID 形如 agnes-image-2.5-flash / agnes-image-2.1-flash /
+#   agnes-image-2.0-flash，不带 -flash 后缀的写法无效）
 #
 # 注：视频 / 图片主模型请通过 Web UI 或 POST /api/config 选择，
 #     不再通过环境变量配置（AGNES_VIDEO_MODEL、AGNES_IMAGE_MODEL、

package/README.md

@@ -1,20 +1,16 @@
 ---
 
-# What's New in v6.4.4
+# What's New in v6.4.6
 
 ## What's New
 
-### Features & Improvements
+### Bug Fixes
 
-* **Image model selection enabled** — you can now choose the image model used for reference images, end frames, and standalone image generation directly in the Settings panel, instead of it being fixed to the built-in default.
-
-* **Agnes Image 2.5 Flash added and set as default** — the latest generation image model `agnes-image-2.5-flash` is now the default for both text-to-image and image-to-image workflows; the older `agnes-image-2.1-flash` and `agnes-image-2.0-flash` remain available as selectable options.
-
-* **LLM upgraded to Agnes 2.5 Flash** — the deprecated `agnes-2.0-flash` text model is removed from the selector and replaced by `agnes-2.5-flash` for story, script, and narration generation, following the official model deprecation notice.
+* **Digital human (anchor) videos no longer fail at the stitch/composite step in Docker** — anchor tasks crashed while looping the presenter clip and compositing it with narration audio and subtitles, and retrying did not help because the underlying cause was permanent. The container ships only the bundled `ffmpeg` binary (no `ffprobe`), and the clip-duration probe did not handle a missing `ffprobe`. Media duration is now probed through `ffmpeg` whenever `ffprobe` is unavailable, with a safe default as a final fallback, so digital-human video composition completes normally in Docker and other minimal environments.
 
 ---
 
-This is a maintenance release focused on model flexibility: open image model selection, a newer default image model, and migration off the deprecated text model.
+No action is required after upgrading.
 
 ---
 
@@ -37,7 +33,7 @@ free-short-video
 
 [![中文](https://img.shields.io/badge/CN-中文-red)](/README_ZH.md)
 [![GitHub Stars](https://img.shields.io/github/stars/lcy362/agnes-video-generator?style=social)](https://github.com/lcy362/agnes-video-generator)
-[![License](https://img.shields.io/github/license/lcy362/agnes-video-generator)](https://github.com/lcy362/agnes-video-generator/blob/main/LICENSE)
+[![License](https://img.shields.io/github/license/lcy362/agnes-video-generator)](https://github.com/lcy362/agnes-video-generator/blob/HEAD/LICENSE)
 [![Python](https://img.shields.io/badge/python-3.10+-blue)](https://www.python.org/)
 [![Website](https://img.shields.io/badge/website-video.lichuanyang.top-8A2BE2)](https://video.lichuanyang.top)
 [![Docker Hub](https://img.shields.io/docker/pulls/lcy362/free-short-video?label=docker%20pulls)](https://hub.docker.com/r/lcy362/free-short-video)
@@ -194,7 +190,7 @@ Full walkthrough: [Getting Started → Configure API Key](docs/public/getting-st
 - **[Getting Started](docs/public/getting-started.md)** — Install and deploy in 4 ways: Manual (`start.sh`), Docker, npm (`npx free-short-video`), or AI-Agent assisted.
 - **[Usage Guide](docs/public/usage.md)** — Configure your API key, pick a video mode, resume from checkpoints, the three chaining modes, and logs & output layout.
 - **[Architecture](docs/public/architecture.md)** — Project structure and tech stack.
-- **[API Reference](docs/public/api.md)** — Full REST + WebSocket endpoint list.
+- **[API Reference](docs/public/api.md)** — Full REST endpoint list (progress via polling, no WebSocket).
 - **[FAQ](docs/public/faq.md)** — Frequently asked questions.
 - **[About & License](docs/public/about.md)** — Acknowledgments and the MIT license.
 

package/core/api/agnes_chat.py

@@ -16,6 +16,7 @@ import requests
 
 from core.api.error_collector import collect_error, collect_error_from_exception
 from core.api.rate_limiter import get_rate_limiter, request_with_key_rotation
+from core.config import DEFAULT_TEXT_MODEL
 
 logger = logging.getLogger(__name__)
 
@@ -58,7 +59,7 @@ def strip_code_fence(text: str) -> str:
 class AgnesChatAPI:
     """Agnes LLM Chat API 封装（text + multimodal）。"""
 
-    def __init__(self, api_key: str, model: str = "agnes-2.5-flash"):
+    def __init__(self, api_key: str, model: str = DEFAULT_TEXT_MODEL):
         self.api_key = api_key
         self.model = model
         # 基础 headers（不含 Authorization）：每次请求前经 _auth_headers() 注入当前 Key

package/core/api/agnes_models.py

@@ -21,12 +21,12 @@ REQUEST_TIMEOUT = 20
 
 # 分组失败时的兜底列表
 _FALLBACK = {
-    "text": [DEFAULT_TEXT_MODEL],
+    "text": [DEFAULT_TEXT_MODEL, "agnes-2.5-flash"],
     "image": [DEFAULT_IMAGE_MODEL, "agnes-image-2.1-flash", "agnes-image-2.0-flash"],
     "video": [DEFAULT_VIDEO_MODEL],
 }
 
-# 已废弃、应从可选列表中剔除的模型 ID（如 agnes-2.0-flash，官方已迁移至 agnes-2.5-flash）
+# 已废弃、应从可选列表中剔除的模型 ID（如 agnes-2.0-flash，官方已迁移至新版本）
 _DEPRECATED_MODELS = {"agnes-2.0-flash"}
 
 
@@ -35,7 +35,7 @@ def _classify(model_id: str) -> str:
 
     - ``agnes-image*`` → image
     - ``agnes-video*`` → video
-    - 其余（如 ``agnes-2.5-flash``）→ text
+    - 其余（如 ``agnes-3.0-flash``）→ text
     """
     if model_id.startswith("agnes-image"):
         return "image"

package/core/compositor/concatenator/audio_overlay.py

@@ -7,6 +7,7 @@ import itertools
 import json
 import logging
 import os
+import re
 import subprocess
 from typing import List, Optional, Tuple
 
@@ -771,6 +772,69 @@ class AudioOverlayMixin:
             logger.warning(f"[Compositor] merge scene srts failed: {e}")
             return False
 
+    @staticmethod
+    def _probe_clip_duration(path: str, default: float = 5.0) -> float:
+        """探测媒体文件时长（秒），三级兜底。
+
+        修复 Issue #54：Docker 镜像仅暴露 imageio-ffmpeg 自带的 ``ffmpeg``，
+        不含 ``ffprobe``，``resolve_binary("ffprobe")`` 返回 ``None``；若直接传入
+        ``subprocess.run([None, ...])`` 会在 ``os.path.dirname(None)`` 处抛
+        ``TypeError``。此处按可用性依次尝试：
+
+        1. ``ffprobe``（解析到真实路径时才用）；
+        2. ``ffmpeg -i`` 的 stderr ``Duration:`` 行（ffmpeg 为硬依赖，镜像必有）；
+        3. 调用方给定的 ``default``。
+
+        Args:
+            path: 媒体文件路径。
+            default: 全部探测失败时返回的兜底时长（秒）。
+
+        Returns:
+            时长（秒）；无法探测时返回 ``default``。
+        """
+        # 1) ffprobe（可能为 None，必须先判空）
+        ffprobe = resolve_binary("ffprobe")
+        if ffprobe:
+            try:
+                r = subprocess.run(
+                    [ffprobe, "-v", "error", "-show_entries", "format=duration",
+                     "-of", "csv=p=0", path],
+                    stdin=subprocess.DEVNULL, capture_output=True, text=True, timeout=15,
+                )
+                val = float((r.stdout or "").strip() or 0)
+                if val > 0:
+                    return val
+            except Exception as e:
+                logger.warning(f"[Compositor] ffprobe duration failed: {e}")
+
+        # 2) ffmpeg stderr 解析（ffmpeg 是硬依赖，Docker 镜像必有）
+        ffmpeg = resolve_binary("ffmpeg")
+        if ffmpeg:
+            try:
+                r = subprocess.run(
+                    [ffmpeg, "-hide_banner", "-i", path],
+                    stdin=subprocess.DEVNULL, capture_output=True, text=True, timeout=15,
+                )
+                m = re.search(
+                    r"Duration:\s*(\d+):(\d+):(\d+(?:\.\d+)?)", r.stderr or ""
+                )
+                if m:
+                    h, mi, s = m.groups()
+                    val = int(h) * 3600 + int(mi) * 60 + float(s)
+                    if val > 0:
+                        logger.info(
+                            f"[Compositor] duration via ffmpeg fallback: {val:.2f}s ({path})"
+                        )
+                        return val
+            except Exception as e:
+                logger.warning(f"[Compositor] ffmpeg duration probe failed: {e}")
+
+        # 3) 默认兜底
+        logger.warning(
+            f"[Compositor] duration probe unavailable for {path}, using default {default}s"
+        )
+        return default
+
     @staticmethod
     def composite_anchor_video(
         clip_path: str,
@@ -810,14 +874,8 @@ class AudioOverlayMixin:
         )
         os.makedirs(os.path.dirname(output_path) or ".", exist_ok=True)
 
-        # Step 1: Get clip duration
-        probe = subprocess.run(
-            [resolve_binary("ffprobe"), "-v", "error", "-show_entries", "format=duration",
-             "-of", "csv=p=0", clip_path],
-            stdin=subprocess.DEVNULL,
-            capture_output=True, text=True, timeout=15,
-        )
-        clip_duration = float(probe.stdout.strip() or 5.0)
+        # Step 1: Get clip duration（ffprobe 不可用时回退 ffmpeg，修复 Issue #54）
+        clip_duration = AudioOverlayMixin._probe_clip_duration(clip_path, default=5.0)
         if clip_duration <= 0:
             clip_duration = 5.0
 

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.4.4"
+APP_VERSION = "6.4.6"
 
 # 未配置 API Key 时的统一报错文案（含免费获取与在线体验兜底，全站路由共用）
 API_KEY_MISSING_MSG = (
@@ -870,7 +870,7 @@ DURATION_FRAME_MAP = {
 # ═══════════════════════════════════════════════════
 
 # 各类型 Agnes 模型默认值（与三个 API 客户端的默认 model 对齐）
-DEFAULT_TEXT_MODEL = "agnes-2.5-flash"
+DEFAULT_TEXT_MODEL = "agnes-3.0-flash"
 DEFAULT_IMAGE_MODEL = "agnes-image-2.5-flash"
 DEFAULT_VIDEO_MODEL = "agnes-video-v2.0"
 

package/core/pipelines/anchor_video.py

@@ -18,6 +18,7 @@ from typing import Callable, Optional
 from core.api.agnes_image import AgnesImageAPI
 from core.api.agnes_video import AgnesVideoAPI, VideoTaskCancelled
 from core.compositor.concatenator import VideoConcatenator
+from core.config import DEFAULT_TEXT_MODEL
 from core.pipelines import MultiScenePipeline
 from core.screenwriter import Screenwriter
 from models.task import (
@@ -75,7 +76,7 @@ class AnchorPipeline(MultiScenePipeline):
         api_key: str,
         task_id: str,
         dir_name: Optional[str] = None,
-        chat_model: str = "agnes-2.5-flash",
+        chat_model: str = DEFAULT_TEXT_MODEL,
         image_model: str = "agnes-image-2.5-flash",
         video_model: str = "agnes-video-v2.0",
         progress_callback: Optional[Callable] = None,

package/core/pipelines/creative/pipeline.py

@@ -8,6 +8,7 @@ from typing import Callable, Optional
 
 from core.api.agnes_image import AgnesImageAPI
 from core.api.agnes_video import AgnesVideoAPI
+from core.config import DEFAULT_TEXT_MODEL
 from core.pipelines import MultiScenePipeline
 from core.screenwriter import Screenwriter
 from models.task import CreativeVideoTask
@@ -47,7 +48,7 @@ class CreativeVideoPipeline(
         api_key: str,
         task_id: str,
         dir_name: Optional[str] = None,
-        chat_model: str = "agnes-2.5-flash",
+        chat_model: str = DEFAULT_TEXT_MODEL,
         image_model: str = "agnes-image-2.5-flash",
         video_model: str = "agnes-video-v2.0",
         progress_callback: Optional[Callable] = None,

package/core/pipelines/manuscript_video.py

@@ -19,6 +19,7 @@ from core.api.agnes_video import AgnesVideoAPI, VideoTaskCancelled
 from core.async_io import read_text
 from core.audio.voices import duration_len, estimate_chars_per_sec
 from core.compositor.concatenator import VideoConcatenator
+from core.config import DEFAULT_TEXT_MODEL
 from core.pipelines import MultiScenePipeline
 from core.screenwriter import Screenwriter, is_prompt_language_explicit
 from models.task import (
@@ -144,7 +145,7 @@ class ManuscriptVideoPipeline(MultiScenePipeline):
         api_key: str,
         task_id: str,
         dir_name: str = None,
-        chat_model: str = "agnes-2.5-flash",
+        chat_model: str = DEFAULT_TEXT_MODEL,
         image_model: str = "agnes-image-2.5-flash",
         video_model: str = "agnes-video-v2.0",
         progress_callback: Optional[Callable] = None,

package/core/pipelines/poetry_video.py

@@ -19,6 +19,7 @@ from core.api.agnes_video import AgnesVideoAPI
 from core.audio.subtitle import SubtitleGenerator
 from core.audio.tts import SilentTTSEngine
 from core.compositor.concatenator import VideoConcatenator
+from core.config import DEFAULT_TEXT_MODEL
 from core.pipelines import MultiScenePipeline
 from core.screenwriter import Screenwriter, clean_narration_text
 from models.task import (
@@ -73,7 +74,7 @@ class PoetryVideoPipeline(MultiScenePipeline):
         api_key: str,
         task_id: str,
         dir_name: Optional[str] = None,
-        chat_model: str = "agnes-2.5-flash",
+        chat_model: str = DEFAULT_TEXT_MODEL,
         video_model: str = "agnes-video-v2.0",
         progress_callback: Optional[callable] = None,
         shutdown_event: Optional = None,

package/core/pipelines/simple_video.py

@@ -11,6 +11,7 @@ import traceback
 from typing import Callable, Optional
 
 from core.api.agnes_video import AgnesVideoAPI
+from core.config import DEFAULT_TEXT_MODEL
 from core.pipelines import BasePipeline, PipelineShutdown
 from models.task import SimpleVideoTask, StepStatus
 
@@ -37,7 +38,7 @@ class SimpleVideoPipeline(BasePipeline):
         api_key: str,
         task_id: str,
         dir_name: str = None,
-        chat_model: str = "agnes-2.5-flash",
+        chat_model: str = DEFAULT_TEXT_MODEL,
         image_model: str = "agnes-image-2.5-flash",
         video_model: str = "agnes-video-v2.0",
         progress_callback: Optional[Callable] = None,

package/core/screenwriter/__init__.py

@@ -26,7 +26,7 @@ logger = logging.getLogger(__name__)
 #   "zh" — 所有 meta-prompt 使用中文（默认）
 #   "en" — 所有 meta-prompt 使用英文
 # 示例：export PROMPT_LANGUAGE=en
-from core.config import get_settings as _get_settings  # noqa: I001 就地导入避免循环依赖
+from core.config import DEFAULT_TEXT_MODEL, get_settings as _get_settings  # noqa: I001 就地导入避免循环依赖
 PROMPT_LANGUAGE = _get_settings().prompt_language
 
 
@@ -112,7 +112,7 @@ class Screenwriter(
     对外接口与拆分前完全一致（mixin 组合，方法经 MRO 解析）。
     """
 
-    def __init__(self, api_key: str, model: str = "agnes-2.5-flash", language: str = None):
+    def __init__(self, api_key: str, model: str = DEFAULT_TEXT_MODEL, language: str = None):
         self.api_key = api_key
         self.model = model
         self.language = language if language else PROMPT_LANGUAGE  # "zh" 中文 / "en" 英文

package/package.json

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