🔖 1.7.2

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/Release.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: astral-sh/setup-uv@v4
+      - uses: astral-sh/setup-uv@v5
         name: Setup UV
         with:
           enable-cache: true

.github/workflows/Test.yml

@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup uv
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
           cache-suffix: ${{ env.PYTHON_VERSION }}_${{ env.OS }}

.github/workflows/TypeCheck.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: astral-sh/setup-uv@v4
+      - uses: astral-sh/setup-uv@v5
         name: Setup UV
         with:
           enable-cache: true

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ ci:
   autoupdate_commit_msg: ':arrow_up: auto update by pre-commit hooks'
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.1
+    rev: v0.11.0
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

nonebot_plugin_tetris_stats/db/__init__.py

@@ -11,7 +11,7 @@ from nonebot_plugin_orm import AsyncSession, get_session
 from nonebot_plugin_user import User
 from sqlalchemy import select
 
-from ..utils.typing import AllCommandType, BaseCommandType, GameType, TETRIOCommandType
+from ..utils.typedefs import AllCommandType, BaseCommandType, GameType, TETRIOCommandType
 from .models import Bind, TriggerHistoricalData
 
 UTC = timezone.utc

nonebot_plugin_tetris_stats/db/models.py

@@ -9,7 +9,7 @@ from sqlalchemy import JSON, DateTime, Dialect, String, TypeDecorator
 from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column
 from typing_extensions import override
 
-from ..utils.typing import AllCommandType, GameType
+from ..utils.typedefs import AllCommandType, GameType
 
 
 class PydanticType(TypeDecorator):

nonebot_plugin_tetris_stats/games/schemas.py

@@ -3,7 +3,7 @@ from typing import Generic, TypeVar
 
 from pydantic import BaseModel
 
-from ..utils.typing import GameType
+from ..utils.typedefs import GameType
 
 T = TypeVar('T', bound=GameType)
 

nonebot_plugin_tetris_stats/games/tetrio/api/models.py

@@ -7,7 +7,7 @@ from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column
 
 from ....db.models import PydanticType
 from .schemas.base import SuccessModel
-from .typing import Records, Summaries
+from .typedefs import Records, Summaries
 
 
 class TETRIOHistoricalData(MappedAsDataclass, Model):

nonebot_plugin_tetris_stats/games/tetrio/api/player.py

@@ -27,7 +27,7 @@ from .schemas.summaries.base import User as SummariesUser
 from .schemas.summaries.league import LeagueSuccessModel
 from .schemas.user import User
 from .schemas.user_info import UserInfo, UserInfoSuccess
-from .typing import Records, Summaries
+from .typedefs import Records, Summaries
 
 
 class RecordModeType(str, Enum):
@@ -46,7 +46,7 @@ class RecordKey(NamedTuple):
     record_type: RecordType
 
     def to_records(self) -> Records:
-        return cast(Records, f'{self.mode_type.value}_{self.record_type.value}')
+        return cast('Records', f'{self.mode_type.value}_{self.record_type.value}')
 
 
 class Player:
@@ -89,7 +89,7 @@ class Player:
 
     @property
     def _request_user_parameter(self) -> str:
-        return self.user_id or cast(str, self.user_name).lower()
+        return self.user_id or cast('str', self.user_name).lower()
 
     @property
     async def user(self) -> User:

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/base/__init__.py

@@ -3,7 +3,7 @@ from typing import Literal
 
 from pydantic import BaseModel, Field
 
-from ...typing import Prisecter
+from ...typedefs import Prisecter
 
 
 class AggregateStats(BaseModel):

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/leaderboards/__init__.py

@@ -3,7 +3,7 @@ from typing import Any
 from nonebot.compat import PYDANTIC_V2
 from pydantic import BaseModel, Field
 
-from ...typing import Prisecter
+from ...typedefs import Prisecter
 
 
 class Parameter(BaseModel):

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/leaderboards/by.py

@@ -3,11 +3,11 @@ from typing import Literal
 
 from pydantic import BaseModel, Field
 
-from ...typing import Rank, ValidRank
+from ...typedefs import Rank, ValidRank
 from ..base import ArCounts, FailedModel, P, SuccessModel
 
 
-class League(BaseModel):
+class BaseLeague(BaseModel):
     gamesplayed: int
     gameswon: int
     tr: float
