fix gather bug

app/bot/handlers/library.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 from typing import Union
 
@@ -8,7 +7,7 @@ from aiogram.types import CallbackQuery, Message
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.bot.keyboards import library as kb
-from app.core.aio import gather_safe
+from app.core.aio import gather_results, gather_safe
 from app.core.catalog import KINDS
 from app.core.i18n import all_translations, t
 from app.db.models import User
@@ -26,10 +25,9 @@ async def _show(target: Union[Message, CallbackQuery], text: str, markup) -> Non
         if not target.message:
             await target.answer()
             return
-        _, edited = await asyncio.gather(
+        _, edited = await gather_results(
             target.answer(),
             target.message.edit_text(text, reply_markup=markup),
-            return_exceptions=True,
         )
         if isinstance(edited, Exception) and "not modified" not in str(edited):
             log.warning("edit_text failed (%r); sending a new message instead", edited)

app/core/aio.py

@@ -4,9 +4,22 @@ import logging
 log = logging.getLogger(__name__)
 
 
+async def _await(aw):
+    return await aw
+
+
+async def gather_results(*aws) -> list:
+    """Run awaitables in parallel and return results (exceptions included, never raised).
+
+    aiogram's bot-method objects (call.answer(), message.edit_text(), ...) are awaitable but are
+    unhashable pydantic models, and asyncio.gather() puts its arguments in a dict -> TypeError
+    "unhashable type". Wrapping each one in a coroutine avoids that.
+    """
+    return await asyncio.gather(*(_await(a) for a in aws), return_exceptions=True)
+
+
 async def gather_safe(*aws) -> None:
-    """Run independent Telegram calls in parallel; log (never raise) failures."""
-    results = await asyncio.gather(*aws, return_exceptions=True)
-    for res in results:
+    """Parallel Telegram calls; failures are logged, not raised."""
+    for res in await gather_results(*aws):
         if isinstance(res, Exception):
             log.info("Parallel call failed: %r", res)

tests/test_logic.py

@@ -6,7 +6,10 @@ from types import SimpleNamespace
 
 sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
 
+import asyncio  # noqa: E402
+
 from app.core import cache  # noqa: E402
+from app.core.aio import gather_results, gather_safe  # noqa: E402
 from app.services.engagement import DAILY_POINTS, MILESTONES, touch  # noqa: E402
 from app.services.ingest import parse_caption  # noqa: E402
 
@@ -53,6 +56,35 @@ def test_cache_roundtrip_and_isolation():
     assert cache.get(7) is None
 
 
+class _Unhashable:
+    """Mimics aiogram method objects: awaitable, but unhashable (pydantic model)."""
+
+    __hash__ = None
+
+    def __init__(self, value):
+        self.value = value
+
+    def __await__(self):
+        async def run():
+            return self.value
+
+        return run().__await__()
+
+
+def test_plain_gather_fails_but_ours_works():
+    async def go():
+        try:
+            await asyncio.gather(_Unhashable(1))
+            plain_ok = True
+        except TypeError:
+            plain_ok = False
+        assert plain_ok is False  # this is the bug that broke the library buttons
+        assert await gather_results(_Unhashable(1), _Unhashable(2)) == [1, 2]
+        await gather_safe(_Unhashable(3))
+
+    asyncio.run(go())
+
+
 if __name__ == "__main__":
     for name, fn in list(globals().items()):
         if name.startswith("test_"):