free-short-video 6.4.2 → 6.4.4

package/README.md

@@ -1,23 +1,20 @@
 ---
 
-# What's New in v6.4.2
+# What's New in v6.4.4
 
 ## What's New
 
 ### Features & Improvements
 
-* **Per-Key domain binding** — each API Key saved in the projects config can now carry its own access domain (`com` / `cn` / `cn_bak`), so keys issued on the global site and keys issued on the domestic site can coexist and be routed to the correct endpoint automatically. Keys can from the environment still use the global domain.
+* **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.
 
-* **One-click "Auto-detect domains" button** — in the API Key config panel, trigger a probe that tests each key across the candidate domains and fills in the matching domain automatically, instead of guessing it by hand.
+* **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.
 
-* **Restored China fallback domain** **`apihub.agnes-ai.cn`** — this endpoint accepts both domestic and global keys, giving users a migration path when their key domain changes. It is not listed in the official docs and may be removed later, so we recommend choosing the domain that matches your key.
+* **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.
 
-### Bug Fixes
-
-* **Fixed multi-key authentication failures across domains** — after the Chinese domain migration, global-site keys could fail authentication against the strict domestic endpoint; domain is now resolved per key with the restored fallback, so mixed global/domestic keys authenticate successfully.
-
-* **Domain mismatch hints in the config UI** — keys without a bound domain now show a clear "domain not set" hint, prompting users to pick or auto-detect the matching domain on their next visit.
+---
 
+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.
 
 ---
 
