Pull 0.5.0v

.github/workflows/ci.yml

@@ -8,30 +8,24 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: add secrets
-        run: |
-          echo "bot_token: ${{ secrets.BOT_TOKEN }}" > deploy/dev/ttt/secrets.yaml
-          echo "payments_token: ${{ secrets.PAYMENTS_TOKEN }}" >> deploy/dev/ttt/secrets.yaml
-          echo "gemini_api_key: ${{ secrets.GEMINI_API_KEY }}" >> deploy/dev/ttt/secrets.yaml
-          echo "sentry_dsn: ${{ secrets.SENTRY_DSN }}" >> deploy/dev/ttt/secrets.yaml
+      - name: install ruff
+        run: curl -LsSf https://astral.sh/ruff/0.13.0/install.sh | sh
 
       - name: ruff
-        run: docker compose -f deploy/dev/docker-compose.yaml run ttt ruff check src tests
+        run: ruff check src tests
 
   mypy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: add secrets
+      - name: install dependencies
         run: |
-          echo "bot_token: ${{ secrets.BOT_TOKEN }}" > deploy/dev/ttt/secrets.yaml
-          echo "payments_token: ${{ secrets.PAYMENTS_TOKEN }}" >> deploy/dev/ttt/secrets.yaml
-          echo "gemini_api_key: ${{ secrets.GEMINI_API_KEY }}" >> deploy/dev/ttt/secrets.yaml
-          echo "sentry_dsn: ${{ secrets.SENTRY_DSN }}" >> deploy/dev/ttt/secrets.yaml
+          curl -LsSf https://astral.sh/uv/install.sh | sh
+          uv sync
 
       - name: mypy
-        run: docker compose -f deploy/dev/docker-compose.yaml run ttt mypy src tests
+        run: uv run mypy src tests
 
   pytest:
     runs-on: ubuntu-latest
@@ -44,6 +38,7 @@ jobs:
           echo "payments_token: ${{ secrets.PAYMENTS_TOKEN }}" >> deploy/dev/ttt/secrets.yaml
           echo "gemini_api_key: ${{ secrets.GEMINI_API_KEY }}" >> deploy/dev/ttt/secrets.yaml
           echo "sentry_dsn: ${{ secrets.SENTRY_DSN }}" >> deploy/dev/ttt/secrets.yaml
+          echo "sentry_dsn: ${{ secrets.ADMIN_TOKEN }}" >> deploy/dev/ttt/secrets.yaml
 
       - name: pytest
         run: docker compose -f deploy/dev/docker-compose.yaml run ttt pytest tests --cov --cov-report=xml

deploy/dev/docker-compose.yaml

@@ -35,6 +35,16 @@ services:
       TTT_NATS_URL: nats://nats:4222
 
       TTT_GEMINI_URL: https://my-openai-gemini-sigma-sandy.vercel.app
+
+      TTT_DIALOG_TTL: 259200  # 3 days
+
+      TTT_MATCHMAKING_MAX_WORKERS: 4
+      TTT_MATCHMAKING_WORKER_MAX_USERS: 100
+      TTT_MATCHMAKING_WORKER_CREATION_INTERVAL_SECONDS: 0.5
+
+      TTT_AUTO_CANCEL_INVITATIONS_TO_GAME_INTERVAL_SECONDS: 1
+
+      TTT_SERIALIZATION_ERROR_MAX_RETRIES: 10
     secrets:
       - secrets
     command: ttt-dev
@@ -84,15 +94,16 @@ services:
       interval: 3s
 
   nats_streams:
-    image: bitnami/natscli:0.2.3-debian-12-r4
+    image: n255/natscli:0.3.0-bookworm-slim
     container_name: ttt-nats-streams
     depends_on:
       nats:
         condition: service_healthy
     volumes:
       - ./nats:/mnt
-    entrypoint: [""]
     command: ["bash", "/mnt/add_streams.sh"]
+    environment:
+      NATS_URL: nats://nats:4222
 
 volumes:
   backend-data:

deploy/dev/nats/add_streams.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-nats -s nats://nats:4222 stream add --config /mnt/streams/user.json
+for stream_config_file in `ls -lx /mnt/streams`; do
+    nats stream add --config /mnt/streams/$stream_config_file
+done

deploy/dev/nats/streams/game.json

