mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-09-29 00:32:06 +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>
155 lines
5.4 KiB
Python
155 lines
5.4 KiB
Python
import hashlib
|
|
import json
|
|
from pathlib import Path
|
|
|
|
import nonebot
|
|
from nonebot import get_loaded_plugins
|
|
from nonebot.drivers import Driver
|
|
from nonebot.plugin import Plugin
|
|
from ruamel.yaml import YAML
|
|
from ruamel.yaml.comments import CommentedMap
|
|
|
|
from zhenxun.configs.config import Config
|
|
from zhenxun.configs.path_config import DATA_PATH
|
|
from zhenxun.configs.utils import RegisterConfig
|
|
from zhenxun.services.log import logger
|
|
from zhenxun.utils.manager.priority_manager import PriorityLifecycle
|
|
|
|
_yaml = YAML(pure=True)
|
|
_yaml.allow_unicode = True
|
|
_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():
|
|
old_config_file.rename(SIMPLE_CONFIG_FILE)
|
|
|
|
|
|
def _handle_config(plugin: Plugin, exists_module: list[str]):
|
|
"""处理配置项
|
|
|
|
参数:
|
|
plugin: Plugin
|
|
"""
|
|
if plugin.metadata and plugin.metadata.extra:
|
|
extra = plugin.metadata.extra
|
|
if configs := extra.get("configs"):
|
|
for config in configs:
|
|
reg_config = RegisterConfig(**config)
|
|
module = reg_config.module or plugin.name
|
|
g_config = Config.get(module)
|
|
g_config.name = plugin.metadata.name
|
|
Config.add_plugin_config(
|
|
module,
|
|
reg_config.key,
|
|
reg_config.value,
|
|
help=reg_config.help,
|
|
default_value=reg_config.default_value,
|
|
type=reg_config.type, # type: ignore
|
|
arg_parser=reg_config.arg_parser,
|
|
_override=False,
|
|
)
|
|
exists_module.append(f"{module}:{reg_config.key}".lower())
|
|
|
|
|
|
def _generate_simple_config(exists_module: list[str]):
|
|
"""
|
|
生成简易配置
|
|
|
|
异常:
|
|
AttributeError: AttributeError
|
|
"""
|
|
# 读取用户配置
|
|
_data = {}
|
|
_tmp_data = {}
|
|
exists_module += Config.add_module
|
|
if SIMPLE_CONFIG_FILE.exists():
|
|
_data = _yaml.load(SIMPLE_CONFIG_FILE.open(encoding="utf8"))
|
|
# 将简易配置文件的数据填充到配置文件
|
|
for module in Config.keys():
|
|
_tmp_data[module] = {}
|
|
for k in Config[module].configs.keys():
|
|
try:
|
|
if _data.get(module) and k in _data[module].keys():
|
|
Config.set_config(module, k, _data[module][k])
|
|
if f"{module}:{k}".lower() in exists_module:
|
|
_tmp_data[module][k] = Config.get_config(
|
|
module, k, build_model=False
|
|
)
|
|
except AttributeError as e:
|
|
raise AttributeError(f"{e}\n可能为config.yaml配置文件填写不规范") from e
|
|
if not _tmp_data[module]:
|
|
_tmp_data.pop(module)
|
|
Config.save()
|
|
temp_file = DATA_PATH / "temp_config.yaml"
|
|
# 重新生成简易配置文件以挂载注释
|
|
try:
|
|
with open(temp_file, "w", encoding="utf8") as wf:
|
|
_yaml.dump(_tmp_data, wf)
|
|
with open(temp_file, encoding="utf8") as rf:
|
|
_data = _yaml.load(rf)
|
|
# 添加注释
|
|
for module in _data.keys():
|
|
help_text = ""
|
|
plugin_name = Config.get(module).name or module
|
|
help_text += plugin_name + "\n"
|
|
for k in _data[module].keys():
|
|
help_text += f"{k}: {Config[module].configs[k].help}" + "\n"
|
|
_data.yaml_set_comment_before_after_key(after=help_text[:-1], key=module)
|
|
with SIMPLE_CONFIG_FILE.open("w", encoding="utf8") as wf:
|
|
_yaml.dump(_data, wf)
|
|
except Exception as e:
|
|
logger.error("生成简易配置注释错误...", e=e)
|
|
if temp_file.exists():
|
|
temp_file.unlink()
|
|
|
|
|
|
@PriorityLifecycle.on_startup(priority=0)
|
|
def _():
|
|
"""
|
|
初始化插件数据配置
|
|
"""
|
|
plugins2config_file = DATA_PATH / "configs" / "plugins2config.yaml"
|
|
exists_module = []
|
|
for plugin in get_loaded_plugins():
|
|
if plugin.metadata:
|
|
_handle_config(plugin, exists_module)
|
|
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")
|