kerrad/telegram-helper-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix isort

Browse Source
This commit is contained in:
Andrey
2026-02-01 23:04:32 +03:00
parent f8962225ee
commit 9a6ab9a045
44 changed files with 207 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
database/__init__.py
View File

@@ -11,19 +11,9 @@
from .async_db import AsyncBotDB from .async_db import AsyncBotDB
from .base import DatabaseConnection from .base import DatabaseConnection
from .models import ( from .models import (Admin, AudioListenRecord, AudioMessage, AudioModerate,
Admin, BlacklistUser, MessageContentLink, Migration, PostContent,
AudioListenRecord, TelegramPost, User, UserMessage)
AudioMessage,
AudioModerate,
BlacklistUser,
MessageContentLink,
Migration,
PostContent,
TelegramPost,
User,
UserMessage,
)
from .repository_factory import RepositoryFactory from .repository_factory import RepositoryFactory
# Для обратной совместимости экспортируем старый интерфейс # Для обратной совместимости экспортируем старый интерфейс

13
database/async_db.py
View File

@@ -3,16 +3,9 @@ from typing import Any, Dict, List, Optional, Tuple
import aiosqlite import aiosqlite
from database.models import ( from database.models import (Admin, AudioMessage, BlacklistHistoryRecord,
Admin, BlacklistUser, PostContent, TelegramPost, User,
AudioMessage, UserMessage)
BlacklistHistoryRecord,
BlacklistUser,
PostContent,
TelegramPost,
User,
UserMessage,
)
from database.repository_factory import RepositoryFactory from database.repository_factory import RepositoryFactory

5
database/repository_factory.py
View File

@@ -2,9 +2,8 @@ from typing import Optional
from database.repositories.admin_repository import AdminRepository from database.repositories.admin_repository import AdminRepository
from database.repositories.audio_repository import AudioRepository from database.repositories.audio_repository import AudioRepository
from database.repositories.blacklist_history_repository import ( from database.repositories.blacklist_history_repository import \
BlacklistHistoryRepository, BlacklistHistoryRepository
)
from database.repositories.blacklist_repository import BlacklistRepository from database.repositories.blacklist_repository import BlacklistRepository
from database.repositories.message_repository import MessageRepository from database.repositories.message_repository import MessageRepository
from database.repositories.post_repository import PostRepository from database.repositories.post_repository import PostRepository

18
helper_bot/handlers/admin/__init__.py
View File

