✨ 新增简化导入方式

YiriMiraiProject · Jun 21, 2024 · 6f2ab65 · 6f2ab65
1 parent 71790c6
commit 6f2ab65
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 2 deletions.
diff --git a/mirai_onebot/__init__.py b/mirai_onebot/__init__.py
@@ -1,3 +1,49 @@
+from .adapters import ReverseWebsocketAdapter
+from .api import (ApiProvider, BotSelf, BotStatus, DeleteMessageRequest,
+                  DeleteMessageRequestParams, DeleteMessageResponse,
+                  GetGroupInfoRequest, GetGroupInfoRequestParams,
+                  GetGroupInfoResponse, GetGroupInfoResponseData,
+                  GetGroupListRequest, GetGroupListRequestParams,
+                  GetGroupListResponse, GetGroupListResponseData,
+                  GetGroupMemberInfoRequest, GetGroupMemberInfoRequestParams,
+                  GetGroupMemberInfoResponse, GetGroupMemberInfoResponseData,
+                  GetGroupMemberListRequest, GetGroupMemberListRequestParams,
+                  GetGroupMemberListResponse, GetGroupMemberListResponseData,
+                  GetStatusRequest, GetStatusRequestParams, GetStatusResponse,
+                  GetStatusResponseData, SendMessageRequest,
+                  SendMessageRequestParams, SendMessageResponse,
+                  SendMessageResponseData)
 from .bot import Bot
+from .event import (SLUG_TO_EVENT, EventBus, MessageGroupEvent,
+                    MessagePrivateEvent, NoticeFriendDecreaseEvent,
+                    NoticeFriendIncreaseEvent, NoticeGroupMemberDecreaseEvent,
+                    NoticeGroupMemberIncreaseEvent, NoticePrivateMessageDelete)
+from .message import (Audio, File, Image, Location, Mention, MentionAll,
+                      MessageChain, Reply, Text, Video, Voice)
 
-__all__ = ["Bot"]
+__all__ = [
+    "Bot",
+    "ReverseWebsocketAdapter",
+    "Audio", "File", "Image", "Location", "Mention", "MentionAll", "MessageChain", "Reply", "Text", "Video", "Voice",
+
+    'ApiProvider',
+    "BotSelf",
+    "GetGroupInfoRequest", "GetGroupInfoResponse", "GetGroupInfoRequestParams", "GetGroupInfoResponseData",
+    "GetGroupListRequest", "GetGroupListResponse", "GetGroupListRequestParams", "GetGroupListResponseData",
+    "GetGroupMemberInfoRequest", "GetGroupMemberInfoResponse", "GetGroupMemberInfoRequestParams", "GetGroupMemberInfoResponseData",
+    "GetGroupMemberListRequest", "GetGroupMemberListResponse", "GetGroupMemberListRequestParams", "GetGroupMemberListResponseData",
+    'SendMessageRequest', 'SendMessageResponse', 'SendMessageRequestParams', 'SendMessageResponseData',
+    'DeleteMessageRequest', 'DeleteMessageResponse', 'DeleteMessageRequestParams',
+    'GetStatusRequest', 'GetStatusResponse', 'GetStatusRequestParams', 'GetStatusResponseData', 'BotStatus',
+
+    'EventBus',
+    'MessageGroupEvent',
+    'NoticeGroupMemberDecreaseEvent',
+    'NoticeGroupMemberIncreaseEvent',
+    'NoticeGroupMessageDeleteEvent',
+    'MessagePrivateEvent',
+    'NoticeFriendDecreaseEvent',
+    'NoticeFriendIncreaseEvent',
+    'SLUG_TO_EVENT',
+    'NoticePrivateMessageDelete'
+]
diff --git a/mirai_onebot/api/__init__.py b/mirai_onebot/api/__init__.py
@@ -1,5 +1,38 @@
 from mirai_onebot.api.api_provider import ApiProvider
 
