maxapi-python 2.1.3__py3-none-any.whl → 2.2.0__py3-none-any.whl

pymax/api/chats/service.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import time
 from typing import TYPE_CHECKING
 
+from pymax.api.binding import bind_api_model
 from pymax.api.response import (
     parse_payload_item_model,
     parse_payload_list,
@@ -46,7 +47,7 @@ class ChatService:
         self.app = app
 
     def _bind_chat(self, chat: Chat) -> Chat:
-        return chat.bind(self.app.api.messages, self)
+        return bind_api_model(self.app, chat)
 
     def _cache_chat(self, chat: Chat) -> Chat:
         chat = self._bind_chat(chat)
@@ -72,15 +73,19 @@ class ChatService:
         if self.app.chats is None:
             return
 
-        self.app.chats = [
-            chat for chat in self.app.chats if chat.id != chat_id
-        ]
+        self.app.chats = [chat for chat in self.app.chats if chat.id != chat_id]
 
     @staticmethod
     def _process_chat_join_link(link: str) -> str | None:
         idx = link.find(ChatLinkPrefix.JOIN)
         return link[idx:] if idx != -1 else None
 
+    async def _join_chat(self, link: str) -> Chat:
+        frame = JoinChatPayload(link=link)
+        response = await self.app.invoke(Opcode.CHAT_JOIN, frame.to_payload())
+        chat = require_payload_item_model(response, ChatPayloadKey.CHAT, Chat)
+        return self._cache_chat(chat)
+
     async def create_group(
         self,
         name: str,
@@ -112,8 +117,9 @@ class ChatService:
             return None
 
         chat = self._cache_chat(chat)
-        message = require_payload_model(response, Message).bind(
-            self.app.api.messages
+        message = bind_api_model(
+            self.app,
+            require_payload_model(response, Message),
         )
         return chat, message
 
@@ -145,9 +151,7 @@ class ChatService:
         user_ids: list[int],
         show_history: bool = True,
     ) -> Chat | None:
-        return await self.invite_users_to_group(
-            chat_id, user_ids, show_history
-        )
+        return await self.invite_users_to_group(chat_id, user_ids, show_history)
 
     async def remove_users_from_group(
         self,
@@ -191,9 +195,7 @@ class ChatService:
             ),
         )
 
-        response = await self.app.invoke(
-            Opcode.CHAT_UPDATE, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.CHAT_UPDATE, frame.to_payload())
         chat = parse_payload_item_model(response, ChatPayloadKey.CHAT, Chat)
         if chat:
             self._cache_chat(chat)
@@ -210,9 +212,7 @@ class ChatService:
             description=description,
         )
 
-        response = await self.app.invoke(
-            Opcode.CHAT_UPDATE, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.CHAT_UPDATE, frame.to_payload())
         chat = parse_payload_item_model(response, ChatPayloadKey.CHAT, Chat)
         if chat:
             self._cache_chat(chat)
@@ -222,10 +222,12 @@ class ChatService:
         if proceed_link is None:
             raise ValueError("Invalid group link")
 
-        frame = JoinChatPayload(link=proceed_link)
-        response = await self.app.invoke(Opcode.CHAT_JOIN, frame.to_payload())
-        chat = require_payload_item_model(response, ChatPayloadKey.CHAT, Chat)
-        return self._cache_chat(chat)
+        return await self._join_chat(proceed_link)
+
+    async def join_channel(self, link: str) -> Chat:
+        proceed_link = self._process_chat_join_link(link)
+
+        return await self._join_chat(proceed_link or link)
 
     async def resolve_group_by_link(self, link: str) -> Chat | None:
         proceed_link = self._process_chat_join_link(link)
@@ -242,9 +244,7 @@ class ChatService:
 
     async def rework_invite_link(self, chat_id: int) -> Chat:
         frame = ReworkInviteLinkPayload(chat_id=chat_id)
-        response = await self.app.invoke(
-            Opcode.CHAT_UPDATE, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.CHAT_UPDATE, frame.to_payload())
         chat = require_payload_item_model(response, ChatPayloadKey.CHAT, Chat)
         return self._cache_chat(chat)
 
@@ -254,18 +254,12 @@ class ChatService:
             for chat_id in chat_ids
             if (chat := self._get_cached_chat(chat_id)) is not None
         }
-        missed_chat_ids = [
-            chat_id for chat_id in chat_ids if chat_id not in cached
-        ]
+        missed_chat_ids = [chat_id for chat_id in chat_ids if chat_id not in cached]
 
         if missed_chat_ids:
             frame = GetChatInfoPayload(chat_ids=missed_chat_ids)