@@ -1,20 +1,10 @@
from .admin_handlers import admin_router from .admin_handlers import admin_router
from .dependencies import AdminAccessMiddleware, BotDB, Settings from .dependencies import AdminAccessMiddleware, BotDB, Settings
from .exceptions import ( from .exceptions import (AdminAccessDeniedError, AdminError, InvalidInputError,
AdminAccessDeniedError, UserAlreadyBannedError, UserNotFoundError)
AdminError,
InvalidInputError,
UserAlreadyBannedError,
UserNotFoundError,
)
from .services import AdminService, BannedUser, User from .services import AdminService, BannedUser, User
from .utils import ( from .utils import (escape_html, format_ban_confirmation, format_user_info,
escape_html, handle_admin_error, return_to_admin_menu)
format_ban_confirmation,
format_user_info,
handle_admin_error,
return_to_admin_menu,
)
__all__ = [ __all__ = [
"admin_router", "admin_router",

19
helper_bot/handlers/admin/admin_handlers.py
View File

@@ -4,26 +4,19 @@ from aiogram.fsm.context import FSMContext
from helper_bot.filters.main import ChatTypeFilter from helper_bot.filters.main import ChatTypeFilter
from helper_bot.handlers.admin.dependencies import AdminAccessMiddleware from helper_bot.handlers.admin.dependencies import AdminAccessMiddleware
from helper_bot.handlers.admin.exceptions import ( from helper_bot.handlers.admin.exceptions import (InvalidInputError,
InvalidInputError, UserAlreadyBannedError)
UserAlreadyBannedError,
)
from helper_bot.handlers.admin.services import AdminService from helper_bot.handlers.admin.services import AdminService
from helper_bot.handlers.admin.utils import ( from helper_bot.handlers.admin.utils import (escape_html,
escape_html,
format_ban_confirmation, format_ban_confirmation,
format_user_info, format_user_info,
handle_admin_error, handle_admin_error,
return_to_admin_menu, return_to_admin_menu)
) from helper_bot.keyboards.keyboards import (create_keyboard_for_approve_ban,
from helper_bot.keyboards.keyboards import (
create_keyboard_for_approve_ban,
create_keyboard_for_ban_days, create_keyboard_for_ban_days,
create_keyboard_for_ban_reason, create_keyboard_for_ban_reason,
create_keyboard_with_pagination, create_keyboard_with_pagination,
get_reply_keyboard_admin, get_reply_keyboard_admin)
)
# Local imports - metrics # Local imports - metrics
from helper_bot.utils.metrics import db_query_time, track_errors, track_time from helper_bot.utils.metrics import db_query_time, track_errors, track_time
from logs.custom_logger import logger from logs.custom_logger import logger

14
helper_bot/handlers/admin/rate_limit_handlers.py
View File

@@ -8,18 +8,14 @@ from aiogram.fsm.context import FSMContext
from aiogram.types import FSInputFile from aiogram.types import FSInputFile
from helper_bot.filters.main import ChatTypeFilter from helper_bot.filters.main import ChatTypeFilter
from helper_bot.middlewares.dependencies_middleware import DependenciesMiddleware from helper_bot.middlewares.dependencies_middleware import \
DependenciesMiddleware
# Local imports - metrics # Local imports - metrics
from helper_bot.utils.metrics import track_errors, track_time from helper_bot.utils.metrics import track_errors, track_time
from helper_bot.utils.rate_limit_metrics import ( from helper_bot.utils.rate_limit_metrics import (
get_rate_limit_metrics_summary, get_rate_limit_metrics_summary, update_rate_limit_gauges)
update_rate_limit_gauges, from helper_bot.utils.rate_limit_monitor import (get_rate_limit_summary,
) rate_limit_monitor)
from helper_bot.utils.rate_limit_monitor import (
get_rate_limit_summary,
rate_limit_monitor,
)
from logs.custom_logger import logger from logs.custom_logger import logger

13
helper_bot/handlers/admin/services.py
View File

@@ -1,16 +1,11 @@
from datetime import datetime from datetime import datetime
from typing import List, Optional from typing import List, Optional
from helper_bot.handlers.admin.exceptions import ( from helper_bot.handlers.admin.exceptions import (InvalidInputError,
InvalidInputError, UserAlreadyBannedError)
UserAlreadyBannedError, from helper_bot.utils.helper_func import (add_days_to_date,
)
from helper_bot.utils.helper_func import (
add_days_to_date,
get_banned_users_buttons, get_banned_users_buttons,
get_banned_users_list, get_banned_users_list)
)
# Local imports - metrics # Local imports - metrics
from helper_bot.utils.metrics import track_errors, track_time from helper_bot.utils.metrics import track_errors, track_time
from logs.custom_logger import logger from logs.custom_logger import logger

19
helper_bot/handlers/callback/__init__.py
View File

@@ -1,19 +1,8 @@
from .callback_handlers import callback_router from .callback_handlers import callback_router
from .constants import ( from .constants import (CALLBACK_BAN, CALLBACK_DECLINE, CALLBACK_PAGE,
CALLBACK_BAN, CALLBACK_PUBLISH, CALLBACK_RETURN, CALLBACK_UNLOCK)
CALLBACK_DECLINE, from .exceptions import (BanError, PostNotFoundError, PublishError,
CALLBACK_PAGE, UserBlockedBotError, UserNotFoundError)
CALLBACK_PUBLISH,
CALLBACK_RETURN,
CALLBACK_UNLOCK,
)
from .exceptions import (
BanError,
PostNotFoundError,
PublishError,
UserBlockedBotError,
UserNotFoundError,
)
from .services import BanService, PostPublishService from .services import BanService, PostPublishService
__all__ = [ __all__ = [

46
helper_bot/handlers/callback/callback_handlers.py
View File

@@ -11,45 +11,25 @@ from aiogram.types import CallbackQuery
from helper_bot.handlers.admin.utils import format_user_info from helper_bot.handlers.admin.utils import format_user_info
from helper_bot.handlers.voice.constants import CALLBACK_DELETE, CALLBACK_SAVE from helper_bot.handlers.voice.constants import CALLBACK_DELETE, CALLBACK_SAVE
from helper_bot.handlers.voice.services import AudioFileService from helper_bot.handlers.voice.services import AudioFileService
from helper_bot.keyboards.keyboards import ( from helper_bot.keyboards.keyboards import (create_keyboard_for_ban_reason,
create_keyboard_for_ban_reason,
create_keyboard_with_pagination, create_keyboard_with_pagination,
get_reply_keyboard_admin, get_reply_keyboard_admin)
)
from helper_bot.utils.base_dependency_factory import get_global_instance from helper_bot.utils.base_dependency_factory import get_global_instance
from helper_bot.utils.helper_func import get_banned_users_buttons, get_banned_users_list from helper_bot.utils.helper_func import (get_banned_users_buttons,
get_banned_users_list)
# Local imports - metrics # Local imports - metrics
from helper_bot.utils.metrics import ( from helper_bot.utils.metrics import (db_query_time, track_errors,
db_query_time, track_file_operations, track_time)
track_errors,
track_file_operations,
track_time,
)
from logs.custom_logger import logger from logs.custom_logger import logger
from .constants import ( from .constants import (CALLBACK_BAN, CALLBACK_DECLINE, CALLBACK_PAGE,
CALLBACK_BAN, CALLBACK_PUBLISH, CALLBACK_RETURN, CALLBACK_UNLOCK,
CALLBACK_DECLINE, ERROR_BOT_BLOCKED, MESSAGE_DECLINED, MESSAGE_ERROR,
CALLBACK_PAGE, MESSAGE_PUBLISHED, MESSAGE_USER_BANNED,
CALLBACK_PUBLISH, MESSAGE_USER_UNLOCKED)
CALLBACK_RETURN,
CALLBACK_UNLOCK,
ERROR_BOT_BLOCKED,
MESSAGE_DECLINED,
MESSAGE_ERROR,
MESSAGE_PUBLISHED,
MESSAGE_USER_BANNED,
MESSAGE_USER_UNLOCKED,
)
from .dependency_factory import get_ban_service, get_post_publish_service from .dependency_factory import get_ban_service, get_post_publish_service
from .exceptions import ( from .exceptions import (BanError, PostNotFoundError, PublishError,
BanError, UserBlockedBotError, UserNotFoundError)
PostNotFoundError,
PublishError,
UserBlockedBotError,
UserNotFoundError,
)
callback_router = Router() callback_router = Router()

46
helper_bot/handlers/callback/services.py
View File

@@ -6,47 +6,27 @@ from aiogram import Bot, types
from aiogram.types import CallbackQuery from aiogram.types import CallbackQuery
from helper_bot.keyboards.keyboards import create_keyboard_for_ban_reason from helper_bot.keyboards.keyboards import create_keyboard_for_ban_reason
from helper_bot.utils.helper_func import ( from helper_bot.utils.helper_func import (delete_user_blacklist,
delete_user_blacklist, get_text_message, send_audio_message,
get_text_message,
send_audio_message,
send_media_group_to_channel, send_media_group_to_channel,
send_photo_message, send_photo_message,
send_text_message, send_text_message,
send_video_message, send_video_message,
send_video_note_message, send_video_note_message,
send_voice_message, send_voice_message)
)
# Local imports - metrics # Local imports - metrics
from helper_bot.utils.metrics import ( from helper_bot.utils.metrics import (db_query_time, track_errors,
db_query_time, track_media_processing, track_time)
track_errors,
track_media_processing,
track_time,
)
from logs.custom_logger import logger from logs.custom_logger import logger
from .constants import ( from .constants import (CONTENT_TYPE_AUDIO, CONTENT_TYPE_MEDIA_GROUP,
CONTENT_TYPE_AUDIO, CONTENT_TYPE_PHOTO, CONTENT_TYPE_TEXT,
CONTENT_TYPE_MEDIA_GROUP, CONTENT_TYPE_VIDEO, CONTENT_TYPE_VIDEO_NOTE,
CONTENT_TYPE_PHOTO, CONTENT_TYPE_VOICE, ERROR_BOT_BLOCKED,
CONTENT_TYPE_TEXT, MESSAGE_POST_DECLINED, MESSAGE_POST_PUBLISHED,
CONTENT_TYPE_VIDEO, MESSAGE_USER_BANNED_SPAM)
CONTENT_TYPE_VIDEO_NOTE, from .exceptions import (BanError, PostNotFoundError, PublishError,
CONTENT_TYPE_VOICE, UserBlockedBotError, UserNotFoundError)
ERROR_BOT_BLOCKED,
MESSAGE_POST_DECLINED,
MESSAGE_POST_PUBLISHED,
MESSAGE_USER_BANNED_SPAM,
)
from .exceptions import (
BanError,
PostNotFoundError,
PublishError,
UserBlockedBotError,
UserNotFoundError,
)
class PostPublishService: class PostPublishService:

1
helper_bot/handlers/group/__init__.py
View File

@@ -6,7 +6,6 @@ from .constants import ERROR_MESSAGES, FSM_STATES
from .decorators import error_handler from .decorators import error_handler
from .exceptions import NoReplyToMessageError, UserNotFoundError from .exceptions import NoReplyToMessageError, UserNotFoundError
from .group_handlers import GroupHandlers, create_group_handlers, group_router from .group_handlers import GroupHandlers, create_group_handlers, group_router
# Local imports - services # Local imports - services
from .services import AdminReplyService, DatabaseProtocol from .services import AdminReplyService, DatabaseProtocol

5
helper_bot/handlers/group/decorators.py
View File

@@ -25,9 +25,8 @@ def error_handler(func: Callable[..., Any]) -> Callable[..., Any]:
(arg for arg in args if isinstance(arg, types.Message)), None (arg for arg in args if isinstance(arg, types.Message)), None
) )
if message and hasattr(message, "bot"): if message and hasattr(message, "bot"):
from helper_bot.utils.base_dependency_factory import ( from helper_bot.utils.base_dependency_factory import \
get_global_instance, get_global_instance
)
bdf = get_global_instance() bdf = get_global_instance()
important_logs = bdf.settings["Telegram"]["important_logs"] important_logs = bdf.settings["Telegram"]["important_logs"]

2
helper_bot/handlers/group/group_handlers.py
View File

@@ -7,10 +7,8 @@ from aiogram.fsm.context import FSMContext
# Local imports - filters # Local imports - filters
from database.async_db import AsyncBotDB from database.async_db import AsyncBotDB
from helper_bot.filters.main import ChatTypeFilter from helper_bot.filters.main import ChatTypeFilter
# Local imports - metrics # Local imports - metrics
from helper_bot.utils.metrics import metrics, track_errors, track_time from helper_bot.utils.metrics import metrics, track_errors, track_time
# Local imports - utilities # Local imports - utilities
from logs.custom_logger import logger from logs.custom_logger import logger

1
helper_bot/handlers/group/services.py
View File

@@ -8,7 +8,6 @@ from aiogram import types
# Local imports # Local imports
from helper_bot.utils.helper_func import send_text_message from helper_bot.utils.helper_func import send_text_message
# Local imports - metrics # Local imports - metrics
from helper_bot.utils.metrics import db_query_time, track_errors, track_time from helper_bot.utils.metrics import db_query_time, track_errors, track_time
from logs.custom_logger import logger from logs.custom_logger import logger

4
helper_bot/handlers/private/__init__.py
View File

@@ -4,8 +4,8 @@
# Local imports - constants and utilities # Local imports - constants and utilities
from .constants import BUTTON_TEXTS, ERROR_MESSAGES, FSM_STATES from .constants import BUTTON_TEXTS, ERROR_MESSAGES, FSM_STATES
from .decorators import error_handler from .decorators import error_handler
from .private_handlers import PrivateHandlers, create_private_handlers, private_router from .private_handlers import (PrivateHandlers, create_private_handlers,
private_router)
# Local imports - services # Local imports - services
from .services import BotSettings, PostService, StickerService, UserService from .services import BotSettings, PostService, StickerService, UserService

5
helper_bot/handlers/private/decorators.py
View File

@@ -25,9 +25,8 @@ def error_handler(func: Callable[..., Any]) -> Callable[..., Any]:
(arg for arg in args if isinstance(arg, types.Message)), None (arg for arg in args if isinstance(arg, types.Message)), None
) )
if message and hasattr(message, "bot"): if message and hasattr(message, "bot"):
from helper_bot.utils.base_dependency_factory import ( from helper_bot.utils.base_dependency_factory import \
get_global_instance, get_global_instance
)
bdf = get_global_instance() bdf = get_global_instance()
important_logs = bdf.settings["Telegram"]["important_logs"] important_logs = bdf.settings["Telegram"]["important_logs"]

