🔖 1.2.10

player实例被alconna缓存

nonebot_plugin_tetris_stats/__init__.py

@@ -8,6 +8,11 @@ require('nonebot_plugin_orm')
 require('nonebot_plugin_session')
 require('nonebot_plugin_session_orm')
 
+from nonebot_plugin_alconna import namespace  # noqa: E402
+
+with namespace('tetris_stats') as ns:
+    ns.enable_message_cache = False
+
 from .config.config import migrations  # noqa: E402
 
 __plugin_meta__ = PluginMetadata(
@@ -21,5 +26,4 @@ __plugin_meta__ = PluginMetadata(
     },
 )
 
-from . import game_data_processor  # noqa: F401, E402
-from .utils import host  # noqa: F401, E402
+from . import games  # noqa: F401, E402

nonebot_plugin_tetris_stats/db/__init__.py

@@ -16,9 +16,9 @@ from .models import Bind, TriggerHistoricalData
 UTC = timezone.utc
 
 if TYPE_CHECKING:
-    from ..game_data_processor.io_data_processor.api.models import TETRIOHistoricalData
-    from ..game_data_processor.top_data_processor.api.models import TOPHistoricalData
-    from ..game_data_processor.tos_data_processor.api.models import TOSHistoricalData
+    from ..games.tetrio.api.models import TETRIOHistoricalData
+    from ..games.top.api.models import TOPHistoricalData
+    from ..games.tos.api.models import TOSHistoricalData
 
 
 class BindStatus(Enum):

nonebot_plugin_tetris_stats/games/__init__.py

@@ -32,11 +32,7 @@ def add_default_handlers(matcher: type[AlconnaMatcher]) -> None:
         raise FinishedException
 
 
-from . import (  # noqa: F401, E402
-    io_data_processor,
-    top_data_processor,
-    tos_data_processor,
-)
+from . import tetrio, top, tos  # noqa: F401, E402
 
 
 @run_postprocessor

nonebot_plugin_tetris_stats/games/tetrio/__init__.py

@@ -1,6 +1,7 @@
 from arclet.alconna import Alconna, AllParam, Arg, ArgFlag, Args, CommandMeta, Option
 from nonebot_plugin_alconna import At, on_alconna
 
+from ... import ns
 from ...utils.exception import MessageFormatError
 from ...utils.typing import Me
 from .. import add_default_handlers
@@ -72,6 +73,7 @@ alc = on_alconna(
             compact=True,
             fuzzy_match=True,
         ),
+        namespace=ns,
     ),
     skip_for_unmatch=False,
     auto_send_output=True,

nonebot_plugin_tetris_stats/games/tetrio/api/schemas/user_records.py

@@ -96,7 +96,7 @@ class MultiRecord(_Record):
 
 
 class SoloModeRecord(BaseModel):
-    record: SoloRecord
+    record: SoloRecord | None = None
     rank: int | None = None
 
 

nonebot_plugin_tetris_stats/games/tetrio/query.py

@@ -26,9 +26,9 @@ from zstandard import ZstdDecompressor
 from ...db import query_bind_info, trigger
 from ...utils.host import HostPage, get_self_netloc
 from ...utils.platform import get_platform
-from ...utils.render import TETRIOInfo, render
-from ...utils.render.schemas.base import Avatar
-from ...utils.render.schemas.tetrio_info import Data, Radar, Ranking, TetraLeague, TetraLeagueHistory
+from ...utils.render import render
+from ...utils.render.schemas.base import Avatar, Ranking
+from ...utils.render.schemas.tetrio_info import Data, Info, Radar, TetraLeague, TetraLeagueHistory
 from ...utils.render.schemas.tetrio_info import User as TemplateUser
 from ...utils.screenshot import screenshot
 from ...utils.typing import Me, Number
@@ -69,9 +69,9 @@ async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me, event_ses
         user, user_info, user_records = await gather(player.user, player.get_info(), player.get_records())
         sprint = user_records.data.records.sprint
         blitz = user_records.data.records.blitz
