mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-09-29 00:32:06 +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,4 +1,4 @@
|
||||
from typing_extensions import Self
|
||||
from typing import ClassVar
|
||||
|
||||
from tortoise import fields
|
||||
|
||||
@@ -63,6 +63,7 @@ class PluginInfo(Model):
|
||||
class Meta: # pyright: ignore [reportIncompatibleVariableOverride]
|
||||
table = "plugin_info"
|
||||
table_description = "插件基本信息"
|
||||
indexes: ClassVar = [("module",), ("module_path",)]
|
||||
|
||||
cache_type = CacheType.PLUGINS
|
||||
"""缓存类型"""
|
||||
@@ -91,10 +92,58 @@ class PluginInfo(Model):
|
||||
await super().delete(*args, **kwargs)
|
||||
await PluginInfoMemoryCache.remove(module, module_path)
|
||||
|
||||
@staticmethod
|
||||
def _supports_cached_filter(key: str) -> bool:
|
||||
if "__" not in key:
|
||||
return True
|
||||
return key.rsplit("__", 1)[1] in {"in", "not", "not_in"}
|
||||
|
||||
@staticmethod
|
||||
def _match_filter_value(current, operator: str, expected) -> bool:
|
||||
if operator == "in":
|
||||
return current in expected
|
||||
if operator == "not":
|
||||
return current != expected
|
||||
if operator == "not_in":
|
||||
return current not in expected
|
||||
return current == expected
|
||||
|
||||
@classmethod
|
||||
def _can_use_cached_filters(cls, filters: dict) -> bool:
|
||||
return all(cls._supports_cached_filter(key) for key in filters)
|
||||
|
||||
@classmethod
|
||||
async def _get_cached_plugins(cls) -> list["PluginInfo"]:
|
||||
plugins = await PluginInfoMemoryCache.get_all()
|
||||
return sorted(
|
||||
plugins.values(),
|
||||
key=lambda item: (int(getattr(item, "id", 0) or 0), item.module or ""),
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def _filter_cached_plugins(
|
||||
cls, plugins: list["PluginInfo"], filters: dict
|
||||
) -> list["PluginInfo"]:
|
||||
result: list["PluginInfo"] = []
|
||||
for plugin in plugins:
|
||||
matched = True
|
||||
for key, expected in filters.items():
|
||||
if "__" in key:
|
||||
field, operator = key.rsplit("__", 1)
|
||||
else:
|
||||
field, operator = key, ""
|
||||
current = getattr(plugin, field, None)
|
||||
if not cls._match_filter_value(current, operator, expected):
|
||||
matched = False
|
||||
break
|
||||
if matched:
|
||||
result.append(plugin)
|
||||
return result
|
||||
|
||||
@classmethod
|
||||
async def get_plugin(
|
||||
cls, load_status: bool = True, filter_parent: bool = True, **kwargs
|
||||
) -> Self | None:
|
||||
cls, load_status: bool | None = True, filter_parent: bool = True, **kwargs
|
||||
) -> "PluginInfo | None":
|
||||
"""获取插件列表
|
||||
|
||||
参数:
|
||||
@@ -104,16 +153,15 @@ class PluginInfo(Model):
|
||||
返回:
|
||||
Self | None: 插件
|
||||
"""
|
||||
if not kwargs.get("plugin_type") and filter_parent:
|
||||
return await cls.get_or_none(
|
||||
load_status=load_status, plugin_type__not=PluginType.PARENT, **kwargs
|
||||
)
|
||||
return await cls.get_or_none(load_status=load_status, **kwargs)
|
||||
plugins = await cls.get_plugins(
|
||||
load_status=load_status, filter_parent=filter_parent, **kwargs
|
||||
)
|
||||
return plugins[0] if plugins else None
|
||||
|
||||
@classmethod
|
||||
async def get_plugins(
|
||||
cls, load_status: bool = True, filter_parent: bool = True, **kwargs
|
||||
) -> list[Self]:
|
||||
cls, load_status: bool | None = True, filter_parent: bool = True, **kwargs
|
||||
) -> list["PluginInfo"]:
|
||||
"""获取插件列表
|
||||
|
||||
参数:
|
||||
@@ -123,11 +171,38 @@ class PluginInfo(Model):
|
||||
返回:
|
||||
list[Self]: 插件列表
|
||||
"""
|
||||
if not kwargs.get("plugin_type") and filter_parent:
|
||||
return await cls.filter(
|
||||
load_status=load_status, plugin_type__not=PluginType.PARENT, **kwargs
|
||||
).all()
|
||||
return await cls.filter(load_status=load_status, **kwargs).all()
|
||||
filters = dict(kwargs)
|
||||
if load_status is not None:
|
||||
filters.setdefault("load_status", load_status)
|
||||
if filter_parent and not any(key.startswith("plugin_type") for key in filters):
|
||||
filters["plugin_type__not"] = PluginType.PARENT
|
||||
|
||||
if cls._can_use_cached_filters(filters):
|
||||
plugins = await cls._get_cached_plugins()
|
||||
return cls._filter_cached_plugins(plugins, filters)
|
||||
|
||||
return await PluginInfo.filter(**filters).all()
|
||||
|
||||
@classmethod
|
||||
async def get_plugins_values_list(
|
||||
cls,
|
||||
*fields: str,
|
||||
load_status: bool | None = True,
|
||||
filter_parent: bool = True,
|
||||
**kwargs,
|
||||
) -> list:
|
||||
plugins = await cls.get_plugins(
|
||||
load_status=load_status,
|
||||
filter_parent=filter_parent,
|
||||
**kwargs,
|
||||
)
|
||||
if len(fields) == 1:
|
||||
field = fields[0]
|
||||
return [getattr(plugin, field, None) for plugin in plugins]
|
||||
return [
|
||||
tuple(getattr(plugin, field, None) for field in fields)
|
||||
for plugin in plugins
|
||||
]
|
||||
|
||||
@classmethod
|
||||
async def _run_script(cls):
|
||||
|
||||
Reference in New Issue
Block a user