feat(bot): 为 TypeVar 增加默认值，使用 Plugin 不指定范型参数时将提供合理的默认值

AliceBotProject · Jan 22, 2025 · dddee54 · dddee54
1 parent f631728
commit dddee54
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/alicebot/adapter/__init__.py b/alicebot/adapter/__init__.py
@@ -12,11 +12,11 @@
     Callable,
     Generic,
     Optional,
-    TypeVar,
     Union,
     final,
     overload,
 )
+from typing_extensions import TypeVar
 
 import structlog
 
@@ -36,7 +36,7 @@
     __import__("pkg_resources").declare_namespace(__name__)
 
 
-_EventT = TypeVar("_EventT", bound="Event[Any]")
+_EventT = TypeVar("_EventT", bound="Event[Any]", default="Event[Any]")
 
 
 class Adapter(Generic[EventT, ConfigT], ABC):

diff --git a/alicebot/bot.py b/alicebot/bot.py
@@ -601,7 +601,7 @@ async def get(
         func: Optional[Callable[[EventT], Union[bool, Awaitable[bool]]]] = None,
         *,
         event_type: type[EventT],
-        adapter_type: Optional[type[AdapterT]] = None,
+        adapter_type: Optional[type[Adapter[Any, Any]]] = None,
         max_try_times: Optional[int] = None,
         timeout: Optional[Union[int, float]] = None,
     ) -> EventT: ...

diff --git a/alicebot/typing.py b/alicebot/typing.py
@@ -6,7 +6,8 @@
 # ruff: noqa: A005
 
 from collections.abc import Awaitable
-from typing import TYPE_CHECKING, Callable, Optional, TypeVar
+from typing import TYPE_CHECKING, Callable, Optional
+from typing_extensions import TypeVar
 
 from alicebot.message import BuildMessageType, MessageSegmentT, MessageT
 
@@ -33,11 +34,11 @@
     "StateT",
 ]
 
-StateT = TypeVar("StateT")
-EventT = TypeVar("EventT", bound="Event[Any]")
+EventT = TypeVar("EventT", bound="Event[Any]", default="Event[Any]")
+StateT = TypeVar("StateT", default=None)
+ConfigT = TypeVar("ConfigT", bound=Optional["ConfigModel"], default=None)
 PluginT = TypeVar("PluginT", bound="Plugin[Any, Any, Any]")
 AdapterT = TypeVar("AdapterT", bound="Adapter[Any, Any]")
-ConfigT = TypeVar("ConfigT", bound=Optional["ConfigModel"])
 
 BotHook = Callable[["Bot"], Awaitable[None]]
 AdapterHook = Callable[["Adapter[Any, Any]"], Awaitable[None]]

diff --git a/pyproject.toml b/pyproject.toml
@@ -23,7 +23,7 @@ dependencies = [
     "aiohttp>=3.8.0,<4.0.0",
     "structlog>=25.1.0,<26.0.0",
     "rich>=13.7.0,<14.0.0",
-    "typing-extensions>=4.5.0",
+    "typing-extensions>=4.12.0,<5.0.0",
     "anyio>=4.4.0,<5.0.0",
 ]