mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-05 20:00:04 +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
@@ -1,5 +1,8 @@
|
||||
import asyncio
|
||||
import hashlib
|
||||
import json
|
||||
from pathlib import Path
|
||||
import re
|
||||
from urllib.parse import urlparse
|
||||
|
||||
import aiofiles
|
||||
@@ -7,7 +10,7 @@ import nonebot
|
||||
from nonebot.utils import is_coroutine_callable
|
||||
from tortoise import Tortoise
|
||||
from tortoise.connection import connections
|
||||
from tortoise.exceptions import OperationalError
|
||||
from tortoise.exceptions import ConfigurationError, OperationalError
|
||||
|
||||
from zhenxun.configs.config import BotConfig
|
||||
from zhenxun.services.log import logger
|
||||
@@ -44,6 +47,8 @@ __all__ = [
|
||||
|
||||
driver = nonebot.get_driver()
|
||||
|
||||
_SCRIPT_HASH_FILE = Path() / "data" / ".db_script_hash"
|
||||
|
||||
|
||||
def get_config() -> dict:
|
||||
"""获取数据库配置"""
|
||||
@@ -121,7 +126,6 @@ async def init():
|
||||
config=get_config(),
|
||||
)
|
||||
if db_model.script_method:
|
||||
db = Tortoise.get_connection("default")
|
||||
logger.debug(
|
||||
"即将运行SCRIPT_METHOD方法, 合计 "
|
||||
f"<u><y>{len(db_model.script_method)}</y></u> 个..."
|
||||
@@ -134,34 +138,108 @@ async def init():
|
||||
sql_list += sql
|
||||
except Exception as e:
|
||||
logger.debug(f"{module} 执行SCRIPT_METHOD方法出错...", e=e)
|
||||
for sql in sql_list:
|
||||
logger.debug(f"执行SQL: {sql}")
|
||||
try:
|
||||
await asyncio.wait_for(
|
||||
db.execute_query_dict(sql), timeout=DB_TIMEOUT_SECONDS
|
||||
)
|
||||
except OperationalError as e:
|
||||
err_str = str(e).lower()
|
||||
if any(
|
||||
x in err_str
|
||||
for x in [
|
||||
"already exists",
|
||||
"duplicate column",
|
||||
"已经存在",
|
||||
"已存在",
|
||||
]
|
||||
):
|
||||
pass
|
||||
elif any(
|
||||
x in err_str for x in ["does not exist", "check that", "不存在"]
|
||||
) and ("drop" in sql.lower() or "rename" in sql.lower()):
|
||||
pass
|
||||
else:
|
||||
logger.warning(f"执行SQL警告: {sql} || {e}")
|
||||
except Exception as e:
|
||||
logger.debug(f"执行SQL: {sql} 错误...", e=e)
|
||||
if sql_list:
|
||||
logger.debug("SCRIPT_METHOD方法执行完毕!")
|
||||
fingerprint = hashlib.md5(
|
||||
json.dumps(sorted(sql_list), ensure_ascii=False).encode()
|
||||
).hexdigest()
|
||||
need_run = not (
|
||||
_SCRIPT_HASH_FILE.exists()
|
||||
and _SCRIPT_HASH_FILE.read_text(encoding="utf-8").strip()
|
||||
== fingerprint
|
||||
)
|
||||
if need_run:
|
||||
db = Tortoise.get_connection("default")
|
||||
|
||||
async def table_exists(table_name: str) -> bool:
|
||||
"""检查表是否存在"""
|
||||
try:
|
||||
# PostgreSQL
|
||||
result = await db.execute_query_dict(
|
||||
"SELECT to_regclass($1) IS NOT NULL as exists",
|
||||
[table_name],
|
||||
)
|
||||
if result:
|
||||
return result[0]["exists"]
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
# MySQL
|
||||
result = await db.execute_query_dict(
|
||||
"SELECT COUNT(*) as count FROM information_schema.tables " # noqa: E501
|
||||
"WHERE table_name = %s",
|
||||
[table_name],
|
||||
)
|
||||
if result:
|
||||
return result[0]["count"] > 0
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
# SQLite
|
||||
result = await db.execute_query_dict(
|
||||
"SELECT name FROM sqlite_master WHERE type='table' AND name=?", # noqa: E501
|
||||
[table_name],
|
||||
)
|
||||
return len(result) > 0
|
||||
except Exception:
|
||||
pass
|
||||
return True # 如果检查失败，假设表存在，让SQL自己报错
|
||||
|
||||
for sql in sql_list:
|
||||
# 对于 ALTER TABLE 操作，先检查表是否存在
|
||||
if sql.strip().upper().startswith("ALTER TABLE"):
|
||||
match = re.match(
|
||||
r"ALTER\s+TABLE\s+(\w+)", sql, re.IGNORECASE
|
||||
)
|
||||
if match:
|
||||
table_name = match.group(1)
|
||||
if not await table_exists(table_name):
|
||||
logger.debug(f"跳过SQL（表不存在）: {sql}")
|
||||
continue
|
||||
|
||||
logger.debug(f"执行SQL: {sql}")
|
||||
try:
|
||||
await asyncio.wait_for(
|
||||
db.execute_query_dict(sql),
|
||||
timeout=DB_TIMEOUT_SECONDS,
|
||||
)
|
||||
except OperationalError as e:
|
||||
err_str = str(e).lower()
|
||||
sql_lower = sql.lower()
|
||||
if any(
|
||||
x in err_str
|
||||
for x in [
|
||||
"already exists",
|
||||
"duplicate column",
|
||||
"已经存在",
|
||||
"已存在",
|
||||
]
|
||||
):
|
||||
pass
|
||||
elif any(
|
||||
x in err_str
|
||||
for x in [
|
||||
"does not exist",
|
||||
"check that",
|
||||
"不存在",
|
||||
"no such column",
|
||||
]
|
||||
) and ("drop" in sql_lower or "rename" in sql_lower):
|
||||
pass
|
||||
elif "syntax error" in err_str and (
|
||||
"alter column" in sql_lower
|
||||
or "drop not null" in sql_lower
|
||||
):
|
||||
# SQLite 不支持 PostgreSQL 的 ALTER COLUMN 语法
|
||||
pass
|
||||
else:
|
||||
logger.warning(f"执行SQL警告: {sql} || {e}")
|
||||
except Exception as e:
|
||||
logger.debug(f"执行SQL: {sql} 错误...", e=e)
|
||||
logger.debug("SCRIPT_METHOD方法执行完毕!")
|
||||
_SCRIPT_HASH_FILE.parent.mkdir(parents=True, exist_ok=True)
|
||||
_SCRIPT_HASH_FILE.write_text(fingerprint, encoding="utf-8")
|
||||
else:
|
||||
logger.debug("迁移脚本无变化，跳过执行")
|
||||
logger.debug("开始生成数据库表结构...")
|
||||
await Tortoise.generate_schemas()
|
||||
logger.debug("数据库表结构生成完毕!")
|
||||
@@ -170,5 +248,11 @@ async def init():
|
||||
raise DbConnectError(f"数据库连接错误... e:{e}") from e
|
||||
|
||||
|
||||
@PriorityLifecycle.on_shutdown(priority=100)
|
||||
async def disconnect():
|
||||
await connections.close_all()
|
||||
try:
|
||||
await connections.close_all()
|
||||
except ConfigurationError:
|
||||
logger.debug("数据库连接未初始化，跳过关闭")
|
||||
except Exception as e:
|
||||
logger.error(f"关闭数据库连接时发生意外错误: {e}")
|
||||
|
||||
Reference in New Issue
Block a user