Initial commit for dev-8 branch with all current changes

helper_bot/main.py

@@ -2,6 +2,8 @@ from aiogram import Bot, Dispatcher
 from aiogram.client.default import DefaultBotProperties
 from aiogram.fsm.storage.memory import MemoryStorage
 from aiogram.fsm.strategy import FSMStrategy
+import asyncio
+import logging
 
 from helper_bot.handlers.admin import admin_router
 from helper_bot.handlers.callback import callback_router
@@ -10,6 +12,7 @@ from helper_bot.handlers.private import private_router
 from helper_bot.middlewares.dependencies_middleware import DependenciesMiddleware
 from helper_bot.middlewares.blacklist_middleware import BlacklistMiddleware
 from helper_bot.middlewares.metrics_middleware import MetricsMiddleware, ErrorMetricsMiddleware
+from helper_bot.server_prometheus import start_metrics_server, stop_metrics_server
 
 
 async def start_bot(bdf):
@@ -33,4 +36,21 @@ async def start_bot(bdf):
     
     dp.include_routers(admin_router, private_router, callback_router, group_router)
     await bot.delete_webhook(drop_pending_updates=True)
-    await dp.start_polling(bot, skip_updates=True)
+    
+    # Запускаем HTTP сервер для метрик параллельно с ботом
+    metrics_host = bdf.settings.get('Metrics', {}).get('host', '0.0.0.0')
+    metrics_port = bdf.settings.get('Metrics', {}).get('port', 8080)
+    
+    try:
+        # Запускаем метрики сервер
+        await start_metrics_server(metrics_host, metrics_port)
+        
+        # Запускаем бота
+        await dp.start_polling(bot, skip_updates=True)
+        
+    except Exception as e:
+        logging.error(f"Error in bot startup: {e}")
+        raise
+    finally:
+        # Останавливаем метрики сервер при завершении
+        await stop_metrics_server()