maxapi 0.6__tar.gz → 0.8__tar.gz

{maxapi-0.6/maxapi.egg-info → maxapi-0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxapi
-Version: 0.6
+Version: 0.8
 Summary: Библиотека для разработки чат-ботов с помощью API мессенджера MAX
 Author-email: Denis <your-email@example.com>
 Project-URL: Homepage, https://github.com/love-apples/maxapi
@@ -33,6 +33,8 @@ pip install maxapi
 
 ## 🚀 Быстрый старт
 
+Если вы тестируете бота в чате - не забудьте дать ему права администратора!
+
 ```python
 import asyncio
 import logging
@@ -75,6 +77,16 @@ if __name__ == '__main__':
 
 ---
 
+## ⭐️ Примеры
+
+ - [Эхо бот](https://love-apples/maxapi/blob/main/examples/echo/main.py)
+ - [Обработчик доступных событий](https://love-apples/maxapi/blob/main/examples/events/main.py)
+ - [Обработчики с MagicFilter](https://love-apples/maxapi/blob/main/examples/magic_filters/main.py)
+ - [Демонстрация роутинга, InputMedia и механика контекста](https://love-apples/maxapi/blob/main/examples/router_with_input_media/main.py) (audio.mp3 для команды /media)
+
+---
+
+
 ## 🧩 Возможности
 
 - ✅ Роутеры

{maxapi-0.6 → maxapi-0.8}/README.md

@@ -16,6 +16,8 @@ pip install maxapi
 
 ## 🚀 Быстрый старт
 
+Если вы тестируете бота в чате - не забудьте дать ему права администратора!
+
 ```python
 import asyncio
 import logging
@@ -58,6 +60,16 @@ if __name__ == '__main__':
 
 ---
 
+## ⭐️ Примеры
+
+ - [Эхо бот](https://love-apples/maxapi/blob/main/examples/echo/main.py)
+ - [Обработчик доступных событий](https://love-apples/maxapi/blob/main/examples/events/main.py)
+ - [Обработчики с MagicFilter](https://love-apples/maxapi/blob/main/examples/magic_filters/main.py)
+ - [Демонстрация роутинга, InputMedia и механика контекста](https://love-apples/maxapi/blob/main/examples/router_with_input_media/main.py) (audio.mp3 для команды /media)
+
+---
+
+
 ## 🧩 Возможности
 
 - ✅ Роутеры

{maxapi-0.6 → maxapi-0.8}/maxapi/bot.py

@@ -1,6 +1,8 @@
 from datetime import datetime
 from typing import Any, Dict, List, TYPE_CHECKING
 
+from maxapi.methods.download_media import DownloadMedia
+
 from .methods.get_upload_url import GetUploadURL
 from .methods.get_updates import GetUpdates
 from .methods.remove_member_chat import RemoveMemberChat
@@ -33,6 +35,7 @@ from .enums.parse_mode import ParseMode
 from .enums.sender_action import SenderAction
 from .enums.upload_type import UploadType
 
+from .types.message import Message
 from .types.attachments.attachment import Attachment
 from .types.attachments.image import PhotoAttachmentRequestPayload
 from .types.message import Messages, NewMessageLink
@@ -41,29 +44,27 @@ from .types.command import BotCommand
 
 from .connection.base import BaseConnection
 
-if TYPE_CHECKING:
-    from .types.message import Message
-    from .methods.types.added_admin_chat import AddedListAdminChat
-    from .methods.types.added_members_chat import AddedMembersChat
-    from .methods.types.deleted_bot_from_chat import DeletedBotFromChat
-    from .methods.types.deleted_chat import DeletedChat
-    from .methods.types.deleted_message import DeletedMessage
-    from .methods.types.deleted_pin_message import DeletedPinMessage
-    from .methods.types.edited_message import EditedMessage
-    from .methods.types.getted_list_admin_chat import GettedListAdminChat
-    from .methods.types.getted_members_chat import GettedMembersChat
-    from .methods.types.getted_pineed_message import GettedPin
-    from .methods.types.getted_upload_url import GettedUploadUrl
-    from .methods.types.pinned_message import PinnedMessage
-    from .methods.types.removed_admin import RemovedAdmin
-    from .methods.types.removed_member_chat import RemovedMemberChat
-    from .methods.types.sended_action import SendedAction
-    from .methods.types.sended_callback import SendedCallback
-    from .methods.types.sended_message import SendedMessage
-    from maxapi.types.attachments.video import Video
-    from maxapi.types.chats import Chat, ChatMember, Chats
-    from maxapi.types.updates import UpdateUnion
-    
+from .methods.types.added_admin_chat import AddedListAdminChat
+from .methods.types.added_members_chat import AddedMembersChat
+from .methods.types.deleted_bot_from_chat import DeletedBotFromChat
+from .methods.types.deleted_chat import DeletedChat
+from .methods.types.deleted_message import DeletedMessage
+from .methods.types.deleted_pin_message import DeletedPinMessage
+from .methods.types.edited_message import EditedMessage
+from .methods.types.getted_list_admin_chat import GettedListAdminChat
+from .methods.types.getted_members_chat import GettedMembersChat
+from .methods.types.getted_pineed_message import GettedPin
+from .methods.types.getted_upload_url import GettedUploadUrl
+from .methods.types.pinned_message import PinnedMessage
+from .methods.types.removed_admin import RemovedAdmin
+from .methods.types.removed_member_chat import RemovedMemberChat
+from .methods.types.sended_action import SendedAction
+from .methods.types.sended_callback import SendedCallback
+from .methods.types.sended_message import SendedMessage
+from .types.attachments.video import Video
+from .types.chats import Chat, ChatMember, Chats
+from .types.updates import UpdateUnion
+
 
 class Bot(BaseConnection):
     
@@ -571,7 +572,7 @@ class Bot(BaseConnection):
         """Получает участников чата.
 
         :param chat_id: ID чата
-        :param user_ids: Фильтр по ID пользователей
+        :param user_ids: Список ID участников
         :param marker: Маркер для пагинации
         :param count: Количество участников
 
@@ -585,6 +586,28 @@ class Bot(BaseConnection):
             marker=marker,
             count=count,
         ).request()
+        
+    async def get_chat_member(
+            self,
+            chat_id: int,
+            user_id: int,
+        ) -> GettedMembersChat:
+        
+        """Получает участника чата.
+
+        :param chat_id: ID чата
+        :param user_id: ID участника
+
+        :return: Участник
+        """
+        
+        members = await self.get_chat_members(
+            chat_id=chat_id,
+            user_ids=[user_id]
+        )
+        
+        if members.members:
+            return members.members[0]
     
     async def add_chat_members(
             self,
@@ -674,4 +697,28 @@ class Bot(BaseConnection):
         return await ChangeInfo(
             bot=self,
             commands=list(commands)
+        ).request()
+        
+    async def download_file(
+            self, 
+            path: str, 
+            url: str, 
+            token: str
+        ):
+        
+        """
+        Скачивает медиа с указанной ссылки по токену, сохраняя по определенному пути
+
+        :param path: Путь сохранения медиа
+        :param url: Ссылка на медиа
+        :param token: Токен медиа
+
+        :return: Числовой статус
+        """
+        
+        return await DownloadMedia(
+            bot=self,
+            path=path, 
+            media_url=url, 
+            media_token=token
         ).request()

{maxapi-0.6 → maxapi-0.8}/maxapi/connection/base.py

@@ -1,13 +1,19 @@
 import os
+
 from typing import TYPE_CHECKING
 
+import aiofiles
 import aiohttp
+
 from pydantic import BaseModel
 
+from ..exceptions.invalid_token import InvalidToken
+
 from ..types.errors import Error
 from ..enums.http_method import HTTPMethod
 from ..enums.api_path import ApiPath
 from ..enums.upload_type import UploadType
+
 from ..loggers import logger_bot, logger_connection
 
 if TYPE_CHECKING:
@@ -65,6 +71,9 @@ class BaseConnection:
             )
         except aiohttp.ClientConnectorDNSError as e:
             return logger_connection.error(f'Ошибка при отправке запроса: {e}')
+        
+        if r.status == 401:
+            raise InvalidToken('Неверный токен!')
 
         if not r.ok:
             raw = await r.json()
@@ -124,4 +133,33 @@ class BaseConnection:
                 data=form
             )
 
-            return await response.text()
+            return await response.text()
+        
+    async def download_file(
+            self,
+            path: str,
+            url: str,
+            token: str,
+    ):
+        """
+        Скачивает медиа с указанной ссылки по токену, сохраняя по определенному пути
+
+        :param path: Путь сохранения медиа
+        :param url: Ссылка на медиа
+        :param token: Токен медиа
+
+        :return: Числовой статус
+        """
+        
+        headers = {
+            'Authorization': f'Bearer {token}'
+        }
+
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url, headers=headers) as response:
+                
+                if response.status == 200:
+                    async with aiofiles.open(path, 'wb') as f:
+                        await f.write(await response.read())
+                        
+                return response.status

{maxapi-0.6 → maxapi-0.8}/maxapi/context/__init__.py

@@ -2,7 +2,7 @@ import asyncio
 
 from typing import Any, Dict
 
-from ..context.state_machine import State
+from ..context.state_machine import State, StatesGroup
 
 
 class MemoryContext:

{maxapi-0.6 → maxapi-0.8}/maxapi/dispatcher.py

@@ -2,6 +2,7 @@ from typing import Callable, List
 
 from fastapi import FastAPI, Request
 from fastapi.responses import JSONResponse
+from magic_filter import MagicFilter
 from uvicorn import Config, Server
 from aiohttp import ClientConnectorError
 
@@ -33,6 +34,8 @@ class Dispatcher:
     def __init__(self):
         self.event_handlers: List[Handler] = []
         self.contexts: List[MemoryContext] = []
+        self.routers: List[Router] = []
+        self.filters: List[MagicFilter] = []
         self.bot = None
         self.on_started_func = None
 
@@ -65,9 +68,24 @@ class Dispatcher:
         """
         
         for router in routers:
-            for event in router.event_handlers:
-                self.event_handlers.append(event)
+            self.routers.append(router)
+            
+    async def __ready(self, bot: Bot):
+        self.bot = bot
+        await self.check_me()
+        
+        self.routers += [self]
+        
+        handlers_count = 0
+        for router in self.routers:
+            for handler in router.event_handlers:
+                handlers_count += 1
 
+        logger_dp.info(f'{handlers_count} событий на обработку')
+
+        if self.on_started_func:
+            await self.on_started_func()
+            
     def __get_memory_context(self, chat_id: int, user_id: int):
         
         """Возвращает или создает контекст для чата и пользователя.
@@ -95,40 +113,51 @@ class Dispatcher:
         Args:
             event_object: Объект события для обработки
         """
+        ids = event_object.get_ids()
         
         is_handled = False
+        
+        for router in self.routers:
+            
+            if is_handled:
+                break
+            
+            if router.filters:
+                if not filter_attrs(event_object, *router.filters):
+                    continue
+            
+            for handler in router.event_handlers:
 
-        for handler in self.event_handlers:
-
-            if not handler.update_type == event_object.update_type:
-                continue
-
-            if handler.filters:
-                if not filter_attrs(event_object, *handler.filters):
+                if not handler.update_type == event_object.update_type:
                     continue
 
-            ids = event_object.get_ids()
+                if handler.filters:
+                    if not filter_attrs(event_object, *handler.filters):
+                        continue
 
-            memory_context = self.__get_memory_context(*ids)
-            
-            if not handler.state == await memory_context.get_state() \
-                and handler.state:
-                continue
-            
-            func_args = handler.func_event.__annotations__.keys()
+                memory_context = self.__get_memory_context(*ids)
+                
+                if not handler.state == await memory_context.get_state() \
+                    and handler.state:
+                    continue
+                
+                func_args = handler.func_event.__annotations__.keys()
 
-            kwargs = {'context': memory_context}
+                kwargs = {'context': memory_context}
 
-            for key in kwargs.copy().keys():
-                if not key in func_args:
-                    del kwargs[key]
+                for key in kwargs.copy().keys():
+                    if not key in func_args:
+                        del kwargs[key]
+                        
+                if handler.middleware:
+                    await handler.middleware()
 
-            await handler.func_event(event_object, **kwargs)
+                await handler.func_event(event_object, **kwargs)
 
-            logger_dp.info(f'Обработано: {event_object.update_type} | chat_id: {ids[0]}, user_id: {ids[1]}')
+                logger_dp.info(f'Обработано: {event_object.update_type} | chat_id: {ids[0]}, user_id: {ids[1]}')
 
-            is_handled = True
-            break
+                is_handled = True
+                break
 
         if not is_handled:
             logger_dp.info(f'Проигнорировано: {event_object.update_type} | chat_id: {ids[0]}, user_id: {ids[1]}')
@@ -140,14 +169,7 @@ class Dispatcher:
         Args:
             bot: Экземпляр бота
         """
-        
-        self.bot = bot
-        await self.check_me()
-
-        logger_dp.info(f'{len(self.event_handlers)} событий на обработку')
-
-        if self.on_started_func:
-            await self.on_started_func()
+        await self.__ready(bot)
 
         while True:
             try:
@@ -184,11 +206,7 @@ class Dispatcher:
             port: Порт для сервера
         """
         
-        self.bot = bot
-        await self.check_me()
-
-        if self.on_started_func:
-            await self.on_started_func()
+        await self.__ready(bot)
 
         @app.post('/')
         async def _(request: Request):
@@ -206,7 +224,6 @@ class Dispatcher:
             except Exception as e:
                 logger_dp.error(f"Ошибка при обработке события: {event_json['update_type']}: {e}")
 
-        logger_dp.info(f'{len(self.event_handlers)} событий на обработку')
         config = Config(app=app, host=host, port=port, log_level="critical")
         server = Server(config)
 
@@ -231,8 +248,10 @@ class Event:
 
     def __call__(self, *args, **kwargs):
         def decorator(func_event: Callable):
+            
             if self.update_type == UpdateType.ON_STARTED:
                 self.router.on_started_func = func_event
+                
             else:
                 self.router.event_handlers.append(
                     Handler(

maxapi-0.8/maxapi/exceptions/download_file.py

@@ -0,0 +1,4 @@
+
+
+class NotAvailableForDownload(BaseException):
+    ...

maxapi-0.8/maxapi/exceptions/invalid_token.py

@@ -0,0 +1,4 @@
+
+
+class InvalidToken(BaseException):
+    ...

maxapi-0.8/maxapi/filters/__init__.py

@@ -0,0 +1,20 @@
+from magic_filter import MagicFilter
+from magic_filter.operations.call import CallOperation as mf_call
+from magic_filter.operations.function import FunctionOperation as mf_func
+from magic_filter.operations.comparator import ComparatorOperation as mf_comparator
+
+F = MagicFilter()
+
+
+def filter_attrs(obj: object, *filters: MagicFilter) -> bool:
+    """
+    Применяет один или несколько фильтров MagicFilter к объекту.
+    
+    :param obj: Любой объект с атрибутами (например, event/message)
+    :param filters: Один или несколько MagicFilter выражений
+    :return: True, если все фильтры возвращают True, иначе False
+    """
+    try:
+        return all(f.resolve(obj) for f in filters)
+    except Exception:
+        return False

{maxapi-0.6 → maxapi-0.8}/maxapi/filters/handler.py

@@ -2,9 +2,14 @@ from typing import Callable
 
 from magic_filter import F, MagicFilter
 
+from ..filters.middleware import BaseMiddleware
+
 from ..types.command import Command
+
 from ..context.state_machine import State
+
 from ..enums.update import UpdateType
+
 from ..loggers import logger_dp
 
 
@@ -36,10 +41,11 @@ class Handler:
         :param kwargs: Дополнительные параметры (не используются)
         """
         
-        self.func_event = func_event
-        self.update_type = update_type
+        self.func_event: Callable = func_event
+        self.update_type: UpdateType = update_type
         self.filters = []
-        self.state = None
+        self.state: State = None
+        self.middleware: BaseMiddleware = None
 
         for arg in args:
             if isinstance(arg, MagicFilter):
@@ -48,6 +54,8 @@ class Handler:
                 self.state = arg
             elif isinstance(arg, Command):
                 self.filters.insert(0, F.message.body.text.startswith(arg.command))
+            elif isinstance(arg, BaseMiddleware):
+                self.middleware = arg
             else:
                 logger_dp.info(f'Обнаружен неизвестный фильтр `{arg}` при ' 
                                f'регистрации функции `{func_event.__name__}`')

maxapi-0.8/maxapi/filters/middleware.py

@@ -0,0 +1,6 @@
+from ..types.updates import UpdateUnion
+
+
+class BaseMiddleware:
+    def __init__(self):
+        ...

maxapi-0.8/maxapi/methods/download_media.py

@@ -0,0 +1,52 @@
+from typing import TYPE_CHECKING
+
+from ..methods.types.deleted_pin_message import DeletedPinMessage
+
+from ..enums.http_method import HTTPMethod
+from ..enums.api_path import ApiPath
+from ..enums.upload_type import UploadType
+
+from ..connection.base import BaseConnection
+
+
+if TYPE_CHECKING:
+    from ..bot import Bot
+
+
+class DownloadMedia(BaseConnection):
+    
+    """
+    Класс для скачивания медиафайлов.
+
+    Args:
+        bot (Bot): Экземпляр бота для выполнения запроса.
+        media_url (str): Ссылка на медиа.
+        media_token (str): Токен медиа.
+    """
+    
+    def __init__(
+            self,
+            bot: 'Bot',
+            path: str,
+            media_url: str,
+            media_token: str
+        ):
+            self.bot = bot
+            self.path = path
+            self.media_url = media_url
+            self.media_token = media_token
+
+    async def request(self) -> int:
+        
+        """
+        Выполняет GET-запрос для скачивания медиафайла
+
+        Returns:
+            int: Код операции.
+        """
+        
+        return await super().download_file(
+            path=self.path,
+            url=self.media_url,
+            token=self.media_token
+        )

{maxapi-0.6 → maxapi-0.8}/maxapi/methods/get_members_chat.py

@@ -60,7 +60,9 @@ class GetMembersChat(BaseConnection):
         
         params = self.bot.params.copy()
 
-        if self.user_ids: params['user_ids'] = ','.join(self.user_ids)
+        if self.user_ids: 
+            self.user_ids = [str(user_id) for user_id in self.user_ids]
+            params['user_ids'] = ','.join(self.user_ids)
         if self.marker: params['marker'] = self.marker
         if self.count: params['marker'] = self.count
 

{maxapi-0.6 → maxapi-0.8}/maxapi/methods/types/getted_updates.py

@@ -19,34 +19,77 @@ if TYPE_CHECKING:
 
 async def get_update_model(event: dict, bot: 'Bot'):
     event_object = None
+    
     match event['update_type']:
+        
         case UpdateType.BOT_ADDED:
             event_object = BotAdded(**event)
+            
         case UpdateType.BOT_REMOVED:
             event_object = BotRemoved(**event)
+            
         case UpdateType.BOT_STARTED:
             event_object = BotStarted(**event)
+
         case UpdateType.CHAT_TITLE_CHANGED:
             event_object = ChatTitleChanged(**event)
+            
         case UpdateType.MESSAGE_CALLBACK:
             event_object = MessageCallback(**event)
+            event_object.chat = await bot.get_chat_by_id(event_object.message.recipient.chat_id)
+            event_object.from_user = event_object.callback.user
+            
         case UpdateType.MESSAGE_CHAT_CREATED:
             event_object = MessageChatCreated(**event)
+            event_object.chat = event_object.chat
+            
         case UpdateType.MESSAGE_CREATED:
             event_object = MessageCreated(**event)
+            event_object.chat = await bot.get_chat_by_id(event_object.message.recipient.chat_id)
+            event_object.from_user = event_object.message.sender
+            
         case UpdateType.MESSAGE_EDITED:
             event_object = MessageEdited(**event)
+            event_object.chat = await bot.get_chat_by_id(event_object.message.recipient.chat_id)
+            event_object.from_user = event_object.message.sender
+            
         case UpdateType.MESSAGE_REMOVED:
             event_object = MessageRemoved(**event)
+            event_object.chat = await bot.get_chat_by_id(event_object.chat_id)
+            event_object.from_user = await bot.get_chat_member(
+                chat_id=event_object.chat_id, 
+                user_id=event_object.user_id
+            )
+            
         case UpdateType.USER_ADDED:
             event_object = UserAdded(**event)
+            event_object.chat = await bot.get_chat_by_id(event_object.chat_id)
+            event_object.from_user = event_object.user
+            
         case UpdateType.USER_REMOVED:
             event_object = UserRemoved(**event)
+            event_object.chat = await bot.get_chat_by_id(event_object.chat_id)
+            event_object.from_user = await bot.get_chat_member(
+                chat_id=event_object.chat_id, 
+                user_id=event_object.admin_id
+            ) if event_object.admin_id else None
+            
+    if event['update_type'] in (UpdateType.BOT_ADDED, 
+                                UpdateType.BOT_REMOVED, 
+                                UpdateType.BOT_STARTED, 
+                                UpdateType.CHAT_TITLE_CHANGED):
+        event_object.chat = await bot.get_chat_by_id(event_object.chat_id)
+        event_object.from_user = event_object.user
 
     if hasattr(event_object, 'bot'):
         event_object.bot = bot
+        
     if hasattr(event_object, 'message'):
         event_object.message.bot = bot
+        
+        for attachment in event_object.message.body.attachments:
+            if hasattr(attachment, 'bot'):
+                attachment.bot = bot
     
     return event_object