@@ -16,13 +16,22 @@ class League(BaseModel):
     bestrank: ValidRank
     glicko: float
     rd: float
-    apm: float
-    pps: float
-    vs: float
     decaying: bool
 
 
-class Entry(BaseModel):
+class InvalidLeague(BaseLeague):
+    pps: float | None
+    apm: None
+    vs: None
+
+
+class League(BaseLeague):
+    pps: float
+    apm: float
+    vs: float
+
+
+class BaseEntry(BaseModel):
     id: str = Field(..., alias='_id')
     username: str
     role: Literal['anon', 'user', 'bot', 'halfmod', 'mod', 'admin', 'sysop']
@@ -30,7 +39,6 @@ class Entry(BaseModel):
     xp: float
     country: str | None = None
     supporter: bool | None = None
-    league: League
     gamesplayed: int
     gameswon: int
     gametime: float
@@ -39,8 +47,16 @@ class Entry(BaseModel):
     p: P
 
 
+class InvalidEntry(BaseEntry):
+    league: InvalidLeague
+
+
+class Entry(BaseEntry):
+    league: League
+
+
 class Data(BaseModel):
-    entries: list[Entry]
+    entries: list[Entry | InvalidEntry]
 
 
 class BySuccessModel(SuccessModel):

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/summaries/league.py

@@ -3,7 +3,7 @@ from typing import Literal
 from nonebot.compat import PYDANTIC_V2
 from pydantic import BaseModel, Field
 
-from ...typing import Rank, S1Rank, S1ValidRank
+from ...typedefs import Rank, S1Rank, S1ValidRank
 from ..base import SuccessModel
 
 if PYDANTIC_V2:

nonebot_plugin_tetris_stats/games/tetrio/config.py

@@ -11,7 +11,7 @@ from ...db import trigger
 from . import alc, command
 from .constant import GAME_TYPE
 from .models import TETRIOUserConfig
-from .typing import Template
+from .typedefs import Template
 
 command.add(
     Subcommand(

nonebot_plugin_tetris_stats/games/tetrio/constant.py

@@ -3,7 +3,7 @@ from typing import Literal
 
 from yarl import URL
 
-from .api.typing import ValidRank
+from .api.typedefs import ValidRank
 
 GAME_TYPE: Literal['IO'] = 'IO'
 

nonebot_plugin_tetris_stats/games/tetrio/list.py

@@ -14,6 +14,7 @@ from . import command
 from .api.leaderboards import by
 from .api.schemas.base import P
 from .api.schemas.leaderboards import Parameter
+from .api.schemas.leaderboards.by import Entry
 from .constant import GAME_TYPE
 
 command.add(
@@ -84,6 +85,7 @@ async def _(
                             join_at=None,
                         )
                         for i in league.data.entries
+                        if isinstance(i, Entry)
                     ],
                 ),
             )

nonebot_plugin_tetris_stats/games/tetrio/models.py

@@ -7,8 +7,8 @@ from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column, relationshi
 
 from ...db.models import PydanticType
 from .api.schemas.leaderboards.by import BySuccessModel, Entry
-from .api.typing import ValidRank
+from .api.typedefs import ValidRank
-from .typing import Template
+from .typedefs import Template
 
 
 class TETRIOUserConfig(MappedAsDataclass, Model):

nonebot_plugin_tetris_stats/games/tetrio/query/__init__.py

@@ -16,13 +16,13 @@ from sqlalchemy import select
 from ....db import query_bind_info, trigger
 from ....i18n import Lang
 from ....utils.exception import FallbackError
-from ....utils.typing import Me
+from ....utils.typedefs import Me
 from ... import add_block_handlers, alc
 from .. import command, get_player
 from ..api import Player
 from ..constant import GAME_TYPE
 from ..models import TETRIOUserConfig
-from ..typing import Template
+from ..typedefs import Template
 from .v1 import make_query_image_v1
 from .v2 import make_query_image_v2
 

nonebot_plugin_tetris_stats/games/tetrio/query/v2.py

@@ -43,9 +43,9 @@ async def make_query_image_v2(player: Player) -> bytes:
     play_time: str | None
     if (game_time := handling_special_value(user_info.data.gametime)) is not None:
         if game_time // 3600 > 0:
