aiogram FSM: ko'p bosqichli dialog-formalarni to'g'ri qurish

[boshlang'ich] --/login--> [telefon kutilmoqda] --raqam keldi--> [kod kutilmoqda]
                                                                      |
                                    [kabinetda] <--kod to'g'ri keldi--+

bot/
├── api/
│   └── auth_api.py      ← kompaniya API'si bilan gaplashish
├── states/
│   └── login.py         ← holatlar deklaratsiyasi
├── handlers/
│   ├── login.py         ← dialog qadamlari
│   └── nav_reset.py     ← "qotgan"larni qutqarish (oxirida)
├── validators.py        ← sof tekshiruv funksiyalari (testlanadi)
└── app.py               ← dispatcher + storage

# bot/states/login.py
from aiogram.fsm.state import State, StatesGroup


class Login(StatesGroup):
    # har State — dialogning bitta "to'xtash bekati"
    waiting_phone = State()
    waiting_code = State()

uv add "aiogram[redis]"

# bot/app.py
import asyncio
import os
from datetime import timedelta

from aiogram import Bot, Dispatcher
from aiogram.fsm.storage.redis import RedisStorage

from bot.handlers import ai_calc, login, nav_reset

# Holatlar Redis'da: bot qayta ishga tushsa ham dialog joyidan davom etadi.
# MemoryStorage faqat o'yin uchun — pastdagi ogohlantirishga qarang
storage = RedisStorage.from_url(
    "redis://127.0.0.1:6379/1",
    # tugatilmagan dialog Redis'da abadiy qolmasin: bir sutkadan keyin o'chadi
    state_ttl=timedelta(hours=24),
    data_ttl=timedelta(hours=24),
)
dp = Dispatcher(storage=storage)
dp.include_router(nav_reset.router)  # 1) avval qutqaruvchi
dp.include_router(login.router)  # 2) keyin dialoglar
dp.include_router(ai_calc.router)  # 3) erkin matn (1-qism) — eng oxirida


async def main() -> None:
    await dp.start_polling(Bot(os.environ["BOT_TOKEN"]))


if __name__ == "__main__":
    asyncio.run(main())

# bot/validators.py
import re

# [0-9], \d emas: \d arabcha "٩٠" kabi boshqa yozuvlardagi raqamlarni ham o'tkazadi
PHONE_RE = re.compile(r"^\+?998[0-9]{9}$")
SMS_CODE_RE = re.compile(r"^[0-9]{6}$")


def normalize_phone(raw: str) -> str | None:
    """'+998 90 123-45-67' -> '+998901234567'; yaroqsiz bo'lsa None."""
    digits = re.sub(r"[^0-9+]", "", raw)
    if not digits.startswith("+"):
        digits = "+" + digits
    return digits if PHONE_RE.match(digits) else None


def is_sms_code(raw: str) -> bool:
    return SMS_CODE_RE.match(raw.strip()) is not None

# bot/api/auth_api.py — interfeys (ichi kompaniya API'siga so'rov yuboradi)
async def send_sms(phone: str) -> None:
    """Shu raqamga bir martalik kod yuborilsin."""


async def verify(phone: str, code: str) -> str | None:
    """Kod to'g'ri bo'lsa kabinet tokenini, aks holda None qaytaradi."""


async def save_session(telegram_id: int, token: str) -> None:
    """Tokenni Telegram foydalanuvchisiga bog'lab saqlaydi."""

# bot/handlers/login.py
from aiogram import F, Router, types
from aiogram.filters import Command
from aiogram.fsm.context import FSMContext

from bot.api import auth_api  # kompaniya API'si (SMS yuboradi/tekshiradi)
from bot.states.login import Login
from bot.validators import is_sms_code, normalize_phone

router = Router()

MAX_CODE_ATTEMPTS = 5

# buyruq emas, oddiy matn: /calc, /help kabi buyruqlar dialog ichida ham
# o'z handler'iga yetib borsin, "kod noto'g'ri" javobiga tushib qolmasin
USER_TEXT = F.text & ~F.text.startswith("/")


@router.message(Command("login"))
async def login_start(message: types.Message, state: FSMContext):
    await state.clear()  # oldingi urinishdan qolgan data (hisoblagich ham) tozalansin
    await state.set_state(Login.waiting_phone)  # bekatga keldik
    await message.answer("Telefon raqamingizni yuboring: +998XXXXXXXXX")


@router.message(Login.waiting_phone, USER_TEXT)
async def got_phone(message: types.Message, state: FSMContext):
    phone = normalize_phone(message.text)
    if phone is None:
        # holatni O'ZGARTIRMAYMIZ — foydalanuvchi shu bekatda qoladi
        # va qayta urinadi. Xato = dialogning oxiri emas
        await message.answer("Raqam formati noto'g'ri. Namuna: +998901234567")
        return
    await auth_api.send_sms(phone)
    # keyingi qadamga KERAK bo'ladigan ma'lumotni holat datasiga yozamiz
    await state.update_data(phone=phone, attempts=0)
    await state.set_state(Login.waiting_code)
    await message.answer("SMS'dagi 6 xonali kodni kiriting.")


@router.message(Login.waiting_code, USER_TEXT)
async def got_code(message: types.Message, state: FSMContext):
    if not is_sms_code(message.text):
        await message.answer("Kod 6 ta raqamdan iborat bo'ladi. Qayta kiriting.")
        return
    data = await state.get_data()  # avvalgi qadamda yozilgan phone va hisoblagich
    token = await auth_api.verify(data["phone"], message.text.strip())
    if token is None:
        attempts = data["attempts"] + 1
        if attempts >= MAX_CODE_ATTEMPTS:
            # 6 xonali kodni terib topishga yo'l qo'ymaymiz
            await state.clear()
            await message.answer("Urinishlar tugadi. Yangi kod olish uchun /login.")
            return
        await state.update_data(attempts=attempts)
        left = MAX_CODE_ATTEMPTS - attempts
        await message.answer(f"Kod noto'g'ri yoki eskirgan. Yana {left} ta urinish qoldi.")
        return
    # token — kabinetga kirish kaliti; uni doimiy joyga saqlaymiz:
    # state.clear() holat datasini ham o'chiradi
    await auth_api.save_session(message.from_user.id, token)
    await state.clear()  # dialog tugadi — holat tozalanadi
    await message.answer("Xush kelibsiz! Kabinet: /menu")

# bot/handlers/nav_reset.py
from aiogram import Router, types
from aiogram.filters import Command
from aiogram.fsm.context import FSMContext

router = Router()

# Bu router dispatcher'ga BIRINCHI ulanadi — FSM handler'lardan oldin ishlaydi
NAV_COMMANDS = ["start", "menu", "help", "cancel"]


@router.message(Command(*NAV_COMMANDS))
async def nav_reset(message: types.Message, state: FSMContext):
    """Global navigatsiya-reset: foydalanuvchini FSM holatidan chiqaradi."""
    if await state.get_state() is not None:
        await state.clear()
    # shu yerdan odatiy menyu/started oqimiga o'tib ketiladi
    await message.answer("Bosh menyu: /calc — hisoblash, /login — kabinet")

# tests/test_validators.py
from bot.validators import is_sms_code, normalize_phone


def test_phone_normalization():
    assert normalize_phone("+998 90 123-45-67") == "+998901234567"
    assert normalize_phone("998901234567") == "+998901234567"
    assert normalize_phone("90 123 45 67") is None  # kod yo'q
    assert normalize_phone("+7 900 000 00 00") is None  # boshqa davlat
    assert normalize_phone("+998٩٠١٢٣٤٥٦٧") is None  # arabcha raqamlar


def test_sms_code_shape():
    assert is_sms_code(" 123456 ")
    assert not is_sms_code("12345")
    assert not is_sms_code("kod123")
    assert not is_sms_code("١٢٣٤٥٦")  # arabcha raqamlar

uv run python -m pytest tests -q