🔖 1.10.1

* ⬆️ auto update by pre-commit hooks

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.11.13 → v0.12.3](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.13...v0.12.3)

* 🚨 auto fix by pre-commit hooks

* ⬆️ Upgrade dependency ruff to v0.12.4

* 🚨 修复 lint 警告

* 🚨 添加一个 noqa（

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: 呵呵です <51957264+shoucandanghehe@users.noreply.github.com>
Co-authored-by: shoucandanghehe <wallfjjd@gmail.com>

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

nonebot_plugin_tetris_stats/__init__.py

@@ -6,10 +6,8 @@ require_plugins = {
     'nonebot_plugin_apscheduler',
     'nonebot_plugin_localstore',
     'nonebot_plugin_orm',
-    'nonebot_plugin_session_orm',
+    'nonebot_plugin_uninfo',
-    'nonebot_plugin_session',
     'nonebot_plugin_user',
-    'nonebot_plugin_userinfo',
     'nonebot_plugin_waiter',
 }
 

nonebot_plugin_tetris_stats/config/config.py

@@ -1,4 +1,4 @@
-from nonebot import get_plugin_config
+from nonebot import get_driver, get_plugin_config
 from nonebot_plugin_localstore import get_plugin_cache_dir, get_plugin_data_dir
 from pydantic import BaseModel, Field
 
@@ -26,3 +26,4 @@ class Config(BaseModel):
 
 
 config = get_plugin_config(Config)
+global_config = get_driver().config

nonebot_plugin_tetris_stats/config/migrations/09d4bb60160d_rename_field.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
         batch_op.alter_column('create_time', new_column_name='update_time', existing_type=sa.DateTime())
@@ -41,6 +43,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
         batch_op.alter_column('update_time', new_column_name='create_time')

nonebot_plugin_tetris_stats/config/migrations/0d50142b780f_add_field.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
         batch_op.add_column(sa.Column('file_hash', sa.String(length=128), nullable=True))
@@ -38,6 +40,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_iorank_file_hash'))

nonebot_plugin_tetris_stats/config/migrations/3588702dd3a4_modify_field_length.py

@@ -0,0 +1,52 @@
+"""modify field length
+
+迁移 ID: 3588702dd3a4
+父迁移: bc6abd57928f
+创建时间: 2025-07-19 17:21:17.927162
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
+from alembic import op
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = '3588702dd3a4'
+down_revision: str | Sequence[str] | None = 'bc6abd57928f'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('nb_t_tos_hist_data', schema=None) as batch_op:
+        batch_op.alter_column(
+            'user_unique_identifier',
+            existing_type=sa.VARCHAR(length=24),
+            type_=sa.String(length=256),
+            existing_nullable=False,
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('nb_t_tos_hist_data', schema=None) as batch_op:
+        batch_op.alter_column(
+            'user_unique_identifier',
+            existing_type=sa.String(length=256),
+            type_=sa.VARCHAR(length=24),
+            existing_nullable=False,
+        )
+
+    # ### end Alembic commands ###

nonebot_plugin_tetris_stats/config/migrations/3c25a5a8c050_refactor_historical.py

@@ -16,7 +16,6 @@ from alembic import op
 from nonebot.log import logger
 from rich.progress import BarColumn, MofNCompleteColumn, Progress, TaskProgressColumn, TextColumn, TimeRemainingColumn
 from sqlalchemy import desc, select
-from sqlalchemy.dialects import sqlite
 from sqlalchemy.ext.automap import automap_base
 from sqlalchemy.orm import Session
 
@@ -30,7 +29,7 @@ depends_on: str | Sequence[str] | None = None
 
 
 def migrate_old_data() -> None:  # noqa: C901
-    from json import dumps, loads
+    from json import dumps, loads  # noqa: PLC0415
 
     Base = automap_base()  # noqa: N806
     Base.prepare(autoload_with=op.get_bind())
@@ -109,6 +108,8 @@ def migrate_old_data() -> None:  # noqa: C901
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         'nonebot_plugin_tetris_stats_tetriohistoricaldata',
@@ -219,23 +220,25 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         'nonebot_plugin_tetris_stats_historicaldata',
-        sa.Column('id', sa.INTEGER(), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('trigger_time', sa.DATETIME(), nullable=False),
+        sa.Column('trigger_time', sa.DateTime(), nullable=False),
-        sa.Column('bot_platform', sa.VARCHAR(length=32), nullable=True),
+        sa.Column('bot_platform', sa.String(length=32), nullable=True),
-        sa.Column('bot_account', sa.VARCHAR(), nullable=True),
+        sa.Column('bot_account', sa.String(), nullable=True),
-        sa.Column('source_type', sa.VARCHAR(length=32), nullable=True),
+        sa.Column('source_type', sa.String(length=32), nullable=True),
-        sa.Column('source_account', sa.VARCHAR(), nullable=True),
+        sa.Column('source_account', sa.String(), nullable=True),
-        sa.Column('message', sa.BLOB(), nullable=True),
+        sa.Column('message', sa.PickleType(), nullable=True),
-        sa.Column('game_platform', sa.VARCHAR(length=32), nullable=False),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
-        sa.Column('command_type', sa.VARCHAR(length=16), nullable=False),
+        sa.Column('command_type', sa.String(length=16), nullable=False),
-        sa.Column('command_args', sqlite.JSON(), nullable=False),
+        sa.Column('command_args', sa.JSON(), nullable=False),
-        sa.Column('game_user', sqlite.JSON(), nullable=False),
+        sa.Column('game_user', sa.JSON(), nullable=False),
-        sa.Column('processed_data', sqlite.JSON(), nullable=False),
+        sa.Column('processed_data', sa.JSON(), nullable=False),
-        sa.Column('finish_time', sa.DATETIME(), nullable=False),
+        sa.Column('finish_time', sa.DateTime(), nullable=False),
-        sa.Column('user_unique_identifier', sa.VARCHAR(length=32), nullable=False),
+        sa.Column('user_unique_identifier', sa.String(length=32), nullable=False),
         sa.PrimaryKeyConstraint('id', name='pk_nonebot_plugin_tetris_stats_historicaldata'),
     )
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:

nonebot_plugin_tetris_stats/config/migrations/3d900bb0e8d4_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,82 @@
+"""migrate nonebot_plugin_tetris_stats_tetrioleaguestats
+
+迁移 ID: 3d900bb0e8d4
+父迁移: 405c6936a164
+创建时间: 2025-07-18 02:22:03.771903
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = '3d900bb0e8d4'
+down_revision: str | Sequence[str] | None = '405c6936a164'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tetrioleaguestats' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tetrioleaguestats  # noqa: N806
+    New = Base.classes.nb_t_io_tl_stats  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        update_time=i.update_time,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/405c6936a164_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,85 @@
+"""migrate nonebot_plugin_tetris_stats_tetrioleaguehistorical
+
+迁移 ID: 405c6936a164
+父迁移: bbbdfd94e6fa
+创建时间: 2025-07-18 01:55:27.406032
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = '405c6936a164'
+down_revision: str | Sequence[str] | None = 'bbbdfd94e6fa'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tetrioleaguehistorical' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tetrioleaguehistorical  # noqa: N806
+    New = Base.classes.nb_t_io_tl_hist  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        request_id=i.request_id,
+                        data=i.data,
+                        update_time=i.update_time,
+                        stats_id=i.stats_id,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/5a1b93948494_add_tetrioleaguestats.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         'nonebot_plugin_tetris_stats_tetrioleaguestats',
@@ -102,6 +104,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_tetrioleaguestatsfield', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_tetrioleaguestatsfield_rank'))

nonebot_plugin_tetris_stats/config/migrations/612d8b00d9ac_create_a_new_table.py

@@ -0,0 +1,64 @@
+"""Create a new table
+
+迁移 ID: 612d8b00d9ac
+父迁移: 5a1b93948494
+创建时间: 2025-05-26 04:49:29.664480
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
+from alembic import op
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = '612d8b00d9ac'
+down_revision: str | Sequence[str] | None = '5a1b93948494'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
+    op.create_table(
+        'nonebot_plugin_tetris_stats_triggerhistoricaldatav2',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('trigger_time', sa.DateTime(), nullable=False),
+        sa.Column('session_persist_id', sa.Integer(), nullable=False),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
+        sa.Column('command_type', sa.String(length=16), nullable=False),
+        sa.Column('command_args', sa.JSON(), nullable=False),
+        sa.Column('finish_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nonebot_plugin_tetris_stats_triggerhistoricaldatav2')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_triggerhistoricaldatav2', schema=None) as batch_op:
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_triggerhistoricaldatav2_command_type'),
+            ['command_type'],
+            unique=False,
+        )
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_triggerhistoricaldatav2_game_platform'),
+            ['game_platform'],
+            unique=False,
+        )
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_triggerhistoricaldatav2', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_triggerhistoricaldatav2_game_platform'))
+        batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_triggerhistoricaldatav2_command_type'))
+
+    op.drop_table('nonebot_plugin_tetris_stats_triggerhistoricaldatav2')

nonebot_plugin_tetris_stats/config/migrations/6c3206f90cc3_add_field.py

