feat: stream operation status as a live draft with activity phrases
Статус долгой операции больше не оставляет в чате отдельное сообщение: в приватном чате он стримится живым драфтом (sendMessageDraft), пока идет классификация, генерация, чтение скриншотов или распознавание речи. - activity_phrases.py: пулы фраз по типу операции (generation, training, images, voice, ideas), случайный интервал 3-8 сек (ACTIVITY_MIN_SECONDS / ACTIVITY_MAX_SECONDS), фраза не повторяет предыдущую - OperationStatus: драфт со стабильным draft_id, фоновая ротация фраз, finish() отправляет финальный статус реальным сообщением, retarget() меняет пул на лету (generate_ideas), предохранитель ACTIVITY_MAX_ROTATIONS - в группах и топиках драфты недоступны: прежний answer + edit_text, ротация фраз отключена; при ошибке драфта автоматический откат - Dockerfile копирует activity_phrases.py и support.py, иначе контейнер падает на импорте Проверено: 172 теста OK,其中包括 14 новых в tests/test_activity_phrases.py. Тесты нашли и закрыли баг: ротация запускалась и в группах, где каждый тик был бы реальным редактированием сообщения. VERSION: 0.1.0+48 -> 0.1.0+49
This commit is contained in:
admin committed
1 parent
a95ae7ae5b
commit
87e421ae73
11 files changed
+936
-24
No files matched your search
@@ -0,0 +1,160 @@
|
||||
import asyncio
|
||||
import unittest
|
||||
from typing import Any, cast
|
||||
from unittest.mock import AsyncMock, patch
|
||||
|
||||
import activity_phrases
|
||||
import bot
|
||||
|
||||
|
||||
def make_message(chat_type: str = "private", chat_id: int = 55):
|
||||
"""Минимальный Message с нужными OperationStatus полями."""
|
||||
fake_bot = AsyncMock()
|
||||
fake_bot.send_message_draft = AsyncMock(return_value=True)
|
||||
message = cast(
|
||||
Any,
|
||||
type(
|
||||
"Message",
|
||||
(),
|
||||
{
|
||||
"chat": type("Chat", (), {"id": chat_id, "type": chat_type})(),
|
||||
"bot": fake_bot,
|
||||
"answer": AsyncMock(return_value=AsyncMock()),
|
||||
},
|
||||
)(),
|
||||
)
|
||||
return message
|
||||
|
||||
|
||||
class PhrasePoolTests(unittest.TestCase):
|
||||
def test_known_kinds_have_non_empty_pools(self):
|
||||
for kind, pool in activity_phrases.ACTIVITY_PHRASES.items():
|
||||
self.assertTrue(pool, kind)
|
||||
for phrase in pool:
|
||||
self.assertIsInstance(phrase, str)
|
||||
self.assertTrue(phrase.strip())
|
||||
|
||||
def test_next_phrase_respects_kind(self):
|
||||
for kind, pool in activity_phrases.ACTIVITY_PHRASES.items():
|
||||
self.assertIn(activity_phrases.next_phrase(kind), pool, kind)
|
||||
|
||||
def test_unknown_kind_falls_back_to_defaults(self):
|
||||
self.assertIn(activity_phrases.next_phrase("no-such-kind"), activity_phrases.DEFAULT_PHRASES)
|
||||
|
||||
def test_next_phrase_never_repeats_excluded(self):
|
||||
pool = activity_phrases.ACTIVITY_PHRASES["generation"]
|
||||
excluded = pool[0]
|
||||
for _ in range(200):
|
||||
self.assertNotEqual(activity_phrases.next_phrase("generation", excluded), excluded)
|
||||
|
||||
def test_random_interval_within_bounds(self):
|
||||
low, high = activity_phrases.ACTIVITY_MIN_SECONDS, activity_phrases.ACTIVITY_MAX_SECONDS
|
||||
self.assertLessEqual(low, high)
|
||||
for _ in range(500):
|
||||
value = activity_phrases.random_interval()
|
||||
self.assertGreaterEqual(value, low)
|
||||
self.assertLessEqual(value, high)
|
||||
|
||||
|
||||
class DraftStatusTests(unittest.IsolatedAsyncioTestCase):
|
||||
async def test_private_chat_streams_draft_and_never_posts_a_status_message(self):
|
||||
message = make_message("private")
|
||||
status = await bot.OperationStatus.start(message, "⏳ Старт", kind="generation")
|
||||
await status.cancel()
|
||||
|
||||
message.answer.assert_not_awaited()
|
||||
message.bot.send_message_draft.assert_awaited_once()
|
||||
call = message.bot.send_message_draft.await_args
|
||||
self.assertEqual(call.kwargs["chat_id"], 55)
|
||||
self.assertEqual(call.kwargs["text"], "⏳ Старт")
|
||||
self.assertNotEqual(call.kwargs["draft_id"], 0)
|
||||
|
||||
async def test_draft_id_is_stable_across_updates(self):
|
||||
message = make_message("private")
|
||||
status = await bot.OperationStatus.start(message, "⏳ Старт", kind="generation")
|
||||
await asyncio.sleep(0)
|
||||
await status.update("⏳ Работаю")
|
||||
await status.cancel()
|
||||
|
||||
ids = {c.kwargs["draft_id"] for c in message.bot.send_message_draft.await_args_list}
|
||||
self.assertEqual(len(ids), 1)
|
||||
self.assertEqual(
|
||||
[c.kwargs["text"] for c in message.bot.send_message_draft.await_args_list][:2],
|
||||
["⏳ Старт", "⏳ Работаю"],
|
||||
)
|
||||
|
||||
async def test_finish_posts_real_message_and_stops_rotation(self):
|
||||
message = make_message("private")
|
||||
status = await bot.OperationStatus.start(message, "⏳ Старт", kind="generation")
|
||||
await status.finish("✅ Готово")
|
||||
|
||||
message.answer.assert_awaited_once_with("✅ Готово")
|
||||
self.assertIsNone(status._rotation_task)
|
||||
# после finish ротация не должна больше дёргать драфт
|
||||
calls_before = message.bot.send_message_draft.await_count
|
||||
with patch.object(bot, "random_interval", return_value=0.01):
|
||||
await asyncio.sleep(0.05)
|
||||
self.assertEqual(message.bot.send_message_draft.await_count, calls_before)
|
||||
|
||||
async def test_rotation_emits_activity_phrases(self):
|
||||
message = make_message("private")
|
||||
with patch.object(bot, "random_interval", return_value=0.01):
|
||||
status = await bot.OperationStatus.start(message, "⏳ Старт", kind="training")
|
||||
await asyncio.sleep(0.09)
|
||||
await status.cancel()
|
||||
|
||||
texts = [c.kwargs["text"] for c in message.bot.send_message_draft.await_args_list]
|
||||
self.assertGreater(len(texts), 1)
|
||||
self.assertTrue(
|
||||
any(text in activity_phrases.TRAINING_PHRASES for text in texts[1:]),
|
||||
texts,
|
||||
)
|
||||
|
||||
async def test_no_kind_means_no_rotation(self):
|
||||
message = make_message("private")
|
||||
status = await bot.OperationStatus.start(message, "⏳ Старт")
|
||||
with patch.object(bot, "random_interval", return_value=0.01):
|
||||
await asyncio.sleep(0.05)
|
||||
self.assertEqual(message.bot.send_message_draft.await_count, 1)
|
||||
|
||||
async def test_retarget_switches_pool(self):
|
||||
message = make_message("private")
|
||||
with patch.object(bot, "random_interval", return_value=0.01):
|
||||
status = await bot.OperationStatus.start(message, "⏳ Старт", kind="generation")
|
||||
status.retarget("images")
|
||||
await asyncio.sleep(0.09)
|
||||
await status.cancel()
|
||||
|
||||
texts = [c.kwargs["text"] for c in message.bot.send_message_draft.await_args_list][1:]
|
||||
self.assertTrue(any(text in activity_phrases.IMAGES_PHRASES for text in texts), texts)
|
||||
|
||||
|
||||
class GroupStatusTests(unittest.IsolatedAsyncioTestCase):
|
||||
async def test_group_chat_uses_legacy_edit_path(self):
|
||||
for chat_type in ("group", "supergroup", "channel"):
|
||||
message = make_message(chat_type)
|
||||
status = await bot.OperationStatus.start(message, "⏳ Старт", kind="generation")
|
||||
await asyncio.sleep(0)
|
||||
await status.update("⏳ Работаю")
|
||||
await status.finish("✅ Готово")
|
||||
|
||||
message.bot.send_message_draft.assert_not_awaited()
|
||||
message.answer.assert_awaited_once_with("⏳ Старт")
|
||||
self.assertEqual(
|
||||
[c.args[0] for c in status.status_message.edit_text.await_args_list],
|
||||
["⏳ Работаю", "✅ Готово"],
|
||||
)
|
||||
|
||||
async def test_no_rotation_task_in_groups(self):
|
||||
message = make_message("group")
|
||||
status = await bot.OperationStatus.start(message, "⏳ Старт", kind="generation")
|
||||
self.assertIsNone(status._rotation_task)
|
||||
|
||||
async def test_draft_failure_falls_back_to_real_message(self):
|
||||
message = make_message("private")
|
||||
message.bot.send_message_draft = AsyncMock(side_effect=RuntimeError("draft unsupported"))
|
||||
status = await bot.OperationStatus.start(message, "⏳ Старт", kind="generation")
|
||||
await status.cancel()
|
||||
|
||||
message.answer.assert_awaited_once_with("⏳ Старт")
|
||||
self.assertIsNone(status.draft_id)
|
||||
@@ -72,8 +72,29 @@ class KeyboardLayoutTests(unittest.TestCase):
|
||||
expected.append(keyboards.TRAINING_RESET_BUTTON)
|
||||
elif mode == "generation":
|
||||
expected.insert(0, keyboards.POST_GENERATE_BUTTON)
|
||||
elif mode == "help":
|
||||
expected.insert(0, keyboards.SUPPORT_BUTTON)
|
||||
self.assertEqual(labels, expected, mode)
|
||||
|
||||
def test_support_keyboard_keeps_only_main_menu(self):
|
||||
for mode in bot.MODE_STATES:
|
||||
labels = [
|
||||
b.text
|
||||
for row in keyboards.mode_keyboard(mode, support=True).keyboard
|
||||
for b in row
|
||||
]
|
||||
self.assertEqual(labels, [keyboards.MAIN_MENU_BUTTON], mode)
|
||||
|
||||
def test_help_keyboard_offers_support(self):
|
||||
labels = [b.text for row in keyboards.mode_keyboard("help").keyboard for b in row]
|
||||
self.assertIn(keyboards.SUPPORT_BUTTON, labels)
|
||||
|
||||
def test_support_button_maps_to_internal_value(self):
|
||||
self.assertEqual(
|
||||
keyboards.resolve_button_text(keyboards.SUPPORT_BUTTON),
|
||||
keyboards.SUPPORT_VALUE,
|
||||
)
|
||||
|
||||
def test_mode_entry_copy_uses_short_paragraphs(self):
|
||||
self.assertIn("\n", bot.MODE_COPY["training"][1])
|
||||
self.assertIn("\n", bot.MODE_COPY["generation"][1])
|
||||
|
||||
Reference in new issue
Block a user