12
helper_bot/handlers/private/private_handlers.py
View File

@@ -12,19 +12,15 @@ from aiogram.fsm.context import FSMContext
# Local imports - filters and middlewares # Local imports - filters and middlewares
from database.async_db import AsyncBotDB from database.async_db import AsyncBotDB
from helper_bot.filters.main import ChatTypeFilter from helper_bot.filters.main import ChatTypeFilter
# Local imports - utilities # Local imports - utilities
from helper_bot.keyboards import get_reply_keyboard, get_reply_keyboard_for_post from helper_bot.keyboards import (get_reply_keyboard,
get_reply_keyboard_for_post)
from helper_bot.keyboards.keyboards import get_reply_keyboard_leave_chat from helper_bot.keyboards.keyboards import get_reply_keyboard_leave_chat
from helper_bot.middlewares.album_middleware import AlbumMiddleware from helper_bot.middlewares.album_middleware import AlbumMiddleware
from helper_bot.middlewares.blacklist_middleware import BlacklistMiddleware from helper_bot.middlewares.blacklist_middleware import BlacklistMiddleware
from helper_bot.utils import messages from helper_bot.utils import messages
from helper_bot.utils.helper_func import ( from helper_bot.utils.helper_func import (check_user_emoji, get_first_name,
check_user_emoji, update_user_info)
get_first_name,
update_user_info,
)
# Local imports - metrics # Local imports - metrics
from helper_bot.utils.metrics import db_query_time, track_errors, track_time from helper_bot.utils.metrics import db_query_time, track_errors, track_time