@@ -26,7 +26,9 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
-    from json import dumps, loads
+    if op.get_bind().dialect.name == 'postgresql':
+        return
+    from json import dumps, loads  # noqa: PLC0415
 
     Base = automap_base()  # noqa: N806
     connection = op.get_bind()
@@ -50,7 +52,9 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
-    from json import dumps, loads
+    if op.get_bind().dialect.name == 'postgresql':
+        return
+    from json import dumps, loads  # noqa: PLC0415
 
     Base = automap_base()  # noqa: N806
     connection = op.get_bind()

nonebot_plugin_tetris_stats/config/migrations/766cc7e75a62_migrate_to_uninfo.py

@@ -0,0 +1,120 @@
+"""Migrate to uninfo
+
+迁移 ID: 766cc7e75a62
+父迁移: 612d8b00d9ac
+创建时间: 2025-05-26 04:51:54.665200
+
+"""
+
+from __future__ import annotations
+
+import math
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = '766cc7e75a62'
+down_revision: str | Sequence[str] | None = '612d8b00d9ac'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_triggerhistoricaldata' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    TriggerHistoricalData = Base.classes.nonebot_plugin_tetris_stats_triggerhistoricaldata  # noqa: N806
+    TriggerHistoricalDataV2 = Base.classes.nonebot_plugin_tetris_stats_triggerhistoricaldatav2  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(TriggerHistoricalData).count()
+        if count == 0:
+            return
+
+        try:
+            from nonebot_session_to_uninfo import (  # type: ignore[import-untyped]  # noqa: PLC0415
+                check_tables,
+                get_id_map,
+            )
+        except ImportError as err:
+            msg = '请安装 `nonebot-session-to-uninfo` 以迁移数据'
+            raise ValueError(msg) from err
+
+        check_tables()
+
+        migration_limit = 10000  # 每次迁移的数据量为 10000 条
+        last_id = -1
+        id_map: dict[int, int] = {}
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for _ in range(math.ceil(count / migration_limit)):
+                records = (
+                    db_session.query(TriggerHistoricalData)
+                    .order_by(TriggerHistoricalData.id)
+                    .where(TriggerHistoricalData.id > last_id)
+                    .limit(migration_limit)
+                    .all()
+                )
+                last_id = records[-1].id
+
+                session_ids = [
+                    record.session_persist_id for record in records if record.session_persist_id not in id_map
+                ]
+                if session_ids:
+                    id_map.update(get_id_map(session_ids))
+
+                db_session.add_all(
+                    TriggerHistoricalDataV2(
+                        id=record.id,
+                        session_persist_id=id_map[record.session_persist_id],
+                        trigger_time=record.trigger_time,
+                        game_platform=record.game_platform,
+                        command_type=record.command_type,
+                        command_args=record.command_args,
+                        finish_time=record.finish_time,
+                    )
+                    for record in records
+                )
+
+                progress.update(task, advance=len(records))
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    if op.get_bind().dialect.name == 'postgresql':
+        return