@@ -0,0 +1,14 @@
+{
+    "name": "GAME",
+    "subjects": ["game.>"],
+    "retention": "limits",
+    "max_consumers": -1,
+    "max_msgs": -1,
+    "max_bytes": -1,
+    "max_age": 31536000000000000,
+    "max_msg_size": -1,
+    "storage": "file",
+    "discard": "old",
+    "num_replicas": 1,
+    "duplicate_window": 0
+}

deploy/dev/nats/streams/stars_purchase.json

@@ -0,0 +1,14 @@
+{
+    "name": "STARS_PURCHASE",
+    "subjects": ["stars_purchase.>"],
+    "retention": "limits",
+    "max_consumers": -1,
+    "max_msgs": -1,
+    "max_bytes": -1,
+    "max_age": 31536000000000000,
+    "max_msg_size": -1,
+    "storage": "file",
+    "discard": "old",
+    "num_replicas": 1,
+    "duplicate_window": 0
+}

deploy/prod/docker-compose.yaml

@@ -35,6 +35,16 @@ services:
       TTT_NATS_URL: nats://${NATS_TOKEN}@nats:4222
 
       TTT_GEMINI_URL: ${GEMINI_URL}
+
+      TTT_DIALOG_TTL: 259200  # 3 days
+
+      TTT_MATCHMAKING_MAX_WORKERS: 4
+      TTT_MATCHMAKING_WORKER_MAX_USERS: 100
+      TTT_MATCHMAKING_WORKER_CREATION_INTERVAL_SECONDS: 0.5
+
+      TTT_AUTO_CANCEL_INVITATIONS_TO_GAME_INTERVAL_SECONDS: 1
+
+      TTT_SERIALIZATION_ERROR_MAX_RETRIES: 10
     secrets:
       - secrets
     networks:
@@ -138,7 +148,7 @@ services:
       interval: 3s
 
   nats_streams:
-    image: bitnami/natscli:0.2.3-debian-12-r4
+    image: n255/natscli:0.3.0-bookworm-slim
     container_name: ttt-nats-streams
     depends_on:
       nats:
@@ -148,8 +158,8 @@ services:
     networks:
       - nats
     environment:
+      NATS_URL: nats://nats:4222
       NATS_TOKEN: ${NATS_TOKEN}
-    entrypoint: [""]
     command: ["bash", "/mnt/add_streams.sh"]
 
 volumes:

deploy/prod/nats/add_streams.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-nats -s nats://nats:4222 stream add --config /mnt/streams/user.json
+for stream_config_file in `ls -lx /mnt/streams`; do
+    nats stream add --config /mnt/streams/$stream_config_file
+done

deploy/prod/nats/streams/game.json

@@ -0,0 +1,14 @@
+{
+    "name": "GAME",
+    "subjects": ["game.>"],
+    "retention": "limits",
+    "max_consumers": -1,
+    "max_msgs": -1,
+    "max_bytes": -1,
+    "max_age": 31536000000000000,
+    "max_msg_size": -1,
+    "storage": "file",
+    "discard": "old",
+    "num_replicas": 1,
+    "duplicate_window": 0
+}

deploy/prod/nats/streams/stars_purchase.json

