Skip to content

利用 AI 大模型和自动化工作流,根据主题或关键词一键生成高清短视频。Generate HD short videos from a topic or keyword with an automated AI workflow.

fix(webui): avoid blocking during generation

harry0703bdc45823a15e
diff --git a/app/config/config.py b/app/config/config.py
index b66d620f..28af63af 100644
--- a/app/config/config.py
+++ b/app/config/config.py
@@ -1,3 +1,4 @@
+import copy
import errno
import os
import shutil
@@ -16,7 +17,12 @@ config_file = f"{root_dir}/config.toml"
_CONTAINER_CGROUP_MARKERS = ("docker", "containerd", "kubepods", "libpod", "podman")
_DOCKER_HOST_GATEWAY_NAME = "host.docker.internal"
_config_save_lock = threading.RLock()
+_pending_config_lock = threading.RLock()
+_pending_config_updates = {}
+_pending_config_save_requested = False
+_pending_config_flush_scheduled = False
_MISSING = object()
+_DELETE = object()
class _SynchronizedConfig(dict):
@@ -76,6 +82,193 @@ class _SynchronizedConfig(dict):
super().update(changes)
+def _pending_update_key(config_section, key):
+ """为进程内固定配置分区生成待更新键。"""
+ return id(config_section), key
+
+
+def update_config_nonblocking(config_section, key, value):
+ """
+ 非阻塞更新 WebUI 的运行期配置。
+
+ 视频生成会持有 ``runtime_config_lock``,确保同一任务不会在执行中途切换
+ Provider、密钥或语音配置。Streamlit 控件发生变化时不能等待这把长任务锁,
+ 否则浏览器会表现为页面冻结。锁空闲时立即更新;锁繁忙时只保留每个配置项
+ 的最新值,并在当前任务释放锁时统一应用。
+
+ 返回 True 表示值已经生效,False 表示已进入待更新队列。
+ """
+ # 所有更新都先进入同一队列,再尝试获取配置锁。这样多个页面同时修改同一
+ # 配置项时,写入队列的先后顺序就是最终顺序,不会出现较早线程在获取锁后
+ # 把较新线程已经排队的值误删掉。
+ with _pending_config_lock:
+ _pending_config_updates[_pending_update_key(config_section, key)] = (
+ config_section,
+ key,
+ copy.deepcopy(value),
+ )
+
+ acquired = _config_save_lock.acquire(blocking=False)
+ if not acquired:
+ # 调用方通常会在本次 Streamlit rerun 末尾请求保存,但不能依赖这一步
+ # 一定执行。例如页面中途异常或更新恰好发生在任务退出保存阶段时,仍需
+ # 有后台刷新线程保证排队值最终生效。
+ _schedule_deferred_config_flush()
+ return False
+
+ try:
+ _apply_pending_config_updates_locked()
+ return config_section.get(key, _MISSING) == value
+ finally:
+ _config_save_lock.release()
+
+
+def delete_config_nonblocking(config_section, key):
+ """
+ 非阻塞删除 WebUI 配置项。
+
+ “使用默认值”需要真正移除配置项,而不是写入空字符串。视频任务占用配置
+ 锁时,删除意图会覆盖同一配置项之前排队的更新,并在任务结束后执行。
+ """
+ with _pending_config_lock:
+ _pending_config_updates[_pending_update_key(config_section, key)] = (
+ config_section,
+ key,
+ _DELETE,
+ )
+
+ acquired = _config_save_lock.acquire(blocking=False)
+ if not acquired:
+ _schedule_deferred_config_flush()
+ return False
+
+ try:
+ _apply_pending_config_updates_locked()
+ return key not in config_section
+ finally:
+ _config_save_lock.release()
+
+
+def _apply_pending_config_updates_locked():
+ """在持有配置写锁时应用 WebUI 暂存的最新配置值。"""
+ with _pending_config_lock:
+ updates = list(_pending_config_updates.values())
+ _pending_config_updates.clear()
+ # 应用配置时继续持有待更新锁。读取“当前值 + 待更新值”快照的线程由此
+ # 只能看到应用前或应用后的完整状态,不会读到只更新了一半的配置集合。
+ for config_section, key, value in updates:
+ if value is _DELETE:
+ config_section.pop(key, None)
+ else:
+ config_section[key] = value
+ return bool(updates)
+
+
+def snapshot_config_with_pending(config_section):
+ """
+ 返回配置分区的有效快照,并合并尚未应用的 WebUI 更新。
+
+ 视频任务持锁期间不能改写全局配置,但用户仍可准备下一条内容。LLM 请求
+ 使用这个快照后,界面中刚选择的 Provider、模型和密钥会参与新请求,同时
+ 不会改变正在执行的视频任务。
+ """
+ with _pending_config_lock:
+ snapshot = dict(config_section)
+ section_id = id(config_section)
+ for (pending_section_id, key), (_, _, value) in _pending_config_updates.items():
+ if pending_section_id != section_id:
+ continue
+ if value is _DELETE:
+ snapshot.pop(key, None)
+ else:
+ snapshot[key] = copy.deepcopy(value)
+ return snapshot
+
+
+def _flush_pending_config_locked(*, suppress_save_errors):
+ """在持有配置写锁时应用并保存当前所有待处理配置。"""
+ global _pending_config_save_requested
+
+ updates_applied = _apply_pending_config_updates_locked()
+ with _pending_config_lock:
+ save_requested = _pending_config_save_requested
+ _pending_config_save_requested = False
+
+ if not updates_applied and not save_requested:
+ return True
+
+ try:
+ save_config()
+ return True
+ except Exception as exc:
+ # 内存中的配置已经成功应用,保存失败时只保留待保存标记。视频任务不应
+ # 因配置文件暂时不可写而被改判失败;下一次页面交互会再次触发保存。
+ with _pending_config_lock:
+ _pending_config_save_requested = True
+ if not suppress_save_errors:
+ raise
+ logger.exception(f"failed to save deferred runtime config: {exc}")
+ return False
+
+
+def _run_deferred_config_flush():
+ """等待长任务释放配置锁,并可靠清空期间积累的配置更新。"""
+ global _pending_config_flush_scheduled
+
+ while True:
+ with _config_save_lock:
+ flush_succeeded = _flush_pending_config_locked(
+ suppress_save_errors=True
+ )
+
+ with _pending_config_lock:
+ has_pending_work = bool(
+ _pending_config_updates or _pending_config_save_requested
+ )
+ if not flush_succeeded or not has_pending_work:
+ _pending_config_flush_scheduled = False
+ return
+
+
+def _schedule_deferred_config_flush():
+ """保证同一时间最多只有一个后台线程等待刷新配置。"""
+ global _pending_config_flush_scheduled
+
+ with _pending_config_lock:
+ if _pending_config_flush_scheduled:
+ return
+ _pending_config_flush_scheduled = True
+
+ threading.Thread(
+ target=_run_deferred_config_flush,
+ name="mpt-config-flush",
+ daemon=True,
+ ).start()
+
+
+def try_save_config():
+ """
+ 非阻塞保存 WebUI 配置,锁繁忙时交由当前长任务结束后保存。
+
+ 普通 API、CLI 和维护脚本仍可调用 ``save_config`` 获得原来的阻塞写入语义;
+ 只有 Streamlit rerun 使用本函数,避免页面为等待视频任务而长时间无响应。
+ """
+ global _pending_config_save_requested
+
+ with _pending_config_lock:
+ _pending_config_save_requested = True
+
+ acquired = _config_save_lock.acquire(blocking=False)
+ if not acquired:
+ _schedule_deferred_config_flush()
+ return False
+
+ try:
+ return _flush_pending_config_locked(suppress_save_errors=False)
+ finally:
+ _config_save_lock.release()
+
+
@contextmanager
def runtime_config_lock():
"""
@@ -85,7 +278,13 @@ def runtime_config_lock():
保护生成、试听等长操作,避免另一个标签页在操作中途切换 Provider 或密钥。
"""
with _config_save_lock:
- yield
+ # 如果上一个短操作释放锁时后台刷新线程尚未获得调度,新任务必须在读取
+ # Provider、密钥等全局配置前先应用队列,不能继续使用旧配置执行整条流水线。
+ _flush_pending_config_locked(suppress_save_errors=True)
+ try:
+ yield
+ finally:
+ _flush_pending_config_locked(suppress_save_errors=True)
@contextmanager
@@ -99,9 +298,12 @@ def try_runtime_config_lock():
"""
acquired = _config_save_lock.acquire(blocking=False)
try:
+ if acquired:
+ _flush_pending_config_locked(suppress_save_errors=True)
yield acquired
finally:
if acquired:
+ _flush_pending_config_locked(suppress_save_errors=True)
_config_save_lock.release()
@@ -150,8 +352,7 @@ def _decode_linux_route_gateway(hex_gateway: str) -> str:
raise ValueError("invalid gateway length")
octets = [
- str(int(hex_gateway[index : index + 2], 16))
- for index in range(6, -1, -2)
+ str(int(hex_gateway[index : index + 2], 16)) for index in range(6, -1, -2)
]
return ".".join(octets)
diff --git a/app/services/llm.py b/app/services/llm.py
index b5f3a159..28a12da8 100644
--- a/app/services/llm.py
+++ b/app/services/llm.py
@@ -137,25 +137,31 @@ def _extract_qwen_generation_text(response) -> str:
return _normalize_text_response(text, "qwen")
-def _generate_response(prompt: str) -> str:
+def _generate_response(prompt: str, app_config=None) -> str:
try:
+ # WebUI 在视频生成期间允许用户准备下一条文案。调用方可以传入提交瞬间
+ # 的配置快照,确保模型请求重试期间不会因为后台任务结束并应用新配置,
+ # 而切换到另一个 Provider、Base URL 或模型。
+ runtime_app_config = app_config if app_config is not None else config.app
llm_provider = str(
- config.app.get("llm_provider", DEFAULT_LLM_PROVIDER_ID)
+ runtime_app_config.get("llm_provider", DEFAULT_LLM_PROVIDER_ID)
).lower()
provider = get_llm_provider(llm_provider)
if provider is None:
raise ValueError(f"{llm_provider}: unsupported llm provider")
logger.info(f"llm provider: {llm_provider}")
- api_key = config.app.get(provider.config_key("api_key"), "")
- configured_model = config.app.get(provider.config_key("model_name"), "")
+ api_key = runtime_app_config.get(provider.config_key("api_key"), "")
+ configured_model = runtime_app_config.get(provider.config_key("model_name"), "")
model_name = provider.resolve_model_name(configured_model)
if configured_model and model_name != configured_model:
logger.warning(
f"{llm_provider} model '{configured_model}' is deprecated, "
f"fallback to '{model_name}'"
)
- configured_base_url = config.app.get(provider.config_key("base_url"), "")
+ configured_base_url = runtime_app_config.get(
+ provider.config_key("base_url"), ""
+ )
base_url = provider.resolve_base_url(configured_base_url)
if configured_base_url and configured_base_url.strip().rstrip("/") in {
url.rstrip("/") for url in provider.deprecated_base_urls
@@ -175,13 +181,13 @@ def _generate_response(prompt: str) -> str:
base_url = config.get_default_ollama_base_url()
if adapter == "azure":
- api_version = config.app.get(
+ api_version = runtime_app_config.get(
provider.config_key("api_version"), "2024-02-15-preview"
)
extra_values = {
field.config_suffix: (
- config.app.get(provider.config_key(field.config_suffix), "")
+ runtime_app_config.get(provider.config_key(field.config_suffix), "")
or field.default_value
)
for field in provider.extra_fields
@@ -498,6 +504,7 @@ def generate_script(
paragraph_number: int = 1,
video_script_prompt: str = "",
custom_system_prompt: str = "",
+ app_config=None,
) -> str:
paragraph_number = _normalize_script_paragraph_number(paragraph_number)
video_script_prompt = _limit_script_text(
@@ -542,7 +549,10 @@ def generate_script(
for i in range(_max_retries):
try:
- response = _generate_response(prompt=prompt)
+ if app_config is None:
+ response = _generate_response(prompt=prompt)
+ else:
+ response = _generate_response(prompt=prompt, app_config=app_config)
if response:
final_script = format_response(response)
else:
@@ -587,6 +597,7 @@ def generate_terms(
video_script: str,
amount: int = 5,
match_script_order: bool = False,
+ app_config=None,
) -> List[str]:
if match_script_order:
goal = (
@@ -649,7 +660,10 @@ Please note that you must use English for generating video search terms; Chinese
response = ""
for i in range(_max_retries):
try:
- response = _generate_response(prompt)
+ if app_config is None:
+ response = _generate_response(prompt)
+ else:
+ response = _generate_response(prompt, app_config=app_config)
if response.startswith("Error: "):
# generate_terms 的公开返回类型是 List[str]。如果把 Provider 的
# 错误文案原样返回,下游只做空值判断时会把非空字符串误认为成功,
diff --git a/test/services/test_config.py b/test/services/test_config.py
index 94d83a8c..a213e62a 100644
--- a/test/services/test_config.py
+++ b/test/services/test_config.py
@@ -1,5 +1,6 @@
import errno
import threading
+import time
import tomllib
from pathlib import Path
from tempfile import TemporaryDirectory
@@ -10,6 +11,17 @@ from app.models.llm_provider import LLM_PROVIDER_REGISTRY, get_llm_provider
class TestConfigPersistence:
+ @staticmethod
+ def _wait_for_deferred_flush(timeout=1):
+ """等待配置刷新线程退出,避免并发测试之间共享后台状态。"""
+ deadline = time.monotonic() + timeout
+ while time.monotonic() < deadline:
+ with config._pending_config_lock:
+ if not config._pending_config_flush_scheduled:
+ return
+ time.sleep(0.005)
+ raise AssertionError("deferred config flush did not finish")
+
@staticmethod
def _load_example_config():
config_path = Path(__file__).resolve().parents[2] / "config.example.toml"
@@ -226,3 +238,233 @@ class TestConfigPersistence:
with config.try_runtime_config_lock() as acquired:
assert acquired is True
+
+ def test_nonblocking_update_is_applied_after_runtime_task_finishes(self):
+ """WebUI 改动不能等待长任务,且任务结束后必须应用并保存最新值。"""
+ key = "nonblocking_runtime_update_test"
+ original_value = config.app.get(key, config._MISSING)
+ update_finished = threading.Event()
+ update_result = []
+
+ def update_config():
+ update_result.append(
+ config.update_config_nonblocking(config.app, key, "updated")
+ )
+ update_finished.set()
+
+ try:
+ with patch.object(config, "save_config") as save_config:
+ with config.runtime_config_lock():
+ worker = threading.Thread(target=update_config)
+ worker.start()
+ assert update_finished.wait(timeout=0.2)
+ assert update_result == [False]
+ assert config.app.get(key) != "updated"
+
+ worker.join(timeout=1)
+ assert config.app[key] == "updated"
+ save_config.assert_called_once()
+ finally:
+ if original_value is config._MISSING:
+ config.app.pop(key, None)
+ else:
+ config.app[key] = original_value
+
+ def test_nonblocking_update_keeps_only_latest_value(self):
+ """同一控件在任务期间反复修改时,只应用最后一次选择。"""
+ key = "nonblocking_latest_value_test"
+ original_value = config.app.get(key, config._MISSING)
+ updates_finished = threading.Event()
+
+ def update_config():
+ assert not config.update_config_nonblocking(config.app, key, "first")
+ assert not config.update_config_nonblocking(config.app, key, "latest")
+ updates_finished.set()
+
+ try:
+ with patch.object(config, "save_config"):
+ with config.runtime_config_lock():
+ worker = threading.Thread(target=update_config)
+ worker.start()
+ assert updates_finished.wait(timeout=0.2)
+
+ worker.join(timeout=1)
+ assert config.app[key] == "latest"
+ finally:
+ if original_value is config._MISSING:
+ config.app.pop(key, None)
+ else:
+ config.app[key] = original_value
+
+ def test_nonblocking_delete_is_applied_after_runtime_task_finishes(self):
+ """切回默认选项时,删除配置同样不能阻塞正在运行的视频任务。"""
+ key = "nonblocking_runtime_delete_test"
+ config.app[key] = "custom"
+ delete_finished = threading.Event()
+ delete_result = []
+
+ def delete_config():
+ delete_result.append(config.delete_config_nonblocking(config.app, key))
+ delete_finished.set()
+
+ try:
+ with patch.object(config, "save_config") as save_config:
+ with config.runtime_config_lock():
+ worker = threading.Thread(target=delete_config)
+ worker.start()
+ assert delete_finished.wait(timeout=0.2)
+ assert delete_result == [False]
+ assert config.app[key] == "custom"
+
+ worker.join(timeout=1)
+ assert key not in config.app
+ save_config.assert_called_once()
+ finally:
+ config.app.pop(key, None)
+
+ def test_try_save_config_returns_immediately_while_runtime_task_is_active(self):
+ """页面 rerun 请求保存时不能等待视频任务释放配置锁。"""
+ save_finished = threading.Event()
+ save_result = []
+
+ def save_config():
+ save_result.append(config.try_save_config())
+ save_finished.set()
+
+ with patch.object(config, "save_config") as blocking_save:
+ with config.runtime_config_lock():
+ worker = threading.Thread(target=save_config)
+ worker.start()
+ assert save_finished.wait(timeout=0.2)
+ assert save_result == [False]
+
+ worker.join(timeout=1)
+ blocking_save.assert_called_once()
+
+ self._wait_for_deferred_flush()
+
+ def test_try_runtime_lock_flushes_updates_queued_during_operation(self):
+ """短操作释放配置锁时,也必须应用并保存期间到达的页面修改。"""
+ key = "try_runtime_queued_update_test"
+ original_value = config.app.get(key, config._MISSING)
+ update_finished = threading.Event()
+
+ def queue_update():
+ assert not config.update_config_nonblocking(config.app, key, "updated")
+ update_finished.set()
+
+ try:
+ with patch.object(config, "save_config") as save_config:
+ with config.try_runtime_config_lock() as acquired:
+ assert acquired is True
+ worker = threading.Thread(target=queue_update)
+ worker.start()
+ assert update_finished.wait(timeout=0.2)
+ assert config.app.get(key) != "updated"
+
+ worker.join(timeout=1)
+ assert config.app[key] == "updated"
+ save_config.assert_called_once()
+
+ self._wait_for_deferred_flush()
+ finally:
+ if original_value is config._MISSING:
+ config.app.pop(key, None)
+ else:
+ config.app[key] = original_value
+
+ def test_update_queued_during_save_is_flushed_after_lock_release(self):
+ """退出保存期间的新修改不能停留在队列中,也不能被较早值覆盖。"""
+ key = "late_runtime_update_test"
+ original_value = config.app.get(key, config._MISSING)
+ runtime_entered = threading.Event()
+ release_runtime = threading.Event()
+ first_save_started = threading.Event()
+ release_first_save = threading.Event()
+ second_save_finished = threading.Event()
+ save_count = 0
+ save_count_lock = threading.Lock()
+
+ def blocking_save():
+ nonlocal save_count
+ with save_count_lock:
+ save_count += 1
+ current_save = save_count
+ if current_save == 1:
+ first_save_started.set()
+ assert release_first_save.wait(timeout=1)
+ elif current_save == 2:
+ second_save_finished.set()
+
+ def hold_runtime_lock():
+ with config.runtime_config_lock():
+ runtime_entered.set()
+ assert release_runtime.wait(timeout=1)
+
+ try:
+ with patch.object(config, "save_config", side_effect=blocking_save):
+ runtime_worker = threading.Thread(target=hold_runtime_lock)
+ runtime_worker.start()
+ assert runtime_entered.wait(timeout=1)
+
+ assert not config.update_config_nonblocking(config.app, key, "first")
+ release_runtime.set()
+ assert first_save_started.wait(timeout=1)
+
+ # 第一轮保存已经取得配置快照,此时到达的值必须由后台刷新线程
+ # 在锁释放后再次应用和保存,最终结果应以该值为准。
+ assert not config.update_config_nonblocking(config.app, key, "latest")
+ release_first_save.set()
+
+ runtime_worker.join(timeout=1)
+ assert not runtime_worker.is_alive()
+ assert second_save_finished.wait(timeout=1)
+ assert config.app[key] == "latest"
+ assert save_count == 2
+
+ self._wait_for_deferred_flush()
+ finally:
+ release_runtime.set()
+ release_first_save.set()
+ if original_value is config._MISSING:
+ config.app.pop(key, None)
+ else:
+ config.app[key] = original_value
+
+ def test_config_snapshot_includes_pending_updates(self):
+ """视频生成占锁时,新 LLM 请求应看到界面最新选择而非旧配置。"""
+ keys = {
+ "llm_provider": "pending-provider",
+ "pending-provider_api_key": "pending-key",
+ "pending-provider_model_name": "pending-model",
+ }
+ original_values = {
+ key: config.app.get(key, config._MISSING) for key in keys
+ }
+ updates_finished = threading.Event()
+
+ def queue_updates():
+ for key, value in keys.items():
+ assert not config.update_config_nonblocking(config.app, key, value)
+ updates_finished.set()
+
+ try:
+ with patch.object(config, "save_config"):
+ with config.runtime_config_lock():
+ worker = threading.Thread(target=queue_updates)
+ worker.start()
+ assert updates_finished.wait(timeout=0.2)
+
+ snapshot = config.snapshot_config_with_pending(config.app)
+ assert all(snapshot[key] == value for key, value in keys.items())
+ assert config.app.get("llm_provider") != "pending-provider"
+
+ worker.join(timeout=1)
+
+ self._wait_for_deferred_flush()
+ finally:
+ for key, original_value in original_values.items():
+ if original_value is config._MISSING:
+ config.app.pop(key, None)
+ else:
+ config.app[key] = original_value
diff --git a/test/services/test_llm.py b/test/services/test_llm.py
index b332ee8e..065905c9 100644
--- a/test/services/test_llm.py
+++ b/test/services/test_llm.py
@@ -116,6 +116,32 @@ class TestScriptPromptOptions(unittest.TestCase):
self.assertIn("- number of paragraphs: 2", captured["prompt"])
self.assertIn("开头更有悬念", captured["prompt"])
+ def test_generate_script_reuses_submitted_config_snapshot(self):
+ """WebUI 后台任务结束后应用新配置,不能改变正在重试的模型请求。"""
+ captured = {}
+ app_config = {
+ "llm_provider": "openai",
+ "openai_api_key": "snapshot-key",
+ "openai_model_name": "snapshot-model",
+ }
+
+ def fake_generate_response(prompt, app_config=None):
+ captured["prompt"] = prompt
+ captured["app_config"] = app_config
+ return "Snapshot response"
+
+ with patch.object(
+ llm, "_generate_response", side_effect=fake_generate_response
+ ):
+ result = llm.generate_script(
+ video_subject="Snapshot test",
+ app_config=app_config,
+ )
+
+ self.assertEqual(result, "Snapshot response")
+ self.assertIs(captured["app_config"], app_config)
+ self.assertEqual(captured["app_config"]["openai_api_key"], "snapshot-key")
+
def test_generate_terms_can_request_script_ordered_keywords(self):
"""
按文案顺序匹配素材依赖 LLM 返回有序关键词。这里不调用真实模型,
diff --git a/test/services/test_webui_task.py b/test/services/test_webui_task.py
index 49b188ae..2878ba31 100644
--- a/test/services/test_webui_task.py
+++ b/test/services/test_webui_task.py
@@ -56,6 +56,81 @@ def test_generation_controls_submit_background_task_instead_of_blocking_page():
assert "tm.start" not in calls
+def test_webui_runtime_config_updates_do_not_use_blocking_writes():
+ """
+ 生成期间的普通控件 rerun 不能重新等待长任务持有的配置锁。
+
+ 所有 WebUI 配置写入都必须经过非阻塞 helper;LLM 连接测试和语音试听可
+ 使用 try lock 快速返回,但页面代码不能直接调用阻塞锁或阻塞保存函数。
+ """
+ tree = ast.parse(WEBUI_MAIN.read_text(encoding="utf-8"))
+ calls = {
+ _attribute_name(node.func)
+ for node in ast.walk(tree)
+ if isinstance(node, ast.Call)
+ }
+ assert "config.runtime_config_lock" not in calls
+ assert "config.save_config" not in calls
+ assert not calls.intersection(
+ {
+ "config.app.clear",
+ "config.app.pop",
+ "config.app.setdefault",
+ "config.app.update",
+ "config.azure.clear",
+ "config.azure.pop",
+ "config.azure.setdefault",
+ "config.azure.update",
+ "config.chatterbox.clear",
+ "config.chatterbox.pop",
+ "config.chatterbox.setdefault",
+ "config.chatterbox.update",
+ "config.elevenlabs.clear",
+ "config.elevenlabs.pop",
+ "config.elevenlabs.setdefault",
+ "config.elevenlabs.update",
+ "config.siliconflow.clear",
+ "config.siliconflow.pop",
+ "config.siliconflow.setdefault",
+ "config.siliconflow.update",
+ "config.ui.clear",
+ "config.ui.pop",
+ "config.ui.setdefault",
+ "config.ui.update",
+ }
+ )
+
+ synchronized_sections = {
+ "app",
+ "azure",
+ "chatterbox",
+ "elevenlabs",
+ "siliconflow",
+ "ui",
+ }
+ direct_writes = []
+ for node in ast.walk(tree):
+ targets = []
+ if isinstance(node, (ast.Assign, ast.AnnAssign)):
+ targets = node.targets if isinstance(node, ast.Assign) else [node.target]
+ elif isinstance(node, ast.AugAssign):
+ targets = [node.target]
+
+ for target in targets:
+ if not isinstance(target, ast.Subscript):
+ continue
+ section = target.value
+ if (
+ isinstance(section, ast.Attribute)
+ and isinstance(section.value, ast.Name)
+ and section.value.id == "config"
+ and section.attr in synchronized_sections
+ ):
+ direct_writes.append(node.lineno)
+
+ assert direct_writes == []
+
+
def test_completed_task_renders_subject_named_video_download(tmp_path):
"""完成任务应提供主题命名的下载,且下载数据必须来自实际成片。"""
tree = ast.parse(WEBUI_MAIN.read_text(encoding="utf-8"))
@@ -122,9 +197,7 @@ def test_completed_task_renders_subject_named_video_download(tmp_path):
"tr": lambda key: key,
"_render_generation_logs": lambda _task_id: None,
}
- module = ast.fix_missing_locations(
- ast.Module(body=selected_nodes, type_ignores=[])
- )
+ module = ast.fix_missing_locations(ast.Module(body=selected_nodes, type_ignores=[]))
exec(compile(module, str(WEBUI_MAIN), "exec"), namespace)
namespace["_render_generation_task_snapshot"](
@@ -277,18 +350,16 @@ def test_generation_log_fragment_refreshes_within_half_a_second():
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"
- )
+ 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
- 无法刷新日志。生成分支已经提前保存配置,页面末尾只处理普通交互。
+ 后台任务会在完整生成期间持有 runtime_config_lock。生成分支已经请求过
+ 非阻塞保存,页面末尾无需重复请求;普通交互则继续通过同一个非阻塞 helper
+ 保存,不能重新退回 config.save_config。
"""
tree = ast.parse(WEBUI_MAIN.read_text(encoding="utf-8"))
controls = next(
@@ -311,8 +382,7 @@ def test_generation_submit_skips_duplicate_config_save():
for node in application.body
if isinstance(node, ast.Assign)
and any(
- isinstance(target, ast.Name)
- and target.id == "generation_submitted"
+ isinstance(target, ast.Name) and target.id == "generation_submitted"
for target in node.targets
)
)
@@ -332,7 +402,7 @@ def test_generation_submit_skips_duplicate_config_save():
for node in ast.walk(guarded_save)
if isinstance(node, ast.Call)
}
- assert guarded_calls == {"config.save_config"}
+ assert guarded_calls == {"_save_runtime_config"}
def test_terminal_logger_reload_preserves_task_log_handler():
diff --git a/webui/Main.py b/webui/Main.py
index 8e200030..196d02cb 100644
--- a/webui/Main.py
+++ b/webui/Main.py
@@ -121,6 +121,14 @@ _FINAL_VIDEO_PATTERN = re.compile(
re.IGNORECASE,
)
_DOWNLOAD_FILENAME_INVALID_PATTERN = re.compile(r'[<>:"/\\|?*\x00-\x1f]')
+_RUNTIME_CONFIG_SECTIONS = {
+ "app": config.app,
+ "azure": config.azure,
+ "chatterbox": config.chatterbox,
+ "elevenlabs": config.elevenlabs,
+ "siliconflow": config.siliconflow,
+ "ui": config.ui,
+}
# -----------------------------------------------------------------------------
@@ -128,6 +136,61 @@ _DOWNLOAD_FILENAME_INVALID_PATTERN = re.compile(r'[<>:"/\\|?*\x00-\x1f]')
# -----------------------------------------------------------------------------
+def _set_runtime_config(section_name, key, value):
+ """
+ 更新 WebUI 配置,但不等待正在生成视频的后台任务。
+
+ 后台任务结束前,配置层只保留同一配置项的最新值;任务释放配置锁时会自动
+ 应用并保存。页面控件值仍由 Streamlit session_state 维护,因此暂存期间的
+ rerun 不会把用户刚输入的内容重置为旧配置。
+ """
+ config_section = _RUNTIME_CONFIG_SECTIONS[section_name]
+ updated = config.update_config_nonblocking(config_section, key, value)
+ if not updated:
+ logger.debug(f"deferred WebUI config update: section={section_name}, key={key}")
+ return updated
+
+
+def _delete_runtime_config(section_name, key):
+ """删除 WebUI 配置项;后台任务占用配置时延后执行。"""
+ config_section = _RUNTIME_CONFIG_SECTIONS[section_name]
+ deleted = config.delete_config_nonblocking(config_section, key)
+ if not deleted:
+ logger.debug(f"deferred WebUI config delete: section={section_name}, key={key}")
+ return deleted
+
+
+def _save_runtime_config():
+ """请求保存 WebUI 配置;后台任务占用配置时立即返回。"""
+ saved = config.try_save_config()
+ if not saved:
+ logger.debug("deferred WebUI config save until active task completes")
+ return saved
+
+
+def _run_llm_read_operation(operation_name, operation):
+ """
+ 使用稳定的当前 LLM 配置执行只读请求,并避免等待视频生成任务。
+
+ 能立即取得配置锁时继续沿用原来的互斥保护;锁已被后台视频任务持有时,
+ 全局配置在任务结束前不会发生变化,因此可以安全复制当前配置,并叠加页面
+ 尚未落盘的 Provider、模型和密钥。这样新文案使用界面中的最新选择,同时
+ 不会改变正在生成的视频任务。
+ """
+ with config.try_runtime_config_lock() as lock_acquired:
+ # 配置层在复制全局值和叠加待更新值期间持有队列锁,因此快照只能看到
+ # 更新前或更新后的完整状态,不会混用两组 Provider 参数。
+ app_config_snapshot = config.snapshot_config_with_pending(config.app)
+ if lock_acquired:
+ return operation(app_config_snapshot)
+
+ logger.info(
+ f"run read-only LLM operation with active task configuration: "
+ f"operation={operation_name}"
+ )
+ return operation(app_config_snapshot)
+
+
def _parse_chatterbox_voices(voices):
# Chatterbox 是自托管服务,音色列表由用户在 WebUI 中手动输入。
# 这里统一兼容 TOML 数组和输入框里的逗号分隔字符串,避免下拉框、
@@ -142,28 +205,44 @@ def _sync_chatterbox_config_from_session_state():
# “试听语音合成”按钮之后。如果试听时只读取 config.chatterbox,可能拿不到
# 用户刚在输入框里填入的 base_url/model/voices。先从 session_state 同步一次,
# 可以保证按钮逻辑和输入框显示逻辑使用同一份最新配置。
- config.chatterbox["base_url"] = (
- st.session_state.get(
- "chatterbox_base_url_input",
- config.chatterbox.get("base_url") or DEFAULT_CHATTERBOX_BASE_URL,
- )
- or ""
- ).strip()
- config.chatterbox["api_key"] = st.session_state.get(
- "chatterbox_api_key_input", config.chatterbox.get("api_key", "")
+ _set_runtime_config(
+ "chatterbox",
+ "base_url",
+ (
+ st.session_state.get(
+ "chatterbox_base_url_input",
+ config.chatterbox.get("base_url") or DEFAULT_CHATTERBOX_BASE_URL,
+ )
+ or ""
+ ).strip(),
)
- config.chatterbox["model_id"] = (
- st.session_state.get(
- "chatterbox_model_input",
- config.chatterbox.get("model_id") or DEFAULT_CHATTERBOX_MODEL,
- )
- or DEFAULT_CHATTERBOX_MODEL
- ).strip()
- config.chatterbox["voices"] = _parse_chatterbox_voices(
+ _set_runtime_config(
+ "chatterbox",
+ "api_key",
st.session_state.get(
- "chatterbox_voices_input",
- config.chatterbox.get("voices") or DEFAULT_CHATTERBOX_VOICES,
- )
+ "chatterbox_api_key_input", config.chatterbox.get("api_key", "")
+ ),
+ )
+ _set_runtime_config(
+ "chatterbox",
+ "model_id",
+ (
+ st.session_state.get(
+ "chatterbox_model_input",
+ config.chatterbox.get("model_id") or DEFAULT_CHATTERBOX_MODEL,
+ )
+ or DEFAULT_CHATTERBOX_MODEL
+ ).strip(),
+ )
+ _set_runtime_config(
+ "chatterbox",
+ "voices",
+ _parse_chatterbox_voices(
+ st.session_state.get(
+ "chatterbox_voices_input",
+ config.chatterbox.get("voices") or DEFAULT_CHATTERBOX_VOICES,
+ )
+ ),
)
@@ -1107,9 +1186,7 @@ def _render_top_bar():
)
with brand_col:
- update_snapshot = version_checker.poll_available_update(
- config.project_version
- )
+ update_snapshot = version_checker.poll_available_update(config.project_version)
if update_snapshot.complete:
_render_brand(update_snapshot.available_version)
else:
@@ -1161,8 +1238,8 @@ def _render_top_bar():
st.session_state["ui_language"] = selected_language_code
# 浏览器自动识别只影响当前会话;只有用户主动切换下拉框时才
# 写入 config.toml,后续新会话将优先使用该明确选择。
- config.ui["language"] = selected_language_code
- config.save_config()
+ _set_runtime_config("ui", "language", selected_language_code)
+ _save_runtime_config()
# 切换语言后强制刷新,避免 selectbox 继续展示旧语言文案。
st.rerun()
@@ -1626,7 +1703,7 @@ def reset_subtitle_settings():
"subtitle_background_color",
"rounded_subtitle_background",
):
- config.ui[key] = defaults[key]
+ _set_runtime_config("ui", key, defaults[key])
@st.dialog(tr("Final Prompt Preview"), width="large")
@@ -1705,7 +1782,11 @@ def _get_material_api_keys(config_key):
def _save_material_api_keys(config_key, value):
"""保存逗号分隔的素材 API Key,并允许用户显式清空旧配置。"""
normalized_value = value.replace(" ", "")
- config.app[config_key] = normalized_value.split(",") if normalized_value else []
+ _set_runtime_config(
+ "app",
+ config_key,
+ normalized_value.split(",") if normalized_value else [],
+ )
def _format_file_size(size_bytes):
@@ -1851,7 +1932,7 @@ def _render_settings_dialog():
with st.container():
# 历史 hide_config 只用于隐藏旧基础设置面板。改为固定设置入口后,该值
# 不再有用户可见意义,统一迁移为 false,避免旧配置影响后续版本。
- config.app["hide_config"] = False
+ _set_runtime_config("app", "hide_config", False)
(
middle_config_panel,
right_config_panel,
@@ -1873,7 +1954,7 @@ def _render_settings_dialog():
value=config.ui.get("hide_log", False),
key="hide_log_checkbox",
)
- config.ui["hide_log"] = hide_log
+ _set_runtime_config("ui", "hide_log", hide_log)
_render_cache_management_settings(cache_config_panel)
@@ -1910,7 +1991,7 @@ def _render_settings_dialog():
vertical_alignment="top",
)
llm_helper = llm_help_panel.container()
- config.app["llm_provider"] = llm_provider
+ _set_runtime_config("app", "llm_provider", llm_provider)
llm_provider_spec = get_llm_provider(llm_provider)
if llm_provider_spec is None:
# 正常情况下下拉选项全部来自 Registry,不会进入该分支;保留
@@ -2001,18 +2082,26 @@ def _render_settings_dialog():
)
# 输入框展示 Registry 默认值,但配置只保存真实的用户覆盖值。
# 这样默认模型、Base URL 更新后,未自定义的用户能够自动跟随。
- config.app[llm_provider_spec.config_key("api_key")] = st_llm_api_key
- config.app[llm_provider_spec.config_key("base_url")] = (
+ _set_runtime_config(
+ "app",
+ llm_provider_spec.config_key("api_key"),
+ st_llm_api_key,
+ )
+ _set_runtime_config(
+ "app",
+ llm_provider_spec.config_key("base_url"),
normalize_provider_override(
st_llm_base_url,
llm_default_base_url,
- )
+ ),
)
- config.app[llm_provider_spec.config_key("model_name")] = (
+ _set_runtime_config(
+ "app",
+ llm_provider_spec.config_key("model_name"),
normalize_provider_override(
st_llm_model_name,
llm_provider_spec.default_model,
- )
+ ),
)
# Provider 专用字段也由 Registry 声明。例如 Cloudflare AI Gateway
@@ -2025,9 +2114,13 @@ def _render_settings_dialog():
type="password" if field.secret else "default",
key=f"{llm_provider}_{field.config_suffix}_input",
)
- config.app[field_config_key] = normalize_provider_override(
- field_value,
- field.default_value,
+ _set_runtime_config(
+ "app",
+ field_config_key,
+ normalize_provider_override(
+ field_value,
+ field.default_value,
+ ),
)
if llm_form_panel.button(
@@ -2037,13 +2130,18 @@ def _render_settings_dialog():
type="secondary",
icon=":material/network_check:",
):
- with llm_form_panel.spinner(tr("Testing LLM Connection")):
- with config.runtime_config_lock():
- connection_ok, connection_error, connection_elapsed = (
- llm.test_connection()
- )
+ with config.try_runtime_config_lock() as lock_acquired:
+ if not lock_acquired:
+ llm_form_panel.warning(tr("Runtime Configuration Busy"))
+ else:
+ with llm_form_panel.spinner(tr("Testing LLM Connection")):
+ connection_ok, connection_error, connection_elapsed = (
+ llm.test_connection()
+ )
- if connection_ok:
+ if not lock_acquired:
+ connection_ok = None
+ elif connection_ok:
llm_form_panel.success(
tr("LLM Connection Test Succeeded").format(
provider=llm_provider_labels[llm_provider],
@@ -2085,7 +2183,7 @@ def _render_settings_dialog():
)
_save_material_api_keys("coverr_api_keys", coverr_api_key)
- config.save_config()
+ _save_runtime_config()
# -----------------------------------------------------------------------------
@@ -2193,20 +2291,29 @@ def _render_script_settings(panel, params):
st.warning(tr("Please Enter the Video Subject First"))
else:
with st.spinner(tr("Generating Video Script and Keywords")):
- with config.runtime_config_lock():
+
+ def generate_script_and_terms(app_config_snapshot):
script = llm.generate_script(
video_subject=params.video_subject,
language=params.video_language,
paragraph_number=params.paragraph_number,
video_script_prompt=params.video_script_prompt,
custom_system_prompt=params.custom_system_prompt,
+ app_config=app_config_snapshot,
)
terms = llm.generate_terms(
params.video_subject,
script,
amount=8 if params.match_materials_to_script else 5,
match_script_order=params.match_materials_to_script,
+ app_config=app_config_snapshot,
)
+ return script, terms
+
+ script, terms = _run_llm_read_operation(
+ "generate_script_and_terms",
+ generate_script_and_terms,
+ )
if "Error: " in script:
st.error(tr(script))
elif "Error: " in terms:
@@ -2233,13 +2340,16 @@ def _render_script_settings(panel, params):
st.warning(tr("Please Enter the Video Subject"))
else:
with st.spinner(tr("Generating Video Keywords")):
- with config.runtime_config_lock():
- terms = llm.generate_terms(
+ terms = _run_llm_read_operation(
+ "generate_terms",
+ lambda app_config_snapshot: llm.generate_terms(
params.video_subject,
params.video_script,
amount=8 if params.match_materials_to_script else 5,
match_script_order=params.match_materials_to_script,
- )
+ app_config=app_config_snapshot,
+ ),
+ )
if "Error: " in terms:
st.error(tr(terms))
else:
@@ -2280,7 +2390,7 @@ def _render_video_settings(panel, params):
(v, label) for label, v in video_sources
)[value],
)
- config.app["video_source"] = params.video_source
+ _set_runtime_config("app", "video_source", params.video_source)
if params.video_source == "local":
# Streamlit 的文件类型校验对扩展名大小写敏感,这里同时放行大小写两种形式。
@@ -2318,7 +2428,11 @@ def _render_video_settings(panel, params):
key="match_materials_to_script",
on_change=sync_script_order_concat_mode,
)
- config.app["match_materials_to_script"] = params.match_materials_to_script
+ _set_runtime_config(
+ "app",
+ "match_materials_to_script",
+ params.match_materials_to_script,
+ )
# 视频转场模式
video_transition_modes = [
@@ -2423,9 +2537,9 @@ def _render_video_settings(panel, params):
)
if selected_video_codec == DEFAULT_VIDEO_CODEC_OPTION:
# 默认模式不持久化具体编码器,让配置表达“跟随项目默认值”。
- config.app.pop("video_codec", None)
+ _delete_runtime_config("app", "video_codec")
else:
- config.app["video_codec"] = selected_video_codec
+ _set_runtime_config("app", "video_codec", selected_video_codec)
return uploaded_files
@@ -2841,7 +2955,7 @@ def _render_elevenlabs_api_key_input(label_key):
# 环境变量仅用于当前进程,不在用户未修改时自动复制到 config.toml。
# 已有配置或用户主动修改输入时才更新本机配置,与 Sonilo 行为保持一致。
if configured_key or entered_key != effective_key:
- config.elevenlabs["api_key"] = entered_key
+ _set_runtime_config("elevenlabs", "api_key", entered_key)
return entered_key
@@ -2877,7 +2991,7 @@ def _render_background_music_settings(params, elevenlabs_api_key_rendered=False)
# 仅当用户确实修改输入或本来就使用配置时写回,避免把环境变量中的 Key
# 在无操作的情况下复制进 config.toml。
if configured_key or entered_key != effective_key:
- config.app["sonilo_api_key"] = entered_key
+ _set_runtime_config("app", "sonilo_api_key", entered_key)
elif params.bgm_type == "elevenlabs":
if elevenlabs_api_key_rendered:
# TTS 区域已经渲染共享输入框时不再创建第二个 widget,避免两个独立
@@ -2894,9 +3008,7 @@ def _render_background_music_settings(params, elevenlabs_api_key_rendered=False)
format_func=lambda value: f"{int(value * 100)}%",
disabled=not params.bgm_type,
)
- bgm_enabled = bgm_service.should_use_bgm(
- params.bgm_type, params.bgm_volume
- )
+ bgm_enabled = bgm_service.should_use_bgm(params.bgm_type, params.bgm_volume)
if params.bgm_type == "custom":
uploaded_bgm_file = st.file_uploader(
@@ -2914,9 +3026,7 @@ def _render_background_music_settings(params, elevenlabs_api_key_rendered=False)
)
if uploaded_bgm_file is not None and bgm_enabled:
try:
- safe_name = bgm_service.sanitize_upload_filename(
- uploaded_bgm_file.name
- )
+ safe_name = bgm_service.sanitize_upload_filename(uploaded_bgm_file.name)
# Streamlit 在调整音量等任意控件后都会重新执行页面。使用内容哈希
# 区分上传文件,并在当前会话内缓存完整解码结果,既不能只凭同名、
# 同大小文件误用旧结果,也避免每次 rerun 都重复调用 FFmpeg。
@@ -2966,9 +3076,7 @@ def _render_background_music_settings(params, elevenlabs_api_key_rendered=False)
if cached_validation.get("error"):
if cached_validation.get("error_type") == "service":
- raise bgm_service.BgmServiceError(
- cached_validation["error"]
- )
+ raise bgm_service.BgmServiceError(cached_validation["error"])
raise bgm_service.BgmUploadError(cached_validation["error"])
except bgm_service.BgmUploadError:
# 非法文件不能沿用上一次有效上传的名称,否则任务参数可能仍指向
@@ -2982,9 +3090,7 @@ def _render_background_music_settings(params, elevenlabs_api_key_rendered=False)
else:
# 完整解码校验通过后才展示播放器和“已就绪”。文件仍只在点击
# 生成时持久化,用户仅预览或随后移除文件不会污染 storage/bgm。
- uploaded_mime_type = str(
- getattr(uploaded_bgm_file, "type", "") or ""
- )
+ uploaded_mime_type = str(getattr(uploaded_bgm_file, "type", "") or "")
preview_mime_type = (
uploaded_mime_type
if uploaded_mime_type.startswith("audio/")
@@ -3099,7 +3205,7 @@ def _render_audio_settings(panel, params):
format_func=lambda value: voice_mode_labels[value],
width="stretch",
)
- config.ui["voice_mode"] = voice_mode
+ _set_runtime_config("ui", "voice_mode", voice_mode)
tts_mode_enabled = voice_mode == VOICE_MODE_TTS
# Provider 下拉只负责选择自动配音服务;无配音已经由上方模式控制,
@@ -3132,7 +3238,7 @@ def _render_audio_settings(panel, params):
# 非自动配音模式不渲染 TTS 控件,但保留上次选择,切回后可以继续使用。
selected_tts_server = saved_tts_server
- config.ui["tts_server"] = selected_tts_server
+ _set_runtime_config("ui", "tts_server", selected_tts_server)
# 服务说明紧跟 Provider 选择,先告诉用户需要准备什么,再进入音色和
# 凭证配置。没有说明的 Provider 不渲染空提示块。
@@ -3167,7 +3273,9 @@ def _render_audio_settings(panel, params):
config.elevenlabs.get("api_key", ""),
)
if saved_elevenlabs_api_key:
- config.elevenlabs["api_key"] = saved_elevenlabs_api_key
+ _set_runtime_config(
+ "elevenlabs", "api_key", saved_elevenlabs_api_key
+ )
cache_key = f"elevenlabs_voices_{saved_elevenlabs_api_key}"
if cache_key not in st.session_state:
st.session_state[cache_key] = voice.get_elevenlabs_voices(
@@ -3242,7 +3350,7 @@ def _render_audio_settings(panel, params):
if not voice.is_no_voice(voice_name):
# 占位 sentinel 仅用于非自动模式的禁用展示,不覆盖用户上一次
# 真正选择的音色,切回自动配音后可以恢复原设置。
- config.ui["voice_name"] = voice_name
+ _set_runtime_config("ui", "voice_name", voice_name)
elif tts_mode_enabled:
# 如果没有声音可选,显示提示信息
st.warning(
@@ -3252,7 +3360,7 @@ def _render_audio_settings(panel, params):
)
voice_name = ""
params.voice_name = ""
- config.ui["voice_name"] = ""
+ _set_runtime_config("ui", "voice_name", "")
else:
# 非自动配音模式不显示音色控件,只复用保存值维持参数结构稳定。
voice_name = saved_voice_name or voice.NO_VOICE_NAME
@@ -3276,8 +3384,8 @@ def _render_audio_settings(panel, params):
type="password",
key="azure_speech_key_input",
)
- config.azure["speech_region"] = azure_speech_region
- config.azure["speech_key"] = azure_speech_key
+ _set_runtime_config("azure", "speech_region", azure_speech_region)
+ _set_runtime_config("azure", "speech_key", azure_speech_key)
if tts_mode_enabled and selected_tts_server == "gemini-tts":
# Gemini TTS 与 Gemini LLM 共用同一份密钥;在音频面板提供直接入口,
@@ -3288,7 +3396,7 @@ def _render_audio_settings(panel, params):
type="password",
key="gemini_tts_api_key_input",
)
- config.app["gemini_api_key"] = gemini_tts_api_key
+ _set_runtime_config("app", "gemini_api_key", gemini_tts_api_key)
# 当选择硅基流动时,显示API key输入框和说明信息
if tts_mode_enabled and (
@@ -3304,7 +3412,7 @@ def _render_audio_settings(panel, params):
key="siliconflow_api_key_input",
)
- config.siliconflow["api_key"] = siliconflow_api_key
+ _set_runtime_config("siliconflow", "api_key", siliconflow_api_key)
# 当选择 Xiaomi MiMo TTS 时,复用 MiMo LLM provider 的 API Key。
# 这样用户如果同时使用 MiMo 生成文案和语音,只需要维护一份密钥。
@@ -3321,7 +3429,7 @@ def _render_audio_settings(panel, params):
key="mimo_tts_api_key_input",
)
- config.app["mimo_api_key"] = mimo_api_key
+ _set_runtime_config("app", "mimo_api_key", mimo_api_key)
# ElevenLabs API key section
if tts_mode_enabled and (
@@ -3349,7 +3457,7 @@ def _render_audio_settings(panel, params):
default_value=saved_elevenlabs_model,
key="elevenlabs_model_select",
)
- config.elevenlabs["model_id"] = elevenlabs_model
+ _set_runtime_config("elevenlabs", "model_id", elevenlabs_model)
# Chatterbox API settings section (self-hosted, OpenAI-compatible)
if tts_mode_enabled and (
@@ -3363,7 +3471,9 @@ def _render_audio_settings(panel, params):
key="chatterbox_base_url_input",
placeholder=tr("Chatterbox Base URL Placeholder"),
)
- config.chatterbox["base_url"] = (chatterbox_base_url or "").strip()
+ _set_runtime_config(
+ "chatterbox", "base_url", (chatterbox_base_url or "").strip()
+ )
chatterbox_api_key = st.text_input(
tr("Chatterbox API Key"),
@@ -3371,16 +3481,18 @@ def _render_audio_settings(panel, params):
type="password",
key="chatterbox_api_key_input",
)
- config.chatterbox["api_key"] = chatterbox_api_key
+ _set_runtime_config("chatterbox", "api_key", chatterbox_api_key)
chatterbox_model = st.text_input(
tr("Chatterbox Model"),
value=config.chatterbox.get("model_id") or DEFAULT_CHATTERBOX_MODEL,
key="chatterbox_model_input",
)
- config.chatterbox["model_id"] = (
- chatterbox_model or DEFAULT_CHATTERBOX_MODEL
- ).strip()
+ _set_runtime_config(
+ "chatterbox",
+ "model_id",
+ (chatterbox_model or DEFAULT_CHATTERBOX_MODEL).strip(),
+ )
_saved_chatterbox_voices = (
_parse_chatterbox_voices(config.chatterbox.get("voices"))
@@ -3394,8 +3506,10 @@ def _render_audio_settings(panel, params):
key="chatterbox_voices_input",
placeholder=tr("Chatterbox Voices Placeholder"),
)
- config.chatterbox["voices"] = _parse_chatterbox_voices(
- chatterbox_voices
+ _set_runtime_config(
+ "chatterbox",
+ "voices",
+ _parse_chatterbox_voices(chatterbox_voices),
)
# 三种模式只渲染当前任务真正需要的控件。自动配音可调音量和语速;
@@ -3498,7 +3612,7 @@ def _render_subtitle_settings(panel, params):
key="font_name_select",
disabled=subtitle_settings_disabled,
)
- config.ui["font_name"] = params.font_name
+ _set_runtime_config("ui", "font_name", params.font_name)
subtitle_positions = [
(tr("Top"), "top"),
@@ -3525,7 +3639,7 @@ def _render_subtitle_settings(panel, params):
disabled=subtitle_settings_disabled,
)
params.subtitle_position = selected_subtitle_position
- config.ui["subtitle_position"] = params.subtitle_position
+ _set_runtime_config("ui", "subtitle_position", params.subtitle_position)
if params.subtitle_position == "custom":
saved_custom_position = config.ui.get(
@@ -3544,7 +3658,9 @@ def _render_subtitle_settings(panel, params):
if params.custom_position < 0 or params.custom_position > 100:
st.error(tr("Please enter a value between 0 and 100"))
else:
- config.ui["custom_position"] = params.custom_position
+ _set_runtime_config(
+ "ui", "custom_position", params.custom_position
+ )
except ValueError:
st.error(tr("Please enter a valid number"))
@@ -3561,7 +3677,7 @@ def _render_subtitle_settings(panel, params):
key="font_color_picker",
disabled=subtitle_settings_disabled,
)
- config.ui["text_fore_color"] = params.text_fore_color
+ _set_runtime_config("ui", "text_fore_color", params.text_fore_color)
with font_cols[1]:
saved_font_size = config.ui.get(
@@ -3575,7 +3691,7 @@ def _render_subtitle_settings(panel, params):
key="font_size_slider",
disabled=subtitle_settings_disabled,
)
- config.ui["font_size"] = params.font_size
+ _set_runtime_config("ui", "font_size", params.font_size)
stroke_cols = st.columns([0.42, 0.58])
with stroke_cols[0]:
@@ -3615,7 +3731,11 @@ def _render_subtitle_settings(panel, params):
key="subtitle_background_enabled_checkbox",
disabled=subtitle_settings_disabled,
)
- config.ui["subtitle_background_enabled"] = subtitle_background_enabled
+ _set_runtime_config(
+ "ui",
+ "subtitle_background_enabled",
+ subtitle_background_enabled,
+ )
# 背景颜色和圆角样式都从属于字幕背景开关。子控件始终保留在页面中,
# 父开关关闭时统一禁用,避免一个控件消失而另一个控件禁用造成布局跳动。
@@ -3636,7 +3756,11 @@ def _render_subtitle_settings(panel, params):
disabled=subtitle_settings_disabled
or not subtitle_background_enabled,
)
- config.ui["subtitle_background_color"] = selected_subtitle_background_color
+ _set_runtime_config(
+ "ui",
+ "subtitle_background_color",
+ selected_subtitle_background_color,
+ )
params.text_background_color = (
selected_subtitle_background_color
if subtitle_background_enabled
@@ -3668,8 +3792,10 @@ def _render_subtitle_settings(panel, params):
else False
)
if not subtitle_settings_disabled and subtitle_background_enabled:
- config.ui["rounded_subtitle_background"] = (
- selected_rounded_subtitle_background
+ _set_runtime_config(
+ "ui",
+ "rounded_subtitle_background",
+ selected_rounded_subtitle_background,
)
if video.subtitle_colors_are_indistinguishable(params):
@@ -3704,9 +3830,9 @@ def _render_generation_controls(
"""
校验生成依赖、提交任务,并渲染日志与成片结果。
- 返回本次页面执行是否成功提交了新任务。提交前已经保存过配置,调用方据此
- 跳过页面末尾的重复保存,避免后台长任务先持有配置锁后阻塞 Streamlit 主
- 脚本。主脚本必须及时结束,定时 Fragment 才能持续刷新进度和任务日志。
+ 返回本次页面执行是否成功提交了新任务。提交前已经请求非阻塞保存,调用方
+ 据此跳过页面末尾的重复请求。主脚本必须及时结束,定时 Fragment 才能持续
+ 刷新进度和任务日志。
"""
restore_upload_requirements = st.session_state.get(
"task_restore_upload_requirements", {}
@@ -3741,7 +3867,7 @@ def _render_generation_controls(
)
render_onboarding_tour()
if start_button:
- config.save_config()
+ _save_runtime_config()
task_id = st.session_state.get("pending_generation_task_id") or str(uuid4())
_add_active_generation_task(
task_id,
@@ -3989,11 +4115,10 @@ def _render_application():
voice_mode,
)
- # 生成分支在启动后台线程前已经保存过配置。这里再次保存既没有收益,还可能
- # 与持有 runtime_config_lock 的长任务竞争,使当前 Streamlit 脚本一直阻塞
- # 到视频完成,进而让日志 Fragment 无法运行。普通页面交互仍保留统一保存。
+ # 生成分支在启动后台线程前已经请求过保存。普通控件交互继续请求非阻塞保存;
+ # 如果后台任务正在使用配置,配置层会在任务结束时自动应用并落盘最新值。
if not generation_submitted:
- config.save_config()
+ _save_runtime_config()
_render_application()
diff --git a/webui/i18n/de.json b/webui/i18n/de.json
index fae984c0..3a487950 100644
--- a/webui/i18n/de.json
+++ b/webui/i18n/de.json
@@ -269,6 +269,7 @@
"Cancel": "Abbrechen",
"Test LLM Connection": "Modellverbindung testen",
"Testing LLM Connection": "Modellverbindung wird getestet...",
+ "Runtime Configuration Busy": "Ein Videoauftrag verwendet gerade die Diensteinstellungen. Versuchen Sie es nach Abschluss erneut.",
"LLM Connection Test Succeeded": "Verbindung erfolgreich: {provider} / {model} ({elapsed} s)",
"LLM Connection Test Failed": "Verbindung fehlgeschlagen: {error}",
"Video Source Settings": "**Videoquellen-Einstellungen**",
diff --git a/webui/i18n/en.json b/webui/i18n/en.json
index e0719b83..812ac89b 100644
--- a/webui/i18n/en.json
+++ b/webui/i18n/en.json
@@ -272,6 +272,7 @@
"Cancel": "Cancel",
"Test LLM Connection": "Test Model Connection",
"Testing LLM Connection": "Testing model connection...",
+ "Runtime Configuration Busy": "A video task is using the current service settings. Try again after it finishes.",
"LLM Connection Test Succeeded": "Connection successful: {provider} / {model} ({elapsed}s)",
"LLM Connection Test Failed": "Connection failed: {error}",
"Video Source Settings": "**Video Source Settings**",
diff --git a/webui/i18n/es.json b/webui/i18n/es.json
index e8b4c83d..7349f9e1 100644
--- a/webui/i18n/es.json
+++ b/webui/i18n/es.json
@@ -266,6 +266,7 @@
"Cancel": "Cancelar",
"Test LLM Connection": "Probar conexión del modelo",
"Testing LLM Connection": "Probando la conexión del modelo...",
+ "Runtime Configuration Busy": "Una tarea de video está usando la configuración del servicio. Inténtalo de nuevo cuando termine.",
"LLM Connection Test Succeeded": "Conexión correcta: {provider} / {model} ({elapsed} s)",
"LLM Connection Test Failed": "Error de conexión: {error}",
"Video Source Settings": "**Configuración de fuente de vídeo**",
diff --git a/webui/i18n/id.json b/webui/i18n/id.json
index 490d6706..ee04ddec 100644
--- a/webui/i18n/id.json
+++ b/webui/i18n/id.json
@@ -266,6 +266,7 @@
"Cancel": "Batal",
"Test LLM Connection": "Uji Koneksi Model",
"Testing LLM Connection": "Menguji koneksi model...",
+ "Runtime Configuration Busy": "Tugas video sedang menggunakan pengaturan layanan. Coba lagi setelah selesai.",
"LLM Connection Test Succeeded": "Koneksi berhasil: {provider} / {model} ({elapsed} dtk)",
"LLM Connection Test Failed": "Koneksi gagal: {error}",
"Video Source Settings": "**Pengaturan Sumber Video**",
diff --git a/webui/i18n/pt.json b/webui/i18n/pt.json
index a33b5802..4457d718 100644
--- a/webui/i18n/pt.json
+++ b/webui/i18n/pt.json
@@ -266,6 +266,7 @@
"Cancel": "Cancelar",
"Test LLM Connection": "Testar conexão do modelo",
"Testing LLM Connection": "Testando a conexão do modelo...",
+ "Runtime Configuration Busy": "Uma tarefa de vídeo está usando as configurações do serviço. Tente novamente após a conclusão.",
"LLM Connection Test Succeeded": "Conexão bem-sucedida: {provider} / {model} ({elapsed} s)",
"LLM Connection Test Failed": "Falha na conexão: {error}",
"Video Source Settings": "**Configurações da Fonte do Vídeo**",
diff --git a/webui/i18n/ru.json b/webui/i18n/ru.json
index b1f426a2..4077e0c1 100644
--- a/webui/i18n/ru.json
+++ b/webui/i18n/ru.json
@@ -262,6 +262,7 @@
"Cancel": "Отмена",
"Test LLM Connection": "Проверить подключение модели",
"Testing LLM Connection": "Проверка подключения модели...",
+ "Runtime Configuration Busy": "Текущая задача использует настройки сервиса. Повторите попытку после её завершения.",
"LLM Connection Test Succeeded": "Подключение успешно: {provider} / {model} ({elapsed} с)",
"LLM Connection Test Failed": "Ошибка подключения: {error}",
"Video Source Settings": "**Источники материалов**",
diff --git a/webui/i18n/tr.json b/webui/i18n/tr.json
index e05297ae..06d4cee0 100644
--- a/webui/i18n/tr.json
+++ b/webui/i18n/tr.json
@@ -264,6 +264,7 @@
"Cancel": "İptal",
"Test LLM Connection": "Model bağlantısını test et",
"Testing LLM Connection": "Model bağlantısı test ediliyor...",
+ "Runtime Configuration Busy": "Bir video görevi hizmet ayarlarını kullanıyor. Görev tamamlandıktan sonra tekrar deneyin.",
"LLM Connection Test Succeeded": "Bağlantı başarılı: {provider} / {model} ({elapsed} sn)",
"LLM Connection Test Failed": "Bağlantı başarısız: {error}",
"Video Source Settings": "**Video Kaynağı Ayarları**",
diff --git a/webui/i18n/vi.json b/webui/i18n/vi.json
index 06d8788b..7c659acd 100644
--- a/webui/i18n/vi.json
+++ b/webui/i18n/vi.json
@@ -266,6 +266,7 @@
"Cancel": "Hủy",
"Test LLM Connection": "Kiểm tra kết nối mô hình",
"Testing LLM Connection": "Đang kiểm tra kết nối mô hình...",
+ "Runtime Configuration Busy": "Một tác vụ video đang sử dụng cấu hình dịch vụ. Hãy thử lại sau khi tác vụ hoàn tất.",
"LLM Connection Test Succeeded": "Kết nối thành công: {provider} / {model} ({elapsed} giây)",
"LLM Connection Test Failed": "Kết nối thất bại: {error}",
"Video Source Settings": "**Cài Đặt Nguồn Video**",
diff --git a/webui/i18n/zh.json b/webui/i18n/zh.json
index f9c70ce2..a7631056 100644
--- a/webui/i18n/zh.json
+++ b/webui/i18n/zh.json
@@ -272,6 +272,7 @@
"Cancel": "取消",
"Test LLM Connection": "测试模型连接",
"Testing LLM Connection": "正在测试模型连接...",
+ "Runtime Configuration Busy": "当前视频任务正在使用服务设置,请在任务完成后重试。",
"LLM Connection Test Succeeded": "连接成功:{provider} / {model}({elapsed} 秒)",
"LLM Connection Test Failed": "连接失败:{error}",
"Video Source Settings": "**视频源设置**",