v1.7.0: refactor max_bot to flat structure, add VCF+UserModel+NLP history context, portal pages and proxy fixes
- Refactored max_bot from nested packages to flat module structure - Q2: Extended BotUser model (patronymic, email, org, address, vcf_raw, contact_hash, phone_verified, email_verified, last_interaction, total_conversations, total_tickets) - Q2: VCF parser (FN, N, TEL, EMAIL, ORG, ADR), upsert on re-contact, NLP history context (_get_user_history_context -> YandexGPT) - Q1: Broadcast preview modal with 10s confirmation timer - Q3: CSS var(--white)->var(--bg-card), var(--text)->var(--text-primary) - Q4: bot_settings showNotification(), editable max_bot_id - Q5: Webhook secret passthrough via X-Max-Bot-Api-Secret - Masking sensitive keys, dialog_cleared handler, migrate via _add_column_if_not_exists() - Rate limit (asyncio.sleep 0.5 per 10), dead code removed, conv.intent context in contact.py - Portal pages: bot_consent, bot_kb (edit), bot_settings, bot_test, bot_tickets, portal_settings - Tests: 21/21 passing, added test_yandex_gpt.py, test_email_sender.py - Deploy: deploy_full.sh, schema.sql, seed_knowledge_base.sql
This commit is contained in:
@@ -1,60 +1,107 @@
|
||||
from app.settings_cache import SettingsCache
|
||||
from app.conversation import get_or_create_user, log_consent, get_template_rendered
|
||||
from app.keyboards.inline import build_consent_buttons, build_contact_buttons
|
||||
from app.fsm import BotState, FSM
|
||||
import datetime
|
||||
import logging
|
||||
from sqlalchemy import select
|
||||
from app.database import async_session
|
||||
from app.models import BotUser, BotConversation, BotMessage
|
||||
from app.max_api import max_api
|
||||
from app.config_reader import config_reader
|
||||
from app.keyboards import contact_keyboard, consent_keyboard, return_to_consent_keyboard
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def handle_consent_request(bot, user_data: dict, db, max_api):
|
||||
max_user_id = user_data["user_id"]
|
||||
user = await get_or_create_user(db, max_user_id,
|
||||
user_data.get("first_name", ""),
|
||||
user_data.get("last_name", ""),
|
||||
user_data.get("username", ""))
|
||||
await db.flush()
|
||||
|
||||
await SettingsCache.refresh(db)
|
||||
|
||||
policy_url = SettingsCache.get("consent_policy_url", "https://aegisone.ru/politica.php")
|
||||
text = await get_template_rendered(db, "consent_request", policy_url=policy_url)
|
||||
buttons = build_consent_buttons()
|
||||
await max_api.send_message_with_keyboard(max_user_id, text, buttons, format="markdown")
|
||||
FSM.set_state(max_user_id, BotState.CONSENT_REQUEST)
|
||||
async def handle_consent_callback(user_id: int, conv_id: int, callback_id: str) -> None:
|
||||
if callback_id == "consent_yes":
|
||||
await handle_consent_yes(user_id, conv_id)
|
||||
elif callback_id == "consent_no":
|
||||
await handle_consent_no(user_id, conv_id)
|
||||
|
||||
|
||||
async def handle_consent_given(bot, user_data: dict, db, max_api):
|
||||
max_user_id = user_data["user_id"]
|
||||
user = await get_or_create_user(db, max_user_id)
|
||||
async def handle_consent_response(user_id: int, conv_id: int, text: str) -> None:
|
||||
text_lower = text.strip().lower()
|
||||
consent_words = ["да", "даю", "согласен", "согласна", "yes", "ok", "хорошо", "даю согласие"]
|
||||
refuse_words = ["нет", "не даю", "отказ", "no", "не согласен", "не согласна"]
|
||||
|
||||
user.consent_given = True
|
||||
from datetime import datetime
|
||||
user.consent_timestamp = datetime.now()
|
||||
user.consent_method = "button"
|
||||
await log_consent(db, user.id, "given", "button", user_data.get("ip", ""))
|
||||
await db.flush()
|
||||
|
||||
text = await get_template_rendered(db, "contact_request")
|
||||
buttons = build_contact_buttons()
|
||||
await max_api.send_message_with_keyboard(max_user_id, text, buttons)
|
||||
FSM.set_state(max_user_id, BotState.CONTACT_REQUEST)
|
||||
if any(w in text_lower for w in consent_words):
|
||||
await handle_consent_yes(user_id, conv_id)
|
||||
elif any(w in text_lower for w in refuse_words):
|
||||
await handle_consent_no(user_id, conv_id)
|
||||
else:
|
||||
await max_api.send_message(
|
||||
user_id,
|
||||
"Пожалуйста, дайте чёткий ответ — даёте ли вы согласие на обработку "
|
||||
"персональных данных? Это необходимо для обработки вашего запроса.",
|
||||
attachments=consent_keyboard(),
|
||||
)
|
||||
|
||||
|
||||
async def handle_consent_refused(bot, user_data: dict, db, max_api):
|
||||
max_user_id = user_data["user_id"]
|
||||
user = await get_or_create_user(db, max_user_id)
|
||||
async def handle_consent_yes(user_id: int, conv_id: int) -> None:
|
||||
async with async_session() as db:
|
||||
result = await db.execute(select(BotUser).where(BotUser.id == user_id))
|
||||
user = result.scalar_one_or_none()
|
||||
if user:
|
||||
user.consent_given = True
|
||||
user.consent_date = datetime.datetime.utcnow()
|
||||
|
||||
await log_consent(db, user.id, "revoked", "button", user_data.get("ip", ""))
|
||||
await db.flush()
|
||||
result = await db.execute(
|
||||
select(BotConversation).where(BotConversation.id == conv_id)
|
||||
)
|
||||
conv = result.scalar_one_or_none()
|
||||
if conv:
|
||||
conv.state = "awaiting_contact"
|
||||
|
||||
await SettingsCache.refresh(db)
|
||||
phone_1 = SettingsCache.get("phone_1")
|
||||
phone_2 = SettingsCache.get("phone_2")
|
||||
email = SettingsCache.get("support_email")
|
||||
await db.commit()
|
||||
|
||||
text = await get_template_rendered(db, "consent_refused",
|
||||
phone_1=phone_1, phone_2=phone_2,
|
||||
support_email=email)
|
||||
from app.keyboards.inline import build_phone_email_buttons
|
||||
subject = SettingsCache.get("email_subject")
|
||||
buttons = build_phone_email_buttons(phone_1, phone_2, email, subject)
|
||||
await max_api.send_message_with_keyboard(max_user_id, text, buttons, format="markdown")
|
||||
FSM.reset(max_user_id)
|
||||
await max_api.send_message(
|
||||
user_id,
|
||||
"Спасибо! Поделитесь, пожалуйста, вашим контактом, чтобы мы могли "
|
||||
"связаться с вами.\n\n"
|
||||
"Нажмите кнопку «Поделиться контактом» или введите номер телефона / email вручную.",
|
||||
attachments=contact_keyboard(),
|
||||
)
|
||||
|
||||
|
||||
async def handle_consent_no(user_id: int, conv_id: int) -> None:
|
||||
async with async_session() as db:
|
||||
result = await db.execute(
|
||||
select(BotConversation).where(BotConversation.id == conv_id)
|
||||
)
|
||||
conv = result.scalar_one_or_none()
|
||||
if conv:
|
||||
conv.state = "consent_refused"
|
||||
await db.commit()
|
||||
|
||||
phones = config_reader.get_phones()
|
||||
email = config_reader.get_site_mail()
|
||||
|
||||
phone_text = "\n".join(
|
||||
f"📞 {phone}" for phone, _ in phones
|
||||
)
|
||||
|
||||
await max_api.send_message(
|
||||
user_id,
|
||||
f"Без вашего согласия мы не можем обработать обращение.\n\n"
|
||||
f"Вы можете позвонить нам:\n{phone_text}\n\n"
|
||||
f"Или написать на почту: {email}\n\n"
|
||||
f"Если передумаете и захотите дать согласие — просто напишите об этом.",
|
||||
)
|
||||
|
||||
|
||||
async def handle_refused_again(user_id: int, conv_id: int, text: str) -> None:
|
||||
text_lower = text.strip().lower()
|
||||
consent_words = ["да", "даю", "согласен", "согласна", "yes", "ok", "хорошо", "даю согласие", "передумал", "согласен дать"]
|
||||
|
||||
if any(w in text_lower for w in consent_words):
|
||||
await handle_consent_yes(user_id, conv_id)
|
||||
else:
|
||||
phones = config_reader.get_phones()
|
||||
email = config_reader.get_site_mail()
|
||||
phone_text = ", ".join(phone for phone, _ in phones)
|
||||
|
||||
await max_api.send_message(
|
||||
user_id,
|
||||
f"Связаться с нами можно только по телефону {phone_text} "
|
||||
f"или по почте {email}. "
|
||||
f"Если хотите дать согласие на обработку данных — напишите «Даю согласие».",
|
||||
attachments=return_to_consent_keyboard(),
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user