maxapi-python 2.3.1__py3-none-any.whl → 2.4.0__py3-none-any.whl

pymax/api/auth/enums.py

@@ -6,6 +6,7 @@ class AuthType(str, Enum):
     CHECK_CODE = "CHECK_CODE"
     REGISTER = "REGISTER"
     RESEND = "RESEND"
+    LOGIN = "LOGIN"
 
 
 class ProfileOptions(int, Enum):

pymax/api/auth/payloads.py

@@ -10,12 +10,13 @@ from .enums import AuthType, TwoFactorAction
 class RequestCodePayload(CamelModel):
     phone: str
     type: AuthType = AuthType.START_AUTH
-    language: str = "ru"
+    mode: bytes | None
 
 
 class SendCodePayload(CamelModel):
     token: str
     verify_code: str
+
     auth_token_type: AuthType = AuthType.CHECK_CODE
 
 
@@ -42,19 +43,21 @@ class WebSyncPayload(CamelModel):
         cls,
         token: str,
         sync: SyncState,
+        interactive: bool = True,
     ) -> "WebSyncPayload":
         return cls(
             token=token,
             chats_sync=sync.chats_sync,
             contacts_sync=sync.contacts_sync,
             drafts_sync=sync.drafts_sync,
+            interactive=interactive,
         )
 
 
 class SyncPayload(CamelModel):
     user_agent: MobileUserAgentPayload
     token: str
-    chat_hash_fingerprint: str | None = None
+    chat_cache_fingerprint: bytes | None = None
     chats_count: int | None = None
     chats_sync: int = -1
     contacts_sync: int = -1
@@ -70,15 +73,19 @@ class SyncPayload(CamelModel):
         user_agent: MobileUserAgentPayload,
         token: str,
         sync: SyncState,
+        chat_cache_fingerprint: bytes | None = None,
+        interactive: bool = True,
     ) -> "SyncPayload":
         return cls(
             user_agent=user_agent,
             token=token,
+            chat_cache_fingerprint=chat_cache_fingerprint,
             chats_sync=sync.chats_sync,
             contacts_sync=sync.contacts_sync,
             drafts_sync=sync.drafts_sync,
             presence_sync=sync.presence_sync,
             config_hash=sync.config_hash,
+            interactive=interactive,
         )
 
 
@@ -138,3 +145,22 @@ class ConfirmRegistrationPayload(CamelModel):
     last_name: str | None = None
     token: str
     token_type: AuthType = AuthType.REGISTER
+
+
+class Login2Payload(CamelModel):
+    need_profile: bool
+    contacts_sync: int
+    config_hash: ConfigHash
+
+    @classmethod
+    def from_sync_state(
+        cls,
+        sync: SyncState,
+        profile_enabled: bool,
+        contact_enabled: bool,
+    ) -> "Login2Payload":
+        return cls(
+            need_profile=profile_enabled,
+            contacts_sync=sync.contacts_sync if contact_enabled else -1,
+            config_hash=sync.config_hash,
+        )

pymax/api/auth/service.py

@@ -13,6 +13,7 @@ from pymax.auth import EmailCodeProvider
 from pymax.auth.providers import ConsoleEmailCodeProvider
 from pymax.logging import get_logger
 from pymax.protocol import Opcode
