🎨 优化模板模型路径

~~真的是优化吗~~

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.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.blitz import Record, Statistic
 from ....utils.screenshot import screenshot
 from ....utils.typing import Me
 from ...constant import CANT_VERIFY_MESSAGE

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.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.sprint import Record
 from ....utils.screenshot import screenshot
 from ....utils.typing import Me
 from ...constant import CANT_VERIFY_MESSAGE

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.rank.detail import Data as TETRIORankDetailData
-from .schemas.tetrio.tetrio_rank_detail import Data as TETRIORankDetailData
+from .schemas.tetrio.rank.v1 import Data as TETRIORankDataV1
-from .schemas.tetrio.tetrio_rank_v1 import Data as TETRIORankDataV1
+from .schemas.tetrio.rank.v2 import Data as TETRIORankDataV2
-from .schemas.tetrio.tetrio_rank_v2 import Data as TETRIORankDataV2
+from .schemas.tetrio.record.blitz import Record as TETRIORecordBlitz
-from .schemas.tetrio.tetrio_record_blitz import Record as TETRIORecordBlitz
+from .schemas.tetrio.record.sprint import Record as TETRIORecordSprint
-from .schemas.tetrio.tetrio_record_sprint import Record as TETRIORecordSprint
+from .schemas.tetrio.user.info_v1 import Info as TETRIOUserInfoV1
-from .schemas.tetrio.tetrio_user_info_v2 import Info as TETRIOUserInfoV2
+from .schemas.tetrio.user.info_v2 import Info as TETRIOUserInfoV2
-from .schemas.tetrio.tetrio_user_list_v2 import List as TETRIOUserListV2
+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

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):

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):

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):

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):

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/record/blitz.py

@@ -1,5 +1,5 @@
-from .tetrio_record_base import Record as BaseRecord
+from .base import Record as BaseRecord
-from .tetrio_record_base import Statistic as BaseStatistic
+from .base import Statistic as BaseStatistic
 
 
 class Statistic(BaseStatistic):

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

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/tetrio_record_sprint.py

@@ -1,5 +0,0 @@
-from .tetrio_record_base import Record as BaseRecord
-
-
-class Record(BaseRecord):
-    time: str

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):

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 ......games.tetrio.api.typing import Rank
-from ....typing import Number
+from .....typing import Number
-from ..base import People, Ranking
+from ...base import People, Ranking
 from .base import TetraLeagueHistoryData
 
 

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.schemas.user_records import Zen
-from .....games.tetrio.api.typing import Rank
+from ......games.tetrio.api.typing import Rank, ValidRank
-from ....typing import Number
+from .....typing import Number
-from ..base import Avatar
+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
+    glicko: Number | None
-    rd: Number
+    rd: Number | None
 
     global_rank: int | None
     country_rank: int | None
 
-    pps: Number
+    pps: Number | None
 
-    apm: Number
+    apm: Number | None
-    apl: Number
+    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

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 ......games.tetrio.api.typing import Rank
-from ....typing import Number
+from .....typing import Number
-from ..base import Avatar
+from ...base import Avatar
 
 
 class TetraLeague(BaseModel):