🐛 version 0.60.3

fix rule's depend inject

Author: RF-Tar-Railt

src/nonebot_plugin_alconna/__init__.py

@@ -141,7 +141,7 @@
 from .uniseg import patch_matcher_send as patch_matcher_send
 from .uniseg import patch_saa as patch_saa
 
-__version__ = "0.60.2"
+__version__ = "0.60.3"
 __supported_adapters__ = set(m.value for m in SupportAdapterModule.__members__.values())  # noqa: C401
 __plugin_meta__ = PluginMetadata(
     name="Alconna 插件",

src/nonebot_plugin_alconna/params.py

@@ -1,6 +1,7 @@
+from contextlib import AsyncExitStack
 import inspect
 from typing import Annotated, Any, ClassVar, Literal, Optional, TypeVar, Union, overload
-from typing_extensions import get_args
+from typing_extensions import Self, get_args, override
 
 from arclet.alconna import Alconna, Arparma, Duplication, Empty
 from arclet.alconna.builtin import generate_duplication
@@ -10,7 +11,8 @@
 from nonebot.internal.adapter import Bot, Event
 from nonebot.internal.matcher import Matcher
 from nonebot.internal.params import Depends
-from nonebot.typing import T_State
+from nonebot.typing import T_DependencyCache, T_State
+from nonebot.utils import generic_check_issubclass
 from tarina import run_always_await
 from tarina.generic import get_origin
 
@@ -349,3 +351,47 @@ async def __call__(self, _state: T_State, event: Event, bot: Bot) -> bool:
             self.result = None
             return True
         return False
+
+
+class StackParam(Param):
+    """上下文栈注入参数。
+
+    本注入解析 AsyncExitStack 实例，用于在依赖注入中管理异步上下文。
+    """
+
+    def __repr__(self) -> str:
+        return "_StackParam()"
+
+    @classmethod
+    @override
+    def _check_param(cls, param: inspect.Parameter, allow_types: tuple[type[Param], ...]) -> Optional[Self]:
+        if param.annotation == AsyncExitStack:
+            return cls(..., type=AsyncExitStack)
+        if generic_check_issubclass(param.annotation, AsyncExitStack):
+            return cls(..., type=AsyncExitStack, default=None)
+
+    @override
+    async def _solve(self, stack: Optional[AsyncExitStack] = None, **kwargs: Any) -> Any:
+        return stack
+
+
+class DependencyCacheParam(Param):
+    """依赖缓存注入参数。
+
+    本注入解析 T_DependencyCache 实例，用于在依赖注入中管理依赖缓存。
+    """
+
+    def __repr__(self) -> str:
+        return "_DependencyCacheParam()"
+
+    @classmethod
+    @override
+    def _check_param(cls, param: inspect.Parameter, allow_types: tuple[type[Param], ...]) -> Optional[Self]:
+        if param.annotation == T_DependencyCache:
+            return cls(..., type=T_DependencyCache)
+        if generic_check_issubclass(param.annotation, T_DependencyCache):
+            return cls(..., type=T_DependencyCache, default=None)
+
+    @override
+    async def _solve(self, dependency_cache: Optional[T_DependencyCache] = None, **kwargs: Any) -> Any:
+        return dependency_cache

src/nonebot_plugin_alconna/rule.py

@@ -21,6 +21,7 @@
 from .extension import ExtensionExecutor, SelectedExtensions, _DependentExecutor
 from .i18n import Lang
 from .model import CommandResult, CompConfig
+from .params import DependencyCacheParam, StackParam
 from .uniseg import UniMessage, UniMsg
 from .uniseg.constraint import UNISEG_MESSAGE
 
@@ -292,8 +293,8 @@ async def __call__(
         bot: Bot,
         event: Event,
         state: T_State,
-        stack: Optional[AsyncExitStack] = None,
-        dependency_cache: Optional[dict[_DependentCallable[Any], DependencyCache]] = None,
+        stack: Optional[AsyncExitStack] = StackParam(),  # type: ignore
+        dependency_cache: Optional[dict[_DependentCallable[Any], DependencyCache]] = DependencyCacheParam(),  # type: ignore
     ) -> bool:
 
         if self.before_rules.checkers and not await self.before_rules(bot, event, state, stack, dependency_cache):

src/nonebot_plugin_alconna/uniseg/__init__.py

@@ -64,7 +64,7 @@
 from .tools import image_fetch as image_fetch
 from .tools import reply_fetch as reply_fetch
 
-__version__ = "0.60.2"
+__version__ = "0.60.3"
 
 __plugin_meta__ = PluginMetadata(
     name="Universal Segment 插件",