Merge pull request #38 from emptybutton/dev

chore: pull stable 0.3.0 changes

Author: emptybutton

deploy/dev/docker-compose.yaml

@@ -99,13 +99,13 @@ services:
 
 volumes:
   backend-data:
-    name: "ttt-dev-postgres-backend-data"
+    name: "ttt-dev-backend-data"
   postgres-data:
-    name: "ttt-dev-postgres-postgres-data"
+    name: "ttt-dev-postgres-data"
   redis-data:
-    name: "ttt-dev-postgres-redis-data"
+    name: "ttt-dev-redis-data"
   nats-data:
-    name: "ttt-dev-postgres-nats-data"
+    name: "ttt-dev-nats-data"
 
 secrets:
   secrets:

deploy/prod/.env.template

@@ -6,5 +6,3 @@ POSTGRES_REPLICA_PASSWORD=replica
 NATS_TOKEN=nats
 
 GEMINI_URL=https://my-gemini.vercel.app
-
-GRAFANA_ADMIN_PASSWORD=grafana

deploy/prod/alloy/config.alloy

@@ -155,57 +155,6 @@ services:
     entrypoint: [""]
     command: ["bash", "/mnt/add_streams.sh"]
 
-  alloy:
-    image: grafana/alloy:v1.10.0
-    container_name: ttt-alloy
-    volumes:
-      - ./alloy/config.alloy:/etc/alloy/config.alloy
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      - loki
-    command: run --server.http.listen-addr=0.0.0.0:12345 --storage.path=/var/lib/alloy/data /etc/alloy/config.alloy
-    depends_on:
-      - loki
-
-  loki:
-    image: grafana/loki:3.4.5
-    container_name: ttt-loki
-    environment:
-      TZ: ${SYSTEM_TIMEZONE:-Europe/Moscow}
-    volumes:
-      - loki-data:/loki
-      - ./loki/loki-config.yaml:/etc/loki/local-config.yaml
-    networks:
-      - loki
-    command: -config.file=/etc/loki/local-config.yaml
-
-  grafana:
-    image: grafana/grafana:12.0.2-ubuntu
-    container_name: ttt-grafana
-    environment:
-      - GF_PATHS_PROVISIONING=/etc/grafana/provisioning
-      - GF_FEATURE_TOGGLES_ENABLE=grafanaManagedRecordingRules
-
-      - GF_AUTH_ANONYMOUS_ENABLED=false
-      - GF_AUTH_BASIC_ENABLED=true
-
-      - GF_SECURITY_FORCE_PASSWORD_CHANGE=true
-      - GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION=false
-      - GF_SECURITY_ADMIN_USER=admin
-      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD}
-      - GF_SECURITY_MIN_PASSWORD_LENGTH=4
-
-      - GF_USERS_ALLOW_SIGN_UP=false
-
-      - TZ=${SYSTEM_TIMEZONE:-Europe/Moscow}
-    ports:
-      - 3000:3000
-    volumes:
-      - grafana-data:/var/lib/grafana
-      - ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
-    networks:
-      - loki
-
 volumes:
   postgres-replica1-data:
     name: "ttt-prod-postgres-replica1-data"
@@ -215,16 +164,11 @@ volumes:
     name: "ttt-prod-redis-data"
   nats-data:
     name: "ttt-prod-nats-data"
-  loki-data:
-    name: "ttt-prod-loki-data"
-  grafana-data:
-    name: "ttt-prod-grafana-data"
 
 networks:
   postgres: null
   redis: null
   nats: null
-  loki: null
 
 secrets:
   secrets:

deploy/prod/docker-compose.yaml

@@ -1,6 +1,6 @@
 [project]
 name = "ttt"
-version = "0.1.1"
+version = "0.3.0"
 description = "Tic-Tac-Toe Telegram Bot"
 authors = [
     {name = "Alexander Smolin", email = "[email protected]"}
@@ -20,6 +20,7 @@ dependencies = [
     "pydantic==2.10.6",
     "pydantic-settings[yaml]==2.9.1",
     "aiogram==3.20.0.post0",
+    "aiogram-dialog==2.4.0",
     "nats-py[nkeys]==2.10.0",
     "openai==1.97.0",
     "structlog==25.4.0",
@@ -48,8 +49,8 @@ build-backend = "hatchling.build"
 packages = ["src/ttt"]
 
 [project.scripts]
-ttt = "ttt.main.aiogram_slim.__main__:main"
-ttt-dev = "ttt.main.aiogram_dev.__main__:main"
+ttt = "ttt.main.tg_bot_prod.__main__:main"
+ttt-dev = "ttt.main.tg_bot_dev.__main__:main"
 
 [tool.uv]
 add-bounds = "exact"
@@ -106,9 +107,11 @@ ignore = [
     "TC006",
     "EM101",
     "N807",
+    "FURB118",
 ]
 
 [tool.ruff.lint.per-file-ignores]
+"src/ttt/infrastructure/sqlalchemy/tables/__init__.py" = ["F401"]
 "src/ttt/infrastructure/adapters/*" = ["ARG002"]
 "src/ttt/presentation/adapters/*" = ["ARG002"]
 "src/ttt/presentation/*" = ["RUF001"]

deploy/prod/grafana/provisioning/datasources/loki.yaml

@@ -0,0 +1,15 @@
+from abc import ABC, abstractmethod
+
+
+class InvalidFsmStateError(Exception): ...
+
+
+class Fsm[StateT](ABC):
+    @abstractmethod
+    async def state(self, type_: type[StateT]) -> None:
+        """
+        :raises ttt.application.common.ports.InvalidFsmStateError:
+        """
+
+    @abstractmethod
+    async def set(self, state: StateT | None) -> None: ...