添加uv支持 (#2119)

* bugfix:修复内存泄露和信号量饥饿问题 * 修复图片渲染按高度截断问题 * 优化图片渲染速度 * 权限检查去掉无效引用代码 * 添加uv支持 * 🚨 auto fix by pre-commit hooks * bugfix:修改gitignore换行 * bugfix:修复测试没有新生成uv.lock * 修复导入错误 * bugfix:移除重复调用 * 🚨 auto fix by pre-commit hooks * 清理残余poetry引用 * 更新uv安装方式 * 修复阿里云获取问题 * 增加资源下载提示 * 🚨 auto fix by pre-commit hooks * 修改资源下载为流式 * 🚨 auto fix by pre-commit hooks * 提高启动速度 * 移除bot.py支持 * 🚨 auto fix by pre-commit hooks * 优化win脚本逻辑 * 🚨 auto fix by pre-commit hooks * 清理残余无效逻辑 * 代码改进 * 🚨 auto fix by pre-commit hooks * 增加数据库迁移存在性检查 * 🚨 auto fix by pre-commit hooks * chore(test): 添加pytest超时控制和优雅关闭机制 - 在GitHub Actions工作流中添加作业级和步骤级超时限制，防止测试无限期挂起 - 添加pytest-timeout依赖并配置全局超时为120秒 - 在send_queue服务添加关闭钩子，确保worker任务正确取消 - 在priority_manager添加on_shutdown钩子，支持优先级生命周期的关闭阶段 * chore(lint): 禁用超长行的lint警告 * Modify restart logic for Windows platform * 🚨 auto fix by pre-commit hooks * bugfix:修复sys导入问题 * 清理无效结构 * bugfix:修复路径问题 * bugfix:修复shell语法传递给git导致资源获取失败问题 * 优化关闭显示 * bugfix:修复路径问题 * bugfix:增加路径安全 * bugfix:修复orm绕过问题 * 放宽numpy版本限制 * 修改重启方案 * bugfix:修复循环导入 * 优化逻辑 * Enhance disconnect function with error handling Added error handling for disconnect function and imported ConfigurationError. * Implement emergency restart mechanism Added emergency restart mechanism using atexit to ensure process restart even on severe exceptions during shutdown. * 🚨 auto fix by pre-commit hooks * 重启行为归一化 * 修复测试检测问题 * bugfix:修复测试侧类型报错问题 * 引入launcher机制 * 移除重启测试 * 收紧缓存调用路径 * 类型注解收敛 * 优化浏览器回收行为 * 优化浏览器渲染 * bugfix:解决重复关闭浏览器问题 --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: ManyManyTomato <93612024+ATTomatoo@users.noreply.github.com> Co-authored-by: AkashiCoin <l1040186796@gmail.com>
2026-10-03 02:30:01 +08:00 · 2026-04-18 23:42:10 +08:00
parent 74bf912d04
commit 8b16126e40
83 changed files with 15394 additions and 7062 deletions
@@ -0,0 +1,166 @@
+"""zx CLI — 绪山真寻 Bot 命令行工具
+
+用法:
+    zx run          启动 launcher
+    zx run-worker   启动 worker（由 launcher 调用）
+    zx version      显示版本信息
+"""
+
+from __future__ import annotations
+
+import importlib.metadata
+from pathlib import Path
+import subprocess
+import sys
+import time
+
+
+def _print_version() -> None:
+    try:
+        ver = importlib.metadata.version("zhenxun-bot")
+    except importlib.metadata.PackageNotFoundError:
+        ver = "unknown"
+    sys.stdout.write(f"zhenxun-bot {ver}\n")
+
+
+def _ensure_project_root() -> Path:
+    cwd = Path.cwd()
+    if not (cwd / "zhenxun").is_dir():
+        sys.stderr.write("错误: 当前目录不是 zhenxun_bot 项目目录。\n")
+        sys.stderr.write("请在项目根目录（包含 zhenxun/ 目录的位置）执行 zx run。\n")
+        sys.exit(1)
+
+    cwd_str = str(cwd)
+    if cwd_str not in sys.path:
+        sys.path.insert(0, cwd_str)
+    return cwd
+
+
+def _run_worker() -> None:
+    """启动 Bot worker（必须在项目目录下执行）"""
+    _ensure_project_root()
+
+    import contextlib
+    import platform
+
+    import nonebot
+
+    htmlrender_browser_channel = None
+    system = platform.system()
+
+    if system == "Windows":
+        import winreg
+
+        paths = {
+            "chrome": r"SOFTWARE\Clients\StartMenuInternet\Google Chrome\DefaultIcon",
+            "msedge": r"SOFTWARE\Clients\StartMenuInternet\Microsoft Edge\DefaultIcon",
+        }
+        for name, path in paths.items():
+            with contextlib.suppress(FileNotFoundError):
+                winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, path)
+                htmlrender_browser_channel = name
+                break
+
+    elif system == "Darwin":
+        mac_paths = {
+            "chrome": "/Applications/Google Chrome.app",
+            "msedge": "/Applications/Microsoft Edge.app",
+        }
+        for name, path in mac_paths.items():
+            if Path(path).exists():
+                htmlrender_browser_channel = name
+                break
+
+    if htmlrender_browser_channel:
+        nonebot.logger.info(
+            f"使用 {htmlrender_browser_channel} 作为 htmlrender 驱动启动..."
+        )
+
+    from nonebot.adapters.onebot.v11 import Adapter as OneBotV11Adapter
+
+    nonebot.init(htmlrender_browser_channel=htmlrender_browser_channel)
+
+    driver = nonebot.get_driver()
+    driver.register_adapter(OneBotV11Adapter)
+
+    nonebot.load_plugins("zhenxun/builtin_plugins")
+    nonebot.load_plugins("zhenxun/plugins")
+
+    from zhenxun.configs.config import BotConfig
+
+    for ext in BotConfig.ext_path:
+        ext = ext.strip()
+        if ext:
+            nonebot.logger.info(f"加载第三方插件目录: {ext}")
+            nonebot.load_plugins(ext)
+
+    nonebot.run()
+
+
+def _build_worker_command() -> list[str]:
+    return [sys.executable, "-m", "zhenxun.cli", "run-worker"]
+
+
+def _wait_worker_exit(proc: subprocess.Popen, timeout_seconds: float) -> bool:
+    deadline = time.monotonic() + timeout_seconds
+    while time.monotonic() < deadline:
+        if proc.poll() is not None:
+            return True
+        time.sleep(0.1)
+    return proc.poll() is not None
+
+
+def _terminate_worker(proc: subprocess.Popen) -> None:
+    if proc.poll() is not None:
+        return
+    if _wait_worker_exit(proc, 8.0):
+        return
+    proc.terminate()
+    if _wait_worker_exit(proc, 5.0):
+        return
+    proc.kill()
+    proc.wait(timeout=5)
+
+
+def _run_launcher() -> None:
+    cwd = _ensure_project_root()
+    from zhenxun.utils.restart_state import (
+        clear_launcher_restart_signal,
+        consume_launcher_restart_signal,
+    )
+
+    clear_launcher_restart_signal()
+    while True:
+        worker = subprocess.Popen(_build_worker_command(), cwd=str(cwd))
+        try:
+            return_code = worker.wait()
+        except KeyboardInterrupt:
+            clear_launcher_restart_signal()
+            _terminate_worker(worker)
+            return
+
+        should_restart = consume_launcher_restart_signal()
+        if should_restart:
+            continue
+        raise SystemExit(return_code)
+
+
+def main() -> None:
+    args = sys.argv[1:]
+
+    if not args or args[0] == "run":
+        _run_launcher()
+    elif args[0] == "run-worker":
+        _run_worker()
+    elif args[0] == "version":
+        _print_version()
+    elif args[0] in ("-h", "--help", "help"):
+        sys.stdout.write((__doc__ or "") + "\n")
+    else:
+        sys.stderr.write(f"未知命令: {args[0]}\n")
+        sys.stderr.write((__doc__ or "") + "\n")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()