Skip to content

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

fix(webui): prevent portable import conflicts

harry070310404ceea0a2
diff --git a/test/services/test_webui_startup.py b/test/services/test_webui_startup.py
new file mode 100644
index 00000000..27cb5971
--- /dev/null
+++ b/test/services/test_webui_startup.py
@@ -0,0 +1,72 @@
+import os
+import subprocess
+import sys
+import tempfile
+import textwrap
+import unittest
+from pathlib import Path
+
+
+ROOT_DIR = Path(__file__).parent.parent.parent
+WEBUI_MAIN = ROOT_DIR / "webui" / "Main.py"
+
+
+class TestWebuiStartup(unittest.TestCase):
+ def test_external_directory_prefers_project_app_package(self):
+ with tempfile.TemporaryDirectory() as temp_dir:
+ temp_path = Path(temp_dir)
+ conflicting_root = temp_path / "site-packages"
+ conflicting_app = conflicting_root / "app"
+ conflicting_app.mkdir(parents=True)
+ (conflicting_app / "__init__.py").write_text(
+ 'source = "conflicting dependency"\n',
+ encoding="utf-8",
+ )
+
+ env = os.environ.copy()
+ existing_pythonpath = env.get("PYTHONPATH")
+ env["PYTHONPATH"] = os.pathsep.join(
+ part
+ for part in (str(conflicting_root), existing_pythonpath)
+ if part
+ )
+ script = textwrap.dedent(
+ f"""
+ from pathlib import Path
+ from streamlit.testing.v1 import AppTest
+
+ app = AppTest.from_file({str(WEBUI_MAIN)!r}, default_timeout=30)
+ app.run()
+ if app.exception:
+ raise RuntimeError([str(item.value) for item in app.exception])
+
+ import app.config
+
+ project_root = Path({str(ROOT_DIR)!r}).resolve()
+ imported_config = Path(app.config.__file__).resolve()
+ if project_root not in imported_config.parents:
+ raise RuntimeError(
+ f"app.config resolved outside project: {{imported_config}}"
+ )
+ """
+ )
+
+ result = subprocess.run(
+ [sys.executable, "-X", "utf8", "-c", script],
+ cwd=temp_path,
+ env=env,
+ capture_output=True,
+ text=True,
+ encoding="utf-8",
+ timeout=60,
+ )
+
+ self.assertEqual(
+ result.returncode,
+ 0,
+ f"stdout:\n{result.stdout}\nstderr:\n{result.stderr}",
+ )
+
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/webui/Main.py b/webui/Main.py
index b47d817e..f4b0cd33 100644
--- a/webui/Main.py
+++ b/webui/Main.py
@@ -19,10 +19,12 @@ import streamlit as st
from loguru import logger
from streamlit_tour import Tour
-# WebUI 作为独立入口运行时,需要将项目根目录加入模块搜索路径。
+# WebUI 作为独立入口运行时,需要让项目根目录优先于第三方依赖,
+# 避免依赖中的同名 app 包遮蔽 MoneyPrinterTurbo 自己的 app 包。
root_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-if root_dir not in sys.path:
- sys.path.append(root_dir)
+if root_dir in sys.path:
+ sys.path.remove(root_dir)
+sys.path.insert(0, root_dir)
from app.config import config
from app.models import const