🔖 1.2.6

nonebot_plugin_tetris_stats/db/__init__.py

@@ -1,3 +1,4 @@
+from asyncio import Lock
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 from datetime import datetime, timezone
@@ -72,9 +73,11 @@ async def create_or_update_bind(
 
 T = TypeVar('T', 'TETRIOHistoricalData', 'TOPHistoricalData', 'TOSHistoricalData')
 
+lock = Lock()
+
 
 async def anti_duplicate_add(cls: type[T], model: T) -> None:
-    async with get_session() as session:
+    async with lock, get_session() as session:
         result = (
             await session.scalars(
                 select(cls)
@@ -88,8 +91,8 @@ async def anti_duplicate_add(cls: type[T], model: T) -> None:
                 if i.data == model.data:
                     logger.debug('Anti duplicate successfully')
                     return
-            session.add(model)
-            await session.commit()
+        session.add(model)
+        await session.commit()
 
 
 @asynccontextmanager
@@ -121,12 +124,10 @@ async def trigger(
     command_type: CommandType | Literal['rank'],
     command_args: list[str],
 ) -> AsyncGenerator:
-    logger.debug('running')
     trigger_time = datetime.now(UTC)
     try:
         yield
     except FinishedException:
-        logger.debug('yield')
         async with get_session() as session:
             session.add(
                 TriggerHistoricalData(

nonebot_plugin_tetris_stats/db/models.py

@@ -23,9 +23,8 @@ class PydanticType(TypeDecorator):
         *args: Any,
         **kwargs: Any,
     ):
-        for i in get_model:
-            models.update(i())
-        self.models = models
+        self.get_model = get_model
+        self._models = models
         super().__init__(*args, **kwargs)
 
     if PYDANTIC_V2:
@@ -33,7 +32,7 @@ class PydanticType(TypeDecorator):
         @override
         def process_bind_param(self, value: Any | None, dialect: Dialect) -> str:
             # 将 Pydantic 模型实例转换为 JSON
-            if isinstance(value, tuple(self.pydantic_models)):
+            if isinstance(value, tuple(self.models)):
                 return value.model_dump_json(by_alias=True)  # type: ignore[union-attr]
             raise TypeError
     else:
@@ -41,7 +40,7 @@ class PydanticType(TypeDecorator):
         @override
         def process_bind_param(self, value: Any | None, dialect: Dialect) -> str:
             # 将 Pydantic 模型实例转换为 JSON
-            if isinstance(value, tuple(self.pydantic_models)):
+            if isinstance(value, tuple(self.models)):
                 return value.json(by_alias=True)  # type: ignore[union-attr]
             raise TypeError
 
@@ -49,13 +48,21 @@ class PydanticType(TypeDecorator):
     def process_result_value(self, value: Any | None, dialect: Dialect) -> BaseModel:
         # 将 JSON 转换回 Pydantic 模型实例
         if isinstance(value, str | bytes):
-            for i in self.pydantic_models:
+            for i in self.models:
                 try:
                     return type_validate_json(i, value)
                 except ValidationError:  # noqa: PERF203
                     ...
         raise ValueError
 
+    @property
+    def models(self) -> tuple[type[BaseModel], ...]:
+        models: set[type[BaseModel]] = set()
+        for i in self.get_model:
+            models.update(i())
+        models.update(self._models)
+        return tuple(models)
+
 
 class Bind(MappedAsDataclass, Model):
     id: Mapped[int] = mapped_column(init=False, primary_key=True)

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/api/player.py

@@ -43,7 +43,7 @@ class Player:
         if self.user_id is not None:
             return self.user_id
         if self.user_name is not None:
-            return self.user_name
+            return self.user_name.lower()
         msg = 'Invalid user'
         raise ValueError(msg)
 

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/api/schemas/user_records.py

@@ -2,6 +2,7 @@ from datetime import datetime
 
 from pydantic import BaseModel, Field
 
+from .....utils.typing import Number
 from .base import FailedModel
 from .base import SuccessModel as BaseSuccessModel
 
@@ -45,7 +46,7 @@ class Finesse(BaseModel):
 
 
 class EndContext(BaseModel):
-    seed: int
+    seed: Number
     lines: int
     level_lines: int
     level_lines_needed: int

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/query.py

@@ -172,9 +172,10 @@ async def query_historical_data(user: User, user_info: UserInfoSuccess) -> list[
 
     # 按照时间排序
     histories = sorted(histories, key=lambda x: x.record_at)
+    print(histories)
     for index, value in enumerate(histories):
-        # 在历史记录里找有没有今天0点后的数据
-        if value.record_at > today:
+        # 在历史记录里找有没有今天0点后的数据, 并且至少要有两个数据点
+        if value.record_at > today and len(histories) >= 2:  # noqa: PLR2004
             histories = histories[:index] + [
                 get_specified_point(histories[index - 1], histories[index], today.replace(microsecond=1000))
             ]

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'nonebot-plugin-tetris-stats'
-version = '1.2.0'
+version = '1.2.6'
 description = '一款基于 NoneBot2 的用于查询 Tetris 相关游戏数据的插件'
 authors = ['scdhh <wallfjjd@gmail.com>']
 readme = 'README.md'