fixed adaptix usage

pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
     "redis>=5.0.1,<6.0",
     "pyrogram>=2.0.57,<3.0",
     "dataclass_factory>=2.16,<3.0",
-    "adaptix==3.0.0b7",
+    "adaptix==3.0.0b9",
     "apscheduler>=3.9.1,<4.0",
     "fastapi==0.111.1",
     "uvicorn>=0.30.0,<0.31.0",

shvatka/api/models/responses.py

@@ -3,24 +3,19 @@
 from datetime import datetime
 from typing import Sequence, Generic
 
-from adaptix import Retort, dumper, P
+from adaptix import Retort, dumper
 
 from shvatka.common.factory import REQUIRED_GAME_RECIPES
 from shvatka.core.games.dto import CurrentHints
 from shvatka.core.models import dto, enums
-from shvatka.core.models.dto import scn, action
+from shvatka.core.models.dto import scn
 from shvatka.core.models.enums import GameStatus
 
 T = typing.TypeVar("T")
 retort = Retort(
     recipe=[
         *REQUIRED_GAME_RECIPES,
         dumper(scn.HintsList, lambda x: x.hints),
-        # TODO https://github.com/reagento/adaptix/issues/348
-        dumper(
-            P[action.KeyBonusCondition].keys,
-            lambda keys: [{"text": x.text, "bonus_minutes": x.bonus_minutes} for x in keys],
-        ),
     ]
 )
 

shvatka/common/factory.py

@@ -9,7 +9,6 @@
     name_mapping,
     loader,
     Chain,
-    dumper,
 )
 from adaptix.load_error import LoadError
 from adaptix._internal.morphing.provider_template import ABCProxy
@@ -18,7 +17,7 @@
 from telegraph.aio import Telegraph
 
 from shvatka.common.url_factory import UrlFactory
-from shvatka.core.models.dto import scn, action
+from shvatka.core.models.dto import scn
 from shvatka.core.models.dto.action import AnyCondition
 from shvatka.core.models.dto.scn import HintsList, TimeHint, Conditions
 from shvatka.core.models.schems import schemas
@@ -45,7 +44,6 @@ def create_telegraph(self, bot_config: BotConfig) -> Telegraph:
     ABCProxy(
         Conditions, list[AnyCondition]
     ),  # internal class, can be broken in next adaptix version
-    dumper(P[action.KeyWinCondition].keys, list),
 ]
 
 
@@ -68,13 +66,6 @@ def create_retort(self) -> Retort:
                     name_style=adaptix.NameStyle.LOWER_KEBAB,
                 ),
                 *REQUIRED_GAME_RECIPES,
-                # TODO https://github.com/reagento/adaptix/issues/348
-                dumper(
-                    P[action.KeyBonusCondition].keys,
-                    lambda keys: [
-                        {"text": x.text, "bonus-minutes": x.bonus_minutes} for x in keys
-                    ],
-                ),
                 validator(
                     pred=P[scn.LevelScenario].id,
                     func=lambda x: validate_level_id(x) is not None,

shvatka/infrastructure/db/models/level.py

@@ -2,14 +2,14 @@
 import typing
 from typing import Any
 
-from adaptix import Retort, dumper, P
+from adaptix import Retort
 from sqlalchemy import Integer, Text, ForeignKey, JSON, TypeDecorator, UniqueConstraint
 from sqlalchemy.engine import Dialect
 from sqlalchemy.orm import relationship, mapped_column, Mapped
 
 from shvatka.common.factory import REQUIRED_GAME_RECIPES
 from shvatka.core.models import dto
-from shvatka.core.models.dto import scn, action
+from shvatka.core.models.dto import scn
 from shvatka.infrastructure.db.models import Base
 
 if typing.TYPE_CHECKING:
@@ -24,11 +24,6 @@ class ScenarioField(TypeDecorator):
     cache_ok = True
     retort = Retort(
         recipe=[
-            # TODO https://github.com/reagento/adaptix/issues/348
-            dumper(
-                P[action.KeyBonusCondition].keys,
-                lambda keys: [{"text": x.text, "bonus_minutes": x.bonus_minutes} for x in keys],
-            ),
             *REQUIRED_GAME_RECIPES,
         ],
     )