-            response = await self.app.invoke(
-                Opcode.CHAT_INFO, frame.to_payload()
-            )
-            for chat in parse_payload_list(
-                response, ChatPayloadKey.CHATS, Chat
-            ):
+            response = await self.app.invoke(Opcode.CHAT_INFO, frame.to_payload())
+            for chat in parse_payload_list(response, ChatPayloadKey.CHATS, Chat):
                 chat = self._cache_chat(chat)
                 cached[chat.id] = chat
 
@@ -292,22 +286,19 @@ class ChatService:
 
         chats = [
             self._cache_chat(chat)
-            for chat in parse_payload_list(
-                response, ChatPayloadKey.CHATS, Chat
-            )
+            for chat in parse_payload_list(response, ChatPayloadKey.CHATS, Chat)
         ]
         return chats
 
-    async def get_join_requests(
-        self, chat_id: int, count: int = 100
-    ) -> list[Member]:
+    async def get_join_requests(self, chat_id: int, count: int = 100) -> list[Member]:
         frame = FetchJoinRequests(chat_id=chat_id, count=count)
 
-        response = await self.app.invoke(
-            Opcode.CHAT_MEMBERS, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.CHAT_MEMBERS, frame.to_payload())
 
-        return parse_payload_list(response, ChatPayloadKey.MEMBERS, Member)
+        return bind_api_model(
+            self.app,
+            parse_payload_list(response, ChatPayloadKey.MEMBERS, Member),
+        )
 
     async def confirm_join_requests(
         self,
@@ -322,9 +313,7 @@ class ChatService:
             operation=ChatMemberOperation.ADD,
         )
 
-        response = await self.app.invoke(
-            Opcode.CHAT_MEMBERS_UPDATE, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.CHAT_MEMBERS_UPDATE, frame.to_payload())
 
         chat = parse_payload_item_model(response, ChatPayloadKey.CHAT, Chat)
         if chat:
@@ -356,9 +345,7 @@ class ChatService:
             operation=ChatMemberOperation.REMOVE,
         )
 
-        response = await self.app.invoke(
-            Opcode.CHAT_MEMBERS_UPDATE, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.CHAT_MEMBERS_UPDATE, frame.to_payload())
 
         chat = parse_payload_item_model(response, ChatPayloadKey.CHAT, Chat)
         if chat:

pymax/api/messages/enums.py

@@ -12,6 +12,7 @@ class ReadAction(str, Enum):
 
 
 class MessagePayloadKey(str, Enum):
+    MESSAGE = "message"
     MESSAGES = "messages"
     REACTION_INFO = "reactionInfo"
     MESSAGES_REACTIONS = "messagesReactions"

pymax/api/messages/payloads.py