nonebot_plugin_tetris_stats/config/migrations/8459b2a4b7a3_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,94 @@
+"""migrate nonebot_plugin_tetris_stats_tetrioleaguestatsfield
+
+迁移 ID: 8459b2a4b7a3
+父迁移: 3d900bb0e8d4
+创建时间: 2025-07-18 02:24:59.560252
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = '8459b2a4b7a3'
+down_revision: str | Sequence[str] | None = '3d900bb0e8d4'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tetrioleaguestatsfield' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tetrioleaguestatsfield  # noqa: N806
+    New = Base.classes.nb_t_io_tl_stats_field  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        rank=i.rank,
+                        tr_line=i.tr_line,
+                        player_count=i.player_count,
+                        low_pps=i.low_pps,
+                        low_apm=i.low_apm,
+                        low_vs=i.low_vs,
+                        avg_pps=i.avg_pps,
+                        avg_apm=i.avg_apm,
+                        avg_vs=i.avg_vs,
+                        high_pps=i.high_pps,
+                        high_apm=i.high_apm,
+                        high_vs=i.high_vs,
+                        stats_id=i.stats_id,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/8a91210ce14d_correct_the_data_in_historicaldata.py

@@ -28,10 +28,12 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:  # noqa: C901
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
 
-    from nonebot.compat import PYDANTIC_V2, type_validate_json
+    from nonebot.compat import PYDANTIC_V2, type_validate_json  # noqa: PLC0415
-    from pydantic import BaseModel, ValidationError
+    from pydantic import BaseModel, ValidationError  # noqa: PLC0415
-    from rich.progress import (
+    from rich.progress import (  # noqa: PLC0415
         BarColumn,
         MofNCompleteColumn,
         Progress,
@@ -58,14 +60,14 @@ def upgrade(name: str = '') -> None:  # noqa: C901
             logger.info('空表, 跳过')
             return
 
-        from nonebot_plugin_tetris_stats.version import __version__
+        from nonebot_plugin_tetris_stats.version import __version__  # noqa: PLC0415
 
         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]
+        from nonebot_plugin_tetris_stats.game_data_processor.schemas import (  # type: ignore[import-untyped]  # noqa: PLC0415
             BaseProcessedData,
         )
 
@@ -101,3 +103,5 @@ def upgrade(name: str = '') -> None:  # noqa: C901
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return

nonebot_plugin_tetris_stats/config/migrations/9866f53ce44f_init_db.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         'nonebot_plugin_tetris_stats_bind',
@@ -122,6 +124,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_iorank_rank'))

nonebot_plugin_tetris_stats/config/migrations/9cd1647db502_merge_old_db.py

@@ -63,6 +63,8 @@ def migrate_old_data(connection: Connection) -> None:
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     try:
         db_path = Path(config.db_url)
     except AttributeError:
@@ -91,3 +93,5 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return

nonebot_plugin_tetris_stats/config/migrations/9f6582279ce2_recreate_historical_data.py

@@ -12,7 +12,6 @@ from typing import TYPE_CHECKING
 
 import sqlalchemy as sa
 from alembic import op
-from sqlalchemy.dialects import sqlite
 
 if TYPE_CHECKING:
     from collections.abc import Sequence
@@ -26,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:
         batch_op.drop_index('ix_nonebot_plugin_tetris_stats_historicaldata_command_type')
@@ -71,6 +72,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_historicaldata_source_type'))
@@ -82,19 +85,19 @@ def downgrade(name: str = '') -> None:
 
     op.create_table(
         'nonebot_plugin_tetris_stats_historicaldata',
-        sa.Column('id', sa.INTEGER(), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('trigger_time', sa.DATETIME(), nullable=False),
+        sa.Column('trigger_time', sa.DateTime(), nullable=False),
-        sa.Column('bot_platform', sa.VARCHAR(length=32), nullable=True),
+        sa.Column('bot_platform', sa.String(length=32), nullable=True),
-        sa.Column('bot_account', sa.VARCHAR(), nullable=True),
+        sa.Column('bot_account', sa.String(), nullable=True),
-        sa.Column('source_type', sa.VARCHAR(length=32), nullable=True),
+        sa.Column('source_type', sa.String(length=32), nullable=True),
-        sa.Column('source_account', sa.VARCHAR(), nullable=True),
+        sa.Column('source_account', sa.String(), nullable=True),
-        sa.Column('message', sa.BLOB(), nullable=True),
+        sa.Column('message', sa.PickleType(), nullable=True),
-        sa.Column('game_platform', sa.VARCHAR(length=32), nullable=False),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
-        sa.Column('command_type', sa.VARCHAR(length=16), nullable=False),
+        sa.Column('command_type', sa.String(length=16), nullable=False),
-        sa.Column('command_args', sqlite.JSON(), nullable=False),
+        sa.Column('command_args', sa.JSON(), nullable=False),
-        sa.Column('game_user', sa.BLOB(), nullable=False),
+        sa.Column('game_user', sa.PickleType(), nullable=False),
-        sa.Column('processed_data', sa.BLOB(), nullable=False),
+        sa.Column('processed_data', sa.PickleType(), nullable=False),
-        sa.Column('finish_time', sa.DATETIME(), nullable=False),
+        sa.Column('finish_time', sa.DateTime(), nullable=False),
         sa.PrimaryKeyConstraint('id', name='pk_nonebot_plugin_tetris_stats_historicaldata'),
     )
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:

nonebot_plugin_tetris_stats/config/migrations/a1195e989cc6_add_tetrio_user_configuration.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
         'nonebot_plugin_tetris_stats_tetriouserconfig',
@@ -39,6 +41,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_table('nonebot_plugin_tetris_stats_tetriouserconfig')
     # ### end Alembic commands ###

nonebot_plugin_tetris_stats/config/migrations/b15844837693_migrate_to_nonobot_plugin_user.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_bind', schema=None) as batch_op:
         batch_op.drop_index('ix_nonebot_plugin_tetris_stats_bind_chat_account')
@@ -49,6 +51,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_bind', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_bind_user_id'))
@@ -57,11 +61,11 @@ def downgrade(name: str = '') -> None:
 
     op.create_table(
         'nonebot_plugin_tetris_stats_bind',
-        sa.Column('id', sa.INTEGER(), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('chat_platform', sa.VARCHAR(length=32), nullable=False),
+        sa.Column('chat_platform', sa.String(length=32), nullable=False),
-        sa.Column('chat_account', sa.VARCHAR(), nullable=False),
+        sa.Column('chat_account', sa.String(), nullable=False),
-        sa.Column('game_platform', sa.VARCHAR(length=32), nullable=False),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
-        sa.Column('game_account', sa.VARCHAR(), nullable=False),
+        sa.Column('game_account', sa.String(), nullable=False),
         sa.PrimaryKeyConstraint('id', name='pk_nonebot_plugin_tetris_stats_bind'),
     )
     with op.batch_alter_table('nonebot_plugin_tetris_stats_bind', schema=None) as batch_op:

nonebot_plugin_tetris_stats/config/migrations/b2075a5ce371_create_new_tables.py

@@ -0,0 +1,215 @@
+"""create new tables
+
+迁移 ID: b2075a5ce371
+父迁移: 766cc7e75a62
+创建时间: 2025-07-17 22:57:32.245327
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import sqlalchemy as sa
+from alembic import op
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'b2075a5ce371'
+down_revision: str | Sequence[str] | None = '766cc7e75a62'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        'nb_t_bind',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_id', sa.Integer(), nullable=False),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
+        sa.Column('game_account', sa.String(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_bind')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_bind', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_bind_user_id'), ['user_id'], unique=False)
+
+    op.create_table(
+        'nb_t_io_hist_data',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_unique_identifier', sa.String(length=24), nullable=False),
+        sa.Column('api_type', sa.String(length=32), nullable=False),
+        sa.Column('data', sa.JSON(), nullable=False),
+        sa.Column('update_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_hist_data')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_io_hist_data', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_io_hist_data_api_type'), ['api_type'], unique=False)
+        batch_op.create_index(batch_op.f('ix_nb_t_io_hist_data_update_time'), ['update_time'], unique=False)
+        batch_op.create_index(
+            batch_op.f('ix_nb_t_io_hist_data_user_unique_identifier'), ['user_unique_identifier'], unique=False
+        )
+
+    op.create_table(
+        'nb_t_io_tl_stats',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('update_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_tl_stats')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_io_tl_stats', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_io_tl_stats_update_time'), ['update_time'], unique=False)
+
+    op.create_table(
+        'nb_t_io_u_cfg',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('query_template', sa.String(length=2), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_u_cfg')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    op.create_table(
+        'nb_t_top_hist_data',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_unique_identifier', sa.String(length=24), nullable=False),
+        sa.Column('api_type', sa.String(length=16), nullable=False),
+        sa.Column('data', sa.JSON(), nullable=False),
+        sa.Column('update_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_top_hist_data')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_top_hist_data', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_top_hist_data_api_type'), ['api_type'], unique=False)
+        batch_op.create_index(batch_op.f('ix_nb_t_top_hist_data_update_time'), ['update_time'], unique=False)
+        batch_op.create_index(
+            batch_op.f('ix_nb_t_top_hist_data_user_unique_identifier'), ['user_unique_identifier'], unique=False
+        )
+
+    op.create_table(
+        'nb_t_tos_hist_data',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('user_unique_identifier', sa.String(length=24), nullable=False),
+        sa.Column('api_type', sa.String(length=16), nullable=False),
+        sa.Column('data', sa.JSON(), nullable=False),
+        sa.Column('update_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_tos_hist_data')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_tos_hist_data', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_tos_hist_data_api_type'), ['api_type'], unique=False)
+        batch_op.create_index(batch_op.f('ix_nb_t_tos_hist_data_update_time'), ['update_time'], unique=False)
+        batch_op.create_index(
+            batch_op.f('ix_nb_t_tos_hist_data_user_unique_identifier'), ['user_unique_identifier'], unique=False
+        )
+
+    op.create_table(
+        'nb_t_trigger_hist_v2',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('trigger_time', sa.DateTime(), nullable=False),
+        sa.Column('session_persist_id', sa.Integer(), nullable=False),
+        sa.Column('game_platform', sa.String(length=32), nullable=False),
+        sa.Column('command_type', sa.String(length=16), nullable=False),
+        sa.Column('command_args', sa.JSON(), nullable=False),
+        sa.Column('finish_time', sa.DateTime(), nullable=False),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_trigger_hist_v2')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_trigger_hist_v2', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_trigger_hist_v2_command_type'), ['command_type'], unique=False)
+        batch_op.create_index(batch_op.f('ix_nb_t_trigger_hist_v2_game_platform'), ['game_platform'], unique=False)
+
+    op.create_table(
+        'nb_t_io_tl_hist',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('request_id', sa.Uuid(), nullable=False),
+        sa.Column('data', sa.JSON(), nullable=False),
+        sa.Column('update_time', sa.DateTime(), nullable=False),
+        sa.Column('stats_id', sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ['stats_id'], ['nb_t_io_tl_stats.id'], name=op.f('fk_nb_t_io_tl_hist_stats_id_nb_t_io_tl_stats')
+        ),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_tl_hist')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_io_tl_hist', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_io_tl_hist_request_id'), ['request_id'], unique=False)
+        batch_op.create_index(batch_op.f('ix_nb_t_io_tl_hist_update_time'), ['update_time'], unique=False)
+
+    op.create_table(
+        'nb_t_io_tl_stats_field',
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('rank', sa.String(length=2), nullable=False),
+        sa.Column('tr_line', sa.Float(), nullable=False),
+        sa.Column('player_count', sa.Integer(), nullable=False),
+        sa.Column('low_pps', sa.JSON(), nullable=False),
+        sa.Column('low_apm', sa.JSON(), nullable=False),
+        sa.Column('low_vs', sa.JSON(), nullable=False),
+        sa.Column('avg_pps', sa.Float(), nullable=False),
+        sa.Column('avg_apm', sa.Float(), nullable=False),
+        sa.Column('avg_vs', sa.Float(), nullable=False),
+        sa.Column('high_pps', sa.JSON(), nullable=False),
+        sa.Column('high_apm', sa.JSON(), nullable=False),
+        sa.Column('high_vs', sa.JSON(), nullable=False),
+        sa.Column('stats_id', sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ['stats_id'], ['nb_t_io_tl_stats.id'], name=op.f('fk_nb_t_io_tl_stats_field_stats_id_nb_t_io_tl_stats')
+        ),
+        sa.PrimaryKeyConstraint('id', name=op.f('pk_nb_t_io_tl_stats_field')),
+        info={'bind_key': 'nonebot_plugin_tetris_stats'},
+    )
+    with op.batch_alter_table('nb_t_io_tl_stats_field', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_nb_t_io_tl_stats_field_rank'), ['rank'], unique=False)
+
+    # ### end Alembic commands ###
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('nb_t_io_tl_stats_field', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_tl_stats_field_rank'))
+
+    op.drop_table('nb_t_io_tl_stats_field')
+    with op.batch_alter_table('nb_t_io_tl_hist', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_tl_hist_update_time'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_tl_hist_request_id'))
+
+    op.drop_table('nb_t_io_tl_hist')
+    with op.batch_alter_table('nb_t_trigger_hist_v2', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_trigger_hist_v2_game_platform'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_trigger_hist_v2_command_type'))
+
+    op.drop_table('nb_t_trigger_hist_v2')
+    with op.batch_alter_table('nb_t_tos_hist_data', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_tos_hist_data_user_unique_identifier'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_tos_hist_data_update_time'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_tos_hist_data_api_type'))
+
+    op.drop_table('nb_t_tos_hist_data')
+    with op.batch_alter_table('nb_t_top_hist_data', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_top_hist_data_user_unique_identifier'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_top_hist_data_update_time'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_top_hist_data_api_type'))
+
+    op.drop_table('nb_t_top_hist_data')
+    op.drop_table('nb_t_io_u_cfg')
+    with op.batch_alter_table('nb_t_io_tl_stats', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_tl_stats_update_time'))
+
+    op.drop_table('nb_t_io_tl_stats')
+    with op.batch_alter_table('nb_t_io_hist_data', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_hist_data_user_unique_identifier'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_hist_data_update_time'))
+        batch_op.drop_index(batch_op.f('ix_nb_t_io_hist_data_api_type'))
+
+    op.drop_table('nb_t_io_hist_data')
+    with op.batch_alter_table('nb_t_bind', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nb_t_bind_user_id'))
+
+    op.drop_table('nb_t_bind')
+    # ### end Alembic commands ###

nonebot_plugin_tetris_stats/config/migrations/b7fbdafc339a_add_user_unique_identifier_field_to_.py

@@ -23,13 +23,15 @@ branch_labels: str | Sequence[str] | None = None
 depends_on: str | Sequence[str] | None = None
 
 
-def upgrade(name: str = '') -> None:
+def upgrade(name: str = '') -> None:  # noqa: C901
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
 
-    from nonebot.compat import type_validate_json
+    from nonebot.compat import type_validate_json  # noqa: PLC0415
-    from pydantic import ValidationError
+    from pydantic import ValidationError  # noqa: PLC0415
-    from rich.progress import (
+    from rich.progress import (  # noqa: PLC0415
         BarColumn,
         MofNCompleteColumn,
         Progress,
@@ -37,9 +39,9 @@ def upgrade(name: str = '') -> None:
         TextColumn,
         TimeRemainingColumn,
     )
-    from sqlalchemy import select
+    from sqlalchemy import select  # noqa: PLC0415
-    from sqlalchemy.ext.automap import automap_base
+    from sqlalchemy.ext.automap import automap_base  # noqa: PLC0415
-    from sqlalchemy.orm import Session
+    from sqlalchemy.orm import Session  # noqa: PLC0415
 
     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))
@@ -58,13 +60,15 @@ def upgrade(name: str = '') -> None:
         if count == 0:
             logger.info('空表, 跳过')
         else:
-            from nonebot_plugin_tetris_stats.version import __version__
+            from nonebot_plugin_tetris_stats.version import __version__  # noqa: PLC0415
 
             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]
+            from nonebot_plugin_tetris_stats.game_data_processor.schemas import (  # type: ignore[import-untyped] # noqa: PLC0415
+                BaseUser,
+            )
 
             models: list[type[BaseUser]] = BaseUser.__subclasses__()
 
@@ -103,6 +107,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_historicaldata', schema=None) as batch_op:
         batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_historicaldata_user_unique_identifier'))

nonebot_plugin_tetris_stats/config/migrations/b96c8c18b79a_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,82 @@
+"""migrate nonebot_plugin_tetris_stats_tetriouserconfig
+
+迁移 ID: b96c8c18b79a
+父迁移: 8459b2a4b7a3
+创建时间: 2025-07-18 04:25:44.190319
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'b96c8c18b79a'
+down_revision: str | Sequence[str] | None = '8459b2a4b7a3'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tetriouserconfig' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tetriouserconfig  # noqa: N806
+    New = Base.classes.nb_t_io_u_cfg  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        query_template=i.query_template,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/b9d65badc713_del_old_tos_bind_data.py

@@ -26,6 +26,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
 
     Base = automap_base()  # noqa: N806
     connection = op.get_bind()
@@ -40,3 +42,5 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return

nonebot_plugin_tetris_stats/config/migrations/bbbdfd94e6fa_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,85 @@
+"""migrate nonebot_plugin_tetris_stats_tetriohistoricaldata
+
+迁移 ID: bbbdfd94e6fa
+父迁移: d61e6ae36586
+创建时间: 2025-07-18 00:42:33.730885
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'bbbdfd94e6fa'
+down_revision: str | Sequence[str] | None = 'd61e6ae36586'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tetriohistoricaldata' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tetriohistoricaldata  # noqa: N806
+    New = Base.classes.nb_t_io_hist_data  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        user_unique_identifier=i.user_unique_identifier,
+                        api_type=i.api_type,
+                        data=i.data,
+                        update_time=i.update_time,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/bc6abd57928f_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,87 @@
+"""migrate nonebot_plugin_tetris_stats_triggerhistoricaldatav2
+
+迁移 ID: bc6abd57928f
+父迁移: ee76ae37d70a
+创建时间: 2025-07-18 04:33:04.222045
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'bc6abd57928f'
+down_revision: str | Sequence[str] | None = 'ee76ae37d70a'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_triggerhistoricaldatav2' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_triggerhistoricaldatav2  # noqa: N806
+    New = Base.classes.nb_t_trigger_hist_v2  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        trigger_time=i.trigger_time,
+                        session_persist_id=i.session_persist_id,
+                        game_platform=i.game_platform,
+                        command_type=i.command_type,
+                        command_args=i.command_args,
+                        finish_time=i.finish_time,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/ce073d279d19_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,85 @@
+"""migrate nonebot_plugin_tetris_stats_tophistoricaldata
+
+迁移 ID: ce073d279d19
+父迁移: b96c8c18b79a
+创建时间: 2025-07-18 04:28:13.820635
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'ce073d279d19'
+down_revision: str | Sequence[str] | None = 'b96c8c18b79a'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_tophistoricaldata' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_tophistoricaldata  # noqa: N806
+    New = Base.classes.nb_t_top_hist_data  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        user_unique_identifier=i.user_unique_identifier,
+                        api_type=i.api_type,
+                        data=i.data,
+                        update_time=i.update_time,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/cfeab6961dce_extend_api_type_field_length.py

@@ -26,6 +26,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('nonebot_plugin_tetris_stats_tetriohistoricaldata', schema=None) as batch_op:
         batch_op.alter_column(
@@ -38,6 +40,8 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     # ### commands auto generated by Alembic - please adjust! ###
     logger.warning('新数据可能不支持降级!')
     logger.warning('请确认数据库内数据可以迁移到旧版本!')

nonebot_plugin_tetris_stats/config/migrations/d61e6ae36586_migrate_nonebot_plugin_tetris_stats_bind.py

@@ -0,0 +1,84 @@
+"""migrate nonebot_plugin_tetris_stats_bind
+
+迁移 ID: d61e6ae36586
+父迁移: b2075a5ce371
+创建时间: 2025-07-17 23:58:13.408384
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'd61e6ae36586'
+down_revision: str | Sequence[str] | None = 'b2075a5ce371'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_bind' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_bind  # noqa: N806
+    New = Base.classes.nb_t_bind  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(100):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        user_id=i.user_id,
+                        game_platform=i.game_platform,
+                        game_account=i.game_account,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/ee76ae37d70a_migrate_nonebot_plugin_tetris_stats_.py

@@ -0,0 +1,85 @@
+"""migrate nonebot_plugin_tetris_stats_toshistoricaldata
+
+迁移 ID: ee76ae37d70a
+父迁移: ce073d279d19
+创建时间: 2025-07-18 04:29:52.976624
+
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from alembic import op
+from nonebot.log import logger
+from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from sqlalchemy import inspect
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+revision: str = 'ee76ae37d70a'
+down_revision: str | Sequence[str] | None = 'ce073d279d19'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def data_migrate() -> None:
+    conn = op.get_bind()
+    insp = inspect(conn)
+    table_names = insp.get_table_names()
+    if 'nonebot_plugin_tetris_stats_toshistoricaldata' not in table_names:
+        return
+
+    Base = automap_base()  # noqa: N806
+    Base.prepare(autoload_with=conn)
+    Old = Base.classes.nonebot_plugin_tetris_stats_toshistoricaldata  # noqa: N806
+    New = Base.classes.nb_t_tos_hist_data  # noqa: N806
+
+    with Session(conn) as db_session:
+        count = db_session.query(Old).count()
+        if count == 0:
+            return
+
+        logger.warning('tetris_stats: 正在迁移数据, 请不要关闭程序...')
+
+        with Progress(
+            SpinnerColumn(),
+            TextColumn('[progress.description]{task.description}'),
+            BarColumn(),
+            TaskProgressColumn(),
+        ) as progress:
+            task = progress.add_task('迁移数据...', total=count)
+
+            for i in db_session.query(Old).yield_per(1):
+                db_session.add(
+                    New(
+                        id=i.id,
+                        user_unique_identifier=i.user_unique_identifier,
+                        api_type=i.api_type,
+                        data=i.data,
+                        update_time=i.update_time,
+                    )
+                )
+
+                progress.update(task, advance=1)
+
+                if progress.tasks[task].completed % 100 == 0:
+                    db_session.commit()
+
+        db_session.commit()
+
+        logger.success('tetris_stats: 数据迁移完成!')
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    data_migrate()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/config/migrations/f5b4a6d1325b_tetr_io_new_season.py

@@ -25,6 +25,8 @@ depends_on: str | Sequence[str] | None = None
 def upgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
         batch_op.drop_index('ix_nonebot_plugin_tetris_stats_iorank_file_hash')
         batch_op.drop_index('ix_nonebot_plugin_tetris_stats_iorank_rank')
@@ -66,23 +68,25 @@ def upgrade(name: str = '') -> None:
 def downgrade(name: str = '') -> None:
     if name:
         return
+    if op.get_bind().dialect.name == 'postgresql':
+        return
     op.create_table(
         'nonebot_plugin_tetris_stats_iorank',
-        sa.Column('id', sa.INTEGER(), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('rank', sa.VARCHAR(length=2), nullable=False),
+        sa.Column('rank', sa.String(length=2), nullable=False),
-        sa.Column('tr_line', sa.FLOAT(), nullable=False),
+        sa.Column('tr_line', sa.Float(), nullable=False),
-        sa.Column('player_count', sa.INTEGER(), nullable=False),
+        sa.Column('player_count', sa.Integer(), nullable=False),
         sa.Column('low_pps', sa.JSON(), nullable=False),
         sa.Column('low_apm', sa.JSON(), nullable=False),
         sa.Column('low_vs', sa.JSON(), nullable=False),
-        sa.Column('avg_pps', sa.FLOAT(), nullable=False),
+        sa.Column('avg_pps', sa.Float(), nullable=False),
-        sa.Column('avg_apm', sa.FLOAT(), nullable=False),
+        sa.Column('avg_apm', sa.Float(), nullable=False),
-        sa.Column('avg_vs', sa.FLOAT(), nullable=False),
+        sa.Column('avg_vs', sa.Float(), nullable=False),
         sa.Column('high_pps', sa.JSON(), nullable=False),
         sa.Column('high_apm', sa.JSON(), nullable=False),
         sa.Column('high_vs', sa.JSON(), nullable=False),
-        sa.Column('update_time', sa.DATETIME(), nullable=False),
+        sa.Column('update_time', sa.DateTime(), nullable=False),
-        sa.Column('file_hash', sa.VARCHAR(length=128), nullable=True),
+        sa.Column('file_hash', sa.String(length=128), nullable=True),
         sa.PrimaryKeyConstraint('id', name='pk_nonebot_plugin_tetris_stats_iorank'),
     )
     with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:

nonebot_plugin_tetris_stats/db/__init__.py

@@ -12,7 +12,7 @@ from nonebot_plugin_user import User
 from sqlalchemy import select
 
 from ..utils.typedefs import AllCommandType, BaseCommandType, GameType, TETRIOCommandType
-from .models import Bind, TriggerHistoricalData
+from .models import Bind, TriggerHistoricalDataV2
 
 UTC = timezone.utc
 
@@ -139,7 +139,7 @@ async def trigger(
     except FinishedException:
         async with get_session() as session:
             session.add(
-                TriggerHistoricalData(
+                TriggerHistoricalDataV2(
                     trigger_time=trigger_time,
                     session_persist_id=session_persist_id,
                     game_platform=game_platform,

nonebot_plugin_tetris_stats/db/models.py

@@ -65,13 +65,17 @@ class PydanticType(TypeDecorator):
 
 
 class Bind(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_bind'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
     user_id: Mapped[int] = mapped_column(index=True)
     game_platform: Mapped[GameType] = mapped_column(String(32))
     game_account: Mapped[str]
 
 
-class TriggerHistoricalData(MappedAsDataclass, Model):
+class TriggerHistoricalDataV2(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_trigger_hist_v2'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
     trigger_time: Mapped[datetime] = mapped_column(DateTime)
     session_persist_id: Mapped[int]

nonebot_plugin_tetris_stats/games/schemas.py

@@ -22,3 +22,5 @@ class BaseUser(BaseModel, ABC, Generic[T]):
     @abstractmethod
     def unique_identifier(self) -> str:
         raise NotImplementedError
+
+    __hash__ = BaseModel.__hash__

nonebot_plugin_tetris_stats/games/tetrio/api/models.py

@@ -11,6 +11,8 @@ from .typedefs import Records, Summaries
 
 
 class TETRIOHistoricalData(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_hist_data'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
     user_unique_identifier: Mapped[str] = mapped_column(String(24), index=True)
     api_type: Mapped[Literal['User Info', Records, Summaries]] = mapped_column(String(32), index=True)

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

@@ -1,25 +1,93 @@
-from typing import TypeAlias
+from datetime import datetime
+from enum import IntEnum
+from typing import Literal, TypeAlias
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 from ..base import FailedModel, SuccessModel
 
 
+class RankType(IntEnum):
+    PERCENTILE = 1
+    ISSUE = 2
+    ZENITH = 3
+    PERCENTILELAX = 4
+    PERCENTILEVLAX = 5
+    PERCENTILEMLAX = 6
+
+
+class ValueType(IntEnum):
+    NONE = 0
+    NUMBER = 1
+    TIME = 2
+    TIME_INV = 3
+    FLOOR = 4
+    ISSUE = 5
+    NUMBER_INV = 6
+
+
+class ArType(IntEnum):
+    UNRANKED = 0
+    RANKED = 1
+    COMPETITIVE = 2
+
+
+class Rank(IntEnum):
+    NONE = 0
+    BRONZE = 1
+    SILVER = 2
+    GOLD = 3
+    PLATINUM = 4
+    DIAMOND = 5
+    ISSUED = 100
+
+
+class Ally(BaseModel):
+    id: str = Field(alias='_id')
+    username: str
+    role: Literal['anon', 'user', 'bot', 'halfmod', 'mod', 'admin', 'sysop', 'hidden', 'banned']
+    country: str | None = None
+    supporter: bool
+    avatar_revision: int | None = None
+
+
+class X(BaseModel):
+    ally: Ally | None = None
+
+
 class Achievement(BaseModel):
     # 这**都是些啥
-    k: int
+    achievement_id: int = Field(alias='k')
-    o: int
+    category: str
-    rt: int
+    primary_name: str = Field(alias='name')
-    vt: int
+    objective: str = Field(alias='object')
+    flavor_text: str = Field(alias='desc')
+    order: int = Field(alias='o')
+    rank_type: RankType = Field(alias='rt')
+    value_type: ValueType = Field(alias='vt')
+    ar_type: ArType = Field(alias='art')
     min: int
     deci: int
-    name: str
-    object: str
-    category: str
     hidden: bool
-    desc: str
+    nolb: bool
+    event: str | None = None
+    event_past: bool | None = None
+    disabled: bool | None = None
+    pair: bool | None = None
+    achieved_score: float | None = Field(None, alias='v')
+    a: float | None = None
+    t: datetime | None = None
+    pos: int | None = None
+    total: int | None = None
+    rank: Rank | None = None
+    x: X | None = None
     n: str
-    stub: bool
+
+    tiebreak: int
+    notifypb: bool
+    id: str | None = Field(None, alias='_id')
+    progress: float | None = None
+    stub: bool | None = None
 
 
 class AchievementsSuccessModel(SuccessModel):

nonebot_plugin_tetris_stats/games/tetrio/bind.py

@@ -1,15 +1,17 @@
 from hashlib import md5
+from secrets import choice
 
 from arclet.alconna import Arg, ArgFlag
 from nonebot_plugin_alconna import Args, Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import QryItrface, Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
-from nonebot_plugin_userinfo import BotUserInfo, UserInfo
 from yarl import URL
 
+from ...config.config import global_config
 from ...db import BindStatus, create_or_update_bind, trigger
 from ...utils.host import HostPage, get_self_netloc
 from ...utils.image import get_avatar
@@ -44,7 +46,7 @@ alc.shortcut(
 
 
 @alc.assign('TETRIO.bind')
-async def _(nb_user: User, account: Player, event_session: EventSession, bot_info: UserInfo = BotUserInfo()):  # noqa: B008
+async def _(nb_user: User, account: Player, event_session: Uninfo, interface: QryItrface):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -77,8 +79,15 @@ async def _(nb_user: User, account: Player, event_session: EventSession, bot_inf
                             name=user.name.upper(),
                         ),
                         bot=People(
-                            avatar=await get_avatar(bot_info, 'Data URI', '../../static/logo/logo.svg'),
+                            avatar=await get_avatar(
-                            name=bot_info.user_name,
+                                (
+                                    bot_user := await interface.get_user(event_session.self_id)
+                                    or UninfoUser(id=event_session.self_id)
+                                ),
+                                'Data URI',
+                                '../../static/logo/logo.svg',
+                            ),
+                            name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                         ),
                         prompt='io查我',
                         lang=get_lang(),

nonebot_plugin_tetris_stats/games/tetrio/config.py

@@ -2,8 +2,8 @@ from arclet.alconna import Arg
 from nonebot_plugin_alconna import Option, Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import async_scoped_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
 from sqlalchemy import select
 
@@ -34,7 +34,7 @@ alc.shortcut(
 
 
 @alc.assign('TETRIO.config')
-async def _(user: User, session: async_scoped_session, event_session: EventSession, template: Template):
+async def _(user: User, session: async_scoped_session, event_session: Uninfo, template: Template):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/list.py

@@ -1,7 +1,7 @@
 from nonebot_plugin_alconna import Args, Option, Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 
 from ...db import trigger
 from ...utils.host import HostPage, get_self_netloc
@@ -32,7 +32,7 @@ command.add(
 
 @alc.assign('TETRIO.list')
 async def _(
-    event_session: EventSession,
+    event_session: Uninfo,
     max_tr: float | None = None,
     min_tr: float | None = None,
     limit: int | None = None,

nonebot_plugin_tetris_stats/games/tetrio/models.py

@@ -12,11 +12,15 @@ from .typedefs import Template
 
 
 class TETRIOUserConfig(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_u_cfg'
+
     id: Mapped[int] = mapped_column(primary_key=True)
     query_template: Mapped[Template] = mapped_column(String(2))
 
 
 class TETRIOLeagueStats(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_tl_stats'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
     raw: Mapped[list['TETRIOLeagueHistorical']] = relationship(back_populates='stats', lazy='noload')
     fields: Mapped[list['TETRIOLeagueStatsField']] = relationship(back_populates='stats')
@@ -24,11 +28,13 @@ class TETRIOLeagueStats(MappedAsDataclass, Model):
 
 
 class TETRIOLeagueHistorical(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_tl_hist'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
     request_id: Mapped[UUID] = mapped_column(index=True)
     data: Mapped[BySuccessModel] = mapped_column(PydanticType([], {BySuccessModel}))
     update_time: Mapped[datetime] = mapped_column(DateTime, index=True)
-    stats_id: Mapped[int] = mapped_column(ForeignKey('nonebot_plugin_tetris_stats_tetrioleaguestats.id'), init=False)
+    stats_id: Mapped[int] = mapped_column(ForeignKey('nb_t_io_tl_stats.id'), init=False)
     stats: Mapped['TETRIOLeagueStats'] = relationship(back_populates='raw')
 
 
@@ -36,6 +42,8 @@ entry_type = PydanticType([], {Entry})
 
 
 class TETRIOLeagueStatsField(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_io_tl_stats_field'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
     rank: Mapped[ValidRank] = mapped_column(String(2), index=True)
     tr_line: Mapped[float]
@@ -49,5 +57,5 @@ class TETRIOLeagueStatsField(MappedAsDataclass, Model):
     high_pps: Mapped[Entry] = mapped_column(entry_type)
     high_apm: Mapped[Entry] = mapped_column(entry_type)
     high_vs: Mapped[Entry] = mapped_column(entry_type)
-    stats_id: Mapped[int] = mapped_column(ForeignKey('nonebot_plugin_tetris_stats_tetrioleaguestats.id'), init=False)
+    stats_id: Mapped[int] = mapped_column(ForeignKey('nb_t_io_tl_stats.id'), init=False)
     stats: Mapped['TETRIOLeagueStats'] = relationship(back_populates='fields')

nonebot_plugin_tetris_stats/games/tetrio/query/__init__.py

@@ -7,8 +7,8 @@ from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import Args, At, Option, Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User as NBUser
 from nonebot_plugin_user import get_user
 from sqlalchemy import select
@@ -90,7 +90,7 @@ async def _(  # noqa: PLR0913
     event: Event,
     matcher: Matcher,
     target: At | Me,
-    event_session: EventSession,
+    event_session: Uninfo,
     template: Template | None = None,
 ):
     async with trigger(
@@ -103,7 +103,7 @@ async def _(  # noqa: PLR0913
             bind = await query_bind_info(
                 session=session,
                 user=await get_user(
-                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
@@ -120,7 +120,7 @@ async def _(  # noqa: PLR0913
 
 
 @alc.assign('TETRIO.query')
-async def _(user: NBUser, account: Player, event_session: EventSession, template: Template | None = None):
+async def _(user: NBUser, account: Player, event_session: Uninfo, template: Template | None = 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/v2.py

@@ -11,6 +11,7 @@ from ....utils.metrics import get_metrics
 from ....utils.render import render
 from ....utils.render.schemas.base import Avatar
 from ....utils.render.schemas.v2.tetrio.user.info import (
+    Achievement,
     Badge,
     Best,
     Blitz,
@@ -33,7 +34,7 @@ from .tools import flow_to_history, handling_special_value
 async def make_query_image_v2(player: Player) -> bytes:
     (
         (user, user_info, league, sprint, blitz, zen),
-        (avatar_revision, banner_revision, leagueflow, zenith, zenithex),
+        (avatar_revision, banner_revision, leagueflow, zenith, zenithex, achievements),
     ) = await gather(
         gather(
             player.user,
@@ -49,6 +50,7 @@ async def make_query_image_v2(player: Player) -> bytes:
             player.get_leagueflow(),
             player.get_summaries('zenith'),
             player.get_summaries('zenithex'),
+            player.get_summaries('achievements'),
         ),
     )
     if sprint.data.record is not None:
@@ -110,7 +112,20 @@ async def make_query_image_v2(player: Player) -> bytes:
                     ],
                     xp=user_info.data.xp,
                     ar=user_info.data.ar,
-                    achievements=user_info.data.achievements,
+                    achievements=[
+                        Achievement(
+                            key=i.achievement_id,
+                            rank_type=i.rank_type,
+                            ar_type=i.ar_type,
+                            stub=i.stub,
+                            rank=i.rank,
+                            achieved_score=i.achieved_score,
+                            pos=i.pos,
+                            progress=i.progress,
+                            total=i.total,
+                        )
+                        for i in achievements.data
+                    ],
                     playtime=play_time,
                     join_at=user_info.data.ts,
                 ),

nonebot_plugin_tetris_stats/games/tetrio/rank/all.py

@@ -3,8 +3,8 @@ from datetime import timedelta
 from arclet.alconna import Arg
 from nonebot_plugin_alconna import Option, Subcommand, UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from sqlalchemy import func, select
 from sqlalchemy.orm import selectinload
 
@@ -33,7 +33,7 @@ command.add(
 
 
 @alc.assign('TETRIO.rank.all')
-async def _(event_session: EventSession, template: Template | None = None):
+async def _(event_session: Uninfo, template: Template | None = None):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/rank/detail.py

@@ -5,8 +5,8 @@ from arclet.alconna import Arg
 from nonebot import get_driver
 from nonebot_plugin_alconna import Option, UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from sqlalchemy import func, select
 from sqlalchemy.orm import selectinload
 
@@ -31,7 +31,7 @@ command.add(Option('--detail', Arg('rank', ValidRank), alias=['-D']))
 
 
 @alc.assign('TETRIO.rank')
-async def _(rank: ValidRank, event_session: EventSession):
+async def _(rank: ValidRank, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/record/blitz.py

@@ -7,8 +7,8 @@ from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At, Option
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import get_user
 from yarl import URL
 
@@ -43,7 +43,7 @@ async def _(
     event: Event,
     matcher: Matcher,
     target: At | Me,
-    event_session: EventSession,
+    event_session: Uninfo,
 ):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
@@ -55,7 +55,7 @@ async def _(
             bind = await query_bind_info(
                 session=session,
                 user=await get_user(
-                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
@@ -68,7 +68,7 @@ async def _(
 
 
 @alc.assign('TETRIO.record.blitz')
-async def _(account: Player, event_session: EventSession):
+async def _(account: Player, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/record/sprint.py

@@ -7,8 +7,8 @@ from nonebot.matcher import Matcher
 from nonebot_plugin_alconna import At, Option
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import get_user
 from yarl import URL
 
@@ -43,7 +43,7 @@ async def _(
     event: Event,
     matcher: Matcher,
     target: At | Me,
-    event_session: EventSession,
+    event_session: Uninfo,
 ):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
@@ -55,7 +55,7 @@ async def _(
             bind = await query_bind_info(
                 session=session,
                 user=await get_user(
-                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
@@ -68,7 +68,7 @@ async def _(
 
 
 @alc.assign('TETRIO.record.sprint')
-async def _(account: Player, event_session: EventSession):
+async def _(account: Player, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/tetrio/unbind.py

@@ -1,15 +1,17 @@
 from hashlib import md5
+from secrets import choice
 
 from nonebot_plugin_alconna import Subcommand
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import QryItrface, Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
-from nonebot_plugin_userinfo import BotUserInfo, UserInfo
 from nonebot_plugin_waiter import suggest  # type: ignore[import-untyped]
 from yarl import URL
 
+from ...config.config import global_config
 from ...db import query_bind_info, remove_bind, trigger
 from ...utils.host import HostPage, get_self_netloc
 from ...utils.image import get_avatar
@@ -31,7 +33,7 @@ alc.shortcut(
 
 
 @alc.assign('TETRIO.unbind')
-async def _(nb_user: User, event_session: EventSession, bot_info: UserInfo = BotUserInfo()):  # noqa: B008
+async def _(nb_user: User, event_session: Uninfo, interface: QryItrface):
     async with (
         trigger(
             session_persist_id=await get_session_persist_id(event_session),
@@ -65,8 +67,15 @@ async def _(nb_user: User, event_session: EventSession, bot_info: UserInfo = Bot
                         name=user.name.upper(),
                     ),
                     bot=People(
-                        avatar=await get_avatar(bot_info, 'Data URI', '../../static/logo/logo.svg'),
+                        avatar=await get_avatar(
-                        name=bot_info.user_name,
+                            (
+                                bot_user := await interface.get_user(event_session.self_id)
+                                or UninfoUser(id=event_session.self_id)
+                            ),
+                            'Data URI',
+                            '../../static/logo/logo.svg',
+                        ),
+                        name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                     ),
                     prompt='io绑定{游戏ID}',
                     lang=get_lang(),

nonebot_plugin_tetris_stats/games/top/api/models.py

@@ -10,6 +10,8 @@ from .schemas.user_profile import UserProfile
 
 
 class TOPHistoricalData(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_top_hist_data'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
     user_unique_identifier: Mapped[str] = mapped_column(String(24), index=True)
     api_type: Mapped[Literal['User Profile']] = mapped_column(String(16), index=True)

nonebot_plugin_tetris_stats/games/top/bind.py

@@ -1,10 +1,13 @@
+from secrets import choice
+
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import QryItrface, Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
-from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo
 
+from ...config.config import global_config
 from ...db import BindStatus, create_or_update_bind, trigger
 from ...utils.host import HostPage, get_self_netloc
 from ...utils.image import get_avatar
@@ -18,13 +21,7 @@ from .constant import GAME_TYPE
 
 
 @alc.assign('TOP.bind')
-async def _(
+async def _(nb_user: User, account: Player, event_session: Uninfo, interface: QryItrface):
-    nb_user: User,
-    account: Player,
-    event_session: EventSession,
-    event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
-    bot_info: UserInfo = BotUserInfo(),  # noqa: B008
-):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -47,12 +44,23 @@ async def _(
                         platform=GAME_TYPE,
                         type='unknown',
                         user=People(
-                            avatar=await get_avatar(event_user_info, 'Data URI', None),
+                            avatar=await get_avatar(
+                                event_session.user,
+                                'Data URI',
+                                None,
+                            ),
                             name=user.user_name,
                         ),
                         bot=People(
-                            avatar=await get_avatar(bot_info, 'Data URI', '../../static/logo/logo.svg'),
+                            avatar=await get_avatar(
-                            name=bot_info.user_name,
+                                (
+                                    bot_user := await interface.get_user(event_session.self_id)
+                                    or UninfoUser(id=event_session.self_id)
+                                ),
+                                'Data URI',
+                                '../../static/logo/logo.svg',
+                            ),
+                            name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                         ),
                         prompt='top查我',
                         lang=get_lang(),

nonebot_plugin_tetris_stats/games/top/query.py

@@ -3,8 +3,8 @@ 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
+from nonebot_plugin_uninfo import Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import get_user
 
 from ...db import query_bind_info, trigger
@@ -27,7 +27,7 @@ from .constant import GAME_TYPE
 
 
 @alc.assign('TOP.query')
-async def _(event: Event, matcher: Matcher, target: At | Me, event_session: EventSession):
+async def _(event: Event, matcher: Matcher, target: At | Me, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -38,7 +38,7 @@ async def _(event: Event, matcher: Matcher, target: At | Me, event_session: Even
             bind = await query_bind_info(
                 session=session,
                 user=await get_user(
-                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
@@ -51,7 +51,7 @@ async def _(event: Event, matcher: Matcher, target: At | Me, event_session: Even
 
 
 @alc.assign('TOP.query')
-async def _(account: Player, event_session: EventSession):
+async def _(account: Player, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,

nonebot_plugin_tetris_stats/games/top/unbind.py

@@ -1,11 +1,14 @@
+from secrets import choice
+
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import QryItrface, Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
-from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo
 from nonebot_plugin_waiter import suggest  # type: ignore[import-untyped]
 
+from ...config.config import global_config
 from ...db import query_bind_info, remove_bind, trigger
 from ...utils.host import HostPage, get_self_netloc
 from ...utils.image import get_avatar
@@ -21,9 +24,8 @@ from .constant import GAME_TYPE
 @alc.assign('TOP.unbind')
 async def _(
     nb_user: User,
-    event_session: EventSession,
+    event_session: Uninfo,
-    event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
+    interface: QryItrface,
-    bot_info: UserInfo = BotUserInfo(),  # noqa: B008
 ):
     async with (
         trigger(
@@ -49,12 +51,23 @@ async def _(
                     platform='TOP',
                     type='unlink',
                     user=People(
-                        avatar=await get_avatar(event_user_info, 'Data URI', None),
+                        avatar=await get_avatar(
+                            event_session.user,
+                            'Data URI',
+                            None,
+                        ),
                         name=user.user_name,
                     ),
                     bot=People(
-                        avatar=await get_avatar(bot_info, 'Data URI', '../../static/logo/logo.svg'),
+                        avatar=await get_avatar(
-                        name=bot_info.user_name,
+                            (
+                                bot_user := await interface.get_user(event_session.self_id)
+                                or UninfoUser(id=event_session.self_id)
+                            ),
+                            'Data URI',
+                            '../../static/logo/logo.svg',
+                        ),
+                        name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                     ),
                     prompt='top绑定{游戏ID}',
                     lang=get_lang(),

nonebot_plugin_tetris_stats/games/tos/api/models.py

@@ -11,8 +11,10 @@ from .schemas.user_profile import UserProfile
 
 
 class TOSHistoricalData(MappedAsDataclass, Model):
+    __tablename__ = 'nb_t_tos_hist_data'
+
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
-    user_unique_identifier: Mapped[str] = mapped_column(String(24), index=True)
+    user_unique_identifier: Mapped[str] = mapped_column(String(256), index=True)
     api_type: Mapped[Literal['User Info', 'User Profile']] = mapped_column(String(16), index=True)
     data: Mapped[UserInfoSuccess | UserProfile] = mapped_column(
         PydanticType(get_model=[], models={UserInfoSuccess, UserProfile})

nonebot_plugin_tetris_stats/games/tos/bind.py

@@ -1,10 +1,13 @@
+from secrets import choice
+
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import QryItrface, Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
-from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo
 
+from ...config.config import global_config
 from ...db import BindStatus, create_or_update_bind, trigger
 from ...utils.host import HostPage, get_self_netloc
 from ...utils.image import get_avatar
@@ -21,9 +24,8 @@ from .constant import GAME_TYPE
 async def _(
     nb_user: User,
     account: Player,
-    event_session: EventSession,
+    event_session: Uninfo,
-    event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
+    interface: QryItrface,
-    bot_info: UserInfo = BotUserInfo(),  # noqa: B008
 ):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
@@ -48,11 +50,23 @@ async def _(
                         platform=GAME_TYPE,
                         type='unknown',
                         user=People(
-                            avatar=await get_avatar(event_user_info, 'Data URI', None), name=user_info.data.name
+                            avatar=await get_avatar(
+                                event_session.user,
+                                'Data URI',
+                                None,
+                            ),
+                            name=user_info.data.name,
                         ),
                         bot=People(
-                            avatar=await get_avatar(bot_info, 'Data URI', '../../static/logo/logo.svg'),
+                            avatar=await get_avatar(
-                            name=bot_info.user_remark or bot_info.user_displayname or bot_info.user_name,
+                                (
+                                    bot_user := await interface.get_user(event_session.self_id)
+                                    or UninfoUser(id=event_session.self_id)
+                                ),
+                                'Data URI',
+                                '../../static/logo/logo.svg',
+                            ),
+                            name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                         ),
                         prompt='茶服查我',
                         lang=get_lang(),

nonebot_plugin_tetris_stats/games/tos/query.py

@@ -9,10 +9,9 @@ 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
+from nonebot_plugin_uninfo import Uninfo, User
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import get_user
-from nonebot_plugin_userinfo import EventUserInfo, UserInfo
 from sqlalchemy import select
 
 from ...db import query_bind_info, trigger
@@ -45,8 +44,7 @@ def add_special_handlers(
     async def _(
         event: Event,
         target: At | Me,
-        event_session: EventSession,
+        event_session: Uninfo,
-        event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
     ):
         if isinstance(event, match_event):
             async with trigger(
@@ -66,7 +64,9 @@ def add_special_handlers(
                     if game_data is not None:
                         await UniMessage.image(
                             raw=await make_query_image(
-                                user_info, game_data, None if isinstance(target, At) else event_user_info
+                                user_info,
+                                game_data,
+                                None if isinstance(target, At) else event_session.user,
                             )
                         ).finish()
                     await make_query_text(user_info, game_data).finish()
@@ -112,8 +112,7 @@ async def _(
     event: Event,
     matcher: Matcher,
     target: At | Me,
-    event_session: EventSession,
+    event_session: Uninfo,
-    event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
 ):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
@@ -125,7 +124,7 @@ async def _(
             bind = await query_bind_info(
                 session=session,
                 user=await get_user(
-                    event_session.platform, target.target if isinstance(target, At) else event.get_user_id()
+                    event_session.scope, target.target if isinstance(target, At) else event.get_user_id()
                 ),
                 game_platform=GAME_TYPE,
             )
@@ -139,7 +138,9 @@ async def _(
                 message
                 + UniMessage.image(
                     raw=await make_query_image(
-                        user_info, game_data, None if isinstance(target, At) else event_user_info
+                        user_info,
+                        game_data,
+                        None if isinstance(target, At) else event_session.user,
                     )
                 )
             ).finish()
@@ -147,7 +148,7 @@ async def _(
 
 
 @alc.assign('TOS.query')
-async def _(account: Player, event_session: EventSession):
+async def _(account: Player, event_session: Uninfo):
     async with trigger(
         session_persist_id=await get_session_persist_id(event_session),
         game_platform=GAME_TYPE,
@@ -250,7 +251,7 @@ async def get_historical_data(unique_identifier: str) -> list[HistoryData]:
     ]
 
 
-async def make_query_image(user_info: UserInfoSuccess, game_data: GameData, event_user_info: UserInfo | None) -> bytes:
+async def make_query_image(user_info: UserInfoSuccess, game_data: GameData, event_user_info: User | None) -> bytes:
     metrics = game_data.metrics
     sprint_value = (
         (

nonebot_plugin_tetris_stats/games/tos/unbind.py

@@ -1,17 +1,19 @@
+from secrets import choice
+
 from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_orm import get_session
-from nonebot_plugin_session import EventSession
+from nonebot_plugin_uninfo import QryItrface, Uninfo
-from nonebot_plugin_session_orm import get_session_persist_id  # type: ignore[import-untyped]
+from nonebot_plugin_uninfo import User as UninfoUser
+from nonebot_plugin_uninfo.orm import get_session_persist_id
 from nonebot_plugin_user import User
-from nonebot_plugin_userinfo import BotUserInfo, EventUserInfo, UserInfo
 from nonebot_plugin_waiter import suggest  # type: ignore[import-untyped]
 
+from ...config.config import global_config
 from ...db import query_bind_info, remove_bind, trigger
 from ...utils.host import HostPage, get_self_netloc
 from ...utils.image import get_avatar
 from ...utils.lang import get_lang
 from ...utils.render import Bind, render
-from ...utils.render.avatar import get_avatar as get_random_avatar
 from ...utils.render.schemas.base import People
 from ...utils.screenshot import screenshot
 from . import alc
@@ -22,9 +24,8 @@ from .constant import GAME_TYPE
 @alc.assign('TOP.unbind')
 async def _(
     nb_user: User,
-    event_session: EventSession,
+    event_session: Uninfo,
-    event_user_info: UserInfo = EventUserInfo(),  # noqa: B008
+    interface: QryItrface,
-    bot_info: UserInfo = BotUserInfo(),  # noqa: B008
 ):
     async with (
         trigger(
@@ -50,14 +51,19 @@ async def _(
                     platform='TOS',
                     type='unlink',
                     user=People(
-                        avatar=await get_avatar(event_user_info, 'Data URI', None)
+                        avatar=await get_avatar(event_session.user, 'Data URI', None),
-                        if event_user_info is not None
-                        else get_random_avatar(user.teaid),
                         name=user.name,
                     ),
                     bot=People(
-                        avatar=await get_avatar(bot_info, 'Data URI', '../../static/logo/logo.svg'),
+                        avatar=await get_avatar(
-                        name=bot_info.user_name,
+                            (
+                                bot_user := await interface.get_user(event_session.self_id)
+                                or UninfoUser(id=event_session.self_id)
+                            ),
+                            'Data URI',
+                            '../../static/logo/logo.svg',
+                        ),
+                        name=bot_user.nick or bot_user.name or choice(list(global_config.nickname) or ['bot']),
                     ),
                     prompt='茶服绑定{游戏ID}',
                     lang=get_lang(),

nonebot_plugin_tetris_stats/i18n/__init__.py

@@ -1,7 +1,7 @@
 # This file is @generated by tarina.lang CLI tool
 # It is not intended for manual editing.
 
-# ruff: noqa: E402, F401, PLC0414
+# ruff: noqa: E402
 
 from pathlib import Path
 

nonebot_plugin_tetris_stats/utils/image.py

@@ -2,16 +2,22 @@ from base64 import b64encode
 from io import BytesIO
 from typing import Literal, overload
 
-from nonebot_plugin_userinfo import UserInfo
+from nonebot_plugin_uninfo import User
 from PIL import Image
+from yarl import URL
+
+from ..config.config import config
+from .request import Request
+
+request = Request(config.tetris.proxy.main)
 
 
 @overload
-async def get_avatar(user: UserInfo, scheme: Literal['Data URI'], default: str | None) -> str:
+async def get_avatar(user: User, scheme: Literal['Data URI'], default: str | None) -> str:
     """获取用户头像的指定格式
 
     Args:
-        user (UserInfo): 要获取的用户
+        user (User): 要获取的用户
         scheme (Literal['Data URI']): 格式
         default (str | None): 获取不到时的默认值
 
@@ -25,11 +31,11 @@ async def get_avatar(user: UserInfo, scheme: Literal['Data URI'], default: str |
 
 
 @overload
-async def get_avatar(user: UserInfo, scheme: Literal['bytes'], default: str | None) -> bytes:
+async def get_avatar(user: User, scheme: Literal['bytes'], default: str | None) -> bytes:
     """获取用户头像的指定格式
 
     Args:
-        user (UserInfo): 要获取的用户
+        user (User): 要获取的用户
         scheme (Literal['bytes']): 格式
         default (str | None): 获取不到时的默认值
 
@@ -38,20 +44,20 @@ async def get_avatar(user: UserInfo, scheme: Literal['bytes'], default: str | No
     """
 
 
-async def get_avatar(user: UserInfo, scheme: Literal['Data URI', 'bytes'], default: str | None) -> str | bytes:
+async def get_avatar(user: User, scheme: Literal['Data URI', 'bytes'], default: str | None) -> str | bytes:
-    if user.user_avatar is None:
+    if user.avatar is None:
         if default is None:
             msg = "Can't get avatar"
             raise TypeError(msg)
         return default
-    bot_avatar = await user.user_avatar.get_image()
+    avatar = await request.request(URL(user.avatar), is_json=False)
     if scheme == 'Data URI':
-        avatar_format = Image.open(BytesIO(bot_avatar)).format
+        avatar_format = Image.open(BytesIO(avatar)).format
         if avatar_format is None:
             msg = "Can't get avatar format"
             raise TypeError(msg)
-        return f'data:{Image.MIME[avatar_format]};base64,{b64encode(bot_avatar).decode()}'
+        return f'data:{Image.MIME[avatar_format]};base64,{b64encode(avatar).decode()}'
-    return bot_avatar
+    return avatar
 
 
 def img_to_png(image: bytes) -> bytes:

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

@@ -43,8 +43,8 @@ class Piece(Enum):
     )
 
     I5 = (
-        (True, True, True, True, True),  # fmt: skip
+        (True, True, True, True, True),
-    )
+    )  # fmt: skip
 
     V = (
         (True, False, False),

nonebot_plugin_tetris_stats/utils/render/schemas/v2/tetrio/user/info.py

@@ -3,6 +3,8 @@ from typing import Literal
 
 from pydantic import BaseModel
 
+from .......games.tetrio.api.schemas.summaries.achievements import ArType, RankType
+from .......games.tetrio.api.schemas.summaries.achievements import Rank as AchievementRank
 from .......games.tetrio.api.typedefs import Rank
 from ......typedefs import Number
 from ....base import Avatar, Base, HistoryData
@@ -15,6 +17,18 @@ class Badge(BaseModel):
     receive_at: datetime | None
 
 
+class Achievement(BaseModel):
+    key: int
+    rank_type: RankType
+    ar_type: ArType
+    stub: bool | None
+    rank: AchievementRank | None
+    achieved_score: float | None
+    pos: int | None
+    progress: float | None
+    total: int | None
+
+
 class User(BaseModel):
     id: str
     name: str
@@ -37,7 +51,7 @@ class User(BaseModel):
     xp: Number
 
     ar: Number
-    achievements: list[int]
+    achievements: list[Achievement]
 
     playtime: str | None
     join_at: datetime | None

pnpm-lock.yaml

@@ -10,15 +10,15 @@ importers:
     devDependencies:
       prettier:
         specifier: ^3.3.3
-        version: 3.5.3
+        version: 3.6.2
 
 packages:
 
-  prettier@3.5.3:
+  prettier@3.6.2:
-    resolution: {integrity: sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==}
+    resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==}
     engines: {node: '>=14'}
     hasBin: true
 
 snapshots:
 
-  prettier@3.5.3: {}
+  prettier@3.6.2: {}

pyproject.toml

@@ -1,6 +1,8 @@
+#:schema https://json.schemastore.org/uv.json
+
 [project]
 name = "nonebot-plugin-tetris-stats"
-version = "1.8.2"
+version = "1.10.1"
 description = "一款基于 NoneBot2 的用于查询 Tetris 相关游戏数据的插件"
 readme = "README.md"
 authors = [{ name = "shoucandanghehe", email = "wallfjjd@gmail.com" }]
@@ -19,11 +21,10 @@ dependencies = [
     "nonebot-plugin-apscheduler>=0.5.0",
     "nonebot-plugin-localstore>=0.7.1",
     "nonebot-plugin-orm>=0.7.6",
-    "nonebot-plugin-session>=0.3.2",
+    "nonebot-plugin-uninfo>=0.7.4",
-    "nonebot-plugin-session-orm>=0.2.0",
     "nonebot-plugin-user>=0.4.4",
-    "nonebot-plugin-userinfo>=0.2.6",
     "nonebot-plugin-waiter>=0.8.0",
+    "nonebot-session-to-uninfo>=0.0.2",
     "nonebot2[fastapi]>=2.3.3",
     "pandas>=2.2.3",
     "pillow>=11.0.0",
@@ -58,6 +59,7 @@ dev = [
     "nonebot-adapter-kaiheila>=0.3.4",
     "nonebot-adapter-onebot>=2.4.6",
     "nonebot-adapter-qq>=1.5.3",
+    "nonebot-plugin-orm[postgresql]>=0.8.2",
     "nonebot-plugin-tarina-lang-turbo>=0.1.1",
     "ruff>=0.7.1",
 ]
@@ -160,7 +162,7 @@ defineConstant = { PYDANTIC_V2 = true }
 typeCheckingMode = "standard"
 
 [tool.bumpversion]
-current_version = "1.8.2"
+current_version = "1.10.1"
 tag = true
 sign_tags = true
 tag_name = "{new_version}"

tests/tetrio/test_bind.py

@@ -7,7 +7,7 @@ from tests.fake_event import FakeGroupMessageEvent
 
 @pytest.mark.asyncio
 async def test_invalid_name(app: App) -> None:
-    from nonebot_plugin_tetris_stats.games import alc
+    from nonebot_plugin_tetris_stats.games import alc  # noqa: PLC0415
 
     raw_message = 'tstats tetrio bind 芜湖'
     message = Message(raw_message)