-        # with contextlib.suppress(TypeError):
-        message += UniMessage.image(raw=await make_query_image(user, user_info, sprint.record, blitz.record))
-        await message.finish()
+        with contextlib.suppress(TypeError):
+            message += UniMessage.image(raw=await make_query_image(user, user_info, sprint.record, blitz.record))
+            await message.finish()
         message += make_query_text(user_info, sprint, blitz)
         await message.finish()
 
@@ -230,7 +230,7 @@ async def make_query_image(
     async with HostPage(
         await render(
             'tetrio/info',
-            TETRIOInfo(
+            Info(
                 user=TemplateUser(
                     avatar=f'https://tetr.io/user-content/avatars/{user_info.data.user.id}.jpg?rv={user_info.data.user.avatar_revision}'
                     if user_info.data.user.avatar_revision is not None

nonebot_plugin_tetris_stats/games/top/__init__.py

@@ -1,6 +1,7 @@
 from arclet.alconna import Alconna, AllParam, Arg, ArgFlag, Args, CommandMeta, Option
 from nonebot_plugin_alconna import At, on_alconna
 
+from ... import ns
 from ...utils.exception import MessageFormatError
 from ...utils.typing import Me
 from .. import add_default_handlers
@@ -61,6 +62,7 @@ alc = on_alconna(
             compact=True,
             fuzzy_match=True,
         ),
+        namespace=ns,
     ),
     skip_for_unmatch=False,
     auto_send_output=True,

nonebot_plugin_tetris_stats/games/tos/__init__.py

@@ -1,6 +1,7 @@
 from arclet.alconna import Alconna, AllParam, Arg, ArgFlag, Args, CommandMeta, Option
 from nonebot_plugin_alconna import At, on_alconna
 
+from ... import ns
 from ...utils.exception import MessageFormatError
 from ...utils.typing import Me
 from .. import add_default_handlers
@@ -67,6 +68,7 @@ alc = on_alconna(
             compact=True,
             fuzzy_match=True,
         ),
+        namespace=ns,
     ),
     skip_for_unmatch=False,
     auto_send_output=True,

nonebot_plugin_tetris_stats/games/tos/query.py

@@ -1,22 +1,33 @@
 from asyncio import gather
-from dataclasses import dataclass
-from typing import Literal
+from datetime import timedelta
+from http import HTTPStatus
+from typing import Literal, NamedTuple
+from urllib.parse import urlunparse
 
 from nonebot.adapters import Bot, Event
 from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession  # type: ignore[import-untyped]
+from nonebot_plugin_session import EventSession  # type: ignore[import-untyped]  # type: ignore[import-untyped]
 from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_userinfo import EventUserInfo, UserInfo  # type: ignore[import-untyped]
 
 from ...db import query_bind_info, trigger
+from ...utils.avatar import get_avatar
+from ...utils.exception import RequestError
+from ...utils.host import HostPage, get_self_netloc
 from ...utils.metrics import TetrisMetricsProWithLPMADPM, get_metrics
 from ...utils.platform import get_platform
-from ...utils.typing import Me
+from ...utils.render import render
+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 ..constant import CANT_VERIFY_MESSAGE
 from . import alc
 from .api import Player
+from .api.schemas.user_info import UserInfoSuccess
 from .constant import GAME_TYPE
 
 
@@ -24,7 +35,12 @@ def add_special_handlers(
     teaid_prefix: Literal['onebot-', 'kook-', 'discord-', 'qqguild-'], match_event: type[Event]
 ) -> None:
     @alc.assign('query')
-    async def _(event: Event, target: At | Me, event_session: EventSession):
+    async def _(
+        event: Event,
+        target: At | Me,
+        event_session: EventSession,
+        event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
+    ):
         if isinstance(event, match_event):
             async with trigger(
                 session_persist_id=await get_session_persist_id(event_session),
@@ -32,16 +48,23 @@ def add_special_handlers(
                 command_type='query',
                 command_args=[],
             ):
-                await (
-                    await make_query_text(
-                        Player(
-                            teaid=f'{teaid_prefix}{target.target}'
-                            if isinstance(target, At)
-                            else f'{teaid_prefix}{event.get_user_id()}',
-                            trust=True,
-                        )
-                    )
-                ).finish()
+                player = Player(
+                    teaid=f'{teaid_prefix}{target.target}'
+                    if isinstance(target, At)
+                    else f'{teaid_prefix}{event.get_user_id()}',
+                    trust=True,
+                )
+                try:
+                    user_info, game_data = await gather(player.get_info(), get_game_data(player))
+                    if game_data is not None:
+                        await UniMessage.image(
+                            raw=await make_query_image(user_info, game_data, event_user_info)
+                        ).finish()
+                    await (await make_query_text(user_info, game_data)).finish()
+                except RequestError as e:
+                    if e.status_code == HTTPStatus.BAD_REQUEST and '未找到此用户' in e.message:
+                        return
+                    raise
 
 
 try:
@@ -76,7 +99,14 @@ except ImportError:
 
 
 @alc.assign('query')
-async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me, event_session: EventSession):
+async def _(  # noqa: PLR0913
+    bot: Bot,
+    event: Event,
+    matcher: Matcher,
+    target: At | Me,
+    event_session: EventSession,
+    event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
+):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -93,24 +123,35 @@ async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me, event_ses
         if bind is None:
             await matcher.finish('未查询到绑定信息')
         message = CANT_VERIFY_MESSAGE
-        await (message + await make_query_text(Player(teaid=bind.game_account, trust=True))).finish()
+        player = Player(teaid=bind.game_account, trust=True)
+        user_info, game_data = await gather(player.get_info(), get_game_data(player))
+        if game_data is not None:
+            await (
+                message + UniMessage.image(raw=await make_query_image(user_info, game_data, event_user_info))
+            ).finish()
+        await (message + await make_query_text(user_info, game_data)).finish()
 
 
 @alc.assign('query')
-async def _(account: Player, event_session: EventSession):
+async def _(account: Player, event_session: EventSession, event_user_info: UserInfo = EventUserInfo()):  # noqa: B008
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
         command_type='query',
         command_args=[],
     ):
-        await (await make_query_text(account)).finish()
+        user_info, game_data = await gather(account.get_info(), get_game_data(account))
+        if game_data is not None:
+            await UniMessage.image(raw=await make_query_image(user_info, game_data, event_user_info)).finish()
+        await (await make_query_text(user_info, game_data)).finish()
 
 
-@dataclass
-class GameData:
+class GameData(NamedTuple):
     game_num: int
     metrics: TetrisMetricsProWithLPMADPM
+    OR: Number
+    dspp: Number
+    ge: Number
 
 
 async def get_game_data(player: Player, query_num: int = 50) -> GameData | None:
@@ -119,7 +160,7 @@ async def get_game_data(player: Player, query_num: int = 50) -> GameData | None:
     if user_profile.data == []:
         return None
     weighted_total_lpm = weighted_total_apm = weighted_total_adpm = total_time = 0.0
-    num = 0
+    total_attack = total_dig = total_offset = total_pieses = total_receive = num = 0
     for i in user_profile.data:
         # 排除单人局和时间为0的游戏
         # 茶: 不计算没挖掘的局, 即使apm和lpm也如此
@@ -133,6 +174,11 @@ async def get_game_data(player: Player, query_num: int = 50) -> GameData | None:
         weighted_total_lpm += lpm * time
         weighted_total_apm += apm * time
         weighted_total_adpm += adpm * time
+        total_attack += i.attack
+        total_dig += i.dig
+        total_offset += i.offset
+        total_pieses += i.pieces
+        total_receive += i.receive
         total_time += time
         num += 1
         if num >= query_num:
@@ -143,14 +189,51 @@ async def get_game_data(player: Player, query_num: int = 50) -> GameData | None:
     metrics = get_metrics(
         lpm=weighted_total_lpm / total_time, apm=weighted_total_apm / total_time, adpm=weighted_total_adpm / total_time
     )
-    lpm = weighted_total_lpm / total_time
-    apm = weighted_total_apm / total_time
-    adpm = weighted_total_adpm / total_time
-    return GameData(game_num=num, metrics=metrics)
+    return GameData(
+        game_num=num,
+        metrics=metrics,
+        OR=total_offset / total_receive * 100,
+        dspp=total_dig / total_pieses,
+        ge=2 * ((total_attack * total_dig) / total_pieses**2),
+    )
 
 
-async def make_query_text(player: Player) -> UniMessage:
-    user_info, game_data = await gather(player.get_info(), get_game_data(player))
+async def make_query_image(user_info: UserInfoSuccess, game_data: GameData, event_user_info: UserInfo) -> bytes:
+    metrics = game_data.metrics
+    duration = timedelta(milliseconds=float(user_info.data.pb_sprint)).total_seconds()
+    sprint_value = f'{duration:.1f}s' if duration < 60 else f'{duration // 60:.0f}m {duration % 60:.1f}s'  # noqa: PLR2004
+    async with HostPage(
+        await render(
+            'tos/info',
+            Info(
+                user=People(avatar=await get_avatar(event_user_info, 'Data URI', None), name=user_info.data.name),
+                ranking=Ranking(rating=float(user_info.data.ranking), rd=round(float(user_info.data.rd_now), 2)),
+                multiplayer=Multiplayer(
+                    pps=metrics.pps,
+                    lpm=metrics.lpm,
+                    apm=metrics.apm,
+                    apl=metrics.apl,
+                    vs=metrics.vs,
+                    adpm=metrics.adpm,
+                    adpl=metrics.adpl,
+                ),
+                radar=Radar(
+                    app=(app := (metrics.apm / (60 * metrics.pps))),
+                    OR=game_data.OR,
+                    dspp=game_data.dspp,
+                    ci=150 * game_data.dspp - 125 * app + 50 * (metrics.vs / metrics.apm) - 25,
+                    ge=game_data.ge,
+                ),
+                sprint=sprint_value,
+                challenge=f'{int(user_info.data.pb_challenge):,}' if user_info.data.pb_challenge != '0' else 'N/A',
+                marathon=f'{int(user_info.data.pb_marathon):,}' if user_info.data.pb_marathon != '0' else 'N/A',
+            ),
+        )
+    ) as page_hash:
+        return await screenshot(urlunparse(('http', get_self_netloc(), f'/host/{page_hash}.html', '', '', '')))
+
+
+async def make_query_text(user_info: UserInfoSuccess, game_data: GameData | None) -> UniMessage:
     user_data = user_info.data
     message = f'用户 {user_data.name} ({user_data.teaid}) '
     if user_data.ranked_games == '0':

nonebot_plugin_tetris_stats/utils/render/__init__.py

@@ -5,7 +5,9 @@ from nonebot.compat import PYDANTIC_V2
 
 from ..templates import templates_dir
 from .schemas.bind import Bind
-from .schemas.tetrio_info import TETRIOInfo
+from .schemas.tetrio_info import Info as TETRIOInfo
+from .schemas.top_info import Info as TOPInfo
+from .schemas.tos_info import Info as TOSInfo
 
 env = Environment(
     loader=FileSystemLoader(templates_dir), autoescape=True, trim_blocks=True, lstrip_blocks=True, enable_async=True
@@ -20,10 +22,22 @@ async def render(render_type: Literal['binding'], data: Bind) -> str: ...
 async def render(render_type: Literal['tetrio/info'], data: TETRIOInfo) -> str: ...
 
 
-async def render(render_type: Literal['binding', 'tetrio/info'], data: Bind | TETRIOInfo) -> str:
+@overload
+async def render(render_type: Literal['top/info'], data: TOPInfo) -> str: ...
+
+
+@overload
+async def render(render_type: Literal['tos/info'], data: TOSInfo) -> str: ...
+
+
+async def render(
+    render_type: Literal['binding', 'tetrio/info', 'top/info', 'tos/info'], data: Bind | TETRIOInfo | TOPInfo | TOSInfo
+) -> str:
     if PYDANTIC_V2:
-        return await env.get_template('index.html').render_async(path=render_type, data=data.model_dump_json())
-    return await env.get_template('index.html').render_async(path=render_type, data=data.json())
+        return await env.get_template('index.html').render_async(
+            path=render_type, data=data.model_dump_json(by_alias=True)
+        )
+    return await env.get_template('index.html').render_async(path=render_type, data=data.json(by_alias=True))
 
 
-__all__ = ['render', 'Bind', 'TETRIOInfo']
+__all__ = ['render', 'Bind']

nonebot_plugin_tetris_stats/utils/render/schemas/base.py

@@ -2,6 +2,8 @@ from typing import Literal
 
 from pydantic import BaseModel
 
+from ...typing import Number
+
 
 class Avatar(BaseModel):
     type: Literal['identicon']
@@ -11,3 +13,8 @@ class Avatar(BaseModel):
 class People(BaseModel):
     avatar: str | Avatar
     name: str
+
+
+class Ranking(BaseModel):
+    rating: Number
+    rd: Number

nonebot_plugin_tetris_stats/utils/render/schemas/tetrio_info.py

@@ -4,9 +4,9 @@ from typing import Annotated, ClassVar
 from nonebot.compat import PYDANTIC_V2
 from pydantic import BaseModel
 
-from ....game_data_processor.io_data_processor.api.typing import Rank
+from ....games.tetrio.api.typing import Rank
 from ...typing import Number
-from .base import People
+from .base import People, Ranking
 
 if PYDANTIC_V2:
     from pydantic import PlainSerializer
@@ -20,11 +20,6 @@ class User(People):
     bio: str | None
 
 
-class Ranking(BaseModel):
-    rating: Number
-    rd: Number
-
-
 class TetraLeague(BaseModel):
     rank: Rank
     tr: Number
@@ -62,7 +57,7 @@ class Radar(BaseModel):
     ge: Number
 
 
-class TETRIOInfo(BaseModel):
+class Info(BaseModel):
     user: User
     ranking: Ranking
     tetra_league: TetraLeague

nonebot_plugin_tetris_stats/utils/render/schemas/top_info.py

@@ -0,0 +1,17 @@
+from pydantic import BaseModel
+
+from ...typing import Number
+from .base import People
+
+
+class Data(BaseModel):
+    pps: Number
+    lpm: Number
+    apm: Number
+    apl: Number
+
+
+class Info(BaseModel):
+    user: People
+    today: Data
+    history: Data

nonebot_plugin_tetris_stats/utils/render/schemas/tos_info.py

@@ -0,0 +1,32 @@
+from pydantic import BaseModel, Field
+
+from ...typing import Number
+from .base import People, Ranking
+
+
+class Multiplayer(BaseModel):
+    pps: Number
+    lpm: Number
+    apm: Number
+    apl: Number
+    vs: Number
+    adpm: Number
+    adpl: Number
+
+
+class Radar(BaseModel):
+    app: Number
+    OR: Number = Field(serialization_alias='or')
+    dspp: Number
+    ci: Number
+    ge: Number
+
+
+class Info(BaseModel):
+    user: People
+    ranking: Ranking
+    multiplayer: Multiplayer
+    radar: Radar
+    sprint: str
+    challenge: str
+    marathon: str

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'nonebot-plugin-tetris-stats'
-version = '1.2.8'
+version = '1.2.10'
 description = '一款基于 NoneBot2 的用于查询 Tetris 相关游戏数据的插件'
 authors = ['scdhh <wallfjjd@gmail.com>']
 readme = 'README.md'
@@ -38,12 +38,13 @@ types-lxml = "^2024.2.9"
 types-pillow = "^10.2.0.20240423"
 types-ujson = '^5.9.0'
 pandas-stubs = '>=1.5.2,<3.0.0'
-nonebot-plugin-orm = { extras = ["default"], version = ">=0.3,<0.8" }
+nonebot2 = { extras = ["all"], version = "^2.3.0" }
 nonebot-adapter-discord = "^0.1.3"
 nonebot-adapter-kaiheila = "^0.3.4"
 nonebot-adapter-onebot = "^2.4.1"
 nonebot-adapter-qq = "^1.4.4"
 nonebot-adapter-satori = "^0.11.4"
+nonebot-plugin-orm = { extras = ["default"], version = ">=0.3,<0.8" }
 
 [tool.poetry.group.debug.dependencies]
 memory-profiler = "^0.61.0"