29
helper_bot/handlers/private/services.py
View File

@@ -15,32 +15,17 @@ from aiogram.types import FSInputFile
from database.models import TelegramPost, User from database.models import TelegramPost, User
from helper_bot.keyboards import get_reply_keyboard_for_post from helper_bot.keyboards import get_reply_keyboard_for_post
# Local imports - utilities # Local imports - utilities
from helper_bot.utils.helper_func import ( from helper_bot.utils.helper_func import (
add_in_db_media, add_in_db_media, check_username_and_full_name, determine_anonymity,
check_username_and_full_name, get_first_name, get_text_message, prepare_media_group_from_middlewares,
determine_anonymity, send_audio_message, send_media_group_message_to_private_chat,
get_first_name, send_photo_message, send_text_message, send_video_message,
get_text_message, send_video_note_message, send_voice_message)
prepare_media_group_from_middlewares,
send_audio_message,
send_media_group_message_to_private_chat,
send_photo_message,
send_text_message,
send_video_message,
send_video_note_message,
send_voice_message,
)
# Local imports - metrics # Local imports - metrics
from helper_bot.utils.metrics import ( from helper_bot.utils.metrics import (db_query_time, track_errors,
db_query_time,
track_errors,
track_file_operations, track_file_operations,
track_media_processing, track_media_processing, track_time)
track_time,
)
from logs.custom_logger import logger from logs.custom_logger import logger

19
helper_bot/handlers/voice/services.py
View File

@@ -8,23 +8,16 @@ from typing import List, Optional, Tuple
from aiogram.types import FSInputFile from aiogram.types import FSInputFile
from helper_bot.handlers.voice.constants import ( from helper_bot.handlers.voice.constants import (MESSAGE_DELAY_1,
MESSAGE_DELAY_1,
MESSAGE_DELAY_2, MESSAGE_DELAY_2,
MESSAGE_DELAY_3, MESSAGE_DELAY_3,
MESSAGE_DELAY_4, MESSAGE_DELAY_4, STICK_DIR,
STICK_DIR, STICK_PATTERN, STICKER_DELAY,
STICK_PATTERN, VOICE_USERS_DIR)
STICKER_DELAY, from helper_bot.handlers.voice.exceptions import (AudioProcessingError,
VOICE_USERS_DIR,
)
from helper_bot.handlers.voice.exceptions import (
AudioProcessingError,
DatabaseError, DatabaseError,
FileOperationError, FileOperationError,
VoiceMessageError, VoiceMessageError)
)
# Local imports - metrics # Local imports - metrics
from helper_bot.utils.metrics import db_query_time, track_errors, track_time from helper_bot.utils.metrics import db_query_time, track_errors, track_time
from logs.custom_logger import logger from logs.custom_logger import logger

