Andrey
d128e54694
- Deleted the Makefile, `README_TESTING.md`, and several deployment scripts to streamline the project. - Updated `.dockerignore` to exclude unnecessary development files. - Adjusted database schema comments for clarity. - Refactored metrics handling in middleware for improved command extraction and logging. - Enhanced command mappings for buttons and callbacks in constants for better maintainability. - Start refactor voice bot
49 lines
1.7 KiB
Python
49 lines
1.7 KiB
Python
from typing import Dict, Any
|
||
try:
|
||
from typing import Annotated
|
||
except ImportError:
|
||
from typing_extensions import Annotated
|
||
from aiogram import BaseMiddleware
|
||
from aiogram.types import TelegramObject
|
||
|
||
from helper_bot.utils.base_dependency_factory import get_global_instance
|
||
from logs.custom_logger import logger
|
||
|
||
|
||
class VoiceBotMiddleware(BaseMiddleware):
|
||
"""Middleware для voice_bot с dependency injection"""
|
||
|
||
async def __call__(self, handler, event: TelegramObject, data: Dict[str, Any]) -> Any:
|
||
try:
|
||
# Вызываем хендлер с data
|
||
return await handler(event, data)
|
||
except TypeError as e:
|
||
if "missing 1 required positional argument: 'data'" in str(e):
|
||
logger.error(f"Ошибка в VoiceBotMiddleware: {e}. Хендлер не принимает параметр 'data'")
|
||
# Пытаемся вызвать хендлер без data (для совместимости с MagicData)
|
||
return await handler(event)
|
||
else:
|
||
logger.error(f"TypeError в VoiceBotMiddleware: {e}")
|
||
raise
|
||
except Exception as e:
|
||
logger.error(f"Неожиданная ошибка в VoiceBotMiddleware: {e}")
|
||
raise
|
||
|
||
|
||
# Dependency providers
|
||
def get_bot_db():
|
||
"""Провайдер для получения экземпляра БД"""
|
||
bdf = get_global_instance()
|
||
return bdf.get_db()
|
||
|
||
|
||
def get_settings():
|
||
"""Провайдер для получения настроек"""
|
||
bdf = get_global_instance()
|
||
return bdf.settings
|
||
|
||
|
||
# Type aliases for dependency injection
|
||
BotDB = Annotated[object, get_bot_db()]
|
||
Settings = Annotated[dict, get_settings()]
|