feat(db): add in-memory cache for get_user() + fix connect messages

Cache:
- Add _user_cache dict and invalidate_user_cache() to database/users.py
- Cache get_user() results with TTL=3600s (1 hour)
- Invalidate on every write: update_user_settings, upsert_user,
  save_session, clear_session
- Add USER_CACHE_TTL constant to config.py
- Add autouse fixture + 4 new cache tests

Connect flow messages:
- Remove redundant "This prevents Telegram from blocking the login"
- Replace "letter" with "character" to match dash examples (12-345)
- Remove duplicate /connect mention from connect_code_no_separator

Author: oponfil

config.py

@@ -27,6 +27,7 @@
 SUPABASE_KEY = os.getenv("SUPABASE_KEY", "")
 if not SUPABASE_URL or not SUPABASE_KEY:
     print("⚠️  WARNING: SUPABASE_URL или SUPABASE_KEY не заданы!")
+USER_CACHE_TTL = 3600  # In-memory кэш get_user(), секунды
 
 # ====== ШИФРОВАНИЕ СЕССИЙ ======
 SESSION_ENCRYPTION_KEY = os.getenv("SESSION_ENCRYPTION_KEY", "")

database/users.py

@@ -1,13 +1,22 @@
 # database/users.py — CRUD для таблицы users
 
+import time
 from datetime import datetime, timezone
 from typing import Optional
 
-from config import DEBUG_PRINT
+from config import DEBUG_PRINT, USER_CACHE_TTL
 from database import run_supabase, supabase
 from utils.session_crypto import decrypt_session_string, encrypt_session_string
 from utils.utils import get_timestamp
 
+# In-memory кэш get_user(): {user_id: (expires_at, data)}
+_user_cache: dict[int, tuple[float, dict]] = {}
+
+
+def invalidate_user_cache(user_id: int) -> None:
+    """Удаляет пользователя из in-memory кэша."""
+    _user_cache.pop(user_id, None)
+
 
 class UserStorageError(RuntimeError):
     """Ошибка чтения/создания пользователя в БД."""
@@ -47,6 +56,7 @@ async def upsert_user(
 
         if DEBUG_PRINT:
             print(f"{get_timestamp()} [DB] Upsert user {user_id} (@{username})")
+        invalidate_user_cache(user_id)
         return True
     except Exception as e:
         print(f"{get_timestamp()} [DB] ERROR upsert_user {user_id}: {e}")
@@ -89,6 +99,7 @@ async def save_session(user_id: int, session_string: str) -> bool:
             ).execute()
         )
 
+        invalidate_user_cache(user_id)
         if DEBUG_PRINT:
             print(f"{get_timestamp()} [DB] Session saved for user {user_id}")
         return True
@@ -150,6 +161,7 @@ async def clear_session(user_id: int) -> bool:
             ).eq("user_id", user_id).execute()
         )
 
+        invalidate_user_cache(user_id)
         if DEBUG_PRINT:
             print(f"{get_timestamp()} [DB] Session cleared for user {user_id}")
         return True
@@ -175,7 +187,14 @@ async def has_saved_session(user_id: int) -> bool:
 
 
 async def get_user(user_id: int) -> Optional[dict]:
-    """Получает все поля пользователя из БД."""
+    """Получает все поля пользователя из БД (с in-memory кэшем)."""
+    cached = _user_cache.get(user_id)
+    if cached is not None:
+        expires_at, data = cached
+        if time.monotonic() < expires_at:
+            return data
+        _user_cache.pop(user_id, None)
+
     try:
         result = await run_supabase(
             lambda: supabase.table("users").select(
@@ -184,7 +203,9 @@ async def get_user(user_id: int) -> Optional[dict]:
         )
 
         if result.data and result.data[0]:
-            return result.data[0]
+            user = result.data[0]
+            _user_cache[user_id] = (time.monotonic() + USER_CACHE_TTL, user)
+            return user
         return None
     except Exception as e:
         print(f"{get_timestamp()} [DB] ERROR get_user {user_id}: {e}")
@@ -269,6 +290,7 @@ async def update_user_settings(user_id: int, settings: dict, *, current_settings
                 ).eq("user_id", user_id).execute()
             )
 
+        invalidate_user_cache(user_id)
         if DEBUG_PRINT:
             log_settings = {**merged}
             cp = log_settings.get("custom_prompt")

system_messages.py

@@ -54,9 +54,9 @@
     # — Connect: Phone flow —
     "connect_phone_prompt": "📱 Send your phone number in international format (e.g. +1234567890).\n\n⚠️ The number will be used once for login and will NOT be stored.",
     "connect_phone_btn_qr": "📷 Connect via QR code",