32
helper_bot/handlers/voice/voice_handler.py
View File

@@ -11,33 +11,21 @@ from helper_bot.filters.main import ChatTypeFilter
from helper_bot.handlers.private.constants import BUTTON_TEXTS, FSM_STATES from helper_bot.handlers.private.constants import BUTTON_TEXTS, FSM_STATES
from helper_bot.handlers.voice.constants import * from helper_bot.handlers.voice.constants import *
from helper_bot.handlers.voice.services import VoiceBotService from helper_bot.handlers.voice.services import VoiceBotService
from helper_bot.handlers.voice.utils import ( from helper_bot.handlers.voice.utils import (get_last_message_text,
get_last_message_text,
get_user_emoji_safe, get_user_emoji_safe,
validate_voice_message, validate_voice_message)
)
from helper_bot.keyboards import get_reply_keyboard from helper_bot.keyboards import get_reply_keyboard
from helper_bot.keyboards.keyboards import ( from helper_bot.keyboards.keyboards import (get_main_keyboard,
get_main_keyboard, get_reply_keyboard_for_voice)
get_reply_keyboard_for_voice,
)
from helper_bot.middlewares.blacklist_middleware import BlacklistMiddleware from helper_bot.middlewares.blacklist_middleware import BlacklistMiddleware
from helper_bot.middlewares.dependencies_middleware import DependenciesMiddleware from helper_bot.middlewares.dependencies_middleware import \
DependenciesMiddleware
from helper_bot.utils import messages from helper_bot.utils import messages
from helper_bot.utils.helper_func import ( from helper_bot.utils.helper_func import (check_user_emoji, get_first_name,
check_user_emoji, send_voice_message, update_user_info)
get_first_name,
send_voice_message,
update_user_info,
)
# Local imports - metrics # Local imports - metrics
from helper_bot.utils.metrics import ( from helper_bot.utils.metrics import (db_query_time, track_errors,
db_query_time, track_file_operations, track_time)
track_errors,
track_file_operations,
track_time,
)
from logs.custom_logger import logger from logs.custom_logger import logger

12
helper_bot/main.py
View File

