From 90ed950dbde80816cd9191d2dfe84de1816c877c Mon Sep 17 00:00:00 2001 From: WindowsSov8forUs Date: Thu, 16 May 2024 08:54:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B1=BB=E5=9E=8B=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E5=90=91=E4=B8=8B=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- tsugu_api/_bandoristation.py | 6 ++++-- tsugu_api/_tsugu.py | 18 +++++++++--------- tsugu_api/_typing.py | 13 +++++++------ tsugu_api_async/_bandoristation.py | 6 ++++-- tsugu_api_async/_tsugu.py | 18 +++++++++--------- tsugu_api_async/_typing.py | 13 +++++++------ 7 files changed, 41 insertions(+), 35 deletions(-) diff --git a/setup.py b/setup.py index dff3bae..a693e57 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name='tsugu-api-python', - version='1.1.4', + version='1.1.5', author='WindowsSov8', author_email='qwertyuiop2333@hotmail.com', description='Tsugu BanGDream Bot 的功能 API 统合包', diff --git a/tsugu_api/_bandoristation.py b/tsugu_api/_bandoristation.py index cf9eeea..64d46d4 100644 --- a/tsugu_api/_bandoristation.py +++ b/tsugu_api/_bandoristation.py @@ -1,3 +1,5 @@ +from typing import List + from tsugu_api import settings from tsugu_api._network import Api from tsugu_api._typing import _StationRoom @@ -34,11 +36,11 @@ def submit_room_number(number: int, user_id: str, raw_message: str, source: str, if response['status'] == 'failure': raise RoomSubmitFailure(response['response']) -def query_room_number() -> list[_StationRoom]: +def query_room_number() -> List[_StationRoom]: '''获取房间号 返回: - list[_StationRoom]: 房间信息列表 + List[_StationRoom]: 房间信息列表 ''' # 构建参数 diff --git a/tsugu_api/_tsugu.py b/tsugu_api/_tsugu.py index 134ddae..ccc3998 100644 --- a/tsugu_api/_tsugu.py +++ b/tsugu_api/_tsugu.py @@ -1,4 +1,4 @@ -from typing import Optional +from typing import List, Optional from tsugu_api import settings from tsugu_api._network import Api @@ -124,7 +124,7 @@ def lsycx(server: _Server, tier: int, event_id: Optional[int] = None) -> _Respon proxy=settings.backend_proxy ).post(data).json() -def room_list(room_list: list[_Room]) -> _Response: +def room_list(room_list: List[_Room]) -> _Response: '''绘制车牌绘图 参数: @@ -149,7 +149,7 @@ def room_list(room_list: list[_Room]) -> _Response: proxy=settings.backend_proxy ).post(data).json() -def search_card(default_servers: list[_Server], text: str) -> _Response: +def search_card(default_servers: List[_Server], text: str) -> _Response: '''查询卡片 参数: @@ -177,7 +177,7 @@ def search_card(default_servers: list[_Server], text: str) -> _Response: proxy=settings.backend_proxy ).post(data).json() -def search_character(default_servers: list[_Server], text: str) -> _Response: +def search_character(default_servers: List[_Server], text: str) -> _Response: '''查询角色 参数: @@ -204,7 +204,7 @@ def search_character(default_servers: list[_Server], text: str) -> _Response: proxy=settings.backend_proxy ).post(data).json() -def search_event(default_servers: list[_Server], text: str) -> _Response: +def search_event(default_servers: List[_Server], text: str) -> _Response: '''查询活动 参数: @@ -232,7 +232,7 @@ def search_event(default_servers: list[_Server], text: str) -> _Response: proxy=settings.backend_proxy ).post(data).json() -def search_gacha(default_servers: list[_Server], gacha_id: int) -> _Response: +def search_gacha(default_servers: List[_Server], gacha_id: int) -> _Response: '''查询卡池 参数: @@ -288,7 +288,7 @@ def search_player(player_id: int, server: _Server) -> _Response: proxy=settings.backend_proxy ).post(data).json() -def search_song(default_servers: list[_Server], text: str) -> _Response: +def search_song(default_servers: List[_Server], text: str) -> _Response: '''查询歌曲 参数: @@ -315,7 +315,7 @@ def search_song(default_servers: list[_Server], text: str) -> _Response: proxy=settings.backend_proxy ).post(data).json() -def song_chart(default_servers: list[_Server], song_id: int, difficulty_text: _DifficultyText) -> _Response: +def song_chart(default_servers: List[_Server], song_id: int, difficulty_text: _DifficultyText) -> _Response: '''查询歌曲谱面 参数: @@ -344,7 +344,7 @@ def song_chart(default_servers: list[_Server], song_id: int, difficulty_text: _D proxy=settings.backend_proxy ).post(data).json() -def song_meta(default_servers: list[_Server], server: _Server) -> _Response: +def song_meta(default_servers: List[_Server], server: _Server) -> _Response: '''查询歌曲分数表 参数: diff --git a/tsugu_api/_typing.py b/tsugu_api/_typing.py index 124ffca..bd59a0d 100644 --- a/tsugu_api/_typing.py +++ b/tsugu_api/_typing.py @@ -6,6 +6,7 @@ from typing import ( Any, + List, Union, Literal, TypeAlias, @@ -43,7 +44,7 @@ class _Data(TypedDict): type: Literal['string', 'base64'] string: str -_Response: TypeAlias = list[_Data] +_Response: TypeAlias = List[_Data] _DifficultyText: TypeAlias = Literal['easy', 'normal', 'hard', 'expert', 'special'] '''难度名''' @@ -74,7 +75,7 @@ class _Room(TypedDict): class _QueryResponse(TypedDict): '''`/station/queryAllRoom` 响应结果''' status: _Status - data: Union[str, list[_Room]] + data: Union[str, List[_Room]] class _TsuguUserServer(TypedDict): '''服务器数据''' @@ -87,9 +88,9 @@ class _TsuguUser(TypedDict): user_id: str platform: str server_mode: _ServerId - default_server: list[_ServerId] + default_server: List[_ServerId] car: bool - server_list: list[_TsuguUserServer] + server_list: List[_TsuguUserServer] class _GetUserDataResponse(TypedDict): '''`/user/getUserData` 响应结果''' @@ -101,9 +102,9 @@ class _Update(TypedDict): user_id: NotRequired[str] platform: NotRequired[str] server_mode: NotRequired[_ServerId] - default_server: NotRequired[list[_ServerId]] + default_server: NotRequired[List[_ServerId]] car: NotRequired[bool] - server_list: NotRequired[list[_TsuguUserServer]] + server_list: NotRequired[List[_TsuguUserServer]] class _ChangeUserDataResponse(TypedDict): '''`/user/changeUserData` 响应结果''' diff --git a/tsugu_api_async/_bandoristation.py b/tsugu_api_async/_bandoristation.py index d96ff5f..e71d28f 100644 --- a/tsugu_api_async/_bandoristation.py +++ b/tsugu_api_async/_bandoristation.py @@ -1,3 +1,5 @@ +from typing import List + from httpx import Response from tsugu_api_async import settings @@ -38,11 +40,11 @@ async def submit_room_number(number: int, user_id: str, raw_message: str, source if response['status'] == 'failure': raise RoomSubmitFailure(response['response']) -async def query_room_number() -> list[_StationRoom]: +async def query_room_number() -> List[_StationRoom]: '''获取房间号 返回: - list[_StationRoom]: 房间信息列表 + List[_StationRoom]: 房间信息列表 ''' # 构建参数 diff --git a/tsugu_api_async/_tsugu.py b/tsugu_api_async/_tsugu.py index 24ccbb4..8162640 100644 --- a/tsugu_api_async/_tsugu.py +++ b/tsugu_api_async/_tsugu.py @@ -1,4 +1,4 @@ -from typing import Optional +from typing import List, Optional from httpx import Response @@ -134,7 +134,7 @@ async def lsycx(server: _Server, tier: int, event_id: Optional[int] = None) -> _ if isinstance(response, Response): return response.json() return await response.json() -async def room_list(room_list: list[_Room]) -> _Response: +async def room_list(room_list: List[_Room]) -> _Response: '''绘制车牌绘图 参数: @@ -161,7 +161,7 @@ async def room_list(room_list: list[_Room]) -> _Response: if isinstance(response, Response): return response.json() return await response.json() -async def search_card(default_servers: list[_Server], text: str) -> _Response: +async def search_card(default_servers: List[_Server], text: str) -> _Response: '''查询卡片 参数: @@ -191,7 +191,7 @@ async def search_card(default_servers: list[_Server], text: str) -> _Response: if isinstance(response, Response): return response.json() return await response.json() -async def search_character(default_servers: list[_Server], text: str) -> _Response: +async def search_character(default_servers: List[_Server], text: str) -> _Response: '''查询角色 参数: @@ -220,7 +220,7 @@ async def search_character(default_servers: list[_Server], text: str) -> _Respon if isinstance(response, Response): return response.json() return await response.json() -async def search_event(default_servers: list[_Server], text: str) -> _Response: +async def search_event(default_servers: List[_Server], text: str) -> _Response: '''查询活动 参数: @@ -250,7 +250,7 @@ async def search_event(default_servers: list[_Server], text: str) -> _Response: if isinstance(response, Response): return response.json() return await response.json() -async def search_gacha(default_servers: list[_Server], gacha_id: int) -> _Response: +async def search_gacha(default_servers: List[_Server], gacha_id: int) -> _Response: '''查询卡池 参数: @@ -310,7 +310,7 @@ async def search_player(player_id: int, server: _Server) -> _Response: if isinstance(response, Response): return response.json() return await response.json() -async def search_song(default_servers: list[_Server], text: str) -> _Response: +async def search_song(default_servers: List[_Server], text: str) -> _Response: '''查询歌曲 参数: @@ -339,7 +339,7 @@ async def search_song(default_servers: list[_Server], text: str) -> _Response: if isinstance(response, Response): return response.json() return await response.json() -async def song_chart(default_servers: list[_Server], song_id: int, difficulty_text: _DifficultyText) -> _Response: +async def song_chart(default_servers: List[_Server], song_id: int, difficulty_text: _DifficultyText) -> _Response: '''查询歌曲谱面 参数: @@ -370,7 +370,7 @@ async def song_chart(default_servers: list[_Server], song_id: int, difficulty_te if isinstance(response, Response): return response.json() return await response.json() -async def song_meta(default_servers: list[_Server], server: _Server) -> _Response: +async def song_meta(default_servers: List[_Server], server: _Server) -> _Response: '''查询歌曲分数表 参数: diff --git a/tsugu_api_async/_typing.py b/tsugu_api_async/_typing.py index 75b6e62..857d063 100644 --- a/tsugu_api_async/_typing.py +++ b/tsugu_api_async/_typing.py @@ -6,6 +6,7 @@ from typing import ( Any, + List, Union, Literal, TypeAlias, @@ -48,7 +49,7 @@ class _Data(TypedDict): type: Literal['string', 'base64'] string: str -_Response: TypeAlias = list[_Data] +_Response: TypeAlias = List[_Data] _DifficultyText: TypeAlias = Literal['easy', 'normal', 'hard', 'expert', 'special'] '''难度名''' @@ -79,7 +80,7 @@ class _Room(TypedDict): class _QueryResponse(TypedDict): '''`/station/queryAllRoom` 响应结果''' status: _Status - data: Union[str, list[_Room]] + data: Union[str, List[_Room]] class _TsuguUserServer(TypedDict): '''服务器数据''' @@ -92,9 +93,9 @@ class _TsuguUser(TypedDict): user_id: str platform: str server_mode: _ServerId - default_server: list[_ServerId] + default_server: List[_ServerId] car: bool - server_list: list[_TsuguUserServer] + server_list: List[_TsuguUserServer] class _GetUserDataResponse(TypedDict): '''`/user/getUserData` 响应结果''' @@ -106,9 +107,9 @@ class _Update(TypedDict): user_id: NotRequired[str] platform: NotRequired[str] server_mode: NotRequired[_ServerId] - default_server: NotRequired[list[_ServerId]] + default_server: NotRequired[List[_ServerId]] car: NotRequired[bool] - server_list: NotRequired[list[_TsuguUserServer]] + server_list: NotRequired[List[_TsuguUserServer]] class _ChangeUserDataResponse(TypedDict): '''`/user/changeUserData` 响应结果'''