🎨 impove typing

nonebot/adapters/__init__.py

@@ -15,10 +15,10 @@ from pydantic import BaseModel
 from nonebot.config import Config
 
 if TYPE_CHECKING:
-    from nonebot.drivers import BaseDriver as Driver, BaseWebSocket as WebSocket
+    from nonebot.drivers import Driver, WebSocket
 
 
-class BaseBot(abc.ABC):
+class Bot(abc.ABC):
     """
     Bot 基类。用于处理上报消息，并提供 API 调用接口。
     """
@@ -141,7 +141,7 @@ class BaseBot(abc.ABC):
 T = TypeVar("T", bound=BaseModel)
 
 
-class BaseEvent(abc.ABC, Generic[T]):
+class Event(abc.ABC, Generic[T]):
     """
     Event 基类。提供上报信息的关键信息，其余信息可从原始上报消息获取。
     """
@@ -304,7 +304,7 @@ class BaseEvent(abc.ABC, Generic[T]):
 
 
 @dataclass
-class BaseMessageSegment(abc.ABC):
+class MessageSegment(abc.ABC):
     """消息段基类"""
     type: str
     """
@@ -349,7 +349,7 @@ class BaseMessageSegment(abc.ABC):
         return cls("text", {"text": text})
 
 
-class BaseMessage(list, abc.ABC):
+class Message(list, abc.ABC):
     """消息数组"""
 
     def __init__(self,

nonebot/adapters/cqhttp/bot.py

@@ -10,8 +10,8 @@ import httpx
 from nonebot.log import logger
 from nonebot.config import Config
 from nonebot.typing import overrides
-from nonebot.adapters import BaseBot
 from nonebot.message import handle_event
+from nonebot.adapters import Bot as BaseBot
 from nonebot.exception import RequestDenied
 
 from .event import Event

nonebot/adapters/cqhttp/bot.pyi

@@ -2,7 +2,7 @@ import asyncio
 from typing import Any, Dict, List, Union, Optional
 
 from nonebot.config import Config
-from nonebot.adapters import BaseBot
+from nonebot.adapters import Bot as BaseBot
 from nonebot.drivers import BaseDriver as Driver, BaseWebSocket as WebSocket
 
 from .event import Event

nonebot/adapters/cqhttp/event.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from nonebot.typing import overrides
-from nonebot.adapters import BaseEvent
+from nonebot.adapters import Event as BaseEvent
 
 from .message import Message
 

nonebot/adapters/cqhttp/message.py

@@ -2,7 +2,7 @@ import re
 from typing import Any, Dict, Union, Tuple, Iterable, Optional
 
 from nonebot.typing import overrides
-from nonebot.adapters import BaseMessage, BaseMessageSegment
+from nonebot.adapters import Message as BaseMessage, MessageSegment as BaseMessageSegment
 
 from .utils import log, escape, unescape, _b2s
 

nonebot/adapters/ding/bot.py

@@ -6,8 +6,8 @@ from typing import Any, Union, Optional, TYPE_CHECKING
 import httpx
 from nonebot.log import logger
 from nonebot.config import Config
-from nonebot.adapters import BaseBot
 from nonebot.message import handle_event
+from nonebot.adapters import Bot as BaseBot
 from nonebot.exception import RequestDenied
 
 from .utils import log

nonebot/adapters/ding/event.py

@@ -1,6 +1,6 @@
 from typing import Union, Optional
 
-from nonebot.adapters import BaseEvent
+from nonebot.adapters import Event as BaseEvent
 
 from .message import Message
 from .model import MessageModel, ConversationType, TextMessage

nonebot/adapters/ding/message.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict, Union, Iterable
 
-from nonebot.adapters import BaseMessage, BaseMessageSegment
+from nonebot.adapters import Message as BaseMessage, MessageSegment as BaseMessageSegment
 
 from .utils import log
 from .model import TextMessage