@@ -13,13 +13,13 @@ from helper_bot.handlers.group import group_router
from helper_bot.handlers.private import private_router from helper_bot.handlers.private import private_router
from helper_bot.handlers.voice import VoiceHandlers from helper_bot.handlers.voice import VoiceHandlers
from helper_bot.middlewares.blacklist_middleware import BlacklistMiddleware from helper_bot.middlewares.blacklist_middleware import BlacklistMiddleware
from helper_bot.middlewares.dependencies_middleware import DependenciesMiddleware from helper_bot.middlewares.dependencies_middleware import \
from helper_bot.middlewares.metrics_middleware import ( DependenciesMiddleware
ErrorMetricsMiddleware, from helper_bot.middlewares.metrics_middleware import (ErrorMetricsMiddleware,
MetricsMiddleware, MetricsMiddleware)
)
from helper_bot.middlewares.rate_limit_middleware import RateLimitMiddleware from helper_bot.middlewares.rate_limit_middleware import RateLimitMiddleware
from helper_bot.server_prometheus import start_metrics_server, stop_metrics_server from helper_bot.server_prometheus import (start_metrics_server,
stop_metrics_server)
async def start_bot_with_retry( async def start_bot_with_retry(

16
helper_bot/middlewares/metrics_middleware.py
View File

@@ -16,16 +16,16 @@ from ..utils.metrics import metrics
# Import button command mapping # Import button command mapping
try: try:
from ..handlers.admin.constants import ADMIN_BUTTON_COMMAND_MAPPING, ADMIN_COMMANDS from ..handlers.admin.constants import (ADMIN_BUTTON_COMMAND_MAPPING,
ADMIN_COMMANDS)
from ..handlers.callback.constants import CALLBACK_COMMAND_MAPPING from ..handlers.callback.constants import CALLBACK_COMMAND_MAPPING
from ..handlers.private.constants import BUTTON_COMMAND_MAPPING from ..handlers.private.constants import BUTTON_COMMAND_MAPPING
from ..handlers.voice.constants import ( from ..handlers.voice.constants import \
BUTTON_COMMAND_MAPPING as VOICE_BUTTON_COMMAND_MAPPING, BUTTON_COMMAND_MAPPING as VOICE_BUTTON_COMMAND_MAPPING
) from ..handlers.voice.constants import \
from ..handlers.voice.constants import ( CALLBACK_COMMAND_MAPPING as VOICE_CALLBACK_COMMAND_MAPPING
CALLBACK_COMMAND_MAPPING as VOICE_CALLBACK_COMMAND_MAPPING, from ..handlers.voice.constants import \
) COMMAND_MAPPING as VOICE_COMMAND_MAPPING
from ..handlers.voice.constants import COMMAND_MAPPING as VOICE_COMMAND_MAPPING
except ImportError: except ImportError:
# Fallback if constants not available # Fallback if constants not available
BUTTON_COMMAND_MAPPING = {} BUTTON_COMMAND_MAPPING = {}

3
helper_bot/middlewares/rate_limit_middleware.py
View File

@@ -6,7 +6,8 @@ from typing import Any, Awaitable, Callable, Dict, Union
from aiogram import BaseMiddleware from aiogram import BaseMiddleware
from aiogram.exceptions import TelegramAPIError, TelegramRetryAfter from aiogram.exceptions import TelegramAPIError, TelegramRetryAfter
from aiogram.types import CallbackQuery, ChatMemberUpdated, InlineQuery, Message, Update from aiogram.types import (CallbackQuery, ChatMemberUpdated, InlineQuery,
Message, Update)
from helper_bot.utils.rate_limiter import telegram_rate_limiter from helper_bot.utils.rate_limiter import telegram_rate_limiter
from logs.custom_logger import logger from logs.custom_logger import logger

24
helper_bot/utils/helper_func.py
View File

@@ -17,29 +17,17 @@ except ImportError:
_emoji_lib_available = False _emoji_lib_available = False
from aiogram import types from aiogram import types
from aiogram.types import ( from aiogram.types import (FSInputFile, InputMediaAudio, InputMediaDocument,
FSInputFile, InputMediaPhoto, InputMediaVideo)
InputMediaAudio,
InputMediaDocument,
InputMediaPhoto,
InputMediaVideo,
)
from database.models import TelegramPost from database.models import TelegramPost
from helper_bot.utils.base_dependency_factory import ( from helper_bot.utils.base_dependency_factory import (BaseDependencyFactory,
BaseDependencyFactory, get_global_instance)
get_global_instance,
)
from logs.custom_logger import logger from logs.custom_logger import logger
# Local imports - metrics # Local imports - metrics
from .metrics import ( from .metrics import (db_query_time, track_errors, track_file_operations,
db_query_time, track_media_processing, track_time)
track_errors,
track_file_operations,
track_media_processing,
track_time,
)
bdf = get_global_instance() bdf = get_global_instance()
# TODO: поменять архитектуру и подключить правильный BotDB # TODO: поменять архитектуру и подключить правильный BotDB

9
helper_bot/utils/metrics.py
View File

@@ -10,13 +10,8 @@ from contextlib import asynccontextmanager
from functools import wraps from functools import wraps
from typing import Any, Dict, Optional from typing import Any, Dict, Optional
from prometheus_client import ( from prometheus_client import (CONTENT_TYPE_LATEST, Counter, Gauge, Histogram,
CONTENT_TYPE_LATEST, generate_latest)
Counter,
Gauge,
Histogram,
generate_latest,
)
from prometheus_client.core import CollectorRegistry from prometheus_client.core import CollectorRegistry
# Метрики rate limiter теперь создаются в основном классе # Метрики rate limiter теперь создаются в основном классе

3
helper_bot/utils/rate_limiter.py
View File

@@ -188,7 +188,8 @@ class TelegramRateLimiter:
# Глобальный экземпляр rate limiter # Глобальный экземпляр rate limiter
from helper_bot.config.rate_limit_config import RateLimitSettings, get_rate_limit_config from helper_bot.config.rate_limit_config import (RateLimitSettings,
get_rate_limit_config)
def _create_rate_limit_config(settings: RateLimitSettings) -> RateLimitConfig: def _create_rate_limit_config(settings: RateLimitSettings) -> RateLimitConfig:

3
run_helper.py
View File

@@ -68,7 +68,8 @@ async def main():
# Останавливаем планировщик метрик # Останавливаем планировщик метрик
try: try:
from helper_bot.utils.metrics_scheduler import stop_metrics_scheduler from helper_bot.utils.metrics_scheduler import \
stop_metrics_scheduler
stop_metrics_scheduler() stop_metrics_scheduler()
logger.info("Планировщик метрик остановлен") logger.info("Планировщик метрик остановлен")

3
tests/test_audio_file_service.py
View File

@@ -4,7 +4,8 @@ from unittest.mock import AsyncMock, MagicMock, Mock, mock_open, patch
import pytest import pytest
from helper_bot.handlers.voice.exceptions import DatabaseError, FileOperationError from helper_bot.handlers.voice.exceptions import (DatabaseError,
FileOperationError)
from helper_bot.handlers.voice.services import AudioFileService from helper_bot.handlers.voice.services import AudioFileService

6
tests/test_auto_unban_scheduler.py
View File

@@ -4,10 +4,8 @@ from unittest.mock import AsyncMock, Mock, patch
import pytest import pytest
from helper_bot.utils.auto_unban_scheduler import ( from helper_bot.utils.auto_unban_scheduler import (AutoUnbanScheduler,
AutoUnbanScheduler, get_auto_unban_scheduler)
get_auto_unban_scheduler,
)
class TestAutoUnbanScheduler: class TestAutoUnbanScheduler:

5
tests/test_blacklist_history_repository.py
View File

@@ -5,9 +5,8 @@ from unittest.mock import AsyncMock, Mock, patch
import pytest import pytest
from database.models import BlacklistHistoryRecord from database.models import BlacklistHistoryRecord
from database.repositories.blacklist_history_repository import ( from database.repositories.blacklist_history_repository import \
BlacklistHistoryRepository, BlacklistHistoryRepository
)
class TestBlacklistHistoryRepository: class TestBlacklistHistoryRepository:

4
tests/test_callback_handlers.py
View File

@@ -5,9 +5,7 @@ from unittest.mock import AsyncMock, MagicMock, Mock, patch
import pytest import pytest
from helper_bot.handlers.callback.callback_handlers import ( from helper_bot.handlers.callback.callback_handlers import (
delete_voice_message, delete_voice_message, save_voice_message)
save_voice_message,
)
from helper_bot.handlers.voice.constants import CALLBACK_DELETE, CALLBACK_SAVE from helper_bot.handlers.voice.constants import CALLBACK_DELETE, CALLBACK_SAVE

7
tests/test_improved_media_processing.py
View File

@@ -10,11 +10,8 @@ import pytest
from aiogram import types from aiogram import types
from helper_bot.utils.helper_func import ( from helper_bot.utils.helper_func import (
add_in_db_media, add_in_db_media, add_in_db_media_mediagroup, download_file,
add_in_db_media_mediagroup, send_media_group_message_to_private_chat)
download_file,
send_media_group_message_to_private_chat,
)
class TestDownloadFile: class TestDownloadFile:

14
tests/test_keyboards_and_filters.py
View File

@@ -1,22 +1,16 @@
from unittest.mock import AsyncMock, Mock, patch from unittest.mock import AsyncMock, Mock, patch
import pytest import pytest
from aiogram.types import ( from aiogram.types import (InlineKeyboardButton, InlineKeyboardMarkup,
InlineKeyboardButton, KeyboardButton, ReplyKeyboardMarkup)
InlineKeyboardMarkup,
KeyboardButton,
ReplyKeyboardMarkup,
)
from database.async_db import AsyncBotDB from database.async_db import AsyncBotDB
from helper_bot.filters.main import ChatTypeFilter from helper_bot.filters.main import ChatTypeFilter
from helper_bot.keyboards.keyboards import ( from helper_bot.keyboards.keyboards import (create_keyboard_with_pagination,
create_keyboard_with_pagination,
get_reply_keyboard, get_reply_keyboard,
get_reply_keyboard_admin, get_reply_keyboard_admin,
get_reply_keyboard_for_post, get_reply_keyboard_for_post,
get_reply_keyboard_leave_chat, get_reply_keyboard_leave_chat)
)
class TestKeyboards: class TestKeyboards:

19
tests/test_rate_limiter.py
View File

@@ -8,20 +8,15 @@ from unittest.mock import AsyncMock, MagicMock, patch
import pytest import pytest
from helper_bot.config.rate_limit_config import RateLimitSettings, get_rate_limit_config from helper_bot.config.rate_limit_config import (RateLimitSettings,
from helper_bot.utils.rate_limit_monitor import ( get_rate_limit_config)
RateLimitMonitor, from helper_bot.utils.rate_limit_monitor import (RateLimitMonitor,
RateLimitStats, RateLimitStats,
record_rate_limit_request, record_rate_limit_request)
) from helper_bot.utils.rate_limiter import (ChatRateLimiter, GlobalRateLimiter,
from helper_bot.utils.rate_limiter import ( RateLimitConfig, RetryHandler,
ChatRateLimiter,
GlobalRateLimiter,
RateLimitConfig,
RetryHandler,
TelegramRateLimiter, TelegramRateLimiter,
send_with_rate_limit, send_with_rate_limit)
)
class TestRateLimitConfig: class TestRateLimitConfig:

6
tests/test_refactored_admin_handlers.py
View File

@@ -4,11 +4,9 @@ import pytest
from aiogram import types from aiogram import types
from aiogram.fsm.context import FSMContext from aiogram.fsm.context import FSMContext
from helper_bot.handlers.admin.exceptions import ( from helper_bot.handlers.admin.exceptions import (InvalidInputError,
InvalidInputError,
UserAlreadyBannedError, UserAlreadyBannedError,
UserNotFoundError, UserNotFoundError)
)
from helper_bot.handlers.admin.services import AdminService, BannedUser, User from helper_bot.handlers.admin.services import AdminService, BannedUser, User

12
tests/test_refactored_group_handlers.py
View File

@@ -7,14 +7,10 @@ from aiogram import types
from aiogram.fsm.context import FSMContext from aiogram.fsm.context import FSMContext
from helper_bot.handlers.group.constants import ERROR_MESSAGES, FSM_STATES from helper_bot.handlers.group.constants import ERROR_MESSAGES, FSM_STATES
from helper_bot.handlers.group.exceptions import ( from helper_bot.handlers.group.exceptions import (NoReplyToMessageError,
NoReplyToMessageError, UserNotFoundError)
UserNotFoundError, from helper_bot.handlers.group.group_handlers import (GroupHandlers,
) create_group_handlers)
from helper_bot.handlers.group.group_handlers import (
GroupHandlers,
create_group_handlers,
)
from helper_bot.handlers.group.services import AdminReplyService from helper_bot.handlers.group.services import AdminReplyService

4
tests/test_refactored_private_handlers.py
View File

@@ -8,9 +8,7 @@ from aiogram.fsm.context import FSMContext
from helper_bot.handlers.private.constants import BUTTON_TEXTS, FSM_STATES from helper_bot.handlers.private.constants import BUTTON_TEXTS, FSM_STATES
from helper_bot.handlers.private.private_handlers import ( from helper_bot.handlers.private.private_handlers import (
PrivateHandlers, PrivateHandlers, create_private_handlers)
create_private_handlers,
)
from helper_bot.handlers.private.services import BotSettings from helper_bot.handlers.private.services import BotSettings

41
tests/test_utils.py
View File

@@ -6,37 +6,18 @@ import pytest
import helper_bot.utils.messages as messages # Import for patching constants import helper_bot.utils.messages as messages # Import for patching constants
from database.async_db import AsyncBotDB from database.async_db import AsyncBotDB
from helper_bot.utils.base_dependency_factory import ( from helper_bot.utils.base_dependency_factory import (BaseDependencyFactory,
BaseDependencyFactory, get_global_instance)
get_global_instance,
)
from helper_bot.utils.helper_func import ( from helper_bot.utils.helper_func import (
add_days_to_date, add_days_to_date, add_in_db_media, add_in_db_media_mediagroup,
add_in_db_media, check_access, check_user_emoji, check_username_and_full_name,
add_in_db_media_mediagroup, delete_user_blacklist, determine_anonymity, download_file,
check_access, get_banned_users_buttons, get_banned_users_list, get_first_name,
check_user_emoji, get_random_emoji, get_text_message, prepare_media_group_from_middlewares,
check_username_and_full_name, safe_html_escape, send_audio_message,
delete_user_blacklist, send_media_group_message_to_private_chat, send_media_group_to_channel,
determine_anonymity, send_photo_message, send_text_message, send_video_message,
download_file, send_video_note_message, send_voice_message, update_user_info)
get_banned_users_buttons,
get_banned_users_list,
get_first_name,
get_random_emoji,
get_text_message,
prepare_media_group_from_middlewares,
safe_html_escape,
send_audio_message,
send_media_group_message_to_private_chat,
send_media_group_to_channel,
send_photo_message,
send_text_message,
send_video_message,
send_video_note_message,
send_voice_message,
update_user_info,
)
from helper_bot.utils.messages import get_message from helper_bot.utils.messages import get_message

9
tests/test_voice_bot_architecture.py
View File

@@ -4,13 +4,12 @@ from unittest.mock import AsyncMock, Mock, patch
import pytest import pytest
from helper_bot.handlers.voice.exceptions import AudioProcessingError, VoiceMessageError from helper_bot.handlers.voice.exceptions import (AudioProcessingError,
VoiceMessageError)
from helper_bot.handlers.voice.services import VoiceBotService from helper_bot.handlers.voice.services import VoiceBotService
from helper_bot.handlers.voice.utils import ( from helper_bot.handlers.voice.utils import (get_last_message_text,
get_last_message_text,
get_user_emoji_safe, get_user_emoji_safe,
validate_voice_message, validate_voice_message)
)
class TestVoiceBotService: class TestVoiceBotService:

17
tests/test_voice_constants.py
View File

@@ -1,22 +1,15 @@
import pytest import pytest
from helper_bot.handlers.voice.constants import ( from helper_bot.handlers.voice.constants import (BTN_LISTEN, BTN_SPEAK,
BTN_LISTEN,
BTN_SPEAK,
BUTTON_COMMAND_MAPPING, BUTTON_COMMAND_MAPPING,
CALLBACK_COMMAND_MAPPING, CALLBACK_COMMAND_MAPPING,
CALLBACK_DELETE, CALLBACK_DELETE,
CALLBACK_SAVE, CALLBACK_SAVE, CMD_EMOJI,
CMD_EMOJI, CMD_HELP, CMD_REFRESH,
CMD_HELP, CMD_RESTART, CMD_START,
CMD_REFRESH,
CMD_RESTART,
CMD_START,
COMMAND_MAPPING, COMMAND_MAPPING,
STATE_STANDUP_WRITE, STATE_STANDUP_WRITE,
STATE_START, STATE_START, VOICE_BOT_NAME)
VOICE_BOT_NAME,
)
class TestVoiceConstants: class TestVoiceConstants:

6
tests/test_voice_exceptions.py
View File

@@ -1,10 +1,8 @@
import pytest import pytest
from helper_bot.handlers.voice.exceptions import ( from helper_bot.handlers.voice.exceptions import (AudioProcessingError,
AudioProcessingError,
VoiceBotError, VoiceBotError,
VoiceMessageError, VoiceMessageError)
)
class TestVoiceExceptions: class TestVoiceExceptions:

3
tests/test_voice_handler.py
View File

@@ -4,7 +4,8 @@ import pytest
from aiogram import types from aiogram import types
from aiogram.fsm.context import FSMContext from aiogram.fsm.context import FSMContext
from helper_bot.handlers.voice.constants import STATE_STANDUP_WRITE, STATE_START from helper_bot.handlers.voice.constants import (STATE_STANDUP_WRITE,
STATE_START)
from helper_bot.handlers.voice.voice_handler import VoiceHandlers from helper_bot.handlers.voice.voice_handler import VoiceHandlers

3
tests/test_voice_services.py
View File

@@ -4,7 +4,8 @@ from unittest.mock import AsyncMock, MagicMock, Mock, patch
import pytest import pytest
from helper_bot.handlers.voice.exceptions import AudioProcessingError, VoiceMessageError from helper_bot.handlers.voice.exceptions import (AudioProcessingError,
VoiceMessageError)
from helper_bot.handlers.voice.services import VoiceBotService from helper_bot.handlers.voice.services import VoiceBotService

9
tests/test_voice_utils.py
View File

@@ -4,13 +4,10 @@ from unittest.mock import Mock, patch
import pytest import pytest
from aiogram import types from aiogram import types
from helper_bot.handlers.voice.utils import ( from helper_bot.handlers.voice.utils import (format_time_ago,
format_time_ago,
get_last_message_text, get_last_message_text,
get_user_emoji_safe, get_user_emoji_safe, plural_time,
plural_time, validate_voice_message)
validate_voice_message,
)
class TestVoiceUtils: class TestVoiceUtils: