maxapi 0.3__tar.gz → 0.5__tar.gz

maxapi-0.5/PKG-INFO

@@ -0,0 +1,102 @@
+Metadata-Version: 2.4
+Name: maxapi
+Version: 0.5
+Summary: Библиотека для разработки чат-бото с помощью API мессенджера MAX
+Home-page: https://github.com/love-apples/maxapi/tree/main
+Author: Denis
+License: MIT
+Keywords: max,api,bot
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3.10
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+Requires-Dist: aiohttp>=3.8.0
+Requires-Dist: fastapi>=0.68.0
+Requires-Dist: magic_filter>=1.0.0
+Requires-Dist: pydantic>=1.8.0
+Requires-Dist: uvicorn>=0.15.0
+
+# Асинхронный MAX API
+
+[![PyPI version](https://img.shields.io/pypi/v/maxapi.svg)](https://pypi.org/project/maxapi/)
+[![Python Version](https://img.shields.io/pypi/pyversions/maxapi.svg)](https://pypi.org/project/maxapi/)
+[![License](https://img.shields.io/github/license/love-apples/maxapi.svg)](https://love-apples/maxapi/blob/main/LICENSE)
+
+---
+
+## 📦 Установка
+
+```bash
+pip install maxapi
+```
+
+---
+
+## 🚀 Быстрый старт
+
+```python
+import asyncio
+import logging
+
+from maxapi import Bot, Dispatcher
+from maxapi.types import BotStarted, Command, MessageCreated
+
+logging.basicConfig(level=logging.INFO)
+
+bot = Bot('тут_ваш_токен')
+dp = Dispatcher()
+
+
+@dp.bot_started()
+async def bot_started(event: BotStarted):
+    await event.bot.send_message(
+        chat_id=event.chat_id,
+        text='Привет! Отправь мне /start'
+    )
+
+
+@dp.message_created(Command('start'))
+async def hello(event: MessageCreated):
+    await event.message.answer(f"Пример чат-бота для MAX 💙")
+
+
+async def main():
+    await dp.start_polling(bot)
+
+
+if __name__ == '__main__':
+    asyncio.run(main())
+```
+
+---
+
+## 📚 Документация
+
+В разработке...
+
+---
+
+## 🧩 Возможности
+
+- ✅ Роутеры
+- ✅ Билдер инлайн клавиатур
+- ✅ Простая загрузка медиафайлов
+- ✅ MagicFilter
+- ✅ Внутренние функции моделей
+- ✅ Контекстный менеджер
+- ✅ Поллинг
+- ✅ Вебхук
+- ✅ Логгирование
+
+---
+
+
+## 💬 Обратная связь и поддержка
+
+- MAX: [Чат](https://max.ru/join/IPAok63C3vFqbWTFdutMUtjmrAkGqO56YeAN7iyDfc8)
+- Telegram: [@loveappless](https://t.me/loveappless)
+---
+
+## 📄 Лицензия
+
+Этот проект распространяется под лицензией MIT. См. файл [LICENSE](LICENSE) для подробностей.

maxapi-0.5/README.md

@@ -0,0 +1,84 @@
+# Асинхронный MAX API
+
+[![PyPI version](https://img.shields.io/pypi/v/maxapi.svg)](https://pypi.org/project/maxapi/)
+[![Python Version](https://img.shields.io/pypi/pyversions/maxapi.svg)](https://pypi.org/project/maxapi/)
+[![License](https://img.shields.io/github/license/love-apples/maxapi.svg)](https://love-apples/maxapi/blob/main/LICENSE)
+
+---
+
+## 📦 Установка
+
+```bash
+pip install maxapi
+```
+
+---
+
+## 🚀 Быстрый старт
+
+```python
+import asyncio
+import logging
+
+from maxapi import Bot, Dispatcher
+from maxapi.types import BotStarted, Command, MessageCreated
+
+logging.basicConfig(level=logging.INFO)
+
+bot = Bot('тут_ваш_токен')
+dp = Dispatcher()
+
+
+@dp.bot_started()
+async def bot_started(event: BotStarted):
+    await event.bot.send_message(
+        chat_id=event.chat_id,
+        text='Привет! Отправь мне /start'
+    )
+
+
+@dp.message_created(Command('start'))
+async def hello(event: MessageCreated):
+    await event.message.answer(f"Пример чат-бота для MAX 💙")
+
+
+async def main():
+    await dp.start_polling(bot)
+
+
+if __name__ == '__main__':
+    asyncio.run(main())
+```
+
+---
+
+## 📚 Документация
+
+В разработке...
+
+---
+
+## 🧩 Возможности
+
+- ✅ Роутеры
+- ✅ Билдер инлайн клавиатур
+- ✅ Простая загрузка медиафайлов
+- ✅ MagicFilter
+- ✅ Внутренние функции моделей
+- ✅ Контекстный менеджер
+- ✅ Поллинг
+- ✅ Вебхук
+- ✅ Логгирование
+
+---
+
+
+## 💬 Обратная связь и поддержка
+
+- MAX: [Чат](https://max.ru/join/IPAok63C3vFqbWTFdutMUtjmrAkGqO56YeAN7iyDfc8)
+- Telegram: [@loveappless](https://t.me/loveappless)
+---
+
+## 📄 Лицензия
+
+Этот проект распространяется под лицензией MIT. См. файл [LICENSE](LICENSE) для подробностей.

{maxapi-0.3 → maxapi-0.5}/maxapi/bot.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 from typing import Any, Dict, List, TYPE_CHECKING
 
+from .methods.get_upload_url import GetUploadURL
 from .methods.get_updates import GetUpdates
 from .methods.remove_member_chat import RemoveMemberChat
 from .methods.add_admin_chat import AddAdminChat
@@ -30,11 +31,13 @@ from .methods.send_message import SendMessage
 
 from .enums.parse_mode import ParseMode
 from .enums.sender_action import SenderAction
+from .enums.upload_type import UploadType
 
 from .types.attachments.attachment import Attachment
 from .types.attachments.image import PhotoAttachmentRequestPayload
 from .types.message import NewMessageLink
-from .types.users import BotCommand, ChatAdmin
+from .types.users import ChatAdmin
+from .types.command import BotCommand
 
 from .connection.base import BaseConnection
 
@@ -46,12 +49,11 @@ class Bot(BaseConnection):
 
     def __init__(self, token: str):
         super().__init__()
+
         self.bot = self
 
         self.__token = token
-        self.params = {
-            'access_token': self.__token
-        }
+        self.params = {'access_token': self.__token}
         self.marker_updates = None
         
     async def send_message(
@@ -335,4 +337,22 @@ class Bot(BaseConnection):
     ):
         return await GetUpdates(
             bot=self,
+        ).request()
+    
+    async def get_upload_url(
+            self,
+            type: UploadType
+    ):
+        return await GetUploadURL(
+            bot=self,
+            type=type
+        ).request()
+    
+    async def set_my_commands(
+            self,
+            *commands: BotCommand
+    ):
+        return await ChangeInfo(
+            bot=self,
+            commands=list(commands)
         ).request()

maxapi-0.5/maxapi/connection/base.py

@@ -0,0 +1,94 @@
+import os
+from typing import TYPE_CHECKING
+
+import aiohttp
+from pydantic import BaseModel
+
+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:
+    from ..bot import Bot
+
+
+class BaseConnection:
+
+    API_URL = 'https://botapi.max.ru'
+
+    def __init__(self):
+        self.bot: 'Bot' = None
+        self.session: aiohttp.ClientSession = None
+
+    async def request(
+            self,
+            method: HTTPMethod,
+            path: ApiPath,
+            model: BaseModel = None,
+            is_return_raw: bool = False,
+            **kwargs
+        ):
+        
+        if not self.bot.session:
+            self.bot.session = aiohttp.ClientSession(self.bot.API_URL)
+
+        try:
+            r = await self.bot.session.request(
+                method=method.value, 
+                url=path.value if isinstance(path, ApiPath) else path, 
+                **kwargs
+            )
+        except aiohttp.ClientConnectorDNSError as e:
+            return logger_connection.error(f'Ошибка при отправке запроса: {e}')
+
+        if not r.ok:
+            raw = await r.json()
+            error = Error(code=r.status, raw=raw)
+            logger_bot.error(error)
+            return error
+        
+        raw = await r.json()
+
+        if is_return_raw: return raw
+
+        model = model(**raw)
+        
+        if hasattr(model, 'message'):
+            attr = getattr(model, 'message')
+            if hasattr(attr, 'bot'):
+                attr.bot = self.bot
+        
+        if hasattr(model, 'bot'):
+            model.bot = self.bot
+
+        return model
+    
+    async def upload_file(
+            self,
+            url: str,
+            path: str,
+            type: UploadType
+    ):
+        with open(path, 'rb') as f:
+            file_data = f.read()
+
+        basename = os.path.basename(path)
+        name, ext = os.path.splitext(basename)
+
+        form = aiohttp.FormData()
+        form.add_field(
+            name='data',
+            value=file_data,
+            filename=basename,
+            content_type=f"{type.value}/{ext.lstrip('.')}"
+        )
+
+        async with aiohttp.ClientSession() as session:
+            response = await session.post(
+                url=url, 
+                data=form
+            )
+
+            return await response.text()

{maxapi-0.3 → maxapi-0.5}/maxapi/context/__init__.py

@@ -26,11 +26,14 @@ class MemoryContext:
             self._context.update(kwargs)
 
     async def set_state(self, state: State | str = None):
-        self._state = state
+        async with self._lock:
+            self._state = state
 
     async def get_state(self):
-        return self._state
+        async with self._lock:
+            return self._state
 
     async def clear(self):
-        self._state = None
-        self._context = {}
+        async with self._lock:
+            self._state = None
+            self._context = {}

{maxapi-0.3 → maxapi-0.5}/maxapi/dispatcher.py

@@ -3,6 +3,7 @@ from typing import Callable, List
 from fastapi import FastAPI, Request
 from fastapi.responses import JSONResponse
 from uvicorn import Config, Server
+from aiohttp import ClientConnectorDNSError
 
 from .filters.handler import Handler
 
@@ -41,6 +42,10 @@ class Dispatcher:
         self.user_added = Event(update_type=UpdateType.USER_ADDED, router=self)
         self.user_removed = Event(update_type=UpdateType.USER_REMOVED, router=self)
         self.on_started = Event(update_type=UpdateType.ON_STARTED, router=self)
+        
+    async def check_me(self):
+        me = await self.bot.get_me()
+        logger_dp.info(f'Бот: @{me.username} id={me.user_id}')
 
     def include_routers(self, *routers: 'Router'):
         for router in routers:
@@ -57,6 +62,8 @@ class Dispatcher:
         return new_ctx
 
     async def handle(self, event_object: UpdateUnion):
+        is_handled = False
+
         for handler in self.event_handlers:
 
             if not handler.update_type == event_object.update_type:
@@ -66,9 +73,9 @@ class Dispatcher:
                 if not filter_attrs(event_object, *handler.filters):
                     continue
 
-            memory_context = self.get_memory_context(
-                *event_object.get_ids()
-            )
+            ids = event_object.get_ids()
+
+            memory_context = self.get_memory_context(*ids)
             
             if not handler.state == await memory_context.get_state() \
                 and handler.state:
@@ -82,18 +89,21 @@ class Dispatcher:
                 if not key in func_args:
                     del kwargs[key]
 
-            if kwargs:
-                await handler.func_event(event_object, **kwargs)
-            else:
-                await handler.func_event(event_object, **kwargs)
+            await handler.func_event(event_object, **kwargs)
 
-            logger_dp.info(f'Обработано: {event_object.update_type}')
+            logger_dp.info(f'Обработано: {event_object.update_type} | chat_id: {ids[0]}, user_id: {ids[1]}')
+
+            is_handled = True
             break
 
+        if not is_handled:
+            logger_dp.info(f'Проигнорировано: {event_object.update_type} | chat_id: {ids[0]}, user_id: {ids[1]}')
+
     async def start_polling(self, bot: Bot):
         self.bot = bot
+        await self.check_me()
 
-        logger_dp.info(f'{len(self.event_handlers)} event handlers started')
+        logger_dp.info(f'{len(self.event_handlers)} событий на обработку')
 
         if self.on_started_func:
             await self.on_started_func()
@@ -117,12 +127,15 @@ class Dispatcher:
                     try:
                         await self.handle(event)
                     except Exception as e:
-                        logger_dp.error(f"Ошибка при обработке события: {events['update_type']}: {e}")
+                        logger_dp.error(f"Ошибка при обработке события: {event.update_type}: {e}")
+            except ClientConnectorDNSError:
+                logger_dp.error(f'Ошибка подключения: {e}')
             except Exception as e:
                 logger_dp.error(f'Общая ошибка при обработке событий: {e}')
 
     async def handle_webhook(self, bot: Bot, host: str = 'localhost', port: int = 8080):
         self.bot = bot
+        await self.check_me()
 
         if self.on_started_func:
             await self.on_started_func()

{maxapi-0.3 → maxapi-0.5}/maxapi/enums/api_path.py

@@ -10,4 +10,5 @@ class ApiPath(str, Enum):
     ACTIONS = '/actions'
     PIN = '/pin'
     MEMBERS = '/members'
-    ADMINS = '/admins'
+    ADMINS = '/admins'
+    UPLOADS = '/uploads'

maxapi-0.5/maxapi/enums/chat_status.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+class ChatStatus(str, Enum):
+    ACTIVE = 'active'
+    REMOVED = 'removed'
+    LEFT = 'left'
+    CLOSED = 'closed'
+    SUSPENDED = 'suspended'

maxapi-0.5/maxapi/enums/upload_type.py

@@ -0,0 +1,8 @@
+from enum import Enum
+
+
+class UploadType(str, Enum):
+    IMAGE = 'image'
+    VIDEO = 'video'
+    AUDIO = 'audio'
+    FILE = 'file'

{maxapi-0.3 → maxapi-0.5}/maxapi/filters/handler.py

@@ -5,6 +5,7 @@ from magic_filter import F, MagicFilter
 from ..types.command import Command
 from ..context.state_machine import State
 from ..enums.update import UpdateType
+from ..loggers import logger_dp
 
 
 class Handler:
@@ -28,4 +29,7 @@ class Handler:
             elif isinstance(arg, State):
                 self.state = arg
             elif isinstance(arg, Command):
-                self.filters.insert(0, F.message.body.text == arg.command)
+                self.filters.insert(0, F.message.body.text.startswith(arg.command))
+            else:
+                logger_dp.info(f'Обнаружен неизвестный фильтр `{arg}` при ' 
+                               f'регистрации функции `{func_event.__name__}`')

maxapi-0.5/maxapi/loggers.py

@@ -0,0 +1,5 @@
+import logging
+
+logger_bot = logging.getLogger('bot')
+logger_connection = logging.getLogger('connection')
+logger_dp = logging.getLogger('dispatcher')

{maxapi-0.3 → maxapi-0.5}/maxapi/methods/add_admin_chat.py

@@ -1,6 +1,3 @@
-
-
-from re import findall
 from typing import TYPE_CHECKING, List
 
 from .types.added_admin_chat import AddedListAdminChat

{maxapi-0.3 → maxapi-0.5}/maxapi/methods/add_members_chat.py

@@ -1,6 +1,3 @@
-
-
-from re import findall
 from typing import TYPE_CHECKING, List
 
 from ..methods.types.added_members_chat import AddedMembersChat

{maxapi-0.3 → maxapi-0.5}/maxapi/methods/change_info.py

@@ -1,8 +1,7 @@
-
-
 from typing import Any, Dict, List, TYPE_CHECKING
 
-from ..types.users import BotCommand, User
+from ..types.users import User
+from ..types.command import BotCommand
 
 from ..enums.http_method import HTTPMethod
 from ..enums.api_path import ApiPath

{maxapi-0.3 → maxapi-0.5}/maxapi/methods/edit_chat.py

@@ -5,10 +5,8 @@ from typing import Any, Dict, List, TYPE_CHECKING
 from collections import Counter
 
 from ..types.attachments.image import PhotoAttachmentRequestPayload
-
 from ..types.chats import Chat
-
-from ..types.users import BotCommand, User
+from ..types.command import Command
 
 from ..enums.http_method import HTTPMethod
 from ..enums.api_path import ApiPath

{maxapi-0.3 → maxapi-0.5}/maxapi/methods/get_chat_by_id.py

@@ -1,12 +1,7 @@
-
-
-from re import findall
 from typing import TYPE_CHECKING
 
 from ..types.chats import Chat
 
-from ..types.users import User
-
 from ..enums.http_method import HTTPMethod
 from ..enums.api_path import ApiPath
 

{maxapi-0.3 → maxapi-0.5}/maxapi/methods/get_chat_by_link.py

@@ -1,12 +1,8 @@
-
-
 from re import findall
 from typing import TYPE_CHECKING
 
 from ..types.chats import Chat
 
-from ..types.users import User
-
 from ..enums.http_method import HTTPMethod
 from ..enums.api_path import ApiPath
 

{maxapi-0.3 → maxapi-0.5}/maxapi/methods/get_chats.py

@@ -4,8 +4,6 @@ from typing import TYPE_CHECKING
 
 from ..types.chats import Chats
 
-from ..types.users import User
-
 from ..enums.http_method import HTTPMethod
 from ..enums.api_path import ApiPath
 

{maxapi-0.3 → maxapi-0.5}/maxapi/methods/get_list_admin_chat.py

@@ -1,6 +1,3 @@
-
-
-from re import findall
 from typing import TYPE_CHECKING
 
 from ..methods.types.getted_list_admin_chat import GettedListAdminChat

{maxapi-0.3 → maxapi-0.5}/maxapi/methods/get_me.py

@@ -20,7 +20,7 @@ class GetMe(BaseConnection):
     def __init__(self, bot: 'Bot'):
         self.bot = bot
 
-    async def request(self) -> Chats:
+    async def request(self) -> User:
         return await super().request(
             method=HTTPMethod.GET, 
             path=ApiPath.ME,

{maxapi-0.3 → maxapi-0.5}/maxapi/methods/get_me_from_chat.py

@@ -2,9 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from ..types.chats import ChatMember, Chats
-
-from ..types.users import User
+from ..types.chats import ChatMember
 
 from ..enums.http_method import HTTPMethod
 from ..enums.api_path import ApiPath

{maxapi-0.3 → maxapi-0.5}/maxapi/methods/get_members_chat.py

@@ -1,6 +1,3 @@
-
-
-from re import findall
 from typing import TYPE_CHECKING, List
 
 from ..methods.types.getted_members_chat import GettedMembersChat

maxapi-0.5/maxapi/methods/get_upload_url.py

@@ -0,0 +1,35 @@
+
+
+from typing import TYPE_CHECKING
+
+from ..methods.types.getted_upload_url import GettedUploadUrl
+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 GetUploadURL(BaseConnection):
+    def __init__(
+            self,
+            bot: 'Bot',
+            type: UploadType
+        ):
+        self.bot = bot
+        self.type = type
+
+    async def request(self) -> GettedUploadUrl:
+        params = self.bot.params.copy()
+
+        params['type'] = self.type.value
+
+        return await super().request(
+            method=HTTPMethod.POST, 
+            path=ApiPath.UPLOADS,
+            model=GettedUploadUrl,
+            params=params,
+        )