Added health chek

Author: BushlanovDev

bot/configs/config.py

@@ -9,6 +9,7 @@ class App(BaseSettings):
     port: int = 8080
     url: str = 'https://my.domain'
     webhook_path: str = '/webhook/tg'
+    health_path: str = '/healthz'
     default_language: str = 'en'
 
 

bot/handlers/handlers.py

@@ -57,8 +57,12 @@ async def reply(self, message: Message, ctx: HandlerContext):
         await message.reply(text=ctx.bot_service.upper(text))
 
     async def process_any_inline_button_press(self, callback: CallbackQuery, callback_data: SaveCallbackFactory):
-        await callback.message.answer(text=callback_data.pack())
-        await callback.answer()
+        text = f'Callback packed: {callback_data.pack()}'
+        if callback.message:
+            await callback.message.answer(text=text)
+            await callback.answer()
+        else:
+            await callback.answer(text=text, show_alert=True)
 
     async def __send_message(self, chat_id: int, text: str, reply_to_message_id: int | None = None) -> int:
         await self.bot.send_chat_action(chat_id, ChatAction.TYPING)

bot/middlewares/i18n.py

@@ -2,7 +2,7 @@
 from typing import Any
 
 from aiogram import BaseMiddleware
-from aiogram.types import TelegramObject, User
+from aiogram.types import CallbackQuery, Message, TelegramObject, Update, User
 
 
 class I18nMiddleware(BaseMiddleware):
@@ -12,11 +12,21 @@ async def __call__(
         event: TelegramObject,
         data: dict[str, Any],
     ) -> Any:
-        user: User = data.get('event_from_user')
+        user: User | None = None
+
+        if isinstance(event, Message):
+            user = event.from_user
+        elif isinstance(event, CallbackQuery):
+            user = event.from_user
+        elif isinstance(event, Update):
+            if event.message:
+                user = event.message.from_user
+            elif event.callback_query:
+                user = event.callback_query.from_user
 
         if user is None:
-            return await handler(event, data)
+            user = data.get('event_from_user')
 
-        data['user_lang'] = user.language_code
+        data['user_lang'] = user.language_code if user and user.language_code else None
 
         return await handler(event, data)

main.py

@@ -60,9 +60,8 @@ async def webhook_handler(request: Request) -> None:
             logger.info(f'Received update: {update.update_id}')
             await dp.feed_update(bot, update)
             logger.debug(f'Successfully processed update: {update.update_id}')
-        except Exception as e:
-            logger.error(f'Failed to process update: {str(e)}')
-            raise
+        except Exception:
+            logger.exception('Failed to process update')
 
     return webhook_handler
 
@@ -109,6 +108,7 @@ def create_app(bot: Bot, dp: Dispatcher, settings: App) -> FastAPI:
     app.add_event_handler('startup', create_startup_handler(bot, dp, settings.url + settings.webhook_path))
     app.add_event_handler('shutdown', create_shutdown_handler(bot, settings.debug))
     app.add_api_route(settings.webhook_path, create_webhook_handler(bot, dp), methods=['POST'])
+    app.add_api_route(settings.health_path, lambda: {"status": "ok"}, methods=["GET"])
 
     return app