-            play_time = f'{game_time//3600:.0f}h {game_time % 3600 // 60:.0f}m {game_time % 60:.0f}s'
+            play_time = f'{game_time // 3600:.0f}h {game_time % 3600 // 60:.0f}m {game_time % 60:.0f}s'
         elif game_time // 60 > 0:
-            play_time = f'{game_time//60:.0f}m {game_time % 60:.0f}s'
+            play_time = f'{game_time // 60:.0f}m {game_time % 60:.0f}s'
         else:
             play_time = f'{game_time:.0f}s'
     else:

nonebot_plugin_tetris_stats/games/tetrio/rank/__init__.py

@@ -25,7 +25,7 @@ from ..models import TETRIOLeagueHistorical, TETRIOLeagueStats, TETRIOLeagueStat
 
 if TYPE_CHECKING:
     from ..api.schemas.leaderboards.by import BySuccessModel
-    from ..api.typing import Rank
+    from ..api.typedefs import Rank
 
 UTC = timezone.utc
 
@@ -95,7 +95,7 @@ async def get_tetra_league_data() -> None:
 
     players: list[Entry] = []
     for result in results:
-        players.extend(result.data.entries)
+        players.extend([i for i in result.data.entries if isinstance(i, Entry)])
     players.sort(key=lambda x: x.league.tr, reverse=True)
 
     rank_player_mapping: defaultdict[Rank, list[Entry]] = defaultdict(list)

nonebot_plugin_tetris_stats/games/tetrio/rank/all.py

@@ -21,7 +21,7 @@ from ....utils.screenshot import screenshot
 from .. import alc
 from ..constant import GAME_TYPE
 from ..models import TETRIOLeagueStats
-from ..typing import Template
+from ..typedefs import Template
 from . import command
 
 command.add(

nonebot_plugin_tetris_stats/games/tetrio/rank/detail.py

@@ -17,7 +17,7 @@ from ....utils.render import render
 from ....utils.render.schemas.tetrio.rank.detail import Data, SpecialData
 from ....utils.screenshot import screenshot
 from .. import alc
-from ..api.typing import ValidRank
+from ..api.typedefs import ValidRank
 from ..constant import GAME_TYPE
 from ..models import TETRIOLeagueStats
 from . import command

nonebot_plugin_tetris_stats/games/tetrio/record/__init__.py

@@ -1,7 +1,7 @@
 from arclet.alconna import Arg, ArgFlag
 from nonebot_plugin_alconna import Args, At, Subcommand
 
-from ....utils.typing import Me
+from ....utils.typedefs import Me
 from .. import command as base_command
 from .. import get_player
 

nonebot_plugin_tetris_stats/games/tetrio/record/blitz.py

@@ -22,7 +22,7 @@ from ....utils.render.schemas.base import Avatar
 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 ....utils.typedefs import Me
 from .. import alc
 from ..api.player import Player
 from ..constant import GAME_TYPE

nonebot_plugin_tetris_stats/games/tetrio/record/sprint.py

@@ -22,7 +22,7 @@ from ....utils.render.schemas.base import Avatar
 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 ....utils.typedefs import Me
 from .. import alc
 from ..api.player import Player
 from ..constant import GAME_TYPE

nonebot_plugin_tetris_stats/games/top/__init__.py

@@ -2,7 +2,7 @@ from arclet.alconna import Arg, ArgFlag
 from nonebot_plugin_alconna import Args, At, Subcommand
 
 from ...utils.exception import MessageFormatError
-from ...utils.typing import Me
+from ...utils.typedefs import Me
 from .. import add_block_handlers, alc, command
 from .api import Player
 from .constant import USER_NAME

nonebot_plugin_tetris_stats/games/top/query.py

@@ -18,7 +18,7 @@ from ...utils.render.schemas.base import People
 from ...utils.render.schemas.top_info import Data as InfoData
 from ...utils.render.schemas.top_info import Info
 from ...utils.screenshot import screenshot
-from ...utils.typing import Me
+from ...utils.typedefs import Me
 from . import alc
 from .api import Player
 from .api.schemas.user_profile import Data, UserProfile

nonebot_plugin_tetris_stats/games/tos/__init__.py

@@ -2,7 +2,7 @@ from arclet.alconna import Arg, ArgFlag
 from nonebot_plugin_alconna import Args, At, Subcommand
 
 from ...utils.exception import MessageFormatError
-from ...utils.typing import Me
+from ...utils.typedefs import Me
 from .. import add_block_handlers, alc, command
 from .api import Player
 from .constant import USER_NAME

nonebot_plugin_tetris_stats/games/tos/api/player.py

@@ -64,7 +64,7 @@ class Player:
                 query = {'teaId': self.teaid}
             else:
                 path = 'getUsernameInfo'
-                query = {'username': cast(str, self.user_name)}
+                query = {'username': cast('str', self.user_name)}
             raw_user_info = await request.failover_request(
                 [i / path % query for i in BASE_URL], failover_code=[502], failover_exc=(TimeoutException,)
             )
@@ -91,7 +91,7 @@ class Player:
         if self._user_profile.get(params) is None:
             raw_user_profile = await request.failover_request(
                 [
-                    i / 'getProfile' % {'id': self.teaid or cast(str, self.user_name), **other_parameter}
+                    i / 'getProfile' % {'id': self.teaid or cast('str', self.user_name), **other_parameter}
                     for i in BASE_URL
                 ],
                 failover_code=[502],

nonebot_plugin_tetris_stats/games/tos/query.py

@@ -24,7 +24,7 @@ from ...utils.render.avatar import get_avatar as get_random_avatar
 from ...utils.render.schemas.base import People, Ranking
 from ...utils.render.schemas.tos_info import Info, Multiplayer, Radar
 from ...utils.screenshot import screenshot
-from ...utils.typing import Me, Number
+from ...utils.typedefs import Me, Number
 from . import alc
 from .api import Player
 from .api.schemas.user_info import UserInfoSuccess
@@ -258,7 +258,7 @@ def make_query_text(user_info: UserInfoSuccess, game_data: GameData | None) -> U
     if user_data.ranked_games == '0':
         message += '暂无段位统计数据'
     else:
-        message += f', 段位分 {round(float(user_data.rating_now),2)}±{round(float(user_data.rd_now),2)} ({round(float(user_data.vol_now),2)}) '
+        message += f', 段位分 {round(float(user_data.rating_now), 2)}±{round(float(user_data.rd_now), 2)} ({round(float(user_data.vol_now), 2)}) '
     if game_data is None:
         message += ', 暂无游戏数据'
     else:
@@ -266,7 +266,7 @@ def make_query_text(user_info: UserInfoSuccess, game_data: GameData | None) -> U
         message += f"\nL'PM: {game_data.metrics.lpm} ( {game_data.metrics.pps} pps )"
         message += f'\nAPM: {game_data.metrics.apm} ( x{game_data.metrics.apl} )'
         message += f'\nADPM: {game_data.metrics.adpm} ( x{game_data.metrics.adpl} ) ( {game_data.metrics.vs}vs )'
-    message += f'\n40L: {float(user_data.pb_sprint)/1000:.2f}s' if user_data.pb_sprint != '2147483647' else ''
+    message += f'\n40L: {float(user_data.pb_sprint) / 1000:.2f}s' if user_data.pb_sprint != '2147483647' else ''
     message += f'\nMarathon: {user_data.pb_marathon}' if user_data.pb_marathon != '0' else ''
     message += f'\nChallenge: {user_data.pb_challenge}' if user_data.pb_challenge != '0' else ''
     return UniMessage(message)

nonebot_plugin_tetris_stats/utils/host.py

@@ -2,7 +2,7 @@ from functools import cache
 from hashlib import sha256
 from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path as FilePath
-from typing import TYPE_CHECKING, ClassVar, Literal
+from typing import TYPE_CHECKING, Annotated, ClassVar, Literal
 
 from aiofiles import open as aopen
 from fastapi import BackgroundTasks, FastAPI, Path, status
@@ -69,9 +69,9 @@ def _(page_hash: str) -> HTMLResponse:
 @app.get('/host/resource/tetrio/{resource_type}/{user_id}', status_code=status.HTTP_200_OK)
 async def _(
     resource_type: Literal['avatars', 'banners'],
+    user_id: Annotated[str, Path(regex=r'^[a-f0-9]{24}$')],
     revision: int,
     background_tasks: BackgroundTasks,
-    user_id: str = Path(regex=r'^[a-f0-9]{24}$'),
 ) -> Response:
     if not (path := CACHE_PATH / 'tetrio' / resource_type / f'{user_id}_{revision}.png').exists():
         image = img_to_png(

nonebot_plugin_tetris_stats/utils/limit.py

@@ -23,7 +23,9 @@ def limit(limit: timedelta) -> Callable[[Callable[P, Coroutine[Any, Any, T]]], C
             nonlocal last_call
             async with lock:
                 if (diff := (time() - last_call)) < limit_seconds:
-                    logger.debug(f'func: {func.__name__} trigger limit, wait {(limit_time:=limit_seconds-diff):.3f}s')
+                    logger.debug(
+                        f'func: {func.__name__} trigger limit, wait {(limit_time := limit_seconds - diff):.3f}s'
+                    )
                     await sleep(limit_time)
             last_call = time()
             return await func(*args, **kwargs)

nonebot_plugin_tetris_stats/utils/metrics.py

@@ -1,6 +1,6 @@
 from typing import overload
 
-from .typing import Number
+from .typedefs import Number
 
 
 class TetrisMetricsBaseWithPPS:

nonebot_plugin_tetris_stats/utils/render/avatar/draw/__init__.py

@@ -156,7 +156,7 @@ class SkinManager:
 
 
 class Skin(ABC):
-    def __new__(cls, *args: Any, **kwargs: Any) -> Self:  # noqa: ANN401, ARG003
+    def __new__(cls, *args: Any, **kwargs: Any) -> Self:  # noqa: ANN401, ARG004
         instance = super().__new__(cls)
         SkinManager.register(instance)
         return instance

nonebot_plugin_tetris_stats/utils/render/schemas/base.py

@@ -2,7 +2,7 @@ from typing import Literal
 
 from pydantic import BaseModel
 
-from ...typing import Number
+from ...typedefs import Number
 
 
 class Avatar(BaseModel):

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.typedefs 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.typedefs 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.typedefs import ValidRank
 
 
 class AverageData(BaseModel):

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 .....typedefs import Number
 
 
 class TetraLeagueHistoryData(BaseModel):

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/info_v1.py

@@ -1,7 +1,7 @@
 from pydantic import BaseModel
 
-from ......games.tetrio.api.typing import Rank
+from ......games.tetrio.api.typedefs import Rank
-from .....typing import Number
+from .....typedefs import Number
 from ...base import People, Ranking
 from .base import TetraLeagueHistoryData
 

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/info_v2.py

@@ -3,8 +3,8 @@ from typing import Literal
 
 from pydantic import BaseModel
 
-from ......games.tetrio.api.typing import Rank
+from ......games.tetrio.api.typedefs import Rank
-from .....typing import Number
+from .....typedefs import Number
 from ...base import Avatar
 from .base import TetraLeagueHistoryData
 

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio/user/list_v2.py

@@ -2,8 +2,8 @@ from datetime import datetime
 
 from pydantic import BaseModel
 
-from ......games.tetrio.api.typing import Rank
+from ......games.tetrio.api.typedefs import Rank
-from .....typing import Number
+from .....typedefs import Number
 from ...base import Avatar
 
 

nonebot_plugin_tetris_stats/utils/render/schemas/top_info.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel
 
-from ...typing import Number
+from ...typedefs import Number
 from .base import People
 
 

nonebot_plugin_tetris_stats/utils/render/schemas/tos_info.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel, Field
 
-from ...typing import Number
+from ...typedefs import Number
 from .base import People, Ranking
 
 

pnpm-lock.yaml

@@ -10,15 +10,15 @@ importers:
     devDependencies:
       prettier:
         specifier: ^3.3.3
-        version: 3.4.2
+        version: 3.5.3
 
 packages:
 
-  prettier@3.4.2:
+  prettier@3.5.3:
-    resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==}
+    resolution: {integrity: sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==}
     engines: {node: '>=14'}
     hasBin: true
 
 snapshots:
 
-  prettier@3.4.2: {}
+  prettier@3.5.3: {}

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-tetris-stats"
-version = "1.7.0"
+version = "1.7.2"
 description = "一款基于 NoneBot2 的用于查询 Tetris 相关游戏数据的插件"
 readme = "README.md"
 authors = [{ name = "shoucandanghehe", email = "wallfjjd@gmail.com" }]
@@ -158,7 +158,7 @@ defineConstant = { PYDANTIC_V2 = true }
 typeCheckingMode = "standard"
 
 [tool.bumpversion]
-current_version = "1.7.0"
+current_version = "1.7.2"
 tag = true
 sign_tags = true
 tag_name = "{new_version}"