+from pymax.types.domain import Login2Flags, Login2Response
 from pymax.types.domain.auth import (
     CheckCodeResponse,
     CheckPasswordResponse,
@@ -31,6 +32,7 @@ from .payloads import (
     ConfirmQrPayload,
     ConfirmRegistrationPayload,
     CreateAuthTrackPayload,
+    Login2Payload,
     MobileUserAgentPayload,
     RemoveTwoFactorPayload,
     RequestCodePayload,
@@ -58,7 +60,32 @@ class AuthService:
 
     async def request_code(self, phone: str) -> StartAuthResponse:
         logger.info("requesting sms code phone_set=%s", bool(phone))
-        frame = RequestCodePayload(phone=phone)
+
+        if not self.app.handshake_response:
+            logger.error("request_code requested without handshake response")
+            raise RuntimeError("No handshake response available for request_code")
+
+        device_id = (
+            self.app.session.device_id if self.app.session else self.app.config.device.device_id
+        )
+
+        if self.app.config.device.user_agent.device_type != DeviceType.WEB:
+            if self.app.handshake_response.calls_seed is None:
+                raise ValueError(
+                    "Unexpected internal state: handshake_response.calls_seed is missing "
+                    + "in AuthService.request_code. Please report this issue to the developer."
+                )
+
+            mode = self.app.fingerprint_generator.generate_fingerprint(
+                version=self.app.config.device.user_agent.app_version,
+                device_id=device_id,
+                calls_seed=self.app.handshake_response.calls_seed,
+                arch=self.app.config.device.user_agent.arch or "arm64-v8a",
+            )
+        else:
+            mode = None
+
+        frame = RequestCodePayload(phone=phone, mode=mode)
         response = await self.app.invoke(Opcode.AUTH_REQUEST, frame.to_payload())
         logger.debug(
             "sms code request accepted payload_keys=%s",
@@ -72,7 +99,11 @@ class AuthService:
             bool(token),
             bool(verify_code),
         )
-        frame = SendCodePayload(token=token, verify_code=verify_code)
+
+        frame = SendCodePayload(
+            token=token,
+            verify_code=verify_code,
+        )
         response = await self.app.invoke(Opcode.AUTH, frame.to_payload())
         logger.debug(
             "sms code response payload_keys=%s",
@@ -117,11 +148,35 @@ class AuthService:
             raise RuntimeError("No session available for login")
 
         logger.info("logging in")
+
+        if not self.app.handshake_response:
+            logger.error("login requested without handshake response")
+            raise RuntimeError("No handshake response available for login")
+
+        device_id = (
+            self.app.session.device_id if self.app.session else self.app.config.device.device_id
+        )
+
+        if self.app.handshake_response.calls_seed is None:
+            raise ValueError(
+                "Unexpected internal state: handshake_response.calls_seed is missing "
+                + "in AuthService.mobile_login. Please report this issue to the developer."
+            )
+
+        ccf = self.app.fingerprint_generator.generate_fingerprint(
+            version=self.app.config.device.user_agent.app_version,
+            device_id=device_id,
+            calls_seed=self.app.handshake_response.calls_seed,
+            arch=self.app.config.device.user_agent.arch or "arm64-v8a",
+        )
+
         sync = self.app.config.sync.resolve(session.sync)
         frame = SyncPayload.from_sync_state(
             user_agent=self.app.config.device.user_agent,
             token=session.token,
             sync=sync,
+            chat_cache_fingerprint=ccf,
+            interactive=self.app.config.interactive,
         )
         response = await self.app.invoke(Opcode.LOGIN, frame.to_payload())
 
@@ -134,6 +189,30 @@ class AuthService:
         await self._update_session(login_response)
         return login_response
 
+    async def mobile_login2(self, flags: Login2Flags) -> Login2Response:
+        session = self.app.session
+        if session is None:
+            logger.error("login2 requested without session")
+            raise RuntimeError("No session available for login2")
+
+        sync = self.app.config.sync.resolve(session.sync)
+
+        frame = Login2Payload.from_sync_state(
+            sync,
+            profile_enabled=flags.profile_enabled,
+            contact_enabled=flags.contact_enabled,
+        )
+
+        response = await self.app.invoke(Opcode.LOGIN2, frame.to_payload())
+        logger.debug("login2 response payload_keys=%s", payload_keys(response))
+
+        login2_response = bind_api_model(
+            self.app,
+            require_payload_model(response, Login2Response),
+        )
+        await self._update_session(login2_response)
+        return login2_response
+
     async def web_login(self) -> LoginResponse:
         session = self.app.session
         if session is None:
@@ -146,6 +225,7 @@ class AuthService:
         frame = WebSyncPayload.from_sync_state(
             token=session.token,
             sync=sync,
+            interactive=self.app.config.interactive,
         )
         response = await self.app.invoke(Opcode.LOGIN, frame.to_payload())
 
@@ -177,7 +257,7 @@ class AuthService:
 
         return require_payload_model(response, CheckCodeResponse)
 
-    async def _update_session(self, response: LoginResponse) -> None:
+    async def _update_session(self, response: LoginResponse | Login2Response) -> None:
         session = self.app.session
         if session is None:
             return
@@ -377,3 +457,8 @@ class AuthService:
         response = await self.app.invoke(Opcode.AUTH_CONFIRM, frame.to_payload())
 
         return require_payload_model(response, ConfirmRegistrationResponse)
+
+    def is_update_available(self) -> bool:
+        return bool(
+            self.app.handshake_response.app_update_type if self.app.handshake_response else False
+        )

pymax/api/chats/__init__.py

@@ -1,4 +1,5 @@
 from .enums import (
+    ChannelPermissions,
     ChatLinkPrefix,
     ChatMemberOperation,
     ChatOption,

pymax/api/chats/enums.py

@@ -22,7 +22,22 @@ class ChatPayloadKey(str, Enum):
     CHAT = "chat"
     CHATS = "chats"
     MEMBERS = "members"
+    MARKER = "marker"
 
 
 class ChatLinkPrefix(str, Enum):
     JOIN = "join/"
+
+
+class ChannelPermissions(int, Enum):
+    ADD_REMOVE_MEMBER = 2
+    ADD_ADMIN = 4
+    CHANGE_CHAT_INFO = 8
+    PIN_MESSAGE = 16
+    POST_MESSAGE = 256
+    EDIT_MESSAGE = 512
+    DELETE_MESSAGE = 1024
+
+
+class PermType(str, Enum):
+    ADMIN = "ADMIN"

pymax/api/chats/payloads.py

@@ -6,7 +6,7 @@ from pymax.api.models import CamelModel
 from pymax.types.domain.attachments.enums import AttachmentType
 from pymax.types.domain.enums import ChatType
 
-from .enums import ChatMemberOperation, ChatOption, ControlEvent
+from .enums import ChatMemberOperation, ChatOption, ControlEvent, PermType
 
 
 class CreateGroupAttach(CamelModel):
@@ -95,6 +95,13 @@ class GetChatInfoPayload(CamelModel):
     chat_ids: list[int]
 
 
+class GetChatMembersPayload(CamelModel):
+    type: str = "MEMBER"  # TODO: ENUMM!!!
+    chat_id: int
+    marker: int
+    count: int = 50
+
+
 class LeaveChatPayload(CamelModel):
     chat_id: int
 
@@ -121,3 +128,11 @@ class DeleteChatPayload(CamelModel):
     chat_id: int
     last_event_time: int
     for_all: bool = True
+
+
+class AddAdminPayload(CamelModel):
+    chat_id: int
+    user_ids: list[int]
+    type: PermType = PermType.ADMIN
+    operation: str = "add"
+    permissions: int

pymax/api/chats/service.py

@@ -1,12 +1,15 @@
 from __future__ import annotations
 
 import time
+from functools import reduce
+from operator import or_
 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,
+    payload_item,
     require_payload_item_model,
     require_payload_model,
 )
@@ -15,8 +18,9 @@ from pymax.logging import get_logger
 from pymax.protocol import Opcode
 from pymax.types.domain import Chat, Member, Message
 
-from .enums import ChatLinkPrefix, ChatMemberOperation, ChatPayloadKey
+from .enums import ChannelPermissions, ChatLinkPrefix, ChatMemberOperation, ChatPayloadKey
 from .payloads import (
+    AddAdminPayload,
     ChangeGroupProfilePayload,
     ChangeGroupSettingsOptions,
     ChangeGroupSettingsPayload,
@@ -27,6 +31,7 @@ from .payloads import (
     FetchChatsPayload,
     FetchJoinRequests,
     GetChatInfoPayload,
+    GetChatMembersPayload,
     InviteUsersPayload,
     JoinChatPayload,
     JoinRequestActionPayload,
@@ -266,6 +271,22 @@ class ChatService:
 
         return [cached[chat_id] for chat_id in chat_ids if chat_id in cached]
 
+    async def get_chat_members(
+        self,
+        chat_id: int,
+        marker: int | None = None,
+        count: int = 50,
+    ) -> tuple[list[Member], int]:
+        frame = GetChatMembersPayload(chat_id=chat_id, marker=marker or 0, count=count)
+        response = await self.app.invoke(Opcode.CHAT_MEMBERS, frame.to_payload())
+
+        members = bind_api_model(
+            self.app,
+            parse_payload_list(response, ChatPayloadKey.MEMBERS, Member),
+        )
+        next_marker = payload_item(response, ChatPayloadKey.MARKER, int) or 0
+        return members, next_marker
+
     async def get_chat(self, chat_id: int) -> Chat:
         chats = await self.get_chats([chat_id])
         if not chats:
@@ -380,3 +401,17 @@ class ChatService:
 
         await self.app.invoke(Opcode.CHAT_DELETE, frame.to_payload())
         self._remove_cached_chat(chat_id)
+
+    async def add_admin(
+        self,
+        chat_id: int,
+        user_id: int,
+        permissions: list[ChannelPermissions],
+    ) -> None:
+        frame = AddAdminPayload(
+            chat_id=chat_id,
+            user_ids=[user_id],
+            permissions=reduce(or_, permissions),
+        )
+
+        await self.app.invoke(Opcode.CHAT_MEMBERS_UPDATE, frame.to_payload())

pymax/api/messages/payloads.py

@@ -8,6 +8,7 @@ from pymax.api.uploads.payloads import (
     AttachPhotoPayload,
     VideoAttachPayload,
 )
+from pymax.types.domain import Poll
 
 from .enums import ItemType, ReadAction
 
@@ -20,9 +21,9 @@ class GetMessagesPayload(CamelModel):
 class EditMessagePayload(CamelModel):
     chat_id: int
     message_id: int
-    text: str
+    text: str | None = None
     elements: list[Any]
-    attachments: list[AttachPhotoPayload | VideoAttachPayload | AttachFilePayload] = Field(
+    attachments: list[AttachPhotoPayload | VideoAttachPayload | AttachFilePayload | Poll] = Field(
         default_factory=list
     )
 
@@ -33,10 +34,10 @@ class ReplyLink(CamelModel):
 
 
 class SendMessagePayloadMessage(CamelModel):
-    text: str
+    text: str | None = None
     cid: int
     elements: list[Any]
-    attaches: list[AttachPhotoPayload | VideoAttachPayload | AttachFilePayload]
+    attaches: list[AttachPhotoPayload | VideoAttachPayload | AttachFilePayload | Poll]
     link: ReplyLink | None = None
 
 
@@ -129,3 +130,10 @@ class ReadMessagesPayload(CamelModel):
     chat_id: int
     message_id: str | int  # Сокет просит int а вс str
     mark: int
+
+
+class VotePollPayload(CamelModel):
+    chat_id: int
+    message_id: int
+    poll_id: int
+    answers_ids: list[int]

pymax/api/messages/service.py

@@ -18,13 +18,15 @@ from pymax.api.uploads.payloads import (
     VideoAttachPayload,
 )
 from pymax.exceptions import UploadError
-from pymax.files import File, Photo, Video
+from pymax.files import File, Photo, Video, VideoNote, Voice
 from pymax.formatting.markdown import Formatter
 from pymax.logging import get_logger
 from pymax.protocol import Opcode
 from pymax.types.domain import (
     FileRequest,
     Message,
+    Poll,
+    PollState,
     ReactionInfo,
     ReadState,
     VideoRequest,
@@ -50,12 +52,13 @@ from .payloads import (
     ReplyLink,
     SendMessagePayload,
     SendMessagePayloadMessage,
+    VotePollPayload,
 )
 
 if TYPE_CHECKING:
     from pymax.app import App
 
-SendAttachment: TypeAlias = Photo | File | Video
+SendAttachment: TypeAlias = Photo | File | Video | Poll | Voice | VideoNote
 SendAttachments: TypeAlias = Sequence[SendAttachment] | None
 
 logger = get_logger(__name__)
@@ -76,13 +79,21 @@ class MessageService:
 
     async def _upload_attachments(
         self, attachments: SendAttachments
-    ) -> list[AttachPhotoPayload | VideoAttachPayload | AttachFilePayload]:
-        result: list[AttachPhotoPayload | VideoAttachPayload | AttachFilePayload] = []
+    ) -> list[AttachPhotoPayload | VideoAttachPayload | AttachFilePayload | Poll]:
+        result: list[AttachPhotoPayload | VideoAttachPayload | AttachFilePayload | Poll] = []
         if not attachments:
             return result
 
         for attachment in attachments:
-            if isinstance(attachment, Photo):
+            if isinstance(attachment, Voice):
+                upload_result = await self.app.api.uploads.upload_voice(attachment)
+                if not upload_result:
+                    logger.error("Voice uploading failed")
+                    raise UploadError("Voice uploading failed")
+
+                result.append(upload_result)
+
+            elif isinstance(attachment, Photo):
                 upload_result = await self.app.api.uploads.upload_photo(attachment)
                 if not upload_result:
                     logger.error("Photo uploading failed")
@@ -106,20 +117,30 @@ class MessageService:
 
                 result.append(upload_result)
 
+            elif isinstance(attachment, Poll):
+                result.append(attachment)
+
         return result
 
     async def send_message(
         self,
         chat_id: int,
-        text: str,
+        text: str | None = None,
         reply_to: int | None = None,
         attachments: SendAttachments = None,
         *,
         notify: bool = True,
-    ) -> Message | None:
-        logger.info("sending message chat_id=%s text_len=%s", chat_id, len(text))
+    ) -> Message:
+        logger.info("sending message chat_id=%s text_len=%s", chat_id, len(text) if text else 0)
+
+        if not text and not attachments:
+            logger.error("send_message failed: no text or attachments provided")
+            raise ValueError("Either text or attachments must be provided")
 
-        clean_text, elements = Formatter.format_markdown(text)
+        if text:
+            clean_text, elements = Formatter.format_markdown(text)
+        else:
+            clean_text, elements = None, []
 
         frame = SendMessagePayload(
             chat_id=chat_id,
@@ -149,7 +170,7 @@ class MessageService:
         source_chat_id: int | None = None,
         *,
         notify: bool = True,
-    ) -> Message | None:
+    ) -> Message:
         source_chat_id = chat_id if source_chat_id is None else source_chat_id
         logger.info(
             "forwarding message source_chat_id=%s chat_id=%s message_id=%s",
@@ -208,10 +229,18 @@ class MessageService:
         self,
         chat_id: int,
         message_id: int,
-        text: str,
+        text: str | None = None,
         attachments: SendAttachments = None,
     ) -> Message:
-        clean_text, elements = Formatter.format_markdown(text)
+        if not text and not attachments:
+            logger.error("edit_message failed: no text or attachments provided")
+            raise ValueError("Either text or attachments must be provided")
+
+        if text:
+            clean_text, elements = Formatter.format_markdown(text)
+        else:
+            clean_text, elements = None, []
+
         frame = EditMessagePayload(
             chat_id=chat_id,
             message_id=message_id,
@@ -243,7 +272,7 @@ class MessageService:
         get_chat: bool = False,
         get_messages: bool = True,
         interactive: bool = False,
-    ) -> list[Message] | None:
+    ) -> list[Message]:
         frame = ChatHistoryPayload(
             chat_id=chat_id,
             forward=forward,
@@ -265,7 +294,7 @@ class MessageService:
             self.app,
             parse_payload_list(response, MessagePayloadKey.MESSAGES, Message),
         )
-        return messages or None
+        return messages
 
     async def delete_message(
         self,
@@ -443,3 +472,17 @@ class MessageService:
 
         response = await self.app.invoke(Opcode.CHAT_MARK, frame.to_payload())
         return require_payload_model(response, ReadState)
+
+    async def vote_poll(
+        self,
+        chat_id: int,
+        message_id: int,
+        poll_id: int,
+        answer_ids: list[int],
+    ) -> PollState:
+        frame = VotePollPayload(
+            chat_id=chat_id, message_id=message_id, poll_id=poll_id, answers_ids=answer_ids
+        )
+        response = await self.app.invoke(Opcode.SEND_VOTE, frame.to_payload())
+
+        return require_payload_item_model(response, "state", PollState)

pymax/api/self/__init__.py

@@ -1,2 +1,3 @@
-from .enums import AvatarType, SelfPayloadKey
+from .enums import AvatarType, PrivacyAccess, SelfPayloadKey
+from .payloads import PrivacySettingsUpdate
 from .service import SelfService

pymax/api/self/enums.py

@@ -9,3 +9,12 @@ class SelfPayloadKey(str, Enum):
     PROFILE = "profile"
     URL = "url"
     TOKEN = "token"
+    HASH = "hash"
+
+
+class PrivacyAccess(str, Enum):
+    """Уровень доступа к данным и действиям аккаунта."""
+
+    ALL = "ALL"
+    CONTACTS = "CONTACTS"
+    NOBODY = "_NONE_"

pymax/api/self/payloads.py

@@ -1,8 +1,10 @@
 from typing import Any
 
+from pydantic import BaseModel, Field
+
 from pymax.api.models import CamelModel
 
-from .enums import AvatarType
+from .enums import AvatarType, PrivacyAccess
 
 
 class UploadPayload(CamelModel):
@@ -39,3 +41,40 @@ class UpdateFolderPayload(CamelModel):
 
 class DeleteFolderPayload(CamelModel):
     folder_ids: list[str]
+
+
+class PrivacySettingsUpdate(BaseModel):
+    """Изменяемые настройки приватности аккаунта.
+
+    Все поля необязательны: в запрос попадают только переданные настройки.
+
+    Args:
+        search_by_phone: Кто может найти аккаунт по номеру телефона.
+        incoming_calls: Кто может звонить аккаунту.
+        chat_invites: Кто может добавлять аккаунт в чаты.
+        phone_number_visibility: Кто может видеть номер телефона.
+        hide_online_status: Скрывать ли статус присутствия.
+        safe_content_only: Показывать только безопасный контент.
+    """
+
+    search_by_phone: PrivacyAccess | None = Field(
+        default=None, serialization_alias="SEARCH_BY_PHONE"
+    )
+    incoming_calls: PrivacyAccess | None = Field(default=None, serialization_alias="INCOMING_CALL")
+    chat_invites: PrivacyAccess | None = Field(default=None, serialization_alias="CHATS_INVITE")
+    phone_number_visibility: PrivacyAccess | None = Field(
+        default=None, serialization_alias="PHONE_NUMBER_PRIVACY"
+    )
+
+    hide_online_status: bool | None = Field(default=None, serialization_alias="HIDDEN")
+    safe_content_only: bool | None = Field(
+        default=None, serialization_alias="CONTENT_LEVEL_ACCESS"
+    )
+
+
+class ChangeProfileSettings(CamelModel):
+    user: PrivacySettingsUpdate
+
+
+class ChangeProfileSettingsPayload(CamelModel):
+    settings: ChangeProfileSettings