利用 AI 大模型和自动化工作流,根据主题或关键词一键生成高清短视频。Generate HD short videos from a topic or keyword with an automated AI workflow.
Python ai-video-generatorcontent-creationffmpeginstagram-reelsllmpythonshort-videosubtitlestext-to-speechtiktokvideo-automationvideo-workflowworkflow-automationyoutube-shorts
fix(webui): prevent blank page during generation
harry0703ea9ed6b1bf3a
diff --git a/app/config/__init__.py b/app/config/__init__.pyindex 9792ba7d..2df95973 100644--- a/app/config/__init__.py+++ b/app/config/__init__.py@@ -1,49 +1,23 @@-import osimport sys-from loguru import logger-from app.config import config+from app.utils.logging_utils import configure_terminal_loggerdef __init_logger():# _log_file = utils.storage_dir("logs/server.log")_lvl = config.log_level- root_dir = os.path.dirname(- os.path.dirname(os.path.dirname(os.path.realpath(__file__)))- )-- def format_record(record):- # 获取日志记录中的文件全路径- file_path = record["file"].path- # 将绝对路径转换为相对于项目根目录的路径- relative_path = os.path.relpath(file_path, root_dir)- # 更新记录中的文件路径- record["file"].path = f"./{relative_path}"- # 返回修改后的格式字符串- # 您可以根据需要调整这里的格式- _format = (- "<green>{time:%Y-%m-%d %H:%M:%S}</> | "- + "<level>{level}</> | "- + '"{file.path}:{line}":<blue> {function}</> '- + "- <level>{message}</>"- + "\n"- )- return _format-- logger.remove()- logger.add(+ configure_terminal_logger(sys.stdout,level=_lvl,- format=format_record,colorize=True,)# logger.add(# _log_file,# level=_lvl,- # format=format_record,+ # format=format_log_record,# rotation="00:00",# retention="3 days",# backtrace=True,diff --git a/app/config/config.py b/app/config/config.pyindex b6ff2c2a..d7faab40 100644--- a/app/config/config.py+++ b/app/config/config.py@@ -22,6 +22,13 @@ class _SynchronizedConfig(dict):"""保持 dict 使用方式不变,同时让运行期配置写操作服从同一把锁。"""def __setitem__(self, key, value):+ # Streamlit 每次整页 rerun 都会把当前控件值重新写回配置。视频任务持有+ # runtime_config_lock 时,如果值没有变化,这次写入没有任何副作用,也+ # 不应让刷新后的页面卡在表单中途。真正改变配置的写入仍进入下方锁,+ # 因而不能在正在生成的视频中途切换 Provider、密钥或其它全局设置。+ current = super().get(key, _MISSING)+ if current is not _MISSING and current == value:+ returnwith _config_save_lock:super().__setitem__(key, value)@@ -30,22 +37,42 @@ class _SynchronizedConfig(dict):super().__delitem__(key)def clear(self):+ if not self:+ returnwith _config_save_lock:super().clear()def pop(self, key, default=_MISSING):+ # ``pop(key, default)`` 在 key 不存在时同样不会改变配置。WebUI 使用+ # 这种写法表达“采用默认策略”,刷新时必须允许它直接完成。+ if key not in self:+ if default is _MISSING:+ raise KeyError(key)+ return defaultwith _config_save_lock:if default is _MISSING:return super().pop(key)return super().pop(key, default)def setdefault(self, key, default=None):+ # 与 __setitem__ 相同,已存在 key 的 setdefault 是只读操作。提前返回+ # 可以让只读取默认配置的页面刷新不受长任务配置锁影响。+ current = super().get(key, _MISSING)+ if current is not _MISSING:+ return currentwith _config_save_lock:return super().setdefault(key, default)def update(self, *args, **kwargs):+ changes = dict(*args, **kwargs)+ if all(+ (current := dict.get(self, key, _MISSING)) is not _MISSING+ and current == value+ for key, value in changes.items()+ ):+ returnwith _config_save_lock:- super().update(*args, **kwargs)+ super().update(changes)@contextmanagerdiff --git a/app/services/webui_task.py b/app/services/webui_task.pynew file mode 100644index 00000000..837450a9--- /dev/null+++ b/app/services/webui_task.py@@ -0,0 +1,153 @@+import threading+from collections import deque++from loguru import logger++from app.config import config+from app.controllers.manager.memory_manager import InMemoryTaskManager+from app.models import const+from app.models.schema import VideoParams+from app.services import state as sm+from app.services import task as tm+from app.utils.logging_utils import format_log_record+++# WebUI 的配置保存在进程级全局字典中。原来的同步实现会在完整生成期间持有+# runtime_config_lock,因此不同浏览器会话实际上也是串行执行。这里把并发数固定+# 为 1,既延续原有配置一致性,也避免多个线程只是在配置锁外无意义地等待。+_task_manager = InMemoryTaskManager(+ max_concurrent_tasks=1,+ max_queued_tasks=max(1, int(config.app.get("max_queued_tasks", 100))),+)+_task_logs: dict[str, deque[str]] = {}+_task_logs_lock = threading.RLock()+_MAX_LOG_TASKS = 20+_MAX_LOG_RECORDS_PER_TASK = 1000+# Streamlit 无法由后台线程直接推送组件更新,只能通过 Fragment 轮询。0.5 秒+# 足以让 WebUI 日志接近终端实时输出,又不会像高频刷新那样持续占用浏览器资源。+TASK_LOG_REFRESH_INTERVAL_SECONDS = 0.5+++def _append_task_log(task_id: str, message: str) -> None:+ """按任务保存有限数量的日志,供 Streamlit Fragment 安全轮询。"""+ with _task_logs_lock:+ records = _task_logs.get(task_id)+ if records is None:+ # 只保留最近任务的日志,避免 WebUI 服务长时间运行后持续占用内存。+ # dict 保持插入顺序;任务日志仅用于界面诊断,淘汰最早记录不影响任务。+ if len(_task_logs) >= _MAX_LOG_TASKS:+ oldest_task_id = next(iter(_task_logs))+ _task_logs.pop(oldest_task_id, None)+ records = deque(maxlen=_MAX_LOG_RECORDS_PER_TASK)+ _task_logs[task_id] = records+ records.append(message.rstrip())+++def get_task_logs(task_id: str) -> list[str]:+ """返回日志快照,避免页面渲染期间持有后台线程使用的锁。"""+ with _task_logs_lock:+ return list(_task_logs.get(task_id, ()))+++def _run_generation(+ task_id: str,+ params: VideoParams,+ capture_logs: bool,+) -> dict:+ """+ 在后台线程中执行现有视频流水线。++ Loguru 的 sink 是进程级资源,因此必须按当前工作线程过滤。否则同时运行的+ API 任务或其它页面日志会混入当前任务。页面只读取普通列表快照,不会从后台+ 线程访问 Streamlit session_state,从根源上避免刷新时的 delta 路径错乱。+ """+ log_handler_id = None+ worker_thread_id = threading.get_ident()+ try:+ if capture_logs:+ log_handler_id = logger.add(+ lambda message: _append_task_log(task_id, str(message)),+ level="DEBUG",+ format=format_log_record,+ colorize=False,+ filter=lambda record: record["thread"].id == worker_thread_id,+ )++ # 完整任务仍使用原来的配置锁,防止另一个 WebUI 会话在生成中途修改+ # Provider、密钥等进程级配置,造成同一条视频前后使用不同设置。+ with config.runtime_config_lock():+ return tm.start(task_id=task_id, params=params)+ except Exception as exc:+ # tm.start 已负责把流水线异常转换成失败状态;这里额外保护日志 sink、+ # 配置锁等 WebUI 包装层。任何后台线程异常都必须留下终态,不能让任务+ # 管理器在工作线程退出后仍永久显示“生成中”。+ error = f"{type(exc).__name__}: {exc}"+ failure = {+ "task_id": task_id,+ "state": const.TASK_STATE_FAILED,+ "progress": 0,+ "failed_stage": "webui_worker",+ "error": error,+ }+ sm.state.update_task(+ task_id,+ state=failure["state"],+ progress=failure["progress"],+ failed_stage=failure["failed_stage"],+ error=failure["error"],+ )+ logger.exception(+ f"unexpected WebUI generation worker failure, "+ f"task_id={task_id}, error={exc}"+ )+ return failure+ finally:+ if log_handler_id is not None:+ try:+ logger.remove(log_handler_id)+ except ValueError:+ logger.debug(+ f"WebUI task log handler already removed: task_id={task_id}"+ )+++def submit_generation(+ task_id: str,+ params: VideoParams,+ capture_logs: bool = True,+) -> None:+ """+ 登记并提交 WebUI 视频生成任务,调用后立即返回。++ 任务状态必须在线程启动前写入。这样页面本次脚本执行结束时即可查询到任务,+ 浏览器刷新或 WebSocket 重连也不依赖旧页面内存中的占位符。+ """+ task_params = params.model_copy(deep=True)+ sm.state.update_task(+ task_id,+ state=const.TASK_STATE_PROCESSING,+ progress=0,+ video_subject=task_params.video_subject or task_params.video_script or task_id,+ )+ try:+ _task_manager.add_task(+ _run_generation,+ task_id=task_id,+ params=task_params,+ capture_logs=capture_logs,+ )+ except Exception as exc:+ # 调度失败与流水线失败一样必须成为可查询状态,避免任务管理器永久显示+ # “生成中”。保留异常类型便于从 Docker 或本机日志快速定位队列问题。+ error = f"{type(exc).__name__}: {exc}"+ sm.state.update_task(+ task_id,+ state=const.TASK_STATE_FAILED,+ progress=0,+ failed_stage="scheduling",+ error=error,+ )+ logger.exception(+ f"failed to submit WebUI generation task, task_id={task_id}, error={exc}"+ )+ raisediff --git a/app/utils/logging_utils.py b/app/utils/logging_utils.pynew file mode 100644index 00000000..42276081--- /dev/null+++ b/app/utils/logging_utils.py@@ -0,0 +1,67 @@+import os+import threading++from loguru import logger+++PROJECT_ROOT = os.path.dirname(+ os.path.dirname(os.path.dirname(os.path.realpath(__file__)))+)+LOG_RECORD_FORMAT = (+ "<green>{time:%Y-%m-%d %H:%M:%S}</> | "+ "<level>{level}</> | "+ '"{file.path}:{line}":<blue> {function}</> '+ "- <level>{message}</>\n"+)+# Loguru 启动时默认终端 handler 的 ID 为 0。WebUI 重新加载时只能替换这个+# 基础终端输出,不能调用 logger.remove() 清空全部 handler,否则正在运行任务+# 用于收集 WebUI 日志的临时 sink 也会被删除。+_terminal_handler_id: int | None = 0+_terminal_handler_lock = threading.RLock()+++def format_log_record(record):+ """+ 统一格式化终端与 WebUI 日志。++ Loguru 会把同一条记录交给多个 sink。第一个 sink 可能已经将绝对路径转换+ 为项目相对路径,因此这里同时兼容绝对路径和 ``./`` 开头的已格式化路径。+ WebUI sink 会关闭颜色,但时间、级别、调用位置和消息内容与终端保持一致。+ """+ file_path = record["file"].path+ if os.path.isabs(file_path):+ relative_path = os.path.relpath(file_path, PROJECT_ROOT)+ record["file"].path = f"./{relative_path}"++ # 日志消息有时会包含任务文件的绝对路径。统一缩短为项目相对路径,可以+ # 避免 WebUI 和终端因初始化入口不同而展示两套内容。+ record["message"] = record["message"].replace(PROJECT_ROOT, ".")+ return LOG_RECORD_FORMAT+++def configure_terminal_logger(sink, level: str, colorize: bool = True) -> int:+ """+ 安全替换进程级终端日志 handler,并保留任务专用 handler。++ Streamlit 在代码热重载或缓存失效时可能重新执行日志初始化。这里只按已记录+ 的 handler ID 精确移除旧终端输出,因此不会中断后台任务正在写入的 WebUI+ 日志。锁用于保护多个浏览器会话同时初始化时的 ID 更新。+ """+ global _terminal_handler_id++ with _terminal_handler_lock:+ if _terminal_handler_id is not None:+ try:+ logger.remove(_terminal_handler_id)+ except ValueError:+ # 测试或外部入口可能已经移除该 handler。继续创建新的终端输出,+ # 不需要影响其它仍有效的日志 sink。+ pass++ _terminal_handler_id = logger.add(+ sink,+ level=level,+ format=format_log_record,+ colorize=colorize,+ )+ return _terminal_handler_iddiff --git a/test/services/test_config.py b/test/services/test_config.pyindex 7ad627c2..17141ba4 100644--- a/test/services/test_config.py+++ b/test/services/test_config.py@@ -102,3 +102,25 @@ class TestConfigPersistence:worker.join(timeout=1)assert write_finished.is_set()config.app.pop("runtime_lock_test", None)++ def test_runtime_config_lock_allows_idempotent_page_writes(self):+ """生成期间刷新页面时,相同控件值的回写不能阻塞整页渲染。"""+ key = "runtime_lock_idempotent_test"+ config.app[key] = "unchanged"+ write_finished = threading.Event()++ def write_same_value():+ config.app[key] = "unchanged"+ assert config.app.setdefault(key, "other") == "unchanged"+ config.app.update({key: "unchanged"})+ assert config.app.pop("runtime_lock_missing_key", None) is None+ write_finished.set()++ with config.runtime_config_lock():+ worker = threading.Thread(target=write_same_value)+ worker.start()+ assert write_finished.wait(timeout=0.2)++ worker.join(timeout=1)+ assert config.app[key] == "unchanged"+ config.app.pop(key, None)diff --git a/test/services/test_webui_task.py b/test/services/test_webui_task.pynew file mode 100644index 00000000..d17c7941--- /dev/null+++ b/test/services/test_webui_task.py@@ -0,0 +1,281 @@+import ast+import re+import threading+import time+from contextlib import nullcontext+from pathlib import Path+from unittest.mock import patch++import pytest+from loguru import logger++from app.models import const+from app.models.schema import VideoParams+from app.services import webui_task+from app.utils import logging_utils+++ROOT_DIR = Path(__file__).parent.parent.parent+WEBUI_MAIN = ROOT_DIR / "webui" / "Main.py"+++def _attribute_name(node):+ """把 ``module.function`` 形式的 AST 调用还原为稳定字符串。"""+ names = []+ while isinstance(node, ast.Attribute):+ names.append(node.attr)+ node = node.value+ if isinstance(node, ast.Name):+ names.append(node.id)+ return ".".join(reversed(names))+++def test_generation_controls_submit_background_task_instead_of_blocking_page():+ """+ WebUI 生成按钮不能重新直接调用同步流水线。++ 这是 Issue #1120 白屏的核心回归保护:只要完整页面脚本再次阻塞在+ ``tm.start``,用户在生成期间刷新时仍可能收到指向旧渲染树的 delta。+ """+ tree = ast.parse(WEBUI_MAIN.read_text(encoding="utf-8"))+ function = next(+ node+ for node in tree.body+ if isinstance(node, ast.FunctionDef)+ and node.name == "_render_generation_controls"+ )+ calls = {+ _attribute_name(node.func)+ for node in ast.walk(function)+ if isinstance(node, ast.Call)+ }++ assert "webui_task.submit_generation" in calls+ assert "tm.start" not in calls+++def test_submit_generation_returns_while_pipeline_is_still_running():+ """后台流水线未结束时,提交函数必须已经返回,让 Streamlit 完成本次渲染。"""+ task_id = "background-submit-test"+ started = threading.Event()+ release = threading.Event()+ finished = threading.Event()++ def blocking_start(**_kwargs):+ started.set()+ release.wait(timeout=5)+ finished.set()+ return {"videos": ["/tmp/final-1.mp4"]}++ params = VideoParams(video_subject="异步生成测试")+ try:+ with (+ patch.object(webui_task.tm, "start", side_effect=blocking_start),+ patch.object(+ webui_task.config,+ "runtime_config_lock",+ return_value=nullcontext(),+ ),+ ):+ started_at = time.monotonic()+ webui_task.submit_generation(task_id, params, capture_logs=False)+ elapsed = time.monotonic() - started_at++ assert started.wait(timeout=2)+ assert elapsed < 0.5+ assert not finished.is_set()+ task = webui_task.sm.state.get_task(task_id)+ assert task["state"] == const.TASK_STATE_PROCESSING+ finally:+ release.set()+ assert finished.wait(timeout=2)+ webui_task.sm.state.delete_task(task_id)+++def test_submit_generation_copies_params_before_starting_worker():+ """页面后续 rerun 或流水线内部修改参数时,不能反向污染当前表单对象。"""+ params = VideoParams(video_subject="参数隔离测试")+ with patch.object(webui_task._task_manager, "add_task") as add_task:+ webui_task.submit_generation("copied-params-test", params, capture_logs=False)++ submitted_params = add_task.call_args.kwargs["params"]+ assert submitted_params == params+ assert submitted_params is not params+ webui_task.sm.state.delete_task("copied-params-test")+++def test_scheduling_failure_is_saved_as_terminal_task_state():+ """队列或线程启动失败时不能让任务管理器永久停留在“生成中”。"""+ task_id = "scheduling-failure-test"+ params = VideoParams(video_subject="调度失败测试")+ with patch.object(+ webui_task._task_manager,+ "add_task",+ side_effect=RuntimeError("worker unavailable"),+ ):+ with pytest.raises(RuntimeError, match="worker unavailable"):+ webui_task.submit_generation(task_id, params, capture_logs=False)++ task = webui_task.sm.state.get_task(task_id)+ assert task["state"] == const.TASK_STATE_FAILED+ assert task["failed_stage"] == "scheduling"+ assert task["error"] == "RuntimeError: worker unavailable"+ webui_task.sm.state.delete_task(task_id)+++def test_worker_logs_are_available_without_streamlit_session_state():+ """后台日志写入线程安全缓存,页面只需轮询快照即可恢复实时日志。"""+ task_id = "captured-log-test"+ with webui_task._task_logs_lock:+ webui_task._task_logs.pop(task_id, None)++ def logged_start(**_kwargs):+ logger.info("unique background task log")+ return {"videos": ["/tmp/final-1.mp4"]}++ with (+ patch.object(webui_task.tm, "start", side_effect=logged_start),+ patch.object(+ webui_task.config,+ "runtime_config_lock",+ return_value=nullcontext(),+ ),+ ):+ result = webui_task._run_generation(+ task_id,+ VideoParams(video_subject="日志测试"),+ capture_logs=True,+ )++ assert result == {"videos": ["/tmp/final-1.mp4"]}+ records = webui_task.get_task_logs(task_id)+ assert len(records) == 1+ assert re.fullmatch(+ r"\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} \| INFO \| "+ r'"\./test/services/test_webui_task\.py:\d+": logged_start '+ r"- unique background task log",+ records[0],+ )+++def test_generation_log_fragment_refreshes_within_half_a_second():+ """日志轮询间隔不能退回到明显落后于终端输出的秒级刷新。"""+ assert webui_task.TASK_LOG_REFRESH_INTERVAL_SECONDS <= 0.5++ tree = ast.parse(WEBUI_MAIN.read_text(encoding="utf-8"))+ function = next(+ node+ for node in tree.body+ if isinstance(node, ast.FunctionDef)+ and node.name == "_render_running_generation_task"+ )+ decorator = function.decorator_list[0]+ assert isinstance(decorator, ast.Call)+ assert _attribute_name(decorator.func) == "st.fragment"+ run_every = next(+ keyword.value for keyword in decorator.keywords if keyword.arg == "run_every"+ )+ assert ast.unparse(run_every) == (+ "webui_task.TASK_LOG_REFRESH_INTERVAL_SECONDS"+ )+++def test_generation_submit_skips_duplicate_config_save():+ """+ 提交任务后不能在页面末尾再次等待配置锁。++ 后台任务会在完整生成期间持有 runtime_config_lock。如果 Streamlit 主脚本+ 提交任务后再次调用 save_config,就可能阻塞到任务结束,使定时 Fragment+ 无法刷新日志。生成分支已经提前保存配置,页面末尾只处理普通交互。+ """+ tree = ast.parse(WEBUI_MAIN.read_text(encoding="utf-8"))+ controls = next(+ node+ for node in tree.body+ if isinstance(node, ast.FunctionDef)+ and node.name == "_render_generation_controls"+ )+ application = next(+ node+ for node in tree.body+ if isinstance(node, ast.FunctionDef) and node.name == "_render_application"+ )++ assert isinstance(controls.body[-1], ast.Return)+ assert ast.unparse(controls.body[-1].value) == "start_button"++ submitted_assignment = next(+ node+ for node in application.body+ if isinstance(node, ast.Assign)+ and any(+ isinstance(target, ast.Name)+ and target.id == "generation_submitted"+ for target in node.targets+ )+ )+ assert isinstance(submitted_assignment.value, ast.Call)+ assert _attribute_name(submitted_assignment.value.func) == (+ "_render_generation_controls"+ )++ guarded_save = next(+ node+ for node in application.body+ if isinstance(node, ast.If)+ and ast.unparse(node.test) == "not generation_submitted"+ )+ guarded_calls = {+ _attribute_name(node.func)+ for node in ast.walk(guarded_save)+ if isinstance(node, ast.Call)+ }+ assert guarded_calls == {"config.save_config"}+++def test_terminal_logger_reload_preserves_task_log_handler():+ """热重载只能替换终端 handler,不能清空后台任务的日志 sink。"""+ previous_handler_id = logging_utils._terminal_handler_id+ try:+ with (+ patch.object(logging_utils.logger, "remove") as remove,+ patch.object(logging_utils.logger, "add", return_value=456) as add,+ ):+ logging_utils._terminal_handler_id = 123+ handler_id = logging_utils.configure_terminal_logger(+ sink=object(),+ level="DEBUG",+ colorize=True,+ )++ assert handler_id == 456+ remove.assert_called_once_with(123)+ add.assert_called_once()+ assert logging_utils._terminal_handler_id == 456+ finally:+ logging_utils._terminal_handler_id = previous_handler_id+++def test_worker_wrapper_failure_is_saved_instead_of_leaving_processing_state():+ """日志或配置包装层异常也必须转换成可查询的失败终态。"""+ task_id = "worker-wrapper-failure-test"+ with (+ patch.object(webui_task.tm, "start", side_effect=RuntimeError("lock failed")),+ patch.object(+ webui_task.config,+ "runtime_config_lock",+ return_value=nullcontext(),+ ),+ ):+ result = webui_task._run_generation(+ task_id,+ VideoParams(video_subject="工作线程失败测试"),+ capture_logs=False,+ )++ assert result["state"] == const.TASK_STATE_FAILED+ assert result["failed_stage"] == "webui_worker"+ task = webui_task.sm.state.get_task(task_id)+ assert task["state"] == const.TASK_STATE_FAILED+ assert task["error"] == "RuntimeError: lock failed"+ webui_task.sm.state.delete_task(task_id)diff --git a/webui/Main.py b/webui/Main.pyindex aa94d2bd..225b7758 100644--- a/webui/Main.py+++ b/webui/Main.py@@ -39,11 +39,12 @@ from app.models.schema import (VideoTransitionMode,)from app.services import bgm as bgm_service-from app.services import cache_manager, llm, video, voice+from app.services import cache_manager, llm, video, voice, webui_taskfrom app.services import sonilo as sonilo_servicefrom app.services import state as smfrom app.services import task as tmfrom app.services import version_checker+from app.utils.logging_utils import configure_terminal_loggerfrom app.utils import utilsst.set_page_config(@@ -226,20 +227,6 @@ def _initialize_session_state():supported_languages=locales.keys(),)- if "ui_language" not in st.session_state:- # 语言初始化只在当前浏览器会话首次运行时记录一次。Accept-Language 可以- # 帮助判断浏览器首选语言顺序,而 st.context.locale 对应浏览器实际返回的- # navigator.language;两者一起记录能定位“系统是中文但页面显示英文”。- accept_language = st.context.headers.get("Accept-Language", "")- logger.info(- "initialize UI language: "- f"saved_language={saved_ui_language or '<empty>'}, "- f"browser_locale={browser_locale or '<empty>'}, "- f"accept_language={accept_language or '<empty>'}, "- f"resolved_language={initial_ui_language}, "- f"supported_languages={','.join(locales.keys())}"- )-defaults = {"video_subject": "","video_script": "",@@ -252,10 +239,11 @@ def _initialize_session_state():"ui_language": initial_ui_language,# 已落盘的本地素材允许用户只修改文案后继续复用。"local_video_materials": [],- # 控件交互会触发 rerun,日志必须保存在会话中才能持续显示。- "generation_log_records": [],# 生成按钮回调先登记任务,使顶部入口能立即显示运行中数量。"active_generation_tasks": {},+ # 最近一次从当前页面提交的任务。生成改为后台执行后,页面 Fragment+ # 通过这个 ID 查询状态;刷新时不再依赖正在执行的旧页面脚本。+ "current_generation_task_id": "",}for key, value in defaults.items():st.session_state.setdefault(key, value)@@ -553,7 +541,12 @@ def _collect_task_summaries(limit=20):for task_id, active_task in _active_generation_tasks().items():history_task = history_tasks.get(task_id, {})- if history_task and _task_state_filter_key(history_task) == "complete":+ if history_task and _task_state_filter_key(history_task) in {+ "complete",+ "failed",+ }:+ # 会话中的 active 标记只负责覆盖任务刚提交到状态存储前的极短窗口。+ # 后台任务结束后必须以真实终态为准,不能把失败任务重新显示为生成中。continuetask_path = os.path.join(utils.task_dir(), task_id)@@ -1224,32 +1217,13 @@ def open_task_folder(task_id):@st.cache_resourcedef init_log():# 基础日志 Handler 属于进程级资源,而不是页面会话状态。Streamlit 每次组件- # 交互都会 rerun 页面脚本;如果每次都执行 logger.remove(),会把其它会话或- # 正在生成任务使用的临时 Handler 一并删除。cache_resource 保证每个进程只- # 初始化一次,页面级生成日志仍通过各自的 handler id 单独添加和移除。- logger.remove()+ # 交互都会 rerun 页面脚本,代码热重载也可能让缓存失效。日志初始化只能+ # 精确替换终端 Handler,不能清空正在生成任务使用的 WebUI 临时 Handler。_lvl = "DEBUG"- def format_record(record):- # 日志统一展示项目相对路径,并移除消息中可能重复出现的项目根目录。- file_path = record["file"].path- relative_path = os.path.relpath(file_path, root_dir)- record["file"].path = f"./{relative_path}"- record["message"] = record["message"].replace(root_dir, ".")-- _format = (- "<green>{time:%Y-%m-%d %H:%M:%S}</> | "- + "<level>{level}</> | "- + '"{file.path}:{line}":<blue> {function}</> '- + "- <level>{message}</>"- + "\n"- )- return _format-- return logger.add(+ return configure_terminal_logger(sys.stdout,level=_lvl,- format=format_record,colorize=True,)@@ -1326,28 +1300,123 @@ def render_onboarding_tour():tour.start()-def render_generation_logs(container):+def _render_generation_logs(task_id):+ """渲染后台任务日志快照,不从工作线程访问 Streamlit 会话状态。"""if config.ui.get("hide_log", False):- container.empty()return- log_records = st.session_state.get("generation_log_records", [])+ log_records = webui_task.get_task_logs(task_id)if not log_records:- container.empty()return- with container:- st.code("\n".join(log_records))+ st.code("\n".join(log_records))+++def _render_generation_task_snapshot(task_id, task):+ """根据状态存储中的快照渲染进度、失败原因或最终成片。"""+ if not task:+ st.info(tr("Generating Video"))+ _render_generation_logs(task_id)+ return++ state = _normalize_task_state(task.get("state"))+ progress = max(0, min(100, int(task.get("progress", 0) or 0)))+ if state == const.TASK_STATE_PROCESSING:+ st.info(tr("Generating Video"))+ st.progress(+ progress,+ text=f"{tr('Task Progress')}: {progress}%",+ )+ _render_generation_logs(task_id)+ return++ if state == const.TASK_STATE_FAILED:+ error = str(task.get("error") or "").strip()+ message = tr("Video Generation Failed")+ st.error(f"{message}: {error}" if error else message)+ _render_generation_logs(task_id)+ return++ video_files = task.get("videos") or []+ if state != const.TASK_STATE_COMPLETE or not video_files:+ st.error(tr("Video Generation Failed"))+ _render_generation_logs(task_id)+ return++ st.success(tr("Video Generation Completed"))+ for warning in task.get("warnings") or []:+ if isinstance(warning, Mapping) and warning.get("code") == "sonilo_bgm_failed":+ st.warning(+ tr("Sonilo BGM Fallback Warning").format(+ index=warning.get("video_index", "")+ )+ )+ else:+ st.warning(str(warning))++ try:+ player_cols = st.columns(len(video_files) * 2 + 1)+ for i, url in enumerate(video_files):+ player_cols[i * 2 + 1].video(url)+ except Exception as exc:+ logger.exception(+ f"failed to render generated video preview: task_id={task_id}, "+ f"video_files={video_files}, error={exc}"+ )++ _render_generation_logs(task_id)+ if st.session_state.get("opened_generation_task_id") != task_id:+ # 原同步流程会在生成完成后自动打开任务目录。Fragment 可能重复运行,+ # 因此用会话标记保证每个任务只打开一次,避免连续弹出 Finder/资源管理器。+ st.session_state["opened_generation_task_id"] = task_id+ open_task_folder(task_id)+ logger.info(f"{tr('Video Generation Completed')}: task_id={task_id}")++[email protected](run_every=webui_task.TASK_LOG_REFRESH_INTERVAL_SECONDS)+def _render_running_generation_task(task_id):+ """只在任务运行期间轮询;结束后切回静态结果,停止不必要的定时刷新。"""+ try:+ task = sm.state.get_task(task_id)+ except Exception as exc:+ logger.exception(+ f"failed to query WebUI generation task: task_id={task_id}, error={exc}"+ )+ st.error(tr("Video Generation Failed"))+ return++ state = _normalize_task_state((task or {}).get("state"))+ if state in {const.TASK_STATE_COMPLETE, const.TASK_STATE_FAILED}:+ _remove_active_generation_task(task_id)+ # 完整页面脚本现在没有耗时生成逻辑,可以安全 rerun 并把结果改为静态+ # 渲染。这样任务结束后不会让浏览器永久保留一个两秒轮询的 Fragment。+ st.rerun(scope="app")++ _render_generation_task_snapshot(task_id, task)-def remove_logger_handler_safely(handler_id):+def _render_current_generation_task():+ """在生成按钮下方恢复当前页面最近提交任务的可查询 UI。"""+ task_id = st.session_state.get("current_generation_task_id", "")+ if not task_id:+ return+try:- logger.remove(handler_id)- except ValueError:- # Streamlit 交互可能触发 rerun,Loguru handler 在 finally 执行前- # 已经被其它初始化流程移除。这里忽略缺失 handler,避免生成成功后- # 因清理日志监听器失败而把页面打成异常。- logger.debug(f"log handler already removed: {handler_id}")+ task = sm.state.get_task(task_id)+ except Exception as exc:+ logger.exception(+ f"failed to query current WebUI task: task_id={task_id}, error={exc}"+ )+ st.error(tr("Video Generation Failed"))+ return++ state = _normalize_task_state((task or {}).get("state"))+ if state in {const.TASK_STATE_COMPLETE, const.TASK_STATE_FAILED}:+ _remove_active_generation_task(task_id)+ _render_generation_task_snapshot(task_id, task)+ return++ _render_running_generation_task(task_id)def get_llm_provider_tips(provider_id, **kwargs):@@ -3206,7 +3275,13 @@ def _render_subtitle_settings(panel, params):def _render_generation_controls(params, uploaded_files, uploaded_audio_file, uploaded_bgm_file, voice_mode):- """校验生成依赖、执行任务,并渲染日志与成片结果。"""+ """+ 校验生成依赖、提交任务,并渲染日志与成片结果。++ 返回本次页面执行是否成功提交了新任务。提交前已经保存过配置,调用方据此+ 跳过页面末尾的重复保存,避免后台长任务先持有配置锁后阻塞 Streamlit 主+ 脚本。主脚本必须及时结束,定时 Fragment 才能持续刷新进度和任务日志。+ """restore_upload_requirements = st.session_state.get("task_restore_upload_requirements", {})@@ -3239,9 +3314,7 @@ def _render_generation_controls(on_click=_prepare_generation_task,)render_onboarding_tour()- log_container = st.empty()if start_button:- st.session_state["generation_log_records"] = []config.save_config()task_id = st.session_state.get("pending_generation_task_id") or str(uuid4())_add_active_generation_task(@@ -3396,62 +3469,25 @@ def _render_generation_controls(if m.url:params.video_materials.append(m)- def log_received(msg):- if config.ui["hide_log"]:- return- records = st.session_state.setdefault("generation_log_records", [])- records.append(str(msg).rstrip())- # 日志用于 WebUI 诊断,不需要无限增长;限制数量避免长任务反复- # rerun 后页面负担过重。- if len(records) > 1000:- del records[:-1000]- render_generation_logs(log_container)-- log_handler_id = logger.add(log_received)try:st.toast(tr("Generating Video"))logger.info(tr("Start Generating Video"))logger.info(utils.to_json(params))-- with config.runtime_config_lock():- result = tm.start(task_id=task_id, params=params)- if not result or "videos" not in result:- st.error(tr("Video Generation Failed"))- logger.error(tr("Video Generation Failed"))- st.stop()-- video_files = result.get("videos", [])- st.success(tr("Video Generation Completed"))- for warning in result.get("warnings") or []:- if (- isinstance(warning, Mapping)- and warning.get("code") == "sonilo_bgm_failed"- ):- st.warning(- tr("Sonilo BGM Fallback Warning").format(- index=warning.get("video_index", "")- )- )- else:- st.warning(str(warning))- try:- if video_files:- player_cols = st.columns(len(video_files) * 2 + 1)- for i, url in enumerate(video_files):- player_cols[i * 2 + 1].video(url)- except Exception as e:- logger.exception(- f"failed to render generated video preview: task_id={task_id}, "- f"video_files={video_files}, error={e}"- )-- open_task_folder(task_id)- logger.info(tr("Video Generation Completed"))- finally:+ webui_task.submit_generation(+ task_id=task_id,+ params=params,+ capture_logs=not config.ui.get("hide_log", False),+ )+ except Exception:_remove_active_generation_task(task_id)- remove_logger_handler_safely(log_handler_id)+ st.error(tr("Video Generation Failed"))+ st.stop()- render_generation_logs(log_container)+ st.session_state["current_generation_task_id"] = task_id+ logger.info(f"WebUI generation task submitted: task_id={task_id}")++ _render_current_generation_task()+ return start_buttondef _render_application():@@ -3489,7 +3525,7 @@ def _render_application():_render_subtitle_settings(right_panel, params)- _render_generation_controls(+ generation_submitted = _render_generation_controls(params,uploaded_files,uploaded_audio_file,@@ -3497,7 +3533,11 @@ def _render_application():voice_mode,)- config.save_config()+ # 生成分支在启动后台线程前已经保存过配置。这里再次保存既没有收益,还可能+ # 与持有 runtime_config_lock 的长任务竞争,使当前 Streamlit 脚本一直阻塞+ # 到视频完成,进而让日志 Fragment 无法运行。普通页面交互仍保留统一保存。+ if not generation_submitted:+ config.save_config()_render_application()