@@ -45,6 +42,8 @@ free-short-video
 [![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)
 [![npm](https://img.shields.io/npm/v/free-short-video?label=npm)](https://www.npmjs.com/package/free-short-video)
+[![Sonar Quality Gate](https://img.shields.io/sonar/quality_gate/lcy362_agnes-video-generator?server=https%3A%2F%2Fsonarcloud.io&style=for-the-badge)](https://sonarcloud.io/project/overview?id=lcy362_agnes-video-generator)
+[![Sonar Coverage](https://img.shields.io/sonar/coverage/lcy362_agnes-video-generator?server=https%3A%2F%2Fsonarcloud.io&style=for-the-badge)](https://sonarcloud.io/project/overview?id=lcy362_agnes-video-generator)
 
 <p align="center">
   <img src="images/home.png" alt="Agnes Video Generator — Free AI Video Generator" width="720">

package/core/api/agnes_chat.py

@@ -58,7 +58,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.0-flash"):
+    def __init__(self, api_key: str, model: str = "agnes-2.5-flash"):
         self.api_key = api_key
         self.model = model
         # 基础 headers（不含 Authorization）：每次请求前经 _auth_headers() 注入当前 Key
@@ -217,16 +217,17 @@ class AgnesChatAPI:
             # Step 1: 去围栏
             cleaned = strip_code_fence(content)
             # Step 2: 直接解析
+            # json.JSONDecodeError 是 ValueError 的子类，仅捕获 ValueError（S5713）
             try:
                 return json.loads(cleaned)
-            except (json.JSONDecodeError, ValueError):
+            except ValueError:
                 pass
             # Step 3: 正则提取首个 {…} 块
             match = _JSON_BLOCK_RE.search(cleaned)
             if match:
                 try:
                     return json.loads(match.group())
-                except (json.JSONDecodeError, ValueError):
+                except ValueError:
                     pass
             # Step 3.5: json_repair 修复（可选依赖，修复 LLM 常见缺冒号/尾随逗号/单引号）
             if repair_json is not None:

package/core/api/agnes_image.py

@@ -52,7 +52,7 @@ class AgnesImageAPI:
     def __init__(
         self,
         api_key: str,
-        model: str = "agnes-image-2.1-flash",
+        model: str = "agnes-image-2.5-flash",
         i2i_model: Optional[str] = None,
     ):
         """初始化图片 API。
@@ -60,13 +60,13 @@ class AgnesImageAPI:
         Args:
             api_key: Agnes API Key。
             model: t2i 默认模型。
-            i2i_model: i2i 默认模型。默认与 ``model`` 相同（官方 agnes-image-2.1-flash
-                同时支持 t2i 与 i2i）。如需回退到 2.0，可通过环境变量
+            i2i_model: i2i 默认模型。默认与 ``model`` 相同（官方 agnes-image-2.5-flash
+                同时支持 t2i 与 i2i）。如需回退到旧版，可通过环境变量
                 ``AGNES_IMAGE_I2I_MODEL`` 或显式传参覆盖。
         """
         self.api_key = api_key
         self.model = model
-        # i2i 默认与 t2i 同模型（官方 2.1 同时支持 t2i/i2i）；环境变量可回退到 2.0。
+        # i2i 默认与 t2i 同模型（官方 2.5 同时支持 t2i/i2i）；环境变量可回退到旧版。
         from core.config import get_settings
         env_i2i = get_settings().agnes_image_i2i_model
         self.i2i_model = i2i_model or env_i2i or model
@@ -148,7 +148,11 @@ class AgnesImageAPI:
                 "image": resolved,
             }
 
-        logger.info(f"[AgnesImage] Generating ({'i2i' if use_i2i else 't2i'}): {prompt[:80]}...")
+        # S5145：不在日志中记录用户 prompt 内容（可能含敏感信息），只记模式与长度
+        logger.info(
+            f"[AgnesImage] Generating ({'i2i' if use_i2i else 't2i'}): "
+            f"prompt {len(prompt)} chars"
+        )
 
         resp = None
         attempt = 0

package/core/api/agnes_models.py

@@ -22,17 +22,20 @@ REQUEST_TIMEOUT = 20
 # 分组失败时的兜底列表
 _FALLBACK = {
     "text": [DEFAULT_TEXT_MODEL],
-    "image": [DEFAULT_IMAGE_MODEL],
+    "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）
+_DEPRECATED_MODELS = {"agnes-2.0-flash"}
+
 
 def _classify(model_id: str) -> str:
     """根据模型 ID 前缀判断分组。
 
     - ``agnes-image*`` → image
     - ``agnes-video*`` → video
-    - 其余（如 ``agnes-2.0-flash`` / ``agnes-2.5-flash``）→ text
+    - 其余（如 ``agnes-2.5-flash``）→ text
     """
     if model_id.startswith("agnes-image"):
         return "image"
@@ -68,13 +71,22 @@ def fetch_available_models(api_key: str) -> dict:
         grouped = {"text": [], "image": [], "video": []}
         for item in data.get("data", []):
             mid = item.get("id")
-            if not mid:
+            if not mid or mid in _DEPRECATED_MODELS:
                 continue
             grouped[_classify(mid)].append(mid)
         # 任一分类为空则补回默认，避免 UI 空下拉
         for k, default in _FALLBACK.items():
             if not grouped[k]:
                 grouped[k] = list(default)
+        # 确保各分类的默认模型始终在可选列表内（如服务端未返回时也能选择）
+        _defaults = {
+            "text": DEFAULT_TEXT_MODEL,
+            "image": DEFAULT_IMAGE_MODEL,
+            "video": DEFAULT_VIDEO_MODEL,
+        }
+        for k, d in _defaults.items():
+            if d not in grouped[k]:
+                grouped[k].append(d)
         return grouped
     except Exception as e:  # noqa: BLE001
         logger.warning("[AgnesModels] fetch failed (%s), using fallback", e)

package/core/api/agnes_video.py

@@ -71,6 +71,22 @@ def is_remote_video_failure(exc: BaseException) -> bool:
     return "Video generation failed:" in str(exc)
 
 
+def _read_json_cache(path: str) -> dict:
+    """读取 JSON 缓存文件（线程池执行，避免阻塞事件循环，S7493）。"""
+    with open(path, "r", encoding="utf-8") as f:
+        return json.loads(f.read())
+
+
+def _write_json_cache(path: str, data: dict) -> None:
+    """原子写入 JSON 缓存文件（先写临时文件再 replace，线程池执行）。"""
+    tmp_file = path + ".tmp"
+    with open(tmp_file, "w", encoding="utf-8") as f:
+        json.dump(data, f)
+        f.flush()
+        os.fsync(f.fileno())
+    os.replace(tmp_file, path)
+
+
 class VideoOutput:
     def __init__(self, fmt: str, ext: str, data: str):
         self.fmt = fmt
@@ -147,8 +163,7 @@ class AgnesVideoAPI:
             _URL_CACHE_MAX_AGE = 3600  # 1 小时
             if os.path.exists(url_file):
                 try:
-                    with open(url_file, "r", encoding="utf-8") as f:
-                        cache_data = json.loads(f.read())
+                    cache_data = await asyncio.to_thread(_read_json_cache, url_file)
                     cached_url = cache_data.get("url", "")
                     cached_ts = cache_data.get("ts", 0)
                     age = time.time() - cached_ts
@@ -170,13 +185,7 @@ class AgnesVideoAPI:
             url = await self._upload_image_to_url(ref)
             if url:
                 try:
-                    cache_data = {"url": url, "ts": time.time()}
-                    tmp_file = url_file + ".tmp"
-                    with open(tmp_file, "w", encoding="utf-8") as f:
-                        json.dump(cache_data, f)
-                        f.flush()
-                        os.fsync(f.fileno())
-                    os.replace(tmp_file, url_file)
+                    await asyncio.to_thread(_write_json_cache, url_file, {"url": url, "ts": time.time()})
                 except Exception as e:
                     logger.debug(f"[AgnesVideo] Failed to cache URL: {e}")
                 return url
@@ -196,7 +205,7 @@ class AgnesVideoAPI:
             try:
                 b64_data = self._path_to_b64(image_path)
                 payload = {
-                    "model": "agnes-image-2.1-flash",
+                    "model": "agnes-image-2.5-flash",
                     "prompt": "Keep the image exactly as it is",
                     "n": 1,
                     "size": "1024x1024",

package/core/api/rate_limiter.py

@@ -187,21 +187,19 @@ class AgnesRateLimiter:
         等待在事件循环中执行（不再占线程池）；可被任务取消打断，或经
         ``stop_event`` 提前放行（停止后调用方不会再发请求，无需令牌）。
         """
-        while True:
-            wait_time = self._try_acquire()
-            if wait_time is None:
-                return
-            self._record_wait(wait_time)
-            remaining = wait_time
-            while remaining > 0:
-                if stop_event is not None and stop_event.is_set():
-                    return
-                await asyncio.sleep(min(0.1, remaining))
-                remaining -= 0.1
-            # 预支语义（与同步 acquire 一致）：等待完成即视为已获取令牌。
-            # 注意不能再调用 _try_acquire()——last_refill 已被推进到
-            # now+wait_time，再次计算会因 elapsed≈0 而永远不足。
+        wait_time = self._try_acquire()
+        if wait_time is None:
             return
+        self._record_wait(wait_time)
+        remaining = wait_time
+        while remaining > 0:
+            if stop_event is not None and stop_event.is_set():
+                return
+            await asyncio.sleep(min(0.1, remaining))
+            remaining -= 0.1
+        # 预支语义（与同步 acquire 一致）：等待完成即视为已获取令牌。
+        # 注意不能再调用 _try_acquire()——last_refill 已被推进到
+        # now+wait_time，再次计算会因 elapsed≈0 而永远不足。
 
     @property
     def stats(self) -> dict:

package/core/async_io.py

@@ -0,0 +1,62 @@
+"""异步文件读写辅助（Sonar ``python:S7493``）。
+
+背景
+----
+在 ``async def`` 中直接使用内置 ``open()`` 会阻塞事件循环（文件 IO 虽短，
+但在高并发/大文件场景下会拖慢整个服务）。Sonar 将此类调用判为 BUG。
+
+方案
+----
+统一走 AnyIO 的 ``open_file``（FastAPI/Starlette 的既有依赖，无需新增包）：
+它把文件读写下沉到线程池，对外暴露与内置 ``open()`` 对齐的异步上下文管理器。
+
+用法
+----
+需要完整文件对象时（如逐块写入）::
+
+    async with await async_open(path, "wb") as f:
+        await f.write(chunk)
+
+只是整体读写时用便捷函数更省事::
+
+    content = await read_text(path)
+    await write_text(path, json.dumps(data, ensure_ascii=False))
+"""
+from __future__ import annotations
+
+from anyio import open_file
+
+__all__ = [
+    "async_open",
+    "read_bytes",
+    "read_text",
+    "write_bytes",
+    "write_text",
+]
+
+# 语义等价于内置 open()，返回 AnyIO 异步文件对象（需 ``await`` 后再 ``async with``）
+async_open = open_file
+
+
+async def read_text(path: str, encoding: str = "utf-8") -> str:
+    """异步读取整个文本文件。"""
+    async with await async_open(path, "r", encoding=encoding) as f:
+        return await f.read()
+
+
+async def write_text(path: str, data: str, encoding: str = "utf-8") -> None:
+    """异步写入整个文本文件（覆盖写）。"""
+    async with await async_open(path, "w", encoding=encoding) as f:
+        await f.write(data)
+
+
+async def read_bytes(path: str) -> bytes:
+    """异步读取整个二进制文件。"""
+    async with await async_open(path, "rb") as f:
+        return await f.read()
+
+
+async def write_bytes(path: str, data: bytes) -> None:
+    """异步写入整个二进制文件（覆盖写）。"""
+    async with await async_open(path, "wb") as f:
+        await f.write(data)

package/core/audio/tts.py

@@ -11,6 +11,8 @@ from typing import Optional, Tuple
 
 import edge_tts
 
+from core.async_io import async_open
+
 logger = logging.getLogger(__name__)
 
 
@@ -60,10 +62,10 @@ class EdgeTTSEngine(TTSEngine):
                 sub_maker = edge_tts.SubMaker()
 
                 tmp_path = output_path + ".tmp"
-                with open(tmp_path, "wb") as audio_file:
+                async with await async_open(tmp_path, "wb") as audio_file:
                     async for chunk in communicate.stream():
                         if chunk["type"] == "audio":
-                            audio_file.write(chunk["data"])
+                            await audio_file.write(chunk["data"])
                         elif chunk["type"] in ("WordBoundary", "SentenceBoundary"):
                             sub_maker.feed(chunk)
 

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

package/core/pipelines/__init__.py

@@ -24,6 +24,7 @@ _ENCODING_EXECUTOR = concurrent.futures.ThreadPoolExecutor(
     max_workers=2, thread_name_prefix="encoding"
 )
 
+from core.async_io import read_text, write_text
 from core.compositor.watermark import add_watermark, detect_language
 from core.config import get_watermark_config
 from core.task_manager import TaskManager
@@ -542,8 +543,7 @@ class BasePipeline(ABC):
                 )
 
             if srt_content.strip():
-                with open(srt_path, "w", encoding="utf-8") as f:
-                    f.write(srt_content)
+                await write_text(srt_path, srt_content)
                 entry_count = srt_content.count("\n\n") + 1 if "\n\n" in srt_content else 0
                 logger.info(
                     "[Subtitle] Scene-aware SRT: %d entries across %d segments",
@@ -557,19 +557,17 @@ class BasePipeline(ABC):
             total_dur = actual_audio_dur if actual_audio_dur > 0 else sum(segment_durations)
             SubtitleGenerator.text_to_srt(full_text, srt_path, total_dur)
         else:
-            with open(srt_path, "w", encoding="utf-8") as f:
-                f.write("")
+            await write_text(srt_path, "")
 
         # ── 2.5 统一后处理：确保每条字幕不超过 2 行（参考中文短字幕规范，适配所有语言）──
         try:
-            raw_srt = open(srt_path, "r", encoding="utf-8").read()
+            raw_srt = await read_text(srt_path)
             fixed_srt = SubtitleGenerator.enforce_max_lines(
                 raw_srt, max_lines=2,
                 video_width=video_width, fontsize=subtitle_config.style.fontsize,
             )
             if fixed_srt and fixed_srt != raw_srt:
-                with open(srt_path, "w", encoding="utf-8") as f:
-                    f.write(fixed_srt)
+                await write_text(srt_path, fixed_srt)
                 entry_count = fixed_srt.count("\n\n") + 1 if "\n\n" in fixed_srt else 1
                 logger.info(
                     "[Subtitle] enforce_max_lines applied: ≤2 lines/entry (%d entries)",
@@ -593,8 +591,7 @@ class BasePipeline(ABC):
                         style_hints=subtitle_config.style.style_hints,
                         **({"role": role} if role else {}),
                     )
-                    with open(sp, "w", encoding="utf-8") as f:
-                        json.dump(styles, f, ensure_ascii=False, indent=2)
+                    await write_text(sp, json.dumps(styles, ensure_ascii=False, indent=2))
                     styles_path = sp
                     logger.info(
                         "[Subtitle] LLM styles saved: %s (%d entries)",

package/core/pipelines/anchor_video.py

@@ -75,8 +75,8 @@ class AnchorPipeline(MultiScenePipeline):
         api_key: str,
         task_id: str,
         dir_name: Optional[str] = None,
-        chat_model: str = "agnes-2.0-flash",
-        image_model: str = "agnes-image-2.1-flash",
+        chat_model: str = "agnes-2.5-flash",
+        image_model: str = "agnes-image-2.5-flash",
         video_model: str = "agnes-video-v2.0",
         progress_callback: Optional[Callable] = None,
         shutdown_event: Optional[asyncio.Event] = None,

package/core/pipelines/creative/pipeline.py

@@ -47,8 +47,8 @@ class CreativeVideoPipeline(
         api_key: str,
         task_id: str,
         dir_name: Optional[str] = None,
-        chat_model: str = "agnes-2.0-flash",
-        image_model: str = "agnes-image-2.1-flash",
+        chat_model: str = "agnes-2.5-flash",
+        image_model: str = "agnes-image-2.5-flash",
         video_model: str = "agnes-video-v2.0",
         progress_callback: Optional[Callable] = None,
         shutdown_event: Optional[asyncio.Event] = None,

package/core/pipelines/creative/steps_audio.py

@@ -6,6 +6,7 @@ import os
 import re
 from typing import Optional
 
+from core.async_io import read_text
 from core.audio.voices import estimate_chars_per_sec
 from core.compositor.concatenator import VideoConcatenator
 from core.screenwriter import clean_narration_text
@@ -222,8 +223,7 @@ class AudioStepsMixin:
         script_path = os.path.join(self.working_dir, "script.json")
         if os.path.exists(script_path):
             try:
-                with open(script_path, "r", encoding="utf-8") as f:
-                    script_prompts = json.load(f)
+                script_prompts = json.loads(await read_text(script_path))
             except Exception:
                 pass
         prompts_data = {
@@ -401,10 +401,8 @@ class AudioStepsMixin:
                 prompts_path = os.path.join(self.working_dir, "prompts.json")
                 existing = {}
                 if os.path.exists(prompts_path):
-                    with open(prompts_path, "r", encoding="utf-8") as f:
-                        existing = json.load(f)
-                with open(styles_path, "r", encoding="utf-8") as f:
-                    existing["subtitle_styles"] = json.load(f)
+                    existing = json.loads(await read_text(prompts_path))
+                existing["subtitle_styles"] = json.loads(await read_text(styles_path))
                 self.save_prompts(existing)
             except Exception:
                 pass

package/core/pipelines/creative/steps_script.py

@@ -5,6 +5,7 @@ import logging
 import os
 from typing import List
 
+from core.async_io import read_text, write_text
 from core.pipelines import PipelineShutdown
 from models.task import SceneTask, StepStatus
 
@@ -55,8 +56,7 @@ class ScriptStepsMixin:
         if self._state.step_image_analysis == StepStatus.COMPLETED:
             analysis_file = self._state.image_analysis_file
             if os.path.exists(analysis_file):
-                with open(analysis_file, "r", encoding="utf-8") as f:
-                    content = f.read()
+                content = await read_text(analysis_file)
                 # 检测之前分析失败留下的错误文本，强制重新分析
                 if "(分析失败" in content:
                     logger.warning(
@@ -95,8 +95,7 @@ class ScriptStepsMixin:
         )
 
         analysis_file = os.path.join(self.working_dir, "image_analysis.txt")
-        with open(analysis_file, "w", encoding="utf-8") as f:
-            f.write(image_context)
+        await write_text(analysis_file, image_context)
 
         self._state.step_image_analysis = StepStatus.COMPLETED
         self._state.image_analysis_file = analysis_file
@@ -244,8 +243,7 @@ class ScriptStepsMixin:
             story_path = self._state.story_file
             if os.path.exists(story_path):
                 logger.info("[Pipeline] Step story: SKIP (already completed, file exists)")
-                with open(story_path, "r", encoding="utf-8") as f:
-                    return f.read()
+                return await read_text(story_path)
             logger.warning("[Pipeline] Step story: marked completed but file missing, re-running")
 
         logger.info("[Pipeline] Step story: RUNNING")
@@ -261,8 +259,7 @@ class ScriptStepsMixin:
         )
 
         story_path = os.path.join(self.working_dir, "story.txt")
-        with open(story_path, "w", encoding="utf-8") as f:
-            f.write(story)
+        await write_text(story_path, story)
 
         self._state.step_story = StepStatus.COMPLETED
         self._state.story_file = story_path
@@ -314,8 +311,7 @@ class ScriptStepsMixin:
         if os.path.exists(ref_img_path) and os.path.exists(ref_prompt_path):
             self._state.step_character_ref = StepStatus.COMPLETED
             self._state.character_ref_file = ref_img_path
-            with open(ref_prompt_path, "r", encoding="utf-8") as f:
-                self._state.character_ref_prompt = f.read()
+            self._state.character_ref_prompt = await read_text(ref_prompt_path)
             self.task_manager.update_state(
                 step_character_ref=StepStatus.COMPLETED,
                 character_ref_file=ref_img_path,
@@ -327,8 +323,7 @@ class ScriptStepsMixin:
         char_prompt = await asyncio.to_thread(
             self.screenwriter.extract_character_description, story, self._state.style
         )
-        with open(ref_prompt_path, "w", encoding="utf-8") as f:
-            f.write(char_prompt)
+        await write_text(ref_prompt_path, char_prompt)
 
         await self._emit("character_ref", "running", "正在生成角色参考图 (t2i)...", _PROGRESS_CHARACTER_REF_T2I)
         img_output = await self.image_generator.generate_single_image(
@@ -365,8 +360,7 @@ class ScriptStepsMixin:
             script_path = self._state.script_file
             if os.path.exists(script_path):
                 logger.info("[Pipeline] Step script: SKIP (already completed, file exists)")
-                with open(script_path, "r", encoding="utf-8") as f:
-                    scenes = json.load(f)
+                scenes = json.loads(await read_text(script_path))
                 if self._state.scene_count == len(scenes):
                     return scenes
                 logger.warning("[Pipeline] Step script: scene count mismatch, re-running")
@@ -383,8 +377,7 @@ class ScriptStepsMixin:
         )
 
         script_path = os.path.join(self.working_dir, "script.json")
-        with open(script_path, "w", encoding="utf-8") as f:
-            json.dump(scenes, f, ensure_ascii=False, indent=2)
+        await write_text(script_path, json.dumps(scenes, ensure_ascii=False, indent=2))
 
         self._state.scene_count = len(scenes)
         # Map durations to scenes: use scene_durations list, pad/trim as needed
@@ -453,8 +446,7 @@ class ScriptStepsMixin:
             prompts_path = self._state.end_frame_prompts_file
             if os.path.exists(prompts_path):
                 logger.info("[Pipeline] Step end_frame_prompts: SKIP (already completed, file exists)")
-                with open(prompts_path, "r", encoding="utf-8") as f:
-                    return json.load(f)
+                return json.loads(await read_text(prompts_path))
             logger.warning("[Pipeline] Step end_frame_prompts: marked completed but file missing, re-running")
 
         logger.info("[Pipeline] Step end_frame_prompts: RUNNING")
@@ -471,8 +463,7 @@ class ScriptStepsMixin:
         )
 
         prompts_path = os.path.join(self.working_dir, "end_frame_prompts.json")
-        with open(prompts_path, "w", encoding="utf-8") as f:
-            json.dump(end_frame_prompts, f, ensure_ascii=False, indent=2)
+        await write_text(prompts_path, json.dumps(end_frame_prompts, ensure_ascii=False, indent=2))
 
         self._state.step_end_frame_prompts = StepStatus.COMPLETED
         self._state.end_frame_prompts_file = prompts_path

package/core/pipelines/manuscript_video.py

@@ -16,6 +16,7 @@ import re
 from typing import Callable, List, Optional
 
 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.pipelines import MultiScenePipeline
@@ -143,8 +144,8 @@ class ManuscriptVideoPipeline(MultiScenePipeline):
         api_key: str,
         task_id: str,
         dir_name: str = None,
-        chat_model: str = "agnes-2.0-flash",
-        image_model: str = "agnes-image-2.1-flash",
+        chat_model: str = "agnes-2.5-flash",
+        image_model: str = "agnes-image-2.5-flash",
         video_model: str = "agnes-video-v2.0",
         progress_callback: Optional[Callable] = None,
         shutdown_event: Optional[asyncio.Event] = None,
@@ -542,10 +543,8 @@ class ManuscriptVideoPipeline(MultiScenePipeline):
                 prompts_path = os.path.join(self.working_dir, "prompts.json")
                 existing = {}
                 if os.path.exists(prompts_path):
-                    with open(prompts_path, "r", encoding="utf-8") as f:
-                        existing = json.load(f)
-                with open(styles_path, "r", encoding="utf-8") as f:
-                    existing["subtitle_styles"] = json.load(f)
+                    existing = json.loads(await read_text(prompts_path))
+                existing["subtitle_styles"] = json.loads(await read_text(styles_path))
                 self.save_prompts(existing)
             except Exception:
                 pass

package/core/pipelines/poetry_video.py

@@ -47,9 +47,6 @@ _PROGRESS_AUDIO_SCENE = 0.75
 _PROGRESS_SUBTITLE_SCENE = 0.87
 _PROGRESS_COMPOSITE_SCENE = 0.90
 
-_SCENE_LABEL_RE = re.compile(r"^(场景|Scene)\s*\d+|[（(]\s*\d+\s*:\s*\d+")
-
-
 def _is_scene_label(line: str) -> bool:
     """判断一行是否为纯场景标签（如「场景 1（00:00 - 00:10）」），而非分镜描述。
 
@@ -76,7 +73,7 @@ class PoetryVideoPipeline(MultiScenePipeline):
         api_key: str,
         task_id: str,
         dir_name: Optional[str] = None,
-        chat_model: str = "agnes-2.0-flash",
+        chat_model: str = "agnes-2.5-flash",
         video_model: str = "agnes-video-v2.0",
         progress_callback: Optional[callable] = None,
         shutdown_event: Optional = None,
@@ -424,9 +421,9 @@ class PoetryVideoPipeline(MultiScenePipeline):
                 f"生成字幕 {idx+1}/{len(scenes)}...", _PROGRESS_SUBTITLE_SCENE,
             )
             # v2.0：优先用该场景 cues 生成精确字幕；cues 缺失则回退纯文本估算
-            sub_maker = getattr(self, "_scene_sub_makers", {}).get(idx)
-            if sub_maker is not None and getattr(sub_maker, "cues", None):
-                SubtitleGenerator.cues_to_srt(sub_maker, srt_path)
+            scene_sub_maker = getattr(self, "_scene_sub_makers", {}).get(idx)
+            if scene_sub_maker is not None and getattr(scene_sub_maker, "cues", None):
+                SubtitleGenerator.cues_to_srt(scene_sub_maker, srt_path)
             if not (os.path.exists(srt_path) and os.path.getsize(srt_path) > 0):
                 SubtitleGenerator.text_to_srt(
                     text, srt_path, duration_sec=dur, chars_per_sec=_CHARS_PER_SEC,

package/core/pipelines/simple_video.py

@@ -37,8 +37,8 @@ class SimpleVideoPipeline(BasePipeline):
         api_key: str,
         task_id: str,
         dir_name: str = None,
-        chat_model: str = "agnes-2.0-flash",
-        image_model: str = "agnes-image-2.1-flash",
+        chat_model: str = "agnes-2.5-flash",
+        image_model: str = "agnes-image-2.5-flash",
         video_model: str = "agnes-video-v2.0",
         progress_callback: Optional[Callable] = None,
         shutdown_event: Optional[asyncio.Event] = None,