mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-04 11:20:01 +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:
Copaan
co-authored by
pre-commit-ci[bot]
ManyManyTomato
AkashiCoin
pre-commit-ci[bot]
ManyManyTomato
AkashiCoin
parent
74bf912d04
commit
8b16126e40
@@ -2,6 +2,7 @@ from pathlib import Path
|
||||
|
||||
import nonebot
|
||||
from nonebot.adapters import Bot
|
||||
from nonebot.adapters.onebot.v11.exception import NetworkError
|
||||
from nonebot_plugin_apscheduler import scheduler
|
||||
|
||||
from zhenxun.configs.config import Config
|
||||
@@ -47,17 +48,21 @@ async def _(bot: Bot):
|
||||
|
||||
logger.debug(f"更新Bot: {bot.self_id} 的群认证...", "群认证同步")
|
||||
|
||||
# 实际在用的群列表（当前 bot 连接可见的群）
|
||||
current_group_list, _ = await PlatformUtils.get_group_list(bot)
|
||||
try:
|
||||
current_group_list, _ = await PlatformUtils.get_group_list(bot)
|
||||
except NetworkError as e:
|
||||
logger.debug(
|
||||
f"Bot: {bot.self_id} 群认证同步被连接关闭打断，跳过本次同步: {e}",
|
||||
"群认证同步",
|
||||
)
|
||||
return
|
||||
current_group_ids = {g.group_id for g in current_group_list}
|
||||
|
||||
# 数据库中已有的群记录
|
||||
db_group_list: list[str] = await GroupConsole.all().values_list(
|
||||
"group_id", flat=True
|
||||
) # pyright: ignore[reportAssignmentType]
|
||||
db_group_ids = set(db_group_list)
|
||||
|
||||
# 需要创建的群（当前存在，但数据库中没有）
|
||||
create_list = []
|
||||
for group in current_group_list:
|
||||
if group.group_id not in db_group_ids:
|
||||
@@ -66,8 +71,44 @@ async def _(bot: Bot):
|
||||
|
||||
if create_list:
|
||||
await GroupConsole.bulk_create(create_list, 10)
|
||||
task_modules = await GroupConsole._get_task_modules(default_status=False)
|
||||
plugin_modules = await GroupConsole._get_plugin_modules(default_status=False)
|
||||
new_ids = [g.group_id for g in create_list]
|
||||
fresh = await GroupConsole.filter(group_id__in=new_ids).all()
|
||||
if task_modules or plugin_modules:
|
||||
for group in fresh:
|
||||
await GroupConsole._update_modules(group, task_modules, plugin_modules)
|
||||
from zhenxun.services.cache.runtime_cache import GroupMemoryCache
|
||||
|
||||
if delete_ids := list(db_group_ids - current_group_ids):
|
||||
for group in fresh:
|
||||
await GroupMemoryCache.upsert_from_model(group)
|
||||
|
||||
all_bots = nonebot.get_bots()
|
||||
all_visible: set[str] = set(current_group_ids)
|
||||
for other_bot in all_bots.values():
|
||||
if other_bot is bot:
|
||||
continue
|
||||
if PlatformUtils.get_platform(other_bot) != "qq":
|
||||
continue
|
||||
try:
|
||||
other_groups, _ = await PlatformUtils.get_group_list(other_bot)
|
||||
all_visible.update(g.group_id for g in other_groups)
|
||||
except NetworkError as e:
|
||||
reason = (
|
||||
f"Bot: {other_bot.self_id} 群列表同步被连接关闭打断，"
|
||||
f"回退到数据库集合: {e}"
|
||||
)
|
||||
logger.debug(
|
||||
reason,
|
||||
"群认证同步",
|
||||
)
|
||||
all_visible.update(db_group_ids)
|
||||
break
|
||||
except Exception:
|
||||
all_visible.update(db_group_ids)
|
||||
break
|
||||
|
||||
if delete_ids := list(db_group_ids - all_visible):
|
||||
deleted_count = await GroupConsole.filter(group_id__in=delete_ids).delete()
|
||||
else:
|
||||
deleted_count = 0
|
||||
@@ -78,7 +119,6 @@ async def _(bot: Bot):
|
||||
)
|
||||
|
||||
if Config.get_config("auto_clean", "CLEAN_CHAT_HISTORY"):
|
||||
# 清理已退出群组的聊天记录
|
||||
scheduler.add_job(
|
||||
clean_chat_history,
|
||||
"cron",
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import hashlib
|
||||
import json
|
||||
from pathlib import Path
|
||||
|
||||
import nonebot
|
||||
@@ -20,6 +22,7 @@ _yaml.indent = 2
|
||||
driver: Driver = nonebot.get_driver()
|
||||
|
||||
SIMPLE_CONFIG_FILE = DATA_PATH / "config.yaml"
|
||||
_CONFIG_HASH_FILE = DATA_PATH / "configs" / ".config_hash"
|
||||
|
||||
old_config_file = Path() / "zhenxun" / "configs" / "config.yaml"
|
||||
if old_config_file.exists():
|
||||
@@ -115,17 +118,37 @@ def _():
|
||||
for plugin in get_loaded_plugins():
|
||||
if plugin.metadata:
|
||||
_handle_config(plugin, exists_module)
|
||||
if not Config.is_empty():
|
||||
Config.save()
|
||||
_data: CommentedMap = _yaml.load(plugins2config_file.open(encoding="utf8"))
|
||||
for module in _data.keys():
|
||||
plugin_name = Config.get(module).name
|
||||
_data.yaml_set_comment_before_after_key(
|
||||
after=f"{plugin_name}",
|
||||
key=module,
|
||||
)
|
||||
# 存完插件基本设置
|
||||
with plugins2config_file.open("w", encoding="utf8") as wf:
|
||||
_yaml.dump(_data, wf)
|
||||
if Config.is_empty():
|
||||
_generate_simple_config(exists_module)
|
||||
Config.reload()
|
||||
return
|
||||
# 计算当前插件配置指纹，未变化则跳过重写
|
||||
fingerprint = hashlib.md5(
|
||||
json.dumps(sorted(exists_module), ensure_ascii=False).encode()
|
||||
).hexdigest()
|
||||
if (
|
||||
_CONFIG_HASH_FILE.exists()
|
||||
and _CONFIG_HASH_FILE.read_text(encoding="utf-8").strip() == fingerprint
|
||||
and plugins2config_file.exists()
|
||||
and SIMPLE_CONFIG_FILE.exists()
|
||||
):
|
||||
logger.debug("插件配置无变化，跳过配置文件重写", "初始化配置")
|
||||
_generate_simple_config(exists_module)
|
||||
Config.reload()
|
||||
return
|
||||
Config.save()
|
||||
_data: CommentedMap = _yaml.load(plugins2config_file.open(encoding="utf8"))
|
||||
for module in _data.keys():
|
||||
plugin_name = Config.get(module).name
|
||||
_data.yaml_set_comment_before_after_key(
|
||||
after=f"{plugin_name}",
|
||||
key=module,
|
||||
)
|
||||
# 存完插件基本设置
|
||||
with plugins2config_file.open("w", encoding="utf8") as wf:
|
||||
_yaml.dump(_data, wf)
|
||||
_generate_simple_config(exists_module)
|
||||
Config.reload()
|
||||
# 保存指纹
|
||||
_CONFIG_HASH_FILE.parent.mkdir(parents=True, exist_ok=True)
|
||||
_CONFIG_HASH_FILE.write_text(fingerprint, encoding="utf-8")
|
||||
|
||||
@@ -159,6 +159,9 @@ async def _():
|
||||
# await PluginLimit.bulk_create(limit_create, 10)
|
||||
await PluginInfo.filter(module_path__in=load_plugin).update(load_status=True)
|
||||
await PluginInfo.filter(module_path__not_in=load_plugin).delete()
|
||||
from zhenxun.services.cache.runtime_cache import PluginInfoMemoryCache
|
||||
|
||||
await PluginInfoMemoryCache.refresh()
|
||||
manager.init()
|
||||
if limit_list:
|
||||
for limit in limit_list:
|
||||
|
||||
@@ -431,6 +431,9 @@ class Manager:
|
||||
# )
|
||||
if delete_list:
|
||||
await PluginLimit.filter(id__in=delete_list).delete()
|
||||
from zhenxun.services.cache.runtime_cache import PluginLimitMemoryCache
|
||||
|
||||
await PluginLimitMemoryCache.refresh()
|
||||
cnt = await PluginLimit.filter(status=True).count()
|
||||
logger.info(f"已经加载 {cnt} 个插件限制.")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user