feat: implement adapter/telegram/ with aiogram 3.x
Virtual DM chats, FSM (idle/waiting_response/settings states), SQLite local DB for tg_users+chats, converter, keyboards, and handlers for /start, /new, /chats, /settings, confirm callbacks.
This commit is contained in:
parent
a3449fc864
commit
9c555261b3
15 changed files with 791 additions and 0 deletions
0
adapter/telegram/handlers/__init__.py
Normal file
0
adapter/telegram/handlers/__init__.py
Normal file
67
adapter/telegram/handlers/auth.py
Normal file
67
adapter/telegram/handlers/auth.py
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
# adapter/telegram/handlers/auth.py
|
||||
from __future__ import annotations
|
||||
|
||||
from aiogram import Router
|
||||
from aiogram.filters import CommandStart
|
||||
from aiogram.fsm.context import FSMContext
|
||||
from aiogram.types import Message
|
||||
|
||||
from adapter.telegram import db
|
||||
from adapter.telegram.states import ChatState
|
||||
from core.handler import EventDispatcher
|
||||
from core.protocol import IncomingCommand
|
||||
|
||||
router = Router(name="auth")
|
||||
|
||||
|
||||
@router.message(CommandStart())
|
||||
async def cmd_start(
|
||||
message: Message,
|
||||
state: FSMContext,
|
||||
dispatcher: EventDispatcher,
|
||||
) -> None:
|
||||
tg_id = message.from_user.id
|
||||
display_name = message.from_user.full_name
|
||||
|
||||
# Ensure user exists in platform (mock)
|
||||
from platform.mock import MockPlatformClient
|
||||
# platform is available via dispatcher._platform
|
||||
platform = dispatcher._platform
|
||||
user = await platform.get_or_create_user(
|
||||
external_id=str(tg_id),
|
||||
platform="telegram",
|
||||
display_name=display_name,
|
||||
)
|
||||
platform_user_id = user.user_id
|
||||
|
||||
# Upsert in local DB
|
||||
db.get_or_create_tg_user(tg_id, platform_user_id, display_name)
|
||||
|
||||
last_chat = db.get_last_chat(tg_id)
|
||||
|
||||
if last_chat is None:
|
||||
# New user — create first chat
|
||||
chat_name = "Чат #1"
|
||||
chat_id = db.create_chat(tg_id, chat_name)
|
||||
await state.update_data(active_chat_id=chat_id, active_chat_name=chat_name)
|
||||
await state.set_state(ChatState.idle)
|
||||
await message.answer(
|
||||
f"Привет, {message.from_user.first_name}! 👋\n"
|
||||
f"Я создал тебе первый чат. Просто пиши.\n\n"
|
||||
f"Команды: /new — новый чат, /chats — список чатов"
|
||||
)
|
||||
else:
|
||||
chat_id = last_chat["chat_id"]
|
||||
chat_name = last_chat["name"]
|
||||
await state.update_data(active_chat_id=chat_id, active_chat_name=chat_name)
|
||||
await state.set_state(ChatState.idle)
|
||||
await message.answer(f"С возвращением! Продолжаем [{chat_name}]")
|
||||
|
||||
# Register auth in core
|
||||
event = IncomingCommand(
|
||||
user_id=platform_user_id,
|
||||
platform="telegram",
|
||||
chat_id=chat_id,
|
||||
command="start",
|
||||
)
|
||||
await dispatcher.dispatch(event)
|
||||
122
adapter/telegram/handlers/chat.py
Normal file
122
adapter/telegram/handlers/chat.py
Normal file
|
|
@ -0,0 +1,122 @@
|
|||
# adapter/telegram/handlers/chat.py
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
|
||||
from aiogram import F, Router
|
||||
from aiogram.filters import Command
|
||||
from aiogram.fsm.context import FSMContext
|
||||
from aiogram.types import CallbackQuery, Message
|
||||
|
||||
from adapter.telegram import db
|
||||
from adapter.telegram.converter import format_outgoing, from_message
|
||||
from adapter.telegram.keyboards.chat import chats_list_keyboard
|
||||
from adapter.telegram.states import ChatState
|
||||
from core.handler import EventDispatcher
|
||||
from core.protocol import OutgoingMessage, OutgoingUI
|
||||
from adapter.telegram.keyboards.confirm import confirm_keyboard
|
||||
|
||||
router = Router(name="chat")
|
||||
|
||||
|
||||
async def _send_outgoing(message: Message, chat_name: str, events: list) -> None:
|
||||
for event in events:
|
||||
if isinstance(event, OutgoingUI):
|
||||
from adapter.telegram.keyboards.confirm import confirm_keyboard
|
||||
action_id = event.buttons[0].payload.get("action_id", "unknown") if event.buttons else "unknown"
|
||||
kb = confirm_keyboard(action_id)
|
||||
await message.answer(format_outgoing(chat_name, event), reply_markup=kb)
|
||||
elif isinstance(event, OutgoingMessage):
|
||||
await message.answer(format_outgoing(chat_name, event))
|
||||
|
||||
|
||||
@router.message(ChatState.idle, F.text | F.photo | F.document | F.voice)
|
||||
async def handle_message(
|
||||
message: Message,
|
||||
state: FSMContext,
|
||||
dispatcher: EventDispatcher,
|
||||
) -> None:
|
||||
data = await state.get_data()
|
||||
chat_id = data.get("active_chat_id")
|
||||
chat_name = data.get("active_chat_name", "Чат")
|
||||
|
||||
if not chat_id:
|
||||
await message.answer("Нет активного чата. Введите /start")
|
||||
return
|
||||
|
||||
await state.set_state(ChatState.waiting_response)
|
||||
|
||||
# Typing indicator loop
|
||||
async def _typing_loop():
|
||||
while True:
|
||||
await message.bot.send_chat_action(message.chat.id, "typing")
|
||||
await asyncio.sleep(4)
|
||||
|
||||
task = asyncio.create_task(_typing_loop())
|
||||
try:
|
||||
tg_id = message.from_user.id
|
||||
tg_user = db.get_or_create_tg_user(tg_id, str(tg_id), message.from_user.full_name)
|
||||
platform_user_id = tg_user.get("platform_user_id", str(tg_id))
|
||||
|
||||
incoming = from_message(message, chat_id)
|
||||
incoming.user_id = platform_user_id
|
||||
events = await dispatcher.dispatch(incoming)
|
||||
finally:
|
||||
task.cancel()
|
||||
try:
|
||||
await task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
|
||||
await state.set_state(ChatState.idle)
|
||||
await _send_outgoing(message, chat_name, events)
|
||||
|
||||
|
||||
@router.message(Command("new"))
|
||||
async def cmd_new_chat(message: Message, state: FSMContext) -> None:
|
||||
tg_id = message.from_user.id
|
||||
args = message.text.split(maxsplit=1)
|
||||
name = args[1].strip() if len(args) > 1 else None
|
||||
|
||||
count = db.count_chats(tg_id)
|
||||
chat_name = name or f"Чат #{count + 1}"
|
||||
|
||||
chat_id = db.create_chat(tg_id, chat_name)
|
||||
await state.update_data(active_chat_id=chat_id, active_chat_name=chat_name)
|
||||
await state.set_state(ChatState.idle)
|
||||
await message.answer(f"✅ [{chat_name}] создан. Пиши!")
|
||||
|
||||
|
||||
@router.message(Command("chats"))
|
||||
async def cmd_list_chats(message: Message, state: FSMContext) -> None:
|
||||
tg_id = message.from_user.id
|
||||
chats = db.get_user_chats(tg_id)
|
||||
if not chats:
|
||||
await message.answer("Нет активных чатов. Введи /new чтобы создать.")
|
||||
return
|
||||
|
||||
data = await state.get_data()
|
||||
active_id = data.get("active_chat_id")
|
||||
kb = chats_list_keyboard(chats, active_id)
|
||||
await message.answer("Твои чаты:", reply_markup=kb)
|
||||
|
||||
|
||||
@router.callback_query(F.data.startswith("switch:"))
|
||||
async def switch_chat(callback: CallbackQuery, state: FSMContext) -> None:
|
||||
_, chat_id, chat_name = callback.data.split(":", 2)
|
||||
await state.update_data(active_chat_id=chat_id, active_chat_name=chat_name)
|
||||
await state.set_state(ChatState.idle)
|
||||
await callback.message.edit_text(f"✅ Переключился на [{chat_name}]")
|
||||
await callback.answer()
|
||||
|
||||
|
||||
@router.callback_query(F.data == "new_chat")
|
||||
async def cb_new_chat(callback: CallbackQuery, state: FSMContext) -> None:
|
||||
tg_id = callback.from_user.id
|
||||
count = db.count_chats(tg_id)
|
||||
chat_name = f"Чат #{count + 1}"
|
||||
chat_id = db.create_chat(tg_id, chat_name)
|
||||
await state.update_data(active_chat_id=chat_id, active_chat_name=chat_name)
|
||||
await state.set_state(ChatState.idle)
|
||||
await callback.message.edit_text(f"✅ [{chat_name}] создан. Пиши!")
|
||||
await callback.answer()
|
||||
49
adapter/telegram/handlers/confirm.py
Normal file
49
adapter/telegram/handlers/confirm.py
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
# adapter/telegram/handlers/confirm.py
|
||||
from __future__ import annotations
|
||||
|
||||
from aiogram import F, Router
|
||||
from aiogram.fsm.context import FSMContext
|
||||
from aiogram.types import CallbackQuery
|
||||
|
||||
from core.handler import EventDispatcher
|
||||
from core.protocol import IncomingCallback
|
||||
|
||||
router = Router(name="confirm")
|
||||
|
||||
|
||||
@router.callback_query(F.data.startswith("confirm:"))
|
||||
async def handle_confirm(
|
||||
callback: CallbackQuery,
|
||||
state: FSMContext,
|
||||
dispatcher: EventDispatcher,
|
||||
) -> None:
|
||||
parts = callback.data.split(":", 2)
|
||||
_, decision, action_id = parts # "yes" or "no"
|
||||
|
||||
data = await state.get_data()
|
||||
chat_id = data.get("active_chat_id", "")
|
||||
chat_name = data.get("active_chat_name", "Чат")
|
||||
|
||||
from adapter.telegram import db as tgdb
|
||||
tg_id = callback.from_user.id
|
||||
tg_user = tgdb.get_or_create_tg_user(tg_id, str(tg_id), callback.from_user.full_name)
|
||||
platform_user_id = tg_user.get("platform_user_id", str(tg_id))
|
||||
|
||||
incoming = IncomingCallback(
|
||||
user_id=platform_user_id,
|
||||
platform="telegram",
|
||||
chat_id=chat_id,
|
||||
action="confirm" if decision == "yes" else "cancel",
|
||||
payload={"action_id": action_id},
|
||||
)
|
||||
events = await dispatcher.dispatch(incoming)
|
||||
|
||||
await callback.message.edit_reply_markup(reply_markup=None)
|
||||
|
||||
for event in events:
|
||||
from core.protocol import OutgoingMessage, OutgoingUI
|
||||
from adapter.telegram.converter import format_outgoing
|
||||
if isinstance(event, (OutgoingMessage, OutgoingUI)):
|
||||
await callback.message.answer(format_outgoing(chat_name, event))
|
||||
|
||||
await callback.answer()
|
||||
189
adapter/telegram/handlers/settings.py
Normal file
189
adapter/telegram/handlers/settings.py
Normal file
|
|
@ -0,0 +1,189 @@
|
|||
# adapter/telegram/handlers/settings.py
|
||||
from __future__ import annotations
|
||||
|
||||
from aiogram import F, Router
|
||||
from aiogram.filters import Command
|
||||
from aiogram.fsm.context import FSMContext
|
||||
from aiogram.types import CallbackQuery, Message
|
||||
|
||||
from adapter.telegram.keyboards.settings import (
|
||||
back_keyboard,
|
||||
safety_keyboard,
|
||||
settings_main_keyboard,
|
||||
skills_keyboard,
|
||||
)
|
||||
from adapter.telegram.states import ChatState, SettingsState
|
||||
from core.handler import EventDispatcher
|
||||
from core.protocol import SettingsAction
|
||||
|
||||
router = Router(name="settings")
|
||||
|
||||
|
||||
@router.message(Command("settings"))
|
||||
async def cmd_settings(message: Message, state: FSMContext) -> None:
|
||||
await state.set_state(SettingsState.menu)
|
||||
await message.answer("⚙️ Настройки", reply_markup=settings_main_keyboard())
|
||||
|
||||
|
||||
@router.callback_query(F.data == "settings:back")
|
||||
async def cb_settings_back(callback: CallbackQuery, state: FSMContext) -> None:
|
||||
await state.set_state(SettingsState.menu)
|
||||
await callback.message.edit_text("⚙️ Настройки", reply_markup=settings_main_keyboard())
|
||||
await callback.answer()
|
||||
|
||||
|
||||
@router.callback_query(F.data == "settings:skills")
|
||||
async def cb_skills(callback: CallbackQuery, state: FSMContext, dispatcher: EventDispatcher) -> None:
|
||||
data = await state.get_data()
|
||||
active_chat_id = data.get("active_chat_id", "")
|
||||
tg_id = callback.from_user.id
|
||||
# Get platform user id
|
||||
from adapter.telegram import db as tgdb
|
||||
tg_user = tgdb.get_or_create_tg_user(tg_id, str(tg_id), callback.from_user.full_name)
|
||||
platform_user_id = tg_user.get("platform_user_id", str(tg_id))
|
||||
|
||||
settings = await dispatcher._platform.get_settings(platform_user_id)
|
||||
await callback.message.edit_text(
|
||||
"🧩 Скиллы\nНажмите для переключения:",
|
||||
reply_markup=skills_keyboard(settings.skills),
|
||||
)
|
||||
await callback.answer()
|
||||
|
||||
|
||||
@router.callback_query(F.data.startswith("toggle_skill:"))
|
||||
async def cb_toggle_skill(
|
||||
callback: CallbackQuery,
|
||||
state: FSMContext,
|
||||
dispatcher: EventDispatcher,
|
||||
) -> None:
|
||||
skill = callback.data.split(":", 1)[1]
|
||||
from adapter.telegram import db as tgdb
|
||||
tg_id = callback.from_user.id
|
||||
tg_user = tgdb.get_or_create_tg_user(tg_id, str(tg_id), callback.from_user.full_name)
|
||||
platform_user_id = tg_user.get("platform_user_id", str(tg_id))
|
||||
|
||||
settings = await dispatcher._platform.get_settings(platform_user_id)
|
||||
current = settings.skills.get(skill, False)
|
||||
action = SettingsAction(
|
||||
action="toggle_skill",
|
||||
payload={"skill": skill, "enabled": not current},
|
||||
)
|
||||
await dispatcher._platform.update_settings(platform_user_id, action)
|
||||
|
||||
settings = await dispatcher._platform.get_settings(platform_user_id)
|
||||
await callback.message.edit_reply_markup(reply_markup=skills_keyboard(settings.skills))
|
||||
await callback.answer(f"{'Включён' if not current else 'Выключен'}: {skill}")
|
||||
|
||||
|
||||
@router.callback_query(F.data == "settings:safety")
|
||||
async def cb_safety(callback: CallbackQuery, state: FSMContext, dispatcher: EventDispatcher) -> None:
|
||||
from adapter.telegram import db as tgdb
|
||||
tg_id = callback.from_user.id
|
||||
tg_user = tgdb.get_or_create_tg_user(tg_id, str(tg_id), callback.from_user.full_name)
|
||||
platform_user_id = tg_user.get("platform_user_id", str(tg_id))
|
||||
|
||||
settings = await dispatcher._platform.get_settings(platform_user_id)
|
||||
await callback.message.edit_text(
|
||||
"🔒 Безопасность\nПодтверждение перед выполнением:",
|
||||
reply_markup=safety_keyboard(settings.safety),
|
||||
)
|
||||
await callback.answer()
|
||||
|
||||
|
||||
@router.callback_query(F.data.startswith("toggle_safety:"))
|
||||
async def cb_toggle_safety(
|
||||
callback: CallbackQuery,
|
||||
state: FSMContext,
|
||||
dispatcher: EventDispatcher,
|
||||
) -> None:
|
||||
trigger = callback.data.split(":", 1)[1]
|
||||
from adapter.telegram import db as tgdb
|
||||
tg_id = callback.from_user.id
|
||||
tg_user = tgdb.get_or_create_tg_user(tg_id, str(tg_id), callback.from_user.full_name)
|
||||
platform_user_id = tg_user.get("platform_user_id", str(tg_id))
|
||||
|
||||
settings = await dispatcher._platform.get_settings(platform_user_id)
|
||||
current = settings.safety.get(trigger, False)
|
||||
action = SettingsAction(
|
||||
action="set_safety",
|
||||
payload={"trigger": trigger, "enabled": not current},
|
||||
)
|
||||
await dispatcher._platform.update_settings(platform_user_id, action)
|
||||
|
||||
settings = await dispatcher._platform.get_settings(platform_user_id)
|
||||
await callback.message.edit_reply_markup(reply_markup=safety_keyboard(settings.safety))
|
||||
await callback.answer()
|
||||
|
||||
|
||||
@router.callback_query(F.data == "settings:soul")
|
||||
async def cb_soul_menu(callback: CallbackQuery, state: FSMContext) -> None:
|
||||
await state.set_state(SettingsState.soul_editing)
|
||||
await state.update_data(soul_field=None)
|
||||
await callback.message.edit_text(
|
||||
"🧠 Личность агента\n\nЧто хотите изменить?\n\n"
|
||||
"Отправьте: name: <имя агента>\n"
|
||||
"Или: instructions: <инструкции>\n\n"
|
||||
"Или нажмите Назад.",
|
||||
reply_markup=back_keyboard(),
|
||||
)
|
||||
await callback.answer()
|
||||
|
||||
|
||||
@router.message(SettingsState.soul_editing)
|
||||
async def handle_soul_input(
|
||||
message: Message,
|
||||
state: FSMContext,
|
||||
dispatcher: EventDispatcher,
|
||||
) -> None:
|
||||
text = message.text or ""
|
||||
from adapter.telegram import db as tgdb
|
||||
tg_id = message.from_user.id
|
||||
tg_user = tgdb.get_or_create_tg_user(tg_id, str(tg_id), message.from_user.full_name)
|
||||
platform_user_id = tg_user.get("platform_user_id", str(tg_id))
|
||||
|
||||
if ":" in text:
|
||||
field, _, value = text.partition(":")
|
||||
field = field.strip().lower()
|
||||
value = value.strip()
|
||||
if field in ("name", "instructions"):
|
||||
action = SettingsAction(
|
||||
action="set_soul",
|
||||
payload={"field": field, "value": value},
|
||||
)
|
||||
await dispatcher._platform.update_settings(platform_user_id, action)
|
||||
await message.answer(f"✅ {field} обновлено.")
|
||||
await state.set_state(SettingsState.menu)
|
||||
await message.answer("⚙️ Настройки", reply_markup=settings_main_keyboard())
|
||||
return
|
||||
|
||||
await message.answer(
|
||||
"Формат: name: <имя> или instructions: <инструкции>\n"
|
||||
"Пример: name: Алекс"
|
||||
)
|
||||
|
||||
|
||||
@router.callback_query(F.data == "settings:connectors")
|
||||
async def cb_connectors(callback: CallbackQuery) -> None:
|
||||
await callback.message.edit_text(
|
||||
"🔗 Коннекторы\n\nОAuth-интеграции — скоро.",
|
||||
reply_markup=back_keyboard(),
|
||||
)
|
||||
await callback.answer()
|
||||
|
||||
|
||||
@router.callback_query(F.data == "settings:plan")
|
||||
async def cb_plan(callback: CallbackQuery, dispatcher: EventDispatcher) -> None:
|
||||
from adapter.telegram import db as tgdb
|
||||
tg_id = callback.from_user.id
|
||||
tg_user = tgdb.get_or_create_tg_user(tg_id, str(tg_id), callback.from_user.full_name)
|
||||
platform_user_id = tg_user.get("platform_user_id", str(tg_id))
|
||||
|
||||
settings = await dispatcher._platform.get_settings(platform_user_id)
|
||||
plan = settings.plan
|
||||
text = (
|
||||
f"💳 Подписка\n\n"
|
||||
f"Тариф: {plan.get('name', '?')}\n"
|
||||
f"Токены: {plan.get('tokens_used', 0)} / {plan.get('tokens_limit', 0)}"
|
||||
)
|
||||
await callback.message.edit_text(text, reply_markup=back_keyboard())
|
||||
await callback.answer()
|
||||
Loading…
Add table
Add a link
Reference in a new issue