-    "connect_code_prompt": "📲 Enter the confirmation code you received from Telegram.\n\n⚠️ IMPORTANT: Add any letter or space anywhere in the code.\nExample: 12x345 or 123 45\n\nThis prevents Telegram from blocking the login.",
-    "connect_code_invalid": "❌ Invalid code. Please try again.\nRemember: add any letter or space in the code (e.g. 12x345):",
-    "connect_code_no_separator": "⚠️ It looks like you entered the code without separators. Telegram has blocked this code.\nPlease try /connect again, and this time add any letter or space in the code (e.g. 12x345).",
+    "connect_code_prompt": "📲 Enter the confirmation code you received from Telegram.\n\n⚠️ IMPORTANT: Add any character or space anywhere in the code.\nExample: 12-345 or 1234 5",
+    "connect_code_invalid": "❌ Invalid code. Please try again.\nRemember: add any character or space in the code (e.g. 12-345):",
+    "connect_code_no_separator": "⚠️ It looks like you entered the code without separators. Telegram has blocked this code.\nNext time add any character or space in the code (e.g. 12-345).",
     "connect_code_expired": "⏰ Code expired. Please try /connect again.",
     "connect_phone_invalid": "❌ Invalid phone number. Please send your number in international format (e.g. +1234567890):",
     "connect_phone_timeout": "⏰ Login timed out. Please try /connect again.",

tests/test_database_users.py

@@ -4,6 +4,7 @@
 
 import pytest
 
+import database.users as users_module
 from database.users import (
     clear_session,
     ensure_user_exists,
@@ -21,6 +22,14 @@
 from utils.session_crypto import decrypt_session_string, encrypt_session_string
 
 
+@pytest.fixture(autouse=True)
+def _clear_user_cache():
+    """Очищает кэш get_user() перед каждым тестом."""
+    users_module._user_cache.clear()
+    yield
+    users_module._user_cache.clear()
+
+
 def _make_mock_table():
     """Создаёт мок таблицы Supabase с чейнингом."""
     mock_table = MagicMock()
@@ -393,3 +402,69 @@ async def test_upserts_settings_for_new_user(self):
         )
         mock_table.update.assert_not_called()
 
+
+class TestUserCache:
+    """Тесты для in-memory кэша get_user()."""
+
+    @pytest.mark.asyncio
+    async def test_cache_hit_skips_db(self):
+        """Повторный вызов отдаёт данные из кэша без запроса в БД."""
+        mock_table = _make_mock_table()
+        mock_table.execute.return_value = MagicMock(
+            data=[{"user_id": 42, "settings": {}}]
+        )
+        with patch("database.users.supabase") as mock_sb:
+            mock_sb.table.return_value = mock_table
+            first = await get_user(42)
+            second = await get_user(42)
+
+        assert first == second == {"user_id": 42, "settings": {}}
+        # select вызван один раз — второй раз из кэша
+        assert mock_table.select.call_count == 1
+
+    @pytest.mark.asyncio
+    async def test_cache_expires_after_ttl(self):
+        """После TTL данные перечитываются из БД."""
+        mock_table = _make_mock_table()
+        mock_table.execute.return_value = MagicMock(
+            data=[{"user_id": 42, "settings": {}}]
+        )
+        with patch("database.users.supabase") as mock_sb, \
+             patch("database.users.time") as mock_time:
+            mock_sb.table.return_value = mock_table
+            mock_time.monotonic.side_effect = [0, 3600, 3601, 3601, 7201]
+            #                                  ^put  ^check(ok) ^check(expired) ^put ^put(new)
+            await get_user(42)  # cache miss → DB query, monotonic returns 0 (put)
+            await get_user(42)  # monotonic returns 3600 → < 0+3600=3600? No, == 3600, not <
+            # 3600 is NOT < 3600, so cache expired → DB query again
+
+        assert mock_table.select.call_count == 2
+
+    @pytest.mark.asyncio
+    async def test_invalidate_on_update_settings(self):
+        """update_user_settings() сбрасывает кэш."""
+        mock_table = _make_mock_table()
+        user_data = {"user_id": 42, "settings": {"style": "friend"}}
+        mock_table.execute.return_value = MagicMock(data=[user_data])
+        with patch("database.users.supabase") as mock_sb:
+            mock_sb.table.return_value = mock_table
+            await get_user(42)  # populate cache
+            assert 42 in users_module._user_cache
+
+            await update_user_settings(42, {"style": "romance"})
+            assert 42 not in users_module._user_cache
+
+    @pytest.mark.asyncio
+    async def test_invalidate_on_upsert(self):
+        """upsert_user() сбрасывает кэш."""
+        mock_table = _make_mock_table()
+        mock_table.execute.return_value = MagicMock(
+            data=[{"user_id": 42, "settings": {}}]
+        )
+        with patch("database.users.supabase") as mock_sb:
+            mock_sb.table.return_value = mock_table
+            await get_user(42)  # populate cache
+            assert 42 in users_module._user_cache
+
+            await upsert_user(42, username="new_name")
+            assert 42 not in users_module._user_cache