+from .interfaces.base import BotSelf
+from .interfaces.group import (GetGroupInfoRequest, GetGroupInfoRequestParams,
+                               GetGroupInfoResponse, GetGroupInfoResponseData,
+                               GetGroupListRequest, GetGroupListRequestParams,
+                               GetGroupListResponse, GetGroupListResponseData,
+                               GetGroupMemberInfoRequest,
+                               GetGroupMemberInfoRequestParams,
+                               GetGroupMemberInfoResponse,
+                               GetGroupMemberInfoResponseData,
+                               GetGroupMemberListRequest,
+                               GetGroupMemberListRequestParams,
+                               GetGroupMemberListResponse,
+                               GetGroupMemberListResponseData)
+from .interfaces.message import (DeleteMessageRequest,
+                                 DeleteMessageRequestParams,
+                                 DeleteMessageResponse, SendMessageRequest,
+                                 SendMessageRequestParams, SendMessageResponse,
+                                 SendMessageResponseData)
+from .interfaces.meta import (BotStatus, GetStatusRequest,
+                              GetStatusRequestParams, GetStatusResponse,
+                              GetStatusResponseData)
+
 __all__ = [
-    'ApiProvider'
+    'ApiProvider',
+    "BotSelf",
+
+    "GetGroupInfoRequest", "GetGroupInfoResponse", "GetGroupInfoRequestParams", "GetGroupInfoResponseData",
+    "GetGroupListRequest", "GetGroupListResponse", "GetGroupListRequestParams", "GetGroupListResponseData",
+    "GetGroupMemberInfoRequest", "GetGroupMemberInfoResponse", "GetGroupMemberInfoRequestParams", "GetGroupMemberInfoResponseData",
+    "GetGroupMemberListRequest", "GetGroupMemberListResponse", "GetGroupMemberListRequestParams", "GetGroupMemberListResponseData",
+
+    'SendMessageRequest', 'SendMessageResponse', 'SendMessageRequestParams', 'SendMessageResponseData',
+    'DeleteMessageRequest', 'DeleteMessageResponse', 'DeleteMessageRequestParams',
+
+    'GetStatusRequest', 'GetStatusResponse', 'GetStatusRequestParams', 'GetStatusResponseData', 'BotStatus'
 ]
diff --git a/mirai_onebot/api/interfaces/group.py b/mirai_onebot/api/interfaces/group.py
@@ -3,8 +3,16 @@
 from mirai_onebot.api.interfaces.base import (Request, RequestParams, Response,
                                               ResponseData)
 
+__all__ = [
+    "GetGroupInfoRequest", "GetGroupInfoResponse", "GetGroupInfoRequestParams", "GetGroupInfoResponseData",
+    "GetGroupListRequest", "GetGroupListResponse", "GetGroupListRequestParams", "GetGroupListResponseData",
+    "GetGroupMemberInfoRequest", "GetGroupMemberInfoResponse", "GetGroupMemberInfoRequestParams", "GetGroupMemberInfoResponseData",
+    "GetGroupMemberListRequest", "GetGroupMemberListResponse", "GetGroupMemberListRequestParams", "GetGroupMemberListResponseData",
+]
 
 # ========= GetGroupInfo =========
+
+
 class GetGroupInfoRequestParams(RequestParams):
     group_id: str
 

diff --git a/mirai_onebot/api/interfaces/message.py b/mirai_onebot/api/interfaces/message.py
@@ -3,8 +3,13 @@
 from mirai_onebot.api.interfaces.base import (Request, RequestParams, Response,
                                               ResponseData)
 
+__all__ = [
+    'SendMessageRequest', 'SendMessageResponse', 'SendMessageRequestParams', 'SendMessageResponseData', 'DeleteMessageRequest', 'DeleteMessageResponse', 'DeleteMessageRequestParams'
+]
 
 # ========= SendMessage =========
+
+
 class SendMessageRequestParams(RequestParams):
     detail_type: Literal['private', 'group', 'channel']
     group_id: Optional[str] = None  # 用于群组消息

diff --git a/mirai_onebot/api/interfaces/meta.py b/mirai_onebot/api/interfaces/meta.py
@@ -5,8 +5,13 @@
 from mirai_onebot.api.interfaces.base import (BotSelf, Request, RequestParams,
                                               Response, ResponseData)
 
+__all__ = [
+    'GetStatusRequest', 'GetStatusResponse', 'GetStatusRequestParams', 'GetStatusResponseData', 'BotStatus'
+]
 
 # ========== GetStatus ==========
+
+
 class BotStatus(BaseModel):
     self: BotSelf
     online: bool