🔖 1.5.3

Bumps [pandas-stubs](https://github.com/pandas-dev/pandas-stubs) from 2.2.2.240909 to 2.2.3.241009.
- [Changelog](https://github.com/pandas-dev/pandas-stubs/blob/main/docs/release_procedure.md)
- [Commits](https://github.com/pandas-dev/pandas-stubs/compare/v2.2.2.240909...v2.2.3.241009)

---
updated-dependencies:
- dependency-name: pandas-stubs
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/TypeCheck.yml

@@ -26,7 +26,7 @@ jobs:
               run: |
                   poetry run mypy ./nonebot_plugin_tetris_stats
 
-            - name: Run Pyright
+            - name: Run BasedPyright
               shell: bash
               run: |
-                  poetry run pyright ./nonebot_plugin_tetris_stats/
+                  poetry run basedpyright ./nonebot_plugin_tetris_stats/

.pre-commit-config.yaml

@@ -7,13 +7,13 @@ ci:
     autoupdate_commit_msg: ':arrow_up: auto update by pre-commit hooks'
 repos:
     - repo: https://github.com/astral-sh/ruff-pre-commit
-      rev: v0.6.1
+      rev: v0.6.9
       hooks:
           - id: ruff
             args: [--fix, --exit-non-zero-on-fix]
-            stages: [commit]
+            stages: [pre-commit]
           - id: ruff-format
-            stages: [commit]
+            stages: [pre-commit]
 
     - repo: https://github.com/nonebot/nonemoji
       rev: v0.1.4

nonebot_plugin_tetris_stats/config/migrations/3c25a5a8c050_refactor_historical.py

@@ -29,7 +29,7 @@ branch_labels: str | Sequence[str] | None = None
 depends_on: str | Sequence[str] | None = None
 
 
-def migrate_old_data() -> None:
+def migrate_old_data() -> None:  # noqa: C901
     from json import dumps, loads
 
     Base = automap_base()  # noqa: N806
@@ -47,6 +47,9 @@ def migrate_old_data() -> None:
             TimeRemainingColumn(),
         ) as progress,
     ):
+        if session.query(OldHistoricalData).count() == 0:
+            logger.info('空表, 跳过')
+            return
         task_id = progress.add_task('[cyan]Migrating:', total=session.query(OldHistoricalData).count())
         pointer = 0
         while pointer < session.query(OldHistoricalData).order_by(desc(OldHistoricalData.id)).limit(1).one().id:

nonebot_plugin_tetris_stats/config/migrations/8a91210ce14d_correct_the_data_in_historicaldata.py

@@ -28,12 +28,6 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:  # noqa: C901
     if name:
         return
-    from nonebot_plugin_tetris_stats.version import __version__
-
-    if __version__ != '1.0.3':
-        msg = '本迁移需要1.0.3版本, 请先锁定版本至1.0.3版本再执行本迁移'
-        logger.critical(msg)
-        raise RuntimeError(msg)
 
     from nonebot.compat import PYDANTIC_V2, type_validate_json
     from pydantic import BaseModel, ValidationError
@@ -46,10 +40,6 @@ def upgrade(name: str = '') -> None:  # noqa: C901
         TimeRemainingColumn,
     )
 
-    from nonebot_plugin_tetris_stats.game_data_processor.schemas import (  # type: ignore[import-untyped]
-        BaseProcessedData,
-    )
-
     Base = automap_base()  # noqa: N806
     Base.prepare(autoload_with=op.get_bind())
     HistoricalData = Base.classes.nonebot_plugin_tetris_stats_historicaldata  # noqa: N806
@@ -62,18 +52,33 @@ def upgrade(name: str = '') -> None:  # noqa: C901
         def model_to_json(value: BaseModel) -> str:
             return value.json(by_alias=True)
 
-    models = BaseProcessedData.__subclasses__()
-
-    def json_to_model(value: str) -> BaseModel:
-        for i in models:
-            try:
-                return type_validate_json(i, value)
-            except ValidationError:  # noqa: PERF203
-                ...
-        raise ValueError
-
     with Session(op.get_bind()) as session:
         count = session.query(HistoricalData).count()
