mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-09-28 16:20:56 +08:00
* 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>
88 lines
2.8 KiB
Python
88 lines
2.8 KiB
Python
import asyncio
|
|
from concurrent.futures import ThreadPoolExecutor
|
|
import contextlib
|
|
import os
|
|
|
|
import anyio.to_thread
|
|
from nonebot.drivers import Driver
|
|
|
|
from zhenxun.utils.manager.priority_manager import PriorityLifecycle
|
|
|
|
DEFAULT_EXECUTOR_MIN_WORKERS = 16
|
|
DEFAULT_EXECUTOR_MAX_WORKERS = 64
|
|
DEFAULT_ANYIO_MIN_TOKENS = 32
|
|
DEFAULT_ANYIO_MAX_TOKENS = 128
|
|
|
|
_thread_executor: ThreadPoolExecutor | None = None
|
|
_runtime_hooks_registered = False
|
|
_alconna_patch_applied = False
|
|
|
|
|
|
def _clamp(value: int, minimum: int, maximum: int) -> int:
|
|
return max(minimum, min(value, maximum))
|
|
|
|
|
|
def _get_executor_workers() -> int:
|
|
cpu = os.cpu_count() or 4
|
|
return _clamp(cpu * 4, DEFAULT_EXECUTOR_MIN_WORKERS, DEFAULT_EXECUTOR_MAX_WORKERS)
|
|
|
|
|
|
def _get_anyio_tokens(executor_workers: int) -> int:
|
|
return _clamp(
|
|
executor_workers * 2, DEFAULT_ANYIO_MIN_TOKENS, DEFAULT_ANYIO_MAX_TOKENS
|
|
)
|
|
|
|
|
|
def _apply_alconna_conflict_patch() -> None:
|
|
global _alconna_patch_applied
|
|
if _alconna_patch_applied:
|
|
return
|
|
with contextlib.suppress(Exception):
|
|
from arclet.alconna import formatter as alconna_formatter
|
|
|
|
text_formatter = getattr(alconna_formatter, "TextFormatter", None)
|
|
if text_formatter is None:
|
|
return
|
|
original_remove = getattr(text_formatter, "remove", None)
|
|
if getattr(original_remove, "__zhenxun_safe_remove__", False):
|
|
_alconna_patch_applied = True
|
|
return
|
|
|
|
def _safe_remove(self, base):
|
|
# Tolerate duplicate command cleanup when formatter hash is absent.
|
|
self.data.pop(base._hash, None)
|
|
|
|
setattr(_safe_remove, "__zhenxun_safe_remove__", True)
|
|
setattr(text_formatter, "remove", _safe_remove)
|
|
_alconna_patch_applied = True
|
|
|
|
|
|
def register_runtime_bootstrap(driver: Driver) -> None:
|
|
_apply_alconna_conflict_patch()
|
|
global _runtime_hooks_registered
|
|
if _runtime_hooks_registered:
|
|
return
|
|
_runtime_hooks_registered = True
|
|
|
|
@driver.on_startup
|
|
async def _setup_runtime_concurrency() -> None:
|
|
global _thread_executor
|
|
workers = _get_executor_workers()
|
|
loop = asyncio.get_running_loop()
|
|
if _thread_executor is None:
|
|
_thread_executor = ThreadPoolExecutor(
|
|
max_workers=workers, thread_name_prefix="zhenxun-worker"
|
|
)
|
|
loop.set_default_executor(_thread_executor)
|
|
with contextlib.suppress(Exception):
|
|
limiter = anyio.to_thread.current_default_thread_limiter()
|
|
limiter.total_tokens = _get_anyio_tokens(workers)
|
|
|
|
@PriorityLifecycle.on_shutdown(priority=50)
|
|
async def _shutdown_runtime_concurrency() -> None:
|
|
global _thread_executor
|
|
executor = _thread_executor
|
|
_thread_executor = None
|
|
if executor is not None:
|
|
executor.shutdown(wait=False, cancel_futures=True)
|