free-short-video 5.2.0 → 5.3.0

package/README.md

@@ -33,6 +33,13 @@ free-short-video
 
 > **🖥️ Try it now — no install needed:** Visit [video.lichuanyang.top](https://video.lichuanyang.top) and experience **Simple Video** mode directly in your browser. Just enter a prompt and generate a free AI video instantly.
 
+## 🚀 Two Ways to Use — Both Completely Free
+
+| Project | Run Where | Features | Link |
+|---------|-----------|----------|------|
+| **[Agnes Video Generator](https://github.com/lcy362/agnes-video-generator)** (this project) | **Download & run locally** | **More powerful** — TTS narration, auto subtitles, digital anchor, image-to-video, keyframes animation, manuscript-to-video, checkpoint resume & more | [GitHub](https://github.com/lcy362/agnes-video-generator) |
+| **[FreeShortVideoStudio](https://github.com/lcy362/free-short-video-studio)** | **Fully online, in the browser** | Lightweight, zero install — no setup at all, **features under active construction** | [video.lichuanyang.top/studio](https://video.lichuanyang.top/studio) · [GitHub](https://github.com/lcy362/free-short-video-studio) |
+
 ## ⭐ Support & Contribute
 
 If you find this project useful, please **star the [GitHub repository](https://github.com/lcy362/agnes-video-generator)** ⭐ — your support helps more people discover this free and open-source AI video generator.

package/core/api/agnes_image.py

@@ -17,6 +17,9 @@ from utils.image import download_image
 
 logger = logging.getLogger(__name__)
 
+# 图像生成读超时基数（秒）：timeout = 基数 * (attempt + 1)，首次 120s 逐步放宽
+_READ_TIMEOUT_BASE_SECONDS = 120
+
 
 class ImageOutput:
     def __init__(self, fmt: str, ext: str, data: str):
@@ -82,7 +85,7 @@ class AgnesImageAPI:
         prompt: str,
         reference_image_paths: List[str] = [],
         size: Optional[str] = None,
-        max_retries: int = 3,
+        max_retries: int = 4,
         retry_base_delay: float = 20.0,
         **kwargs,
     ) -> ImageOutput:
@@ -114,8 +117,8 @@ class AgnesImageAPI:
             try:
                 # 全局限速：在发起 HTTP 请求前获取令牌
                 await asyncio.to_thread(get_rate_limiter().acquire)
-                # 动态超时：第一次 60s，后续逐步增加
-                read_timeout = 60 * (attempt + 1)
+                # 动态超时：第一次 120s，后续逐步增加（图像生成较慢，放宽读超时）
+                read_timeout = _READ_TIMEOUT_BASE_SECONDS * (attempt + 1)
                 resp = await asyncio.to_thread(
                     requests.post,
                     f"{get_agnes_base_url()}/images/generations",

package/core/api/agnes_video.py

@@ -26,6 +26,9 @@ DURATION_PRESETS = {
     20: (409, 24),   # capped at 409 (API max for 720p); actual ~17s
 }
 
+# 图片上传 429 退避间隔基数（秒）：delay = 基数 * (attempt + 1)
+_UPLOAD_RETRY_BASE_DELAY_SECONDS = 30
+
 
 class VideoOutput:
     def __init__(self, fmt: str, ext: str, data: str):
@@ -144,7 +147,7 @@ class AgnesVideoAPI:
                     timeout=(30, 120),
                 )
                 if resp.status_code == 429:
-                    delay = 30 * (attempt + 1)
+                    delay = _UPLOAD_RETRY_BASE_DELAY_SECONDS * (attempt + 1)
                     logger.warning(f"[AgnesVideo] Image upload 429, retry in {delay}s...")
                     await asyncio.sleep(delay)
                     continue

package/core/artifacts.py

@@ -12,7 +12,11 @@ core/artifacts.py — 中间产物注册表与级联删除计划
 
 from __future__ import annotations
 
+import json
+import logging
 import os
+import shutil
+import time
 from dataclasses import dataclass, field
 from typing import Any, Optional
 
@@ -572,3 +576,82 @@ def apply_cascade_plan(state: BaseTaskState, plan: CascadePlan) -> dict:
     update_kwargs["status"] = StepStatus.PENDING
 
     return update_kwargs
+
+
+# ═══════════════════════════════════════════════════════════════
+# 僵尸任务磁盘清理（v5.0 Batch 5 / 5.1）
+# ═══════════════════════════════════════════════════════════════
+
+_DEFAULT_PROTECT_STATUSES = {StepStatus.RUNNING, StepStatus.QUEUED, StepStatus.PENDING}
+
+
+def sweep_stale_tasks(age_days: int = 7,
+                      protect_statuses: Optional[set] = None) -> dict:
+    """扫描并清理僵尸任务目录（状态文件超龄且任务非活跃）。
+
+    清理条件（全部满足才删除）：
+    1. 工作区中存在 ``task_state.json`` 且可解析出 ``status`` 字段；
+    2. ``status`` 不在保护集合中；
+    3. ``task_state.json`` 的修改时间距今超过 ``age_days`` 天。
+
+    默认保护 ``RUNNING``（运行中）/ ``QUEUED``（排队中）/ ``PENDING``（断点续传
+    候选），保证活跃任务与可恢复任务永不误删；调用方可传 ``protect_statuses``
+    显式覆盖（如仅保护活跃状态，放开 PENDING）。
+
+    删除策略：整目录 ``shutil.rmtree``（等价于按级联计划删除全部产物 + 状态文件），
+    删除前校验 realpath 必须位于工作区内，防符号链接逃逸。
+
+    Args:
+        age_days: 状态文件超龄阈值（天）
+        protect_statuses: 保护的状态集合；None 时使用默认保护集合
+
+    Returns:
+        {"swept": [目录名], "protected": [目录名], "errors": [描述]}
+    """
+    working_dir = get_working_dir()
+    protect = protect_statuses if protect_statuses is not None else _DEFAULT_PROTECT_STATUSES
+    swept: list[str] = []
+    protected: list[str] = []
+    errors: list[str] = []
+
+    if not os.path.isdir(working_dir):
+        return {"swept": swept, "protected": protected, "errors": errors}
+
+    real_working = os.path.realpath(working_dir)
+    cutoff = time.time() - age_days * 86400
+
+    for name in sorted(os.listdir(working_dir)):
+        task_dir = os.path.join(working_dir, name)
+        if not os.path.isdir(task_dir):
+            continue
+        task_file = os.path.join(task_dir, "task_state.json")
+        if not os.path.isfile(task_file):
+            continue  # 非任务目录（如 uploads/ 或普通文件目录）
+        try:
+            with open(task_file, "r", encoding="utf-8") as f:
+                status_str = json.load(f).get("status")
+        except (OSError, json.JSONDecodeError):
+            errors.append(f"{name}: task_state.json 无法解析")
+            continue
+        if status_str in {s.value for s in protect}:
+            protected.append(name)
+            continue
+        try:
+            mtime = os.path.getmtime(task_file)
+        except OSError:
+            errors.append(f"{name}: 无法读取 task_state.json 修改时间")
+            continue
+        if mtime > cutoff:
+            protected.append(name)  # 未超龄，保留
+            continue
+        # 路径穿越防护：任务目录 realpath 必须位于工作区内
+        if not os.path.realpath(task_dir).startswith(real_working + os.sep):
+            errors.append(f"{name}: 任务目录逃逸工作区，拒绝删除")
+            continue
+        try:
+            shutil.rmtree(task_dir)
+            swept.append(name)
+        except OSError as e:
+            errors.append(f"{name}: 删除失败 ({e})")
+
+    return {"swept": swept, "protected": protected, "errors": errors}

package/core/audio/subtitle/__init__.py

@@ -0,0 +1,35 @@
+"""core.audio.subtitle — SRT 字幕生成 + moviepy 叠加（v5.0 Batch 4 / 4.3 拆分后的包入口）
+
+SubtitleGenerator 由两个职责 mixin（SubtitleSrtMixin / SubtitleRenderMixin）
+组合而成；对外保留全部原符号（subtitle.py 兼容 re-export）。"""
+
+import logging
+
+from .generator import SubtitleSrtMixin
+from .renderer import SubtitleRenderMixin
+
+logger = logging.getLogger(__name__)
+
+
+class SubtitleGenerator(
+    SubtitleSrtMixin,
+    SubtitleRenderMixin,
+):
+
+    """字幕生成器：cues → SRT + moviepy 叠加。"""
+
+
+from . import generator as srt_generator
+from . import renderer as subtitle_renderer
+
+# 运行时注入：mixin 方法内显式 `SubtitleGenerator.xxx` 自引用
+# （原 @staticmethod 风格）在模块级延迟解析到组合类。
+srt_generator.SubtitleGenerator = SubtitleGenerator
+subtitle_renderer.SubtitleGenerator = SubtitleGenerator
+
+__all__ = [
+    "SubtitleGenerator",
+    "SubtitleSrtMixin",
+    "SubtitleRenderMixin",
+]
+