@@ -12,6 +12,21 @@ from pymax.api.uploads.payloads import (
 from .enums import ItemType, ReadAction
 
 
+class GetMessagesPayload(CamelModel):
+    chat_id: int
+    message_ids: list[int]
+
+
+class EditMessagePayload(CamelModel):
+    chat_id: int
+    message_id: int
+    text: str
+    elements: list[Any]
+    attachments: list[AttachPhotoPayload | VideoAttachPayload | AttachFilePayload] = Field(
+        default_factory=list
+    )
+
+
 class ReplyLink(CamelModel):
     type: str = "REPLY"  # TODO: enum?
     message_id: int
@@ -92,5 +107,5 @@ class RemoveReactionPayload(CamelModel):
 class ReadMessagesPayload(CamelModel):
     type: ReadAction
     chat_id: int
-    message_id: str
+    message_id: str | int  # Сокет просит int а вс str
     mark: int

pymax/api/messages/service.py

@@ -3,10 +3,12 @@ from __future__ import annotations
 import time
 from typing import TYPE_CHECKING, TypeAlias
 
+from pymax.api.binding import bind_api_model, bind_api_models
 from pymax.api.response import (
     parse_payload_list,
     parse_payload_model,
     payload_item,
+    require_payload_item_model,
     require_payload_model,
 )
 from pymax.api.uploads.payloads import (
@@ -32,7 +34,9 @@ from .payloads import (
     AddReactionPayload,
     ChatHistoryPayload,
     DeleteMessagePayload,
+    EditMessagePayload,
     GetFilePayload,
+    GetMessagesPayload,
     GetReactionsPayload,
     GetVideoPayload,
     PinMessagePayload,
@@ -69,17 +73,13 @@ class MessageService:
     async def _upload_attachments(
         self, attachments: SendAttachments
     ) -> list[AttachPhotoPayload | VideoAttachPayload | AttachFilePayload]:
-        result: list[
-            AttachPhotoPayload | VideoAttachPayload | AttachFilePayload
-        ] = []
+        result: list[AttachPhotoPayload | VideoAttachPayload | AttachFilePayload] = []
         if not attachments:
             return result
 
         for attachment in attachments:
             if isinstance(attachment, Photo):
-                upload_result = await self.app.api.uploads.upload_photo(
-                    attachment
-                )
+                upload_result = await self.app.api.uploads.upload_photo(attachment)
                 if not upload_result:
                     logger.error("Photo uploading failed")
                     raise UploadError("Photo uploading failed")
@@ -87,9 +87,7 @@ class MessageService:
                 result.append(upload_result)
 
             elif isinstance(attachment, Video):
-                upload_result = await self.app.api.uploads.upload_video(
-                    attachment
-                )
+                upload_result = await self.app.api.uploads.upload_video(attachment)
                 if not upload_result:
                     logger.error("Video uploading failed")
                     raise UploadError("Video uploading failed")
@@ -97,9 +95,7 @@ class MessageService:
                 result.append(upload_result)
 
             elif isinstance(attachment, File):
-                upload_result = await self.app.api.uploads.upload_file(
-                    attachment
-                )
+                upload_result = await self.app.api.uploads.upload_file(attachment)
                 if not upload_result:
                     logger.error("File uploading failed")
                     raise UploadError("File uploading failed")
@@ -117,9 +113,7 @@ class MessageService:
         *,
         notify: bool = True,
     ) -> Message | None:
-        logger.info(
-            "sending message chat_id=%s text_len=%s", chat_id, len(text)
-        )
+        logger.info("sending message chat_id=%s text_len=%s", chat_id, len(text))
 
         clean_text, elements = Formatter.format_markdown(text)
 
@@ -137,10 +131,75 @@ class MessageService:
 
         response = await self.app.invoke(Opcode.MSG_SEND, frame.to_payload())
 
-        message = require_payload_model(response, Message).bind(self)
+        message = bind_api_model(
+            self.app,
+            require_payload_model(response, Message),
+        )
         logger.info("message sent chat_id=%s", chat_id)
         return message
 
+    async def get_messages(
+        self,
+        chat_id: int,
+        message_ids: list[int],
+    ) -> list[Message]:
+        frame = GetMessagesPayload(
+            chat_id=chat_id,
+            message_ids=message_ids,
+        )
+
+        response = await self.app.invoke(Opcode.MSG_GET, frame.to_payload())
+        messages = parse_payload_list(response, MessagePayloadKey.MESSAGES, Message)
+        for message in messages:
+            if message.chat_id is None:
+                message.chat_id = chat_id
+
+        return bind_api_models(self.app, messages)
+
+    async def get_message(
+        self,
+        chat_id: int,
+        message_id: int,
+    ) -> Message | None:
+        messages = await self.get_messages(chat_id, [message_id])
+        return messages[0] if messages else None
+
+    async def edit_message(
+        self,
+        chat_id: int,
+        message_id: int,
+        text: str,
+        attachment: SendAttachment | None = None,
+        attachments: SendAttachments = None,
+    ) -> Message:
+        if attachment is not None and attachments:
+            logger.warning("both attachment and attachments provided; using attachments")
+            attachment = None
+
+        edit_attachments = attachments
+        if attachment is not None:
+            edit_attachments = [attachment]
+
+        clean_text, elements = Formatter.format_markdown(text)
+        frame = EditMessagePayload(
+            chat_id=chat_id,
+            message_id=message_id,
+            text=clean_text,
+            elements=elements,
+            attachments=await self._upload_attachments(edit_attachments),
+        )
+
+        response = await self.app.invoke(Opcode.MSG_EDIT, frame.to_payload())
+        message = require_payload_item_model(
+            response,
+            MessagePayloadKey.MESSAGE,
+            Message,
+        )
+        if message.chat_id is None:
+            message.chat_id = chat_id
+
+        return bind_api_model(self.app, message)
+
     async def fetch_history(
         self,
         chat_id: int,
@@ -171,10 +230,11 @@ class MessageService:
             Opcode.CHAT_HISTORY,
             payload=frame.to_payload(),
         )
-        return (
-            parse_payload_list(response, MessagePayloadKey.MESSAGES, Message)
-            or None
+        messages = bind_api_models(
+            self.app,
+            parse_payload_list(response, MessagePayloadKey.MESSAGES, Message),
         )
+        return messages or None
 
     async def delete_message(
         self,
@@ -195,9 +255,7 @@ class MessageService:
         )
 
         await self.app.invoke(Opcode.MSG_DELETE, frame.to_payload())
-        logger.info(
-            "messages deleted chat_id=%s count=%s", chat_id, len(message_ids)
-        )
+        logger.info("messages deleted chat_id=%s count=%s", chat_id, len(message_ids))
         return True
 
     async def pin_message(
@@ -219,9 +277,7 @@ class MessageService:
         )
 
         await self.app.invoke(Opcode.CHAT_UPDATE, frame.to_payload())
-        logger.info(
-            "message pinned chat_id=%s message_id=%s", chat_id, message_id
-        )
+        logger.info("message pinned chat_id=%s message_id=%s", chat_id, message_id)
         return True
 
     async def get_video_by_id(
@@ -263,9 +319,7 @@ class MessageService:
             file_id=file_id,
         )
 
-        response = await self.app.invoke(
-            Opcode.FILE_DOWNLOAD, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.FILE_DOWNLOAD, frame.to_payload())
         return parse_payload_model(response, FileRequest)
 
     async def add_reaction(
@@ -286,9 +340,7 @@ class MessageService:
             reaction=ReactionInfoPayload(id=reaction),
         )
 
-        response = await self.app.invoke(
-            Opcode.MSG_REACTION, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.MSG_REACTION, frame.to_payload())
         reaction_info = payload_item(response, MessagePayloadKey.REACTION_INFO)
         if reaction_info:
             return ReactionInfo.model_validate(reaction_info)
@@ -345,7 +397,7 @@ class MessageService:
 
         return None
 
-    async def read_message(self, message_id: int, chat_id: int) -> ReadState:
+    async def read_message(self, message_id: int | str, chat_id: int) -> ReadState:
         logger.info(
             "marking message as read chat_id=%s message_id=%s",
             chat_id,
@@ -354,7 +406,7 @@ class MessageService:
         frame = ReadMessagesPayload(
             type=ReadAction.READ_MESSAGE,
             chat_id=chat_id,
-            message_id=str(message_id),
+            message_id=message_id,
             mark=int(time.time() * 1000),
         )
 

pymax/api/models.py

@@ -1,13 +1,11 @@
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 from pydantic.alias_generators import to_camel
 
 
 class CamelModel(BaseModel):
-    model_config = {
-        "alias_generator": to_camel,
-        "populate_by_name": True,
-        "arbitrary_types_allowed": True,
-    }
+    model_config = ConfigDict(
+        alias_generator=to_camel, populate_by_name=True, arbitrary_types_allowed=True
+    )
 
     def to_payload(self) -> dict:
         return self.model_dump(by_alias=True, exclude_none=True)

pymax/api/response.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Any, TypeVar, overload
+from typing import Any, TypeVar, cast, overload
 
 from pydantic import BaseModel
 
@@ -60,7 +60,7 @@ def payload_item(
     if validation_type is None:
         return data
 
-    return validation_type(data)
+    return cast(Any, validation_type)(data)
 
 
 def require_payload_item(

pymax/api/self/service.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 from uuid import uuid4
 
+from pymax.api.binding import bind_api_model
 from pymax.api.response import (
     payload_item,
     require_payload_item,
@@ -38,9 +39,7 @@ class SelfService:
     async def request_profile_photo_upload_url(self) -> str:
         logger.info("requesting profile photo upload url")
         frame = UploadPayload(profile=True)
-        response = await self.app.invoke(
-            Opcode.PHOTO_UPLOAD, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.PHOTO_UPLOAD, frame.to_payload())
         return str(require_payload_item(response, SelfPayloadKey.URL))
 
     async def change_profile(
@@ -53,12 +52,11 @@ class SelfService:
         photo_token: str | None = None,
     ) -> bool:
         if photo is not None:
-            attach = await self.app.api.uploads.upload_photo(
-                photo, profile=True
-            )
+            attach = await self.app.api.uploads.upload_photo(photo, profile=True)
             if photo_token:
                 logger.warning(
-                    "photo_token argument was provided but will be overridden by the uploaded photo token"
+                    "photo_token argument was provided but will be overridden by "
+                    "the uploaded photo token"
                 )
 
             photo_token = attach.photo_token
@@ -70,10 +68,13 @@ class SelfService:
             photo_token=photo_token,
         )
         response = await self.app.invoke(Opcode.PROFILE, frame.to_payload())
-        profile = require_payload_item_model(
-            response,
-            SelfPayloadKey.PROFILE,
-            Profile,
+        profile = bind_api_model(
+            self.app,
+            require_payload_item_model(
+                response,
+                SelfPayloadKey.PROFILE,
+                Profile,
+            ),
         )
         self.app.me = profile
         self.app.users[profile.contact.id] = profile.contact
@@ -92,17 +93,13 @@ class SelfService:
             include=chat_include,
             filters=filters or [],
         )
-        response = await self.app.invoke(
-            Opcode.FOLDERS_UPDATE, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.FOLDERS_UPDATE, frame.to_payload())
         return require_payload_model(response, FolderUpdate)
 
     async def get_folders(self, folder_sync: int = 0) -> FolderList:
         logger.info("fetching folders")
         frame = GetFolderPayload(folder_sync=folder_sync)
-        response = await self.app.invoke(
-            Opcode.FOLDERS_GET, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.FOLDERS_GET, frame.to_payload())
         return require_payload_model(response, FolderList)
 
     async def update_folder(
@@ -121,17 +118,13 @@ class SelfService:
             filters=filters or [],
             options=options or [],
         )
-        response = await self.app.invoke(
-            Opcode.FOLDERS_UPDATE, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.FOLDERS_UPDATE, frame.to_payload())
         return require_payload_model(response, FolderUpdate)
 
     async def delete_folder(self, folder_id: str) -> FolderUpdate:
         logger.info("deleting folder")
         frame = DeleteFolderPayload(folder_ids=[folder_id])
-        response = await self.app.invoke(
-            Opcode.FOLDERS_DELETE, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.FOLDERS_DELETE, frame.to_payload())
         return require_payload_model(response, FolderUpdate)
 
     async def close_all_sessions(self) -> bool:
@@ -145,9 +138,7 @@ class SelfService:
         token = payload_item(response, SelfPayloadKey.TOKEN, str)
 
         if not token:
-            logger.warning(
-                "no token received after closing sessions, skipping token update"
-            )
+            logger.warning("no token received after closing sessions, skipping token update")
             return False
 
         await self.app.store.update_token(self.app.session.token, token)

pymax/api/session/payloads.py

@@ -52,17 +52,10 @@ class MobileUserAgentPayload(CamelModel):
             by_alias=True,
             exclude_none=True,
         )
-        if (
-            self.device_type == DeviceType.WEB
-            and "headerUserAgent" not in payload
-        ):
+        if self.device_type == DeviceType.WEB and "headerUserAgent" not in payload:
             payload["headerUserAgent"] = DEFAULT_WEB_HEADER_USER_AGENT
 
-        return {
-            alias: payload[alias]
-            for alias in WEB_USER_AGENT_ALIASES
-            if alias in payload
-        }
+        return {alias: payload[alias] for alias in WEB_USER_AGENT_ALIASES if alias in payload}
 
 
 class MobileHandshakePayload(CamelModel):

pymax/api/session/service.py

@@ -55,9 +55,7 @@ class SessionService:
         await self.app.invoke(Opcode.SESSION_INIT, frame.to_payload())
         logger.info("mobile handshake completed")
 
-    async def web_handshake(
-        self, user_agent: MobileUserAgentPayload, device_id: str
-    ) -> None:
+    async def web_handshake(self, user_agent: MobileUserAgentPayload, device_id: str) -> None:
         logger.debug(
             "web handshake device_id=%s app_version=%s browser=%s",
             device_id,

pymax/api/uploads/payloads.py

@@ -5,24 +5,18 @@ from pymax.types import AttachmentType
 
 
 class AttachPhotoPayload(CamelModel):
-    type: AttachmentType = Field(
-        default=AttachmentType.PHOTO, serialization_alias="_type"
-    )
+    type: AttachmentType = Field(default=AttachmentType.PHOTO, serialization_alias="_type")
     photo_token: str
 
 
 class VideoAttachPayload(CamelModel):
-    type: AttachmentType = Field(
-        default=AttachmentType.VIDEO, serialization_alias="_type"
-    )
+    type: AttachmentType = Field(default=AttachmentType.VIDEO, serialization_alias="_type")
     video_id: int
     token: str
 
 
 class AttachFilePayload(CamelModel):
-    type: AttachmentType = Field(
-        default=AttachmentType.FILE, serialization_alias="_type"
-    )
+    type: AttachmentType = Field(default=AttachmentType.FILE, serialization_alias="_type")
     file_id: int