feat: scanner statuses, iterative scanning, generalized routers tools

Closes #46

Author: danillatency

src/bot/api.py

@@ -6,7 +6,7 @@
 from src.config import settings
 from src.config_schema import Printer, Scanner
 from src.modules.printing.entity_models import JobAttributes, PreparePrintingResponse, PrinterStatus, PrintingOptions
-from src.modules.scanning.entity_models import ScanningOptions, ScanningResult
+from src.modules.scanning.entity_models import ScannerStatus, ScanningOptions, ScanningResult
 
 
 class InNoHasslePrintAPI:
@@ -101,9 +101,7 @@ async def get_printers_status_list(self, telegram_id: int) -> list[PrinterStatus
             adapter = TypeAdapter(list[PrinterStatus])
             return adapter.validate_python(response.json())
 
-    async def get_printer_status(self, telegram_id: int, printer_cups_name: str | None = None) -> PrinterStatus | None:
-        if printer_cups_name is None:
-            return None
+    async def get_printer_status(self, telegram_id: int, printer_cups_name: str) -> PrinterStatus:
         params = {"printer_cups_name": printer_cups_name}
         async with self._create_client(telegram_id) as client:
             response = await client.get("/print/get_printer_status", params=params)
@@ -126,6 +124,14 @@ async def get_scanner(self, telegram_id: int, scanner_name: str | None = None) -
                 return scanner
         return None
 
+    async def get_scanner_status(self, telegram_id: int, scanner_name: str | None = None) -> ScannerStatus | None:
+        if scanner_name is None:
+            return None
+        async with self._create_client(telegram_id) as client:
+            response = await client.get("/scan/debug/get_scanner_status", params={"scanner_name": scanner_name})
+            response.raise_for_status()
+            return ScannerStatus.model_validate(response.json())
+
     async def start_manual_scan(self, telegram_id: int, scanner: Scanner, scanning_options: ScanningOptions) -> str:
         params = {"scanner_name": scanner.name}
         data = {"scanning_options": scanning_options.model_dump(by_alias=True)}

src/bot/routers/printing/print_settings/copies_setup.py

@@ -7,7 +7,7 @@
 
 from src.bot.api import api_client
 from src.bot.routers.printing.printing_states import PrintWork
-from src.bot.routers.printing.printing_tools import MenuCallback, discard_job_settings_message, format_draft_message
+from src.bot.routers.printing.printing_tools import MenuCallback, discard_job_settings_message, format_configure_message
 
 router = Router(name="copies_setup")
 
@@ -57,8 +57,8 @@ async def handle_copies_action(
     if callback_data.action == "reset":
         data = await state.update_data(copies="1")
         assert "confirmation_message_id" in data
-        printer = await api_client.get_printer(callback.message.chat.id, data.get("printer"))
-        caption, markup = format_draft_message(data, printer)
+        printer_status = await api_client.get_printer_status(callback.message.chat.id, data.get("printer"))
+        caption, markup = format_configure_message(data, printer_status)
         await bot.edit_message_caption(
             caption=caption,
             chat_id=callback.message.chat.id,
@@ -87,8 +87,8 @@ async def apply_settings_copies(message: Message, state: FSMContext, bot: Bot):
     copies = str(max(0, min(50, int(message.text))))
     data = await state.update_data(copies=copies)
     assert "confirmation_message_id" in data
-    printer = await api_client.get_printer(message.chat.id, data.get("printer"))
-    caption, markup = format_draft_message(data, printer)
+    printer_status = await api_client.get_printer_status(message.chat.id, data.get("printer"))
+    caption, markup = format_configure_message(data, printer_status)
     await state.set_state(PrintWork.settings_menu)
     await bot.edit_message_caption(
         caption=caption,

src/bot/routers/printing/print_settings/layout_setup.py

@@ -12,7 +12,7 @@
 
 from src.bot.api import api_client
 from src.bot.routers.printing.printing_states import PrintWork
-from src.bot.routers.printing.printing_tools import MenuCallback, discard_job_settings_message, format_draft_message
+from src.bot.routers.printing.printing_tools import MenuCallback, discard_job_settings_message, format_configure_message
 
 router = Router(name="layout_setup")
 
@@ -58,8 +58,8 @@ async def apply_settings_layout(callback: CallbackQuery, callback_data: LayoutCa
     data = await state.update_data(number_up=callback_data.number_up)
     await discard_job_settings_message(data, callback.message, state, bot)
     assert "confirmation_message_id" in data
-    printer = await api_client.get_printer(callback.message.chat.id, data.get("printer"))
-    caption, markup = format_draft_message(data, printer)
+    printer_status = await api_client.get_printer_status(callback.message.chat.id, data.get("printer"))
+    caption, markup = format_configure_message(data, printer_status)
     await state.set_state(PrintWork.settings_menu)
     await bot.edit_message_caption(
         caption=caption,

src/bot/routers/printing/print_settings/pages_setup.py

@@ -8,7 +8,7 @@
 
 from src.bot.api import api_client
 from src.bot.routers.printing.printing_states import PrintWork
-from src.bot.routers.printing.printing_tools import MenuCallback, discard_job_settings_message, format_draft_message
+from src.bot.routers.printing.printing_tools import MenuCallback, discard_job_settings_message, format_configure_message
 
 router = Router(name="pages_setup")
 
@@ -100,8 +100,8 @@ async def handle_pages_action(callback: CallbackQuery, callback_data: PagesActio
     if callback_data.action == "reset":
         data = await state.update_data(page_ranges=None)
         assert "confirmation_message_id" in data
-        printer = await api_client.get_printer(callback.message.chat.id, data.get("printer"))
-        caption, markup = format_draft_message(data, printer)
+        printer_status = await api_client.get_printer_status(callback.message.chat.id, data.get("printer"))
+        caption, markup = format_configure_message(data, printer_status)
         await bot.edit_message_caption(
             caption=caption,
             chat_id=callback.message.chat.id,
@@ -144,8 +144,8 @@ async def change_settings_pages(message: Message, state: FSMContext, bot: Bot):
     await discard_job_settings_message(data, message, state, bot)
     data = await state.update_data(data)
     assert "confirmation_message_id" in data
-    printer = await api_client.get_printer(message.chat.id, data.get("printer"))
-    caption, markup = format_draft_message(data, printer)
+    printer_status = await api_client.get_printer_status(message.chat.id, data.get("printer"))
+    caption, markup = format_configure_message(data, printer_status)
     await state.set_state(PrintWork.settings_menu)
     await bot.edit_message_caption(
         caption=caption,

src/bot/routers/printing/print_settings/printer_setup.py

@@ -1,10 +1,8 @@
 import asyncio
-from collections.abc import Sequence
 from typing import assert_never
 
 from aiogram import Bot, F, Router, html
 from aiogram.fsm.context import FSMContext
-from aiogram.fsm.state import State
 from aiogram.types import (
     CallbackQuery,
     InlineKeyboardButton,
@@ -19,9 +17,10 @@
     MenuCallback,
     PrinterCallback,
     discard_job_settings_message,
-    format_draft_message,
+    format_configure_message,
     format_printer_status,
 )
+from src.bot.routers.tools import ensure_same_structural_message
 from src.config_schema import Printer
 from src.modules.printing.entity_models import PrinterStatus
 
@@ -39,17 +38,46 @@ async def start_printer_setup(callback_or_message: CallbackQuery | Message, stat
 
     asyncio.create_task(
         update_printer_statuses(
-            message.chat.id,
-            message.chat.id,
-            msg.message_id,
+            msg,
             printers,
             state,
-            bot,
-            checkable_state=PrintWork.setup_printer,
         )
     )
 
 
+async def update_printer_statuses(job_settings_message: Message, printers: list[Printer], state: FSMContext):
+    printers_or_statuses = dict()
+    for elem in printers:
+        printers_or_statuses[elem.cups_name] = elem
+    tasks = [api_client.get_printer_status(job_settings_message.chat.id, printer.cups_name) for printer in printers]
+    for task in asyncio.as_completed(tasks):
+        await ensure_same_structural_message(job_settings_message, "job_settings_message_id", state)
+        status = await task
+        printers_or_statuses[status.printer.cups_name] = status
+        new_reply_markup = printers_keyboard(list(printers_or_statuses.values()))
+        await ensure_same_structural_message(job_settings_message, "job_settings_message_id", state)
+        await job_settings_message.edit_reply_markup(reply_markup=new_reply_markup)
+
+
+def printers_keyboard(statuses_and_printers: list[PrinterStatus | Printer]) -> InlineKeyboardMarkup:
+    keyboard = InlineKeyboardBuilder()
+    for status_or_printer in statuses_and_printers:
+        if isinstance(status_or_printer, PrinterStatus):
+            button = InlineKeyboardButton(
+                text=format_printer_status(status_or_printer),
+                callback_data=PrinterCallback(cups_name=status_or_printer.printer.cups_name).pack(),
+            )
+        elif isinstance(status_or_printer, Printer):
+            button = InlineKeyboardButton(
+                text=status_or_printer.display_name,
+                callback_data=PrinterCallback(cups_name=status_or_printer.cups_name).pack(),
+            )
+        else:
+            assert_never(status_or_printer)
+        keyboard.row(button)
+    return keyboard.as_markup()
+
+
 @router.callback_query(PrintWork.settings_menu, MenuCallback.filter(F.menu == "printer"))
 async def job_settings_printer(callback: CallbackQuery, state: FSMContext, bot: Bot):
     await callback.answer()
@@ -69,65 +97,11 @@ async def apply_settings_printer(callback: CallbackQuery, callback_data: Printer
     assert "printer" in data
     assert "confirmation_message_id" in data
     printer_status = await api_client.get_printer_status(callback.message.chat.id, data.get("printer"))
-    caption, markup = format_draft_message(data, printer_status)
+    caption, markup = format_configure_message(data, printer_status)
     await state.set_state(PrintWork.settings_menu)
     await bot.edit_message_caption(
         caption=caption,
         chat_id=callback.message.chat.id,
         message_id=data["confirmation_message_id"],
         reply_markup=markup,
     )
-
-
-def printers_keyboard(printers: Sequence[PrinterStatus | Printer]) -> InlineKeyboardMarkup:
-    keyboard = InlineKeyboardBuilder()
-
-    for status_or_printer in printers:
-        if isinstance(status_or_printer, PrinterStatus):
-            printer = status_or_printer.printer
-            show_text = format_printer_status(status_or_printer)
-        elif isinstance(status_or_printer, Printer):
-            printer = status_or_printer
-            show_text = printer.display_name
-        else:
-            assert_never(status_or_printer)
-        keyboard.row(
-            InlineKeyboardButton(
-                text=show_text,
-                callback_data=PrinterCallback(cups_name=printer.cups_name).pack(),
-            )
-        )
-    return keyboard.as_markup()
-
-
-async def update_printer_statuses(
-    from_user_id: int,
-    chat_id: int,
-    message_id: int,
-    printers: list,
-    state: FSMContext,
-    bot: Bot,
-    checkable_state: State,
-):
-    tasks = [
-        api_client.get_printer_status(from_user_id, printer.cups_name)
-        for printer in printers
-        if isinstance(printer, Printer)
-    ]
-    for t in asyncio.as_completed(tasks):
-        if await state.get_state() != checkable_state:
-            return
-        result = await t
-        if isinstance(result, PrinterStatus):
-            for i, p in enumerate(printers):
-                if isinstance(p, Printer) and p.cups_name == result.printer.cups_name:
-                    printers[i] = result  # type: ignore
-
-        new_reply_markup = printers_keyboard(printers)
-        if await state.get_state() != checkable_state:
-            return
-        await bot.edit_message_reply_markup(
-            chat_id=chat_id,
-            message_id=message_id,
-            reply_markup=new_reply_markup,
-        )

src/bot/routers/printing/print_settings/sides_setup.py

@@ -12,7 +12,7 @@
 
 from src.bot.api import api_client
 from src.bot.routers.printing.printing_states import PrintWork
-from src.bot.routers.printing.printing_tools import MenuCallback, discard_job_settings_message, format_draft_message
+from src.bot.routers.printing.printing_tools import MenuCallback, discard_job_settings_message, format_configure_message
 
 router = Router(name="sides_setup")
 
@@ -52,8 +52,8 @@ async def apply_settings_sides(callback: CallbackQuery, callback_data: SidesCall
     data = await state.update_data(sides=callback_data.sides)
     await discard_job_settings_message(data, callback.message, state, bot)
     assert "confirmation_message_id" in data
-    printer = await api_client.get_printer(callback.message.chat.id, data.get("printer"))
-    caption, markup = format_draft_message(data, printer)
+    printer_status = await api_client.get_printer_status(callback.message.chat.id, data.get("printer"))
+    caption, markup = format_configure_message(data, printer_status)
     await state.set_state(PrintWork.settings_menu)
     await bot.edit_message_caption(
         caption=caption,