diff --git a/nonebot_plugin_tetris_stats/games/tetrio/record/blitz.py b/nonebot_plugin_tetris_stats/games/tetrio/record/blitz.py index 1ab56fb..04d036c 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/record/blitz.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/record/blitz.py @@ -18,8 +18,8 @@ from ....utils.host import HostPage, get_self_netloc from ....utils.metrics import get_metrics from ....utils.render import render from ....utils.render.schemas.base import Avatar -from ....utils.render.schemas.tetrio.tetrio_record_base import Finesse, Max, Mini, Tspins, User -from ....utils.render.schemas.tetrio.tetrio_record_blitz import Record, Statistic +from ....utils.render.schemas.tetrio.record.base import Finesse, Max, Mini, Tspins, User +from ....utils.render.schemas.tetrio.record.blitz import Record, Statistic from ....utils.screenshot import screenshot from ....utils.typing import Me from ...constant import CANT_VERIFY_MESSAGE diff --git a/nonebot_plugin_tetris_stats/games/tetrio/record/sprint.py b/nonebot_plugin_tetris_stats/games/tetrio/record/sprint.py index 5f316ba..3854054 100644 --- a/nonebot_plugin_tetris_stats/games/tetrio/record/sprint.py +++ b/nonebot_plugin_tetris_stats/games/tetrio/record/sprint.py @@ -18,8 +18,8 @@ from ....utils.host import HostPage, get_self_netloc from ....utils.metrics import get_metrics from ....utils.render import render from ....utils.render.schemas.base import Avatar -from ....utils.render.schemas.tetrio.tetrio_record_base import Finesse, Max, Mini, Statistic, Tspins, User -from ....utils.render.schemas.tetrio.tetrio_record_sprint import Record +from ....utils.render.schemas.tetrio.record.base import Finesse, Max, Mini, Statistic, Tspins, User +from ....utils.render.schemas.tetrio.record.sprint import Record from ....utils.screenshot import screenshot from ....utils.typing import Me from ...constant import CANT_VERIFY_MESSAGE diff --git a/nonebot_plugin_tetris_stats/utils/render/__init__.py b/nonebot_plugin_tetris_stats/utils/render/__init__.py index 81ba164..e1e79bb 100644 --- a/nonebot_plugin_tetris_stats/utils/render/__init__.py +++ b/nonebot_plugin_tetris_stats/utils/render/__init__.py @@ -5,14 +5,14 @@ from nonebot.compat import PYDANTIC_V2 from ..templates import TEMPLATES_DIR from .schemas.bind import Bind -from .schemas.tetrio.tetrio_info import Info as TETRIOInfo -from .schemas.tetrio.tetrio_rank_detail import Data as TETRIORankDetailData -from .schemas.tetrio.tetrio_rank_v1 import Data as TETRIORankDataV1 -from .schemas.tetrio.tetrio_rank_v2 import Data as TETRIORankDataV2 -from .schemas.tetrio.tetrio_record_blitz import Record as TETRIORecordBlitz -from .schemas.tetrio.tetrio_record_sprint import Record as TETRIORecordSprint -from .schemas.tetrio.tetrio_user_info_v2 import Info as TETRIOUserInfoV2 -from .schemas.tetrio.tetrio_user_list_v2 import List as TETRIOUserListV2 +from .schemas.tetrio.rank.detail import Data as TETRIORankDetailData +from .schemas.tetrio.rank.v1 import Data as TETRIORankDataV1 +from .schemas.tetrio.rank.v2 import Data as TETRIORankDataV2 +from .schemas.tetrio.record.blitz import Record as TETRIORecordBlitz +from .schemas.tetrio.record.sprint import Record as TETRIORecordSprint +from .schemas.tetrio.user.info_v1 import Info as TETRIOUserInfoV1 +from .schemas.tetrio.user.info_v2 import Info as TETRIOUserInfoV2 +from .schemas.tetrio.user.list_v2 import List as TETRIOUserListV2 from .schemas.top_info import Info as TOPInfo from .schemas.tos_info import Info as TOSInfo @@ -24,7 +24,7 @@ env = Environment( @overload async def render(render_type: Literal['v1/binding'], data: Bind) -> str: ... @overload -async def render(render_type: Literal['v1/tetrio/info'], data: TETRIOInfo) -> str: ... +async def render(render_type: Literal['v1/tetrio/info'], data: TETRIOUserInfoV1) -> str: ... @overload async def render(render_type: Literal['v1/tetrio/rank'], data: TETRIORankDataV1) -> str: ... @overload @@ -60,7 +60,7 @@ async def render( 'v2/tetrio/rank/detail', ], data: Bind - | TETRIOInfo + | TETRIOUserInfoV1 | TETRIORankDataV1 | TOPInfo | TOSInfo diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_rank_detail.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/detail.py similarity index 91% rename from nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_rank_detail.py rename to nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/detail.py index a208e52..0f7a2d5 100644 --- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_rank_detail.py +++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/detail.py @@ -2,7 +2,7 @@ from datetime import datetime from pydantic import BaseModel -from .....games.tetrio.api.typing import ValidRank +from ......games.tetrio.api.typing import ValidRank class SpecialData(BaseModel): diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_rank_v1.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/v1.py similarity index 82% rename from nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_rank_v1.py rename to nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/v1.py index 29ea837..25ab69d 100644 --- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_rank_v1.py +++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/v1.py @@ -2,7 +2,7 @@ from datetime import datetime from pydantic import BaseModel -from .....games.tetrio.api.typing import ValidRank +from ......games.tetrio.api.typing import ValidRank class ItemData(BaseModel): diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_rank_v2.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/v2.py similarity index 87% rename from nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_rank_v2.py rename to nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/v2.py index 0d6a4ae..df8c2ac 100644 --- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_rank_v2.py +++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/rank/v2.py @@ -2,7 +2,7 @@ from datetime import datetime from pydantic import BaseModel -from .....games.tetrio.api.typing import ValidRank +from ......games.tetrio.api.typing import ValidRank class AverageData(BaseModel): diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_record_base.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/base.py similarity index 97% rename from nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_record_base.py rename to nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/base.py index 7a5d6f8..76859e6 100644 --- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_record_base.py +++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/base.py @@ -3,7 +3,7 @@ from typing import Literal from pydantic import BaseModel -from ..base import People +from ...base import People class User(People): diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_record_blitz.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/blitz.py similarity index 51% rename from nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_record_blitz.py rename to nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/blitz.py index d95b86e..b3a2b87 100644 --- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_record_blitz.py +++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/blitz.py @@ -1,5 +1,5 @@ -from .tetrio_record_base import Record as BaseRecord -from .tetrio_record_base import Statistic as BaseStatistic +from .base import Record as BaseRecord +from .base import Statistic as BaseStatistic class Statistic(BaseStatistic): diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/sprint.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/sprint.py new file mode 100644 index 0000000..9928cd6 --- /dev/null +++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/sprint.py @@ -0,0 +1,5 @@ +from .base import Record as BaseRecord + + +class Record(BaseRecord): + time: str diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_record_sprint.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_record_sprint.py deleted file mode 100644 index 4f5a090..0000000 --- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_record_sprint.py +++ /dev/null @@ -1,5 +0,0 @@ -from .tetrio_record_base import Record as BaseRecord - - -class Record(BaseRecord): - time: str diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/base.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/base.py similarity index 82% rename from nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/base.py rename to nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/base.py index d55d928..8023374 100644 --- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/base.py +++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/base.py @@ -2,7 +2,7 @@ from datetime import datetime from pydantic import BaseModel -from ....typing import Number +from .....typing import Number class TetraLeagueHistoryData(BaseModel): diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_info.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/info_v1.py similarity index 87% rename from nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_info.py rename to nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/info_v1.py index 3e345d5..0b73e32 100644 --- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_info.py +++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/info_v1.py @@ -1,8 +1,8 @@ from pydantic import BaseModel -from .....games.tetrio.api.typing import Rank -from ....typing import Number -from ..base import People, Ranking +from ......games.tetrio.api.typing import Rank +from .....typing import Number +from ...base import People, Ranking from .base import TetraLeagueHistoryData diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_user_info_v2.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/info_v2.py similarity index 77% rename from nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_user_info_v2.py rename to nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/info_v2.py index 54193b8..95b282c 100644 --- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_user_info_v2.py +++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/info_v2.py @@ -3,10 +3,10 @@ from typing import Literal from pydantic import BaseModel -from .....games.tetrio.api.schemas.user_records import Zen -from .....games.tetrio.api.typing import Rank -from ....typing import Number -from ..base import Avatar +from ......games.tetrio.api.schemas.user_records import Zen +from ......games.tetrio.api.typing import Rank, ValidRank +from .....typing import Number +from ...base import Avatar from .base import TetraLeagueHistoryData @@ -54,20 +54,20 @@ class TetraLeagueStatistic(BaseModel): class TetraLeague(BaseModel): rank: Rank - highest_rank: Rank + highest_rank: ValidRank tr: Number - glicko: Number - rd: Number + glicko: Number | None + rd: Number | None global_rank: int | None country_rank: int | None - pps: Number + pps: Number | None - apm: Number - apl: Number + apm: Number | None + apl: Number | None vs: Number | None adpl: Number | None @@ -76,7 +76,7 @@ class TetraLeague(BaseModel): decaying: bool - history: list[TetraLeagueHistoryData] + history: list[TetraLeagueHistoryData] | None class Sprint(BaseModel): @@ -97,4 +97,4 @@ class Info(BaseModel): statistic: Statistic | None sprint: Sprint | None blitz: Blitz | None - zen: Zen + zen: Zen | None diff --git a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_user_list_v2.py b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/list_v2.py similarity index 83% rename from nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_user_list_v2.py rename to nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/list_v2.py index f575d6b..10d7c9e 100644 --- a/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_user_list_v2.py +++ b/nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/list_v2.py @@ -2,9 +2,9 @@ from datetime import datetime from pydantic import BaseModel -from .....games.tetrio.api.typing import Rank -from ....typing import Number -from ..base import Avatar +from ......games.tetrio.api.typing import Rank +from .....typing import Number +from ...base import Avatar class TetraLeague(BaseModel):