From 4000389a6025f538585568cba8ce10f31e052ddf Mon Sep 17 00:00:00 2001 From: Copaan <98086483+Copaan@users.noreply.github.com> Date: Sun, 19 Apr 2026 00:53:39 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BE=9D=E8=B5=96=E4=B8=BA=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E5=AE=89=E8=A3=85=E9=97=AE=E9=A2=98=20(#2122)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 6 ++---- uv.lock | 15 ++++----------- zhenxun/services/__init__.py | 9 +++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index bc92e7f5..52d154c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,6 +33,8 @@ dependencies = [ "python-jose[cryptography]>=3.3.0,<4.0.0", "python-multipart>=0.0.9,<0.1.0", "aiocache[redis]>=0.12.3", + "asyncpg>=0.20.0", + "redis>=5", "py-cpuinfo>=9.0.0,<10.0.0", "nonebot-plugin-alconna>=0.56.0", "tenacity>=9.0.0,<10.0.0", @@ -45,10 +47,6 @@ dependencies = [ "pytest-timeout>=2.4.0", ] -[project.optional-dependencies] -redis = ["redis>=5"] -postgresql = ["asyncpg>=0.20.0"] - [project.scripts] zx = "zhenxun.cli:main" diff --git a/uv.lock b/uv.lock index e1e72c08..6fa05389 100644 --- a/uv.lock +++ b/uv.lock @@ -4158,6 +4158,7 @@ dependencies = [ { name = "aiocache", extra = ["redis"] }, { name = "aiofiles" }, { name = "alibabacloud-devops20210625" }, + { name = "asyncpg" }, { name = "beautifulsoup4" }, { name = "cattrs" }, { name = "cn2an" }, @@ -4185,6 +4186,7 @@ dependencies = [ { name = "pytest-timeout" }, { name = "python-jose", extra = ["cryptography"] }, { name = "python-multipart" }, + { name = "redis" }, { name = "retrying" }, { name = "ruamel-yaml" }, { name = "strenum" }, @@ -4194,14 +4196,6 @@ dependencies = [ { name = "uvloop", marker = "sys_platform != 'win32'" }, ] -[package.optional-dependencies] -postgresql = [ - { name = "asyncpg" }, -] -redis = [ - { name = "redis" }, -] - [package.dev-dependencies] dev = [ { name = "nonebug" }, @@ -4219,7 +4213,7 @@ requires-dist = [ { name = "aiocache", extras = ["redis"], specifier = ">=0.12.3" }, { name = "aiofiles", specifier = ">=23.2.1" }, { name = "alibabacloud-devops20210625", specifier = ">=5.0.2,<6.0.0" }, - { name = "asyncpg", marker = "extra == 'postgresql'", specifier = ">=0.20.0" }, + { name = "asyncpg", specifier = ">=0.20.0" }, { name = "beautifulsoup4", specifier = ">=4.12.3,<5.0.0" }, { name = "cattrs", specifier = ">=23.2.3,<24.0.0" }, { name = "cn2an", specifier = ">=0.5.22,<0.6.0" }, @@ -4247,7 +4241,7 @@ requires-dist = [ { name = "pytest-timeout", specifier = ">=2.4.0" }, { name = "python-jose", extras = ["cryptography"], specifier = ">=3.3.0,<4.0.0" }, { name = "python-multipart", specifier = ">=0.0.9,<0.1.0" }, - { name = "redis", marker = "extra == 'redis'", specifier = ">=5" }, + { name = "redis", specifier = ">=5" }, { name = "retrying", specifier = ">=1.3.4,<2.0.0" }, { name = "ruamel-yaml", specifier = ">=0.18.5" }, { name = "strenum", specifier = ">=0.4.15,<0.5.0" }, @@ -4256,7 +4250,6 @@ requires-dist = [ { name = "ujson", specifier = ">=5.9.0" }, { name = "uvloop", marker = "sys_platform != 'win32'", specifier = ">=0.21.0" }, ] -provides-extras = ["redis", "postgresql"] [package.metadata.requires-dev] dev = [ diff --git a/zhenxun/services/__init__.py b/zhenxun/services/__init__.py index fc31680a..ec0ff65d 100644 --- a/zhenxun/services/__init__.py +++ b/zhenxun/services/__init__.py @@ -9,6 +9,15 @@ Zhenxun Bot - 核心服务模块 - 定时任务调度器 (scheduler): 提供持久化的、可管理的定时任务服务。 """ +from nonebot import require + +require("nonebot_plugin_apscheduler") +require("nonebot_plugin_alconna") +require("nonebot_plugin_session") +require("nonebot_plugin_htmlrender") +require("nonebot_plugin_uninfo") +require("nonebot_plugin_waiter") + from .avatar_service import avatar_service from .db_context import Model, disconnect, with_db_timeout from .group_settings_service import group_settings_service