@@ -0,0 +1,14 @@
+{
+    "name": "STARS_PURCHASE",
+    "subjects": ["stars_purchase.>"],
+    "retention": "limits",
+    "max_consumers": -1,
+    "max_msgs": -1,
+    "max_bytes": -1,
+    "max_age": 31536000000000000,
+    "max_msg_size": -1,
+    "storage": "file",
+    "discard": "old",
+    "num_replicas": 1,
+    "duplicate_window": 0
+}

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ttt"
-version = "0.4.2"
+version = "0.5.0"
 description = "Tic-Tac-Toe Telegram Bot"
 authors = [
     {name = "Alexander Smolin", email = "88573504+emptybutton@users.noreply.github.com"}
@@ -29,13 +29,13 @@ dependencies = [
 
 [dependency-groups]
 dev = [
-    "mypy[faster-cache]==1.16.0",
-    "ruff==0.11.13",
+    "mypy[faster-cache]==1.18.1",
+    "ruff==0.13.0",
     "pytest==8.4.0",
     "pytest-cov==6.1.1",
     "pytest-asyncio==1.0.0",
     "dirty-equals==0.9.0",
-    "better-exceptions==0.3.3",
+    "rich==14.1.0",
 ]
 
 [project.urls]
@@ -111,6 +111,7 @@ ignore = [
     "EM101",
     "N807",
     "FURB118",
+    "DOC402",
 ]
 
 [tool.ruff.lint.per-file-ignores]

src/ttt/application/common/errors/serialization_error.py

@@ -0,0 +1 @@
+class SerializationError(Exception): ...

src/ttt/application/common/ports/map.py

@@ -23,4 +23,5 @@ async def __call__(
         """
         :raises ttt.application.common.ports.map.NotUniqueUserIdError:
         :raises ttt.application.common.ports.map.NotUniqueActiveInvitationToGameUserIdsError:
+        :raises ttt.application.common.errors.serialization_error.SerializationError:
         """  # noqa: E501

src/ttt/application/common/ports/retry.py

@@ -0,0 +1,6 @@
+from abc import ABC, abstractmethod
+
+
+class Retry(ABC):
+    @abstractmethod
+    def __bool__(self) -> bool: ...

src/ttt/application/common/ports/transaction.py

@@ -1,5 +1,33 @@
+from abc import ABC, abstractmethod
 from contextlib import AbstractAsyncContextManager
+from types import TracebackType
 from typing import Any
 
 
-Transaction = AbstractAsyncContextManager[Any]
+class SerializableTransaction(AbstractAsyncContextManager[Any], ABC):
+    @abstractmethod
+    async def __aexit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> bool | None:
+        """
+        :raises ttt.application.common.errors.serialization_error.SerializationError:
+        """  # noqa: E501
+
+        return None
+
+    @abstractmethod
+    async def commit(self) -> None:
+        """
+        :raises ttt.application.common.errors.serialization_error.SerializationError:
+        """  # noqa: E501
+
+
+class NotSerializableTransaction(AbstractAsyncContextManager[Any], ABC):
+    @abstractmethod
+    async def commit(self) -> None: ...
+
+
+class ReadonlyTransaction(AbstractAsyncContextManager[Any], ABC): ...

src/ttt/application/game/game/cancel_game.py

@@ -1,15 +1,12 @@
-from asyncio import gather
 from dataclasses import dataclass
 
 from ttt.application.common.ports.map import Map
-from ttt.application.common.ports.transaction import Transaction
+from ttt.application.common.ports.transaction import SerializableTransaction
 from ttt.application.common.ports.uuids import UUIDs
 from ttt.application.game.game.ports.game_log import GameLog
 from ttt.application.game.game.ports.game_views import GameViews
 from ttt.application.game.game.ports.games import Games
 from ttt.entities.core.game.game import AlreadyCompletedGameError
-from ttt.entities.core.user.user import User
-from ttt.entities.tools.assertion import not_none
 from ttt.entities.tools.tracking import Tracking
 
 
@@ -19,50 +16,38 @@ class CancelGame:
     games: Games
     game_views: GameViews
     uuids: UUIDs
-    transaction: Transaction
+    transaction: SerializableTransaction
     log: GameLog
 
     async def __call__(self, user_id: int) -> None:
+        """
+        :raises ttt.application.common.errors.serialization_error.SerializationError:
+        """  # noqa: E501
+
         async with self.transaction:
-            (
-                game,
-                user1_last_game_id,
-                user2_last_game_id,
-            ) = await gather(
-                self.games.game_with_game_location(user_id),
-                self.uuids.random_uuid(),
-                self.uuids.random_uuid(),
-            )
+            game = await self.games.current_user_game(user_id)
+
             if game is None:
-                await self.game_views.no_game_view(user_id)
+                await self.log.no_current_game_to_cancel_game(user_id)
+                await self.transaction.commit()
+                await self.game_views.no_current_game_view(user_id)
                 return
 
-            locations = tuple(
-                not_none(user.game_location)
-                for user in (game.player1, game.player2)
-                if isinstance(user, User)
-            )
-
             try:
                 tracking = Tracking()
-                game.cancel(
-                    user_id,
-                    user1_last_game_id,
-                    user2_last_game_id,
-                    tracking,
-                )
+                game.cancel(user_id, tracking)
             except AlreadyCompletedGameError:
                 await self.log.already_completed_game_to_cancel(game, user_id)
+                await self.transaction.commit()
                 await self.game_views.game_already_complteted_view(
                     user_id,
                     game,
                 )
                 return
+            else:
+                await self.log.game_cancelled(user_id, game)
 
-            await self.log.game_cancelled(user_id, game)
+                await self.map_(tracking)
+                await self.transaction.commit()
 
-            await self.map_(tracking)
-            await self.game_views.game_view_with_locations(
-                locations,
-                game,
-            )
+                await self.game_views.game_view(game)