🔖 1.5.2

Bumps [playwright](https://github.com/Microsoft/playwright-python) from 1.46.0 to 1.47.0.
- [Release notes](https://github.com/Microsoft/playwright-python/releases)
- [Commits](https://github.com/Microsoft/playwright-python/compare/v1.46.0...v1.47.0)

---
updated-dependencies:
- dependency-name: playwright
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

.github/workflows/TypeCheck.yml

@@ -4,7 +4,7 @@ on:
     push:
 
 jobs:
-    Mypy:
+    TypeCheck:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
@@ -25,3 +25,8 @@ jobs:
               shell: bash
               run: |
                   poetry run mypy ./nonebot_plugin_tetris_stats
+
+            - name: Run BasedPyright
+              shell: bash
+              run: |
+                  poetry run basedpyright ./nonebot_plugin_tetris_stats/

.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.6.1
+      rev: v0.6.4
       hooks:
           - id: ruff
             args: [--fix, --exit-non-zero-on-fix]

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

@@ -1,10 +1,21 @@
+from functools import partial
 from typing import Literal
 
+from nonebot.compat import PYDANTIC_V2
 from pydantic import BaseModel, Field
 
 from ...typing import Rank, S1Rank, S1ValidRank
 from ..base import SuccessModel
 
+if PYDANTIC_V2:
+    from pydantic import field_validator
+
+    custom_validator = partial(field_validator, mode='before')
+else:
+    from pydantic import validator
+
+    custom_validator = partial(validator, pre=True, always=True)  # type: ignore[assignment, arg-type]
+
 
 class PastInner(BaseModel):
     season: str
@@ -75,6 +86,13 @@ class NeverRatedData(BaseData):
     percentile: Literal[-1]
     percentile_rank: Literal['z']
 
+    @custom_validator('apm', 'pps', 'vs')
+    @classmethod
+    def _(cls, value: float | None) -> float:
+        if value is None:
+            return 0
+        return value
+
 
 class RatedData(BaseData):
     gamesplayed: int

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()
+    context = await BrowserManager.get_context('screenshot', factory=context_factory)
-    async with (
+    async with await context.new_page() as page:
-        await browser.new_page(device_scale_factor=config.tetris.screenshot_quality) as page,
-    ):
         await page.goto(url)
         size: ViewportSize = await page.evaluate("""
             () => {

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'nonebot-plugin-tetris-stats'
-version = '1.5.0'
+version = '1.5.2'
 description = '一款基于 NoneBot2 的用于查询 Tetris 相关游戏数据的插件'
 authors = ['scdhh <wallfjjd@gmail.com>']
 readme = 'README.md'
@@ -34,13 +34,14 @@ 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'
 ruff = '>=0.3.0'
 types-aiofiles = '>=23.2.0.20240106,<25.0.0.0'
 types-lxml = '^2024.2.9'
 types-pillow = '^10.2.0.20240423'
 types-ujson = '^5.9.0'
-pandas-stubs = '>=1.5.2,<3.0.0'
 nonebot2 = { extras = ['all'], version = '^2.3.0' }
 nonebot-adapter-discord = '^0.1.3'
 nonebot-adapter-kaiheila = '^0.3.4'
@@ -134,5 +135,11 @@ builtins-ignorelist = ['id']
 [tool.ruff.format]
 quote-style = 'single'
 
+[tool.basedpyright]
+pythonVersion = "3.10"
+pythonPlatform = "All"
+defineConstant = { PYDANTIC_V2 = true }
+typeCheckingMode = "standard"
+
 [tool.nonebot]
 plugins = ['nonebot_plugin_tetris_stats']