mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-19 03:00:09 +08:00
添加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>
This commit is contained in:
co-authored by
pre-commit-ci[bot]
ManyManyTomato
AkashiCoin
parent
74bf912d04
commit
8b16126e40
@@ -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 管理相关方法 ====================
|
||||
|
||||
|
||||
Reference in New Issue
Block a user