Update logic for Max messenger

Author: gistrec

README.md

@@ -39,6 +39,7 @@ ClearTranscriptBot
 │   │   ├── history.py
 │   │   ├── price.py
 │   │   ├── rate_transcription.py
+│   │   ├── send_as_text.py
 │   │   ├── summarize.py
 │   │   ├── text.py
 │   │   └── topup.py
@@ -51,6 +52,7 @@ ClearTranscriptBot
 │       ├── history.py
 │       ├── price.py
 │       ├── rate.py
+│       ├── send_as_text.py
 │       ├── summarize.py
 │       ├── text.py
 │       └── topup.py
@@ -187,7 +189,7 @@ CREATE TABLE IF NOT EXISTS users (
 CREATE TABLE IF NOT EXISTS transcription_history (
     id                     BIGINT          PRIMARY KEY AUTO_INCREMENT,
     user_id                BIGINT          NOT NULL,
-    platform               VARCHAR(16)     NOT NULL,
+    user_platform          VARCHAR(16)     NOT NULL,
     status                 VARCHAR(32)     NOT NULL,
     audio_s3_path          TEXT            NOT NULL,
     result_json            TEXT,
@@ -204,11 +206,10 @@ CREATE TABLE IF NOT EXISTS transcription_history (
     created_at             TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP,
     started_at             TIMESTAMP,
     finished_at            TIMESTAMP,
-    FOREIGN KEY (user_id, user_platform) REFERENCES users(user_id, user_platform)
+    FOREIGN KEY (user_id, user_platform) REFERENCES users(user_id, user_platform),
+    INDEX idx_th_user (user_id, user_platform)
 );
 
-CREATE INDEX idx_th_user ON transcription_history(user_id, user_platform);
-
 -- Payments processed via Tinkoff acquiring
 CREATE TABLE IF NOT EXISTS payments (
     id               INTEGER         PRIMARY KEY AUTO_INCREMENT,
@@ -224,29 +225,28 @@ CREATE TABLE IF NOT EXISTS payments (
     tinkoff_response TEXT            NOT NULL,
     next_check_at    TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP,
     created_at       TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY (user_id, user_platform) REFERENCES users(user_id, user_platform)
+    FOREIGN KEY (user_id, user_platform) REFERENCES users(user_id, user_platform),
+    INDEX idx_payments_user (user_id, user_platform)
 );
 
-CREATE INDEX idx_payments_user ON payments(user_id, user_platform);
-
 -- AI summarization requests for completed transcriptions
 CREATE TABLE IF NOT EXISTS summarizations (
     id                INTEGER         PRIMARY KEY AUTO_INCREMENT,
     transcription_id  INTEGER         NOT NULL REFERENCES transcription_history(id),
     user_id           BIGINT          NOT NULL,
-    platform          VARCHAR(16)     NOT NULL,
+    user_platform     VARCHAR(16)     NOT NULL,
     status            VARCHAR(32)     NOT NULL,
     operation_id      VARCHAR(64),
     result_text       TEXT,
     llm_model         VARCHAR(64),
     message_id        VARCHAR(64),
     created_at        TIMESTAMP       NOT NULL DEFAULT CURRENT_TIMESTAMP,
     finished_at       TIMESTAMP,
-    FOREIGN KEY (user_id, user_platform) REFERENCES users(user_id, user_platform)
+    FOREIGN KEY (user_id, user_platform) REFERENCES users(user_id, user_platform),
+    INDEX idx_summarizations_transcription_id (transcription_id),
+    INDEX idx_sum_user (user_id, user_platform)
 );
 
-CREATE INDEX idx_summarizations_transcription_id ON summarizations(transcription_id);
-
 -- Trigger to maintain users.total_topped_up automatically.
 -- Fires after each payment row update; adds amount only when status
 -- transitions to CONFIRMED to avoid double-counting.

handlers/max/rate.py

@@ -14,8 +14,6 @@
 
 @sentry_bind_user_max
 async def handle_max_rate(callback: aiomax.Callback, bot: aiomax.Bot) -> None:
-    await callback.answer(notification="Спасибо за оценку!")
-
     try:
         _, transcription_id_str, rating_str = callback.payload.split(":")
         transcription_id = int(transcription_id_str)
@@ -31,13 +29,14 @@ async def handle_max_rate(callback: aiomax.Callback, bot: aiomax.Bot) -> None:
 
     update_transcription(transcription_id, rating=rating)
 
-    message_id = callback.message.body.message_id
+    file_attachments = [
+        att for att in (callback.message.body.attachments or [])
+        if att.type == "file"
+    ]
     keyboard = make_rating_keyboard(transcription_id, selected=rating)
-    await bot.edit_message(message_id, RATING_PROMPT, keyboard=keyboard)
-
-
-@sentry_bind_user_max
-async def handle_max_skip_rating(callback: aiomax.Callback, bot: aiomax.Bot) -> None:
-    await callback.answer(notification="")
-    message_id = callback.message.body.message_id
-    await bot.edit_message(message_id, RATING_PROMPT, attachments=[])
+    await callback.answer(
+        notification="Спасибо за оценку!",
+        text=RATING_PROMPT,
+        keyboard=keyboard,
+        attachments=file_attachments if file_attachments else None,
+    )

handlers/telegram/rate_transcription.py

@@ -49,11 +49,3 @@ async def handle_rate_transcription(update: Update, context: ContextTypes.DEFAUL
         caption=RATING_PROMPT,
         reply_markup=make_rating_keyboard(transcription_id, selected=rating),
     )
-
-
-@sentry_bind_user
-async def handle_skip_rating(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    query = update.callback_query
-    await query.answer()
-
-    await query.edit_message_reply_markup(reply_markup=None)

main.py

@@ -25,7 +25,7 @@
 from handlers.telegram.price import handle_price
 from handlers.telegram.text import handle_text
 from handlers.telegram.topup import handle_topup, handle_topup_callback, handle_check_payment, handle_cancel_payment
-from handlers.telegram.rate_transcription import handle_rate_transcription, handle_skip_rating
+from handlers.telegram.rate_transcription import handle_rate_transcription
 from handlers.telegram.summarize import handle_summarize
 from handlers.telegram.send_as_text import handle_send_as_text
 
@@ -35,7 +35,7 @@
 from handlers.max.file import handle_max_file
 from handlers.max.history import handle_max_history
 from handlers.max.price import handle_max_price
-from handlers.max.rate import handle_max_rate, handle_max_skip_rating
+from handlers.max.rate import handle_max_rate
 from handlers.max.summarize import handle_max_summarize
 from handlers.max.send_as_text import handle_max_send_as_text
 from handlers.max.text import handle_max_text
@@ -122,9 +122,6 @@ async def run_bots() -> None:
     application.add_handler(
         CallbackQueryHandler(handle_rate_transcription, pattern=r"^rate:\d+:[1-5]$")
     )
-    application.add_handler(
-        CallbackQueryHandler(handle_skip_rating, pattern=r"^rate_skip:\d+$")
-    )
     application.add_handler(
         CallbackQueryHandler(handle_summarize, pattern=r"^summarize:\d+$")
     )
@@ -204,8 +201,6 @@ async def _on_max_callback(callback: aiomax.Callback) -> None:
                 await handle_max_cancel_task(callback, max_bot)
             elif payload.startswith("rate:"):
                 await handle_max_rate(callback, max_bot)
-            elif payload.startswith("rate_skip:"):
-                await handle_max_skip_rating(callback, max_bot)
             elif payload.startswith("summarize:"):
                 await handle_max_summarize(callback, max_bot)
             elif payload.startswith("send_as_text:"):

utils/bot_sender.py

@@ -4,6 +4,26 @@
 from database.models import PLATFORM_TELEGRAM, PLATFORM_MAX
 
 
+class _MaxKeyboardAttachment:
+    """Wraps an aiomax KeyboardBuilder as an attachment-like object.
+
+    Workaround for an aiomax bug: send_message's AttachmentNotReady retry
+    drops the keyboard= parameter, losing the inline keyboard. By encoding
+    the keyboard as an element of attachments= it survives the retry.
+    """
+    def __init__(self, keyboard):
+        from aiomax.buttons import KeyboardBuilder
+        if isinstance(keyboard, KeyboardBuilder):
+            keyboard = keyboard.to_list()
+        self._keyboard = keyboard
+
+    def as_dict(self):
+        return {
+            "type": "inline_keyboard",
+            "payload": {"buttons": self._keyboard},
+        }
+
+
 class BotSender:
     """Routes message delivery to the correct bot based on platform."""
 
@@ -103,11 +123,14 @@ async def send_document(
             data = file_obj.read() if hasattr(file_obj, "read") else file_obj
             try:
                 file_attachment = await self._max.upload_file(data, filename)
+                if max_keyboard is not None:
+                    attachments = [_MaxKeyboardAttachment(max_keyboard), file_attachment]
+                else:
+                    attachments = [file_attachment]
                 return await self._max.send_message(
                     caption,
                     user_id=int(chat_id),
-                    attachments=[file_attachment],
-                    keyboard=max_keyboard,
+                    attachments=attachments,
                 )
             except Exception:
                 logging.exception("Max send_document failed chat=%s", chat_id)