+        if count == 0:
+            logger.info('空表, 跳过')
+            return
+
+        from nonebot_plugin_tetris_stats.version import __version__
+
+        if __version__ != '1.0.3':
+            msg = '本迁移需要1.0.3版本, 请先锁定版本至1.0.3版本再执行本迁移'
+            logger.critical(msg)
+            raise RuntimeError(msg)
+
+        from nonebot_plugin_tetris_stats.game_data_processor.schemas import (  # type: ignore[import-untyped]
+            BaseProcessedData,
+        )
+
+        models = BaseProcessedData.__subclasses__()
+
+        def json_to_model(value: str) -> BaseModel:
+            for i in models:
+                try:
+                    return type_validate_json(i, value)
+                except ValidationError:  # noqa: PERF203
+                    ...
+            raise ValueError
+
         with Progress(
             TextColumn('[progress.description]{task.description}'),
             BarColumn(),

nonebot_plugin_tetris_stats/config/migrations/b7fbdafc339a_add_user_unique_identifier_field_to_.py

@@ -26,12 +26,7 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
-    from nonebot_plugin_tetris_stats.version import __version__
 
-    if __version__ != '1.0.4':
-        msg = '本迁移需要1.0.4版本, 请先锁定版本至1.0.4版本再执行本迁移'
-        logger.critical(msg)
-        raise RuntimeError(msg)
     from nonebot.compat import type_validate_json
     from pydantic import ValidationError
     from rich.progress import (
@@ -46,8 +41,6 @@ def upgrade(name: str = '') -> None:
     from sqlalchemy.ext.automap import automap_base
     from sqlalchemy.orm import Session
 
-    from nonebot_plugin_tetris_stats.game_data_processor.schemas import BaseUser  # type: ignore[import-untyped]
-
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:
         batch_op.add_column(sa.Column('user_unique_identifier', sa.String(length=32), nullable=True))
         batch_op.create_index(
@@ -60,37 +53,48 @@ def upgrade(name: str = '') -> None:
     Base.prepare(autoload_with=connection)
     HistoricalData = Base.classes.nonebot_plugin_tetris_stats_historicaldata  # noqa: N806
 
-    models: list[type[BaseUser]] = BaseUser.__subclasses__()
-
-    def json_to_model(value: str) -> BaseUser:
-        for i in models:
-            try:
-                return type_validate_json(i, value)
-            except ValidationError:  # noqa: PERF203
-                ...
-        raise ValueError
-
     with Session(op.get_bind()) as session:
         count = session.query(HistoricalData).count()
-        with Progress(
-            TextColumn('[progress.description]{task.description}'),
-            BarColumn(),
-            MofNCompleteColumn(),
-            TaskProgressColumn(),
-            TimeRemainingColumn(),
-        ) as progress:
-            task_id = progress.add_task('[cyan]Updateing:', total=count)
-            for i in range(0, count, 100):
-                for j in session.scalars(
-                    select(HistoricalData).where(HistoricalData.id > i).order_by(HistoricalData.id).limit(100)
-                ):
-                    model = json_to_model(j.game_user)
+        if count == 0:
+            logger.info('空表, 跳过')
+        else:
+            from nonebot_plugin_tetris_stats.version import __version__
+
+            if __version__ != '1.0.4':
+                msg = '本迁移需要1.0.4版本, 请先锁定版本至1.0.4版本再执行本迁移'
+                logger.critical(msg)
+                raise RuntimeError(msg)
+            from nonebot_plugin_tetris_stats.game_data_processor.schemas import BaseUser  # type: ignore[import-untyped]
+
+            models: list[type[BaseUser]] = BaseUser.__subclasses__()
+
+            def json_to_model(value: str) -> BaseUser:
+                for i in models:
                     try:
-                        j.user_unique_identifier = model.unique_identifier
-                    except ValueError:
-                        session.delete(j)
-                    progress.update(task_id, advance=1)
-                session.commit()
+                        return type_validate_json(i, value)
+                    except ValidationError:  # noqa: PERF203
+                        ...
+                raise ValueError
+
+            with Progress(
+                TextColumn('[progress.description]{task.description}'),
+                BarColumn(),
+                MofNCompleteColumn(),
+                TaskProgressColumn(),
+                TimeRemainingColumn(),
+            ) as progress:
+                task_id = progress.add_task('[cyan]Updateing:', total=count)
+                for i in range(0, count, 100):
+                    for j in session.scalars(
+                        select(HistoricalData).where(HistoricalData.id > i).order_by(HistoricalData.id).limit(100)
+                    ):
+                        model = json_to_model(j.game_user)
+                        try:
+                            j.user_unique_identifier = model.unique_identifier
+                        except ValueError:
+                            session.delete(j)
+                        progress.update(task_id, advance=1)
+                    session.commit()
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:
         batch_op.alter_column('user_unique_identifier', existing_type=sa.VARCHAR(length=32), nullable=False)
     logger.success('database upgrade success')

nonebot_plugin_tetris_stats/games/tetrio/list.py

@@ -36,6 +36,7 @@ async def _(
     limit: int | None = None,
     country: str | None = None,
 ):
+    country = country.upper() if country is not None else None
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/query.py

@@ -104,7 +104,7 @@ async def _(  # noqa: PLR0913
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
         command_type='query',
-        command_args=[f'--default-template {template}'] if template is not None else [],
+        command_args=[f'--template {template}'] if template is not None else [],
     ):
         async with get_session() as session:
             bind = await query_bind_info(
@@ -131,7 +131,7 @@ async def _(user: NBUser, account: Player, event_session: EventSession, template
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
         command_type='query',
-        command_args=[f'--default-template {template}'] if template is not None else [],
+        command_args=[f'--template {template}'] if template is not None else [],
     ):
         async with get_session() as session:
             if template is None:

nonebot_plugin_tetris_stats/games/tetrio/rank/all.py

@@ -32,12 +32,12 @@ command.add(
 
 
 @alc.assign('TETRIO.rank.all')
-async def _(event_session: EventSession, template: Template = 'v1'):
+async def _(event_session: EventSession, template: Template | None = None):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
         command_type='rank',
-        command_args=['--all'],
+        command_args=['--all'] + ([f'--template {template}'] if template is not None else []),
     ):
         async with get_session() as session:
             latest_data = (
@@ -62,7 +62,7 @@ async def _(event_session: EventSession, template: Template = 'v1'):
                 )
             ).one()
         match template:
-            case 'v1':
+            case 'v1' | None:
                 await UniMessage.image(raw=await make_image_v1(latest_data, compare_data)).finish()
             case 'v2':
                 await UniMessage.image(raw=await make_image_v2(latest_data, compare_data)).finish()

nonebot_plugin_tetris_stats/utils/browser.py

@@ -1,12 +1,14 @@
 import sys
+from collections.abc import Callable, Coroutine
 from os import environ
 from platform import system
 from re import sub
+from typing import Any, ClassVar
 
 from nonebot import get_driver
 from nonebot.log import logger
 from playwright.__main__ import main
-from playwright.async_api import Browser, async_playwright
+from playwright.async_api import Browser, BrowserContext, async_playwright
 
 driver = get_driver()
 
@@ -27,6 +29,7 @@ class BrowserManager:
     """浏览器管理类"""
 
     _browser: Browser | None = None
+    _contexts: ClassVar[dict[str, BrowserContext]] = {}
 
     @classmethod
     async def init_playwright(cls) -> None:
@@ -72,7 +75,11 @@ class BrowserManager:
     async def _start_browser(cls) -> Browser:
         """启动浏览器实例"""
         playwright = await async_playwright().start()
-        cls._browser = await playwright.firefox.launch()
+        cls._browser = await playwright.firefox.launch(
+            firefox_user_prefs={
+                'network.http.max-persistent-connections-per-server': 64,
+            },
+        )
         return cls._browser
 
     @classmethod
@@ -80,8 +87,26 @@ class BrowserManager:
         """获取浏览器实例"""
         return cls._browser or await cls._start_browser()
 
+    @classmethod
+    async def get_context(
+        cls, context_id: str = 'default', factory: Callable[[], Coroutine[Any, Any, BrowserContext]] | None = None
+    ) -> BrowserContext:
+        """获取浏览器上下文"""
+        return cls._contexts.setdefault(
+            context_id, await factory() if factory is not None else await (await cls.get_browser()).new_context()
+        )
+
+    @classmethod
+    async def del_context(cls, context_id: str) -> None:
+        """删除浏览器上下文"""
+        if context_id in cls._contexts:
+            await cls._contexts[context_id].close()
+            del cls._contexts[context_id]
+
     @classmethod
     async def close_browser(cls) -> None:
         """关闭浏览器实例"""
+        for i in cls._contexts.values():
+            await i.close()
         if isinstance(cls._browser, Browser):
             await cls._browser.close()

nonebot_plugin_tetris_stats/utils/screenshot.py

@@ -1,4 +1,4 @@
-from playwright.async_api import TimeoutError, ViewportSize
+from playwright.async_api import BrowserContext, TimeoutError, ViewportSize
 
 from ..config.config import config
 from .browser import BrowserManager
@@ -6,13 +6,15 @@ from .retry import retry
 from .time_it import time_it
 
 
+async def context_factory() -> BrowserContext:
+    return await (await BrowserManager.get_browser()).new_context(device_scale_factor=config.tetris.screenshot_quality)
+
+
 @retry(exception_type=TimeoutError, reply='截图失败, 重试中')
 @time_it
 async def screenshot(url: str) -> bytes:
-    browser = await BrowserManager.get_browser()
-    async with (
-        await browser.new_page(device_scale_factor=config.tetris.screenshot_quality) as page,
-    ):
+    context = await BrowserManager.get_context('screenshot', factory=context_factory)
+    async with await context.new_page() as page:
         await page.goto(url)
         size: ViewportSize = await page.evaluate("""
             () => {

nonebot_plugin_tetris_stats/utils/typing.py

@@ -1,11 +1,11 @@
-from typing import Literal
+from typing import Literal, TypeAlias
 
-Number = float | int
-GameType = Literal['IO', 'TOP', 'TOS']
-BaseCommandType = Literal['bind', 'query']
-TETRIOCommandType = BaseCommandType | Literal['rank', 'config', 'list', 'record']
-AllCommandType = BaseCommandType | TETRIOCommandType
-Me = Literal[
+Number: TypeAlias = float | int
+GameType: TypeAlias = Literal['IO', 'TOP', 'TOS']
+BaseCommandType: TypeAlias = Literal['bind', 'query']
+TETRIOCommandType: TypeAlias = BaseCommandType | Literal['rank', 'config', 'list', 'record']
+AllCommandType: TypeAlias = BaseCommandType | TETRIOCommandType
+Me: TypeAlias = Literal[
     '我',
     '自己',
     '我等',

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'nonebot-plugin-tetris-stats'
-version = '1.5.1'
+version = '1.5.3'
 description = '一款基于 NoneBot2 的用于查询 Tetris 相关游戏数据的插件'
 authors = ['scdhh <wallfjjd@gmail.com>']
 readme = 'README.md'
@@ -21,22 +21,23 @@ nonebot-plugin-user = '>=0.2,<0.5'
 nonebot-plugin-userinfo = '^0.2.4'
 aiocache = '^0.12.2'
 aiofiles = '>=23.2.1,<25.0.0'
+arclet-alconna = '<2.0.0'
 async-lru = '^2.0.4'
 httpx = '^0.27.0'
 jinja2 = '^3.1.3'
 lxml = '^5.1.0'
-msgspec = "^0.18.6"
+msgspec = '^0.18.6'
 pandas = '>=1.4.3,<3.0.0'
 pillow = '^10.3.0'
 playwright = '^1.41.2'
 rich = '^13.7.1'
-yarl = "^1.9.4"
+yarl = '^1.9.4'
 zstandard = '>=0.22,<0.24'
 
 [tool.poetry.group.dev.dependencies]
+basedpyright = '^1.17.0'
 mypy = '>=1.9'
 pandas-stubs = '>=1.5.2,<3.0.0'
-pyright = "^1.1.377"
 ruff = '>=0.3.0'
 types-aiofiles = '>=23.2.0.20240106,<25.0.0.0'
 types-lxml = '^2024.2.9'
@@ -51,10 +52,10 @@ nonebot-adapter-satori = '>=0.11.4,<0.13.0'
 nonebot-plugin-orm = { extras = ['default'], version = '>=0.3,<0.8' }
 
 [tool.poetry.group.debug.dependencies]
-matplotlib = "^3.9.2"
+matplotlib = '^3.9.2'
 memory-profiler = '^0.61.0'
 objprint = '^0.2.2'
-pyqt6 = "^6.7.1"
+pyqt6 = '^6.7.1'
 viztracer = '^0.16.2'
 
 [build-system]
@@ -135,11 +136,11 @@ builtins-ignorelist = ['id']
 [tool.ruff.format]
 quote-style = 'single'
 
-[tool.pyright]
-pythonVersion = "3.10"
-pythonPlatform = "All"
+[tool.basedpyright]
+pythonVersion = '3.10'
+pythonPlatform = 'All'
 defineConstant = { PYDANTIC_V2 = true }
-typeCheckingMode = "standard"
+typeCheckingMode = 'standard'
 
 [tool.nonebot]
 plugins = ['nonebot_plugin_tetris_stats']