Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2026-10-04 19:29:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

添加uv支持 (#2119)

Browse Source 
* 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>
This commit is contained in:
Copaan
2026-04-18 23:42:10 +08:00
committed by GitHub
co-authored by pre-commit-ci[bot] ManyManyTomato AkashiCoin
parent 74bf912d04
commit 8b16126e40
83 changed files with 15394 additions and 7062 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhenxun/utils/manager/priority_manager.py
+29 -8
View File
@@ -1,3 +1,4 @@
import asyncio
from collections.abc import Callable
from typing import ClassVar
@@ -39,6 +40,14 @@ class PriorityLifecycle:
return wrapper
async def _run_hook(func: Callable, priority: int, hook_type: str = "startup") -> None:
logger.debug(f"执行优先级 [{priority}] on_{hook_type} 方法: {func.__module__}")
if is_coroutine_callable(func):
await func()
else:
func()
@driver.on_startup
async def _():
priority_data = PriorityLifecycle._data.get(PriorityLifecycleType.STARTUP)
@@ -48,13 +57,25 @@ async def _():
priority = 0
try:
for priority in priority_list:
for func in priority_data[priority]:
logger.debug(
f"执行优先级 [{priority}] on_startup 方法: {func.__module__}"
)
if is_coroutine_callable(func):
await func()
else:
func()
funcs = priority_data[priority]
if len(funcs) == 1:
await _run_hook(funcs[0], priority)
else:
await asyncio.gather(*[_run_hook(f, priority) for f in funcs])
except HookPriorityException as e:
logger.error(f"打断优先级 [{priority}] on_startup 方法. {type(e)}: {e}")
@driver.on_shutdown
async def _():
priority_data = PriorityLifecycle._data.get(PriorityLifecycleType.SHUTDOWN)
if not priority_data:
return
priority_list = sorted(priority_data.keys())
for priority in priority_list:
funcs = priority_data[priority]
for func in funcs:
try:
await _run_hook(func, priority, "shutdown")
except Exception as e:
logger.error(f"执行优先级 [{priority}] on_shutdown 方法出错: {e}")
zhenxun/utils/manager/virtual_env_package_manager.py
+25 -31
View File
@@ -7,34 +7,24 @@ from typing import ClassVar
from zhenxun.configs.config import Config
from zhenxun.services.log import logger
BAT_FILE = Path() / "win启动.bat"
LOG_COMMAND = "VirtualEnvPackageManager"
Config.add_plugin_config(
"virtualenv",
"python_path",
None,
help="虚拟环境python路径，为空时使用系统环境的poetry",
help="虚拟环境python路径，为空时使用系统环境的uv",
)
class VirtualEnvPackageManager:
WIN_COMMAND: ClassVar[list[str]] = [
"./Python310/python.exe",
"-m",
"pip",
]
DEFAULT_COMMAND: ClassVar[list[str]] = ["poetry", "run", "pip"]
DEFAULT_COMMAND: ClassVar[list[str]] = ["uv", "pip"]
@classmethod
def __get_command(cls) -> list[str]:
if path := Config.get_config("virtualenv", "python_path"):
return [path, "-m", "pip"]
return (
cls.WIN_COMMAND.copy() if BAT_FILE.exists() else cls.DEFAULT_COMMAND.copy()
)
return cls.DEFAULT_COMMAND.copy()
@classmethod
async def install(cls, package: list[str] | str):
@@ -48,7 +38,7 @@ class VirtualEnvPackageManager:
try:
command = cls.__get_command()
command.append("install")
command.append(" ".join(package))
command.extend(package)
logger.info(f"执行虚拟环境安装包指令: {command}", LOG_COMMAND)
result = await asyncio.to_thread(
subprocess.run,
@@ -62,9 +52,10 @@ class VirtualEnvPackageManager:
LOG_COMMAND,
)
return result.stdout
except CalledProcessError as e:
logger.error(f"安装虚拟环境包指令执行失败: {e.stderr}.", LOG_COMMAND)
return e.stderr
except (CalledProcessError, FileNotFoundError) as e:
stderr = e.stderr if isinstance(e, CalledProcessError) else str(e)
logger.error(f"安装虚拟环境包指令执行失败: {stderr}.", LOG_COMMAND)
return stderr
@classmethod
async def uninstall(cls, package: list[str] | str):
@@ -78,8 +69,7 @@ class VirtualEnvPackageManager:
try:
command = cls.__get_command()
command.append("uninstall")
command.append("-y")
command.append(" ".join(package))
command.extend(package)
logger.info(f"执行虚拟环境卸载包指令: {command}", LOG_COMMAND)
result = await asyncio.to_thread(
subprocess.run,
@@ -93,9 +83,10 @@ class VirtualEnvPackageManager:
LOG_COMMAND,
)
return result.stdout
except CalledProcessError as e:
logger.error(f"卸载虚拟环境包指令执行失败: {e.stderr}.", LOG_COMMAND)
return e.stderr
except (CalledProcessError, FileNotFoundError) as e:
stderr = e.stderr if isinstance(e, CalledProcessError) else str(e)
logger.error(f"卸载虚拟环境包指令执行失败: {stderr}.", LOG_COMMAND)
return stderr
@classmethod
async def update(cls, package: list[str] | str):
@@ -110,7 +101,7 @@ class VirtualEnvPackageManager:
command = cls.__get_command()
command.append("install")
command.append("--upgrade")
command.append(" ".join(package))
command.extend(package)
logger.info(f"执行虚拟环境更新包指令: {command}", LOG_COMMAND)
result = await asyncio.to_thread(
subprocess.run,
@@ -121,9 +112,10 @@ class VirtualEnvPackageManager:
)
logger.debug(f"更新虚拟环境包指令执行完成: {result.stdout}", LOG_COMMAND)
return result.stdout
except CalledProcessError as e:
logger.error(f"更新虚拟环境包指令执行失败: {e.stderr}.", LOG_COMMAND)
return e.stderr
except (CalledProcessError, FileNotFoundError) as e:
stderr = e.stderr if isinstance(e, CalledProcessError) else str(e)
logger.error(f"更新虚拟环境包指令执行失败: {stderr}.", LOG_COMMAND)
return stderr
@staticmethod
def _clean_requirements_file(file_path: Path) -> None:
@@ -191,12 +183,13 @@ class VirtualEnvPackageManager:
LOG_COMMAND,
)
return result.stdout
except CalledProcessError as e:
except (CalledProcessError, FileNotFoundError) as e:
stderr = e.stderr if isinstance(e, CalledProcessError) else str(e)
logger.error(
f"安装虚拟环境依赖文件指令执行失败: {e.stderr}.",
f"安装虚拟环境依赖文件指令执行失败: {stderr}.",
LOG_COMMAND,
)
return e.stderr
return stderr
@classmethod
async def list(cls) -> str:
@@ -217,6 +210,7 @@ class VirtualEnvPackageManager:
LOG_COMMAND,
)
return result.stdout
except CalledProcessError as e:
logger.error(f"列出虚拟环境包指令执行失败: {e.stderr}.", LOG_COMMAND)
except (CalledProcessError, FileNotFoundError) as e:
stderr = e.stderr if isinstance(e, CalledProcessError) else str(e)
logger.error(f"列出虚拟环境包指令执行失败: {stderr}.", LOG_COMMAND)
return ""
zhenxun/utils/manager/zhenxun_repo_manager.py
+35 -10
View File
@@ -58,7 +58,7 @@ class ZhenxunRepoConfig:
# 备份杂项
BACKUP_FILES: ClassVar[list[str]] = [
"pyproject.toml",
"poetry.lock",
"uv.lock",
"requirements.txt",
".env.dev",
".env.example",
@@ -89,7 +89,7 @@ class ZhenxunRepoConfig:
PYPROJECT_FILE_STRING = "pyproject.toml"
PYPROJECT_FILE = Path() / PYPROJECT_FILE_STRING
PYPROJECT_LOCK_FILE_STRING = "poetry.lock"
PYPROJECT_LOCK_FILE_STRING = "uv.lock"
PYPROJECT_LOCK_FILE = Path() / PYPROJECT_LOCK_FILE_STRING
@@ -363,13 +363,16 @@ class ZhenxunRepoManagerClass:
download_url = await GithubUtils.parse_github_url(
self.config.RESOURCE_GITHUB_URL
).get_archive_download_urls()
logger.debug("开始下载resources资源包...", LOG_COMMAND)
logger.info("开始下载资源压缩包...", LOG_COMMAND)
if await AsyncHttpx.download_file(
download_url, self.config.RESOURCE_ZIP_FILE, stream=True
download_url,
self.config.RESOURCE_ZIP_FILE,
stream=True,
show_progress=True,
):
logger.debug("下载resources资源文件压缩包成功!", LOG_COMMAND)
logger.info("下载资源压缩包成功!", LOG_COMMAND)
else:
raise ZhenxunUpdateException("下载resources资源包失败...")
raise ZhenxunUpdateException("下载资源压缩包失败...")
async def resources_unzip(self):
"""解压资源文件"""
@@ -428,13 +431,16 @@ class ZhenxunRepoManagerClass:
source: Literal["git", "ali"] = "ali",
branch: str = "main",
force: bool = False,
):
) -> RepoUpdateResult | None:
"""更新资源文件
参数:
source: 更新源，git 为 git 更新，ali 为阿里云更新
branch: 分支名称
force: 是否强制更新
返回:
RepoUpdateResult | None: git 更新时返回结果，zip 更新时返回 None
"""
critical_dir = self.config.RESOURCE_PATH / "themes" / "default"
if not critical_dir.exists() or not any(critical_dir.iterdir()):
@@ -445,11 +451,30 @@ class ZhenxunRepoManagerClass:
force = True
if await check_git():
await self.resources_git_update(source, branch, force)
logger.debug("使用git更新资源文件!", LOG_COMMAND)
result = await self.resources_git_update(source, branch, force)
if result.success:
logger.info("使用git更新资源文件完成!", LOG_COMMAND)
return result
else:
logger.warning(
f"使用git更新资源文件失败: {result.error_message}，"
"尝试回退到zip下载...",
LOG_COMMAND,
)
# git 失败时回退 zip，确保资源文件一定能获取到
try:
await self.resources_zip_update()
logger.info("回退zip下载资源文件完成!", LOG_COMMAND)
result.success = True
result.error_message = ""
return result
except Exception as e:
logger.error("回退zip下载资源文件也失败", LOG_COMMAND, e=e)
return result
else:
await self.resources_zip_update()
logger.debug("使用zip更新资源文件!", LOG_COMMAND)
logger.info("使用zip更新资源文件完成!", LOG_COMMAND)
return None
# ==================== Web UI 管理相关方法 ====================