maxapi-python 1.2.2__py3-none-any.whl → 1.2.3__py3-none-any.whl

{maxapi_python-1.2.2.dist-info → maxapi_python-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxapi-python
-Version: 1.2.2
+Version: 1.2.3
 Summary: Python wrapper для API мессенджера Max
 Project-URL: Homepage, https://github.com/ink-developer/PyMax
 Project-URL: Repository, https://github.com/ink-developer/PyMax

{maxapi_python-1.2.2.dist-info → maxapi_python-1.2.3.dist-info}/RECORD

@@ -1,32 +1,32 @@
 pymax/__init__.py,sha256=6wUKKwsyxFpWG3b7kwptOvHd-w78C-ygw42iCDBYQvc,1915
-pymax/core.py,sha256=OXGNaQ0pDaf6Ofr1Fb9m7vh5ffpbiMyvUMM0EfwlnIQ,14907
+pymax/core.py,sha256=S5el07cMcqIyXOI25G0a2XtVJSz2_AltmKN7ZW6LEeg,14946
 pymax/crud.py,sha256=YC92TyhA2mr1tJCcfd-tvh8umtXKgqJfgiLo7nXUl3Q,3076
 pymax/exceptions.py,sha256=nDUNx7bM-Yjugj-qfIllcrnwLg9JpZroYqfXapjYbMQ,3178
-pymax/files.py,sha256=AvFIr34Desq2p4CNWXIngRqeyTBKMT98VmcnI-zvUU0,3462
+pymax/files.py,sha256=bSjP1m-dLPJCN8HPZtjrLLp0Oc7OxdGxI6U1K2rQzUA,3587
 pymax/filters.py,sha256=gSHPJ1Vi37HKPxf0jRRv9Q3iGwhiQjw1MGrCaouqHzs,4325
 pymax/formatter.py,sha256=RJ_5VbY7Li8UM3xL1AvcXo8v1iYnY8GvDDkreaFqtnY,860
 pymax/formatting.py,sha256=XRtuXJGweuNZevJFdPxksDftIrfuMGEA-AOUc_v6IhQ,2484
-pymax/interfaces.py,sha256=wKF1z1QRw8LcjvM9rzSHWXTK6gPb6sDt2UGiQLvyMf8,8790
+pymax/interfaces.py,sha256=5-0RM0tH3eBJrVZkjL494lKTTwvIVmOTJiQxDWZo-7A,8829
 pymax/models.py,sha256=PsPGbOkERxesZZltjNrmqhOfRcO44Is2ThbEToREcB8,201
 pymax/navigation.py,sha256=4ia6RGY2pXMArboNhHkbWlWX7LtcYK1VGVXorPX0Pb4,5747
-pymax/payloads.py,sha256=GuTLK6HYe_bLW3ardgpKeZ98f79j349tD_6B6EwkGww,7879
-pymax/types.py,sha256=_ARcVXLGHyiGAJKYPd6EU9QDKzz4VwS6kjTu3YEH_u4,35523
+pymax/payloads.py,sha256=tlqPT-JFexfklp9idSrbpU3bALcQuiDne9H9vTnwL4w,8022
+pymax/types.py,sha256=_Ee1aycVwe4nfBO_hGMnpm9lQDGzkPOkT9vME8OL-sA,36650
 pymax/mixins/__init__.py,sha256=5sXJME34S1EssuDETaN4DLRH7vhMw_Q3Jmay9myAIZM,775
 pymax/mixins/auth.py,sha256=e90vIpEOwAjUxgYMYaG7R6jR_5t9rKsei_mTBQUirL4,14716
 pymax/mixins/channel.py,sha256=W52YnBay1sUYXxF9oAWsz44ZUh_s45jSvKmAyjTbULM,5357
-pymax/mixins/group.py,sha256=LqI1QHmZlmtuQ0-4H1MrNeBV-O9SMDMfHT9f4B_2poE,15189
+pymax/mixins/group.py,sha256=MaiZCQ9R-wWbuEPXyqf4JZAGNmxu_tXCs8qU3JEoYek,15911
 pymax/mixins/handler.py,sha256=ETnI8fA386LYJGjWtUhhWzQHREUA78di1aO1oWwtscA,12523
 pymax/mixins/message.py,sha256=AznKKmTMxdzsYl8IecT43RjWpGvlQM85GzSNGFbI8BA,33279
 pymax/mixins/scheduler.py,sha256=rcMfgfZnzu5V6MkcCg6uRgbi-jkc7UyqOjemulydWbc,964
-pymax/mixins/self.py,sha256=Be5L64eNYylGM-NmoxFpQZv1ohsC1Dx_Cs3Om__V96s,6976
-pymax/mixins/socket.py,sha256=tdHgd1NwWoEZhHCDd74XLOHFKUq-rladxhXV8Z_-APU,22860
+pymax/mixins/self.py,sha256=27ranVw5rdv1qSplhV5mdUvHc4qSxHi63f1gWOjR9B4,9182
+pymax/mixins/socket.py,sha256=tk2puQPsT2Dltg1j6kUSHIbXs64p6q-jiIIcs73Y1Sk,23174
 pymax/mixins/telemetry.py,sha256=LWr68DNQkPhAjGRDYQ5lORXxC3Yw6M9E8sF0TCNISTE,3609
 pymax/mixins/user.py,sha256=RSZd4t-aq8P2k3cVzNVWBkUf-_xTWILrBzwxLRgk1pw,9450
 pymax/mixins/utils.py,sha256=s3FUf3i_wjn2Gbg5YY1rWZB-90ZEGrrcUuND_MqqSTE,853
-pymax/mixins/websocket.py,sha256=GpdboEVWzyN1qLTcsgKZym6TlPnklcQuNeXJ5YKwg8c,17724
+pymax/mixins/websocket.py,sha256=fL8IcsLkvksizSAg98UaFlDPZGyGbYtbtdHnlDzfR9g,18056
 pymax/static/constant.py,sha256=nM0svv3VpsVxK-RqoADn9qsTdQvB-IYv0Sgv-bQcWs4,1116
-pymax/static/enum.py,sha256=Hk0e6zSbGOJC_9Aw7gNXX3hcavnjzQfDyr8vjW22cFo,4648
-maxapi_python-1.2.2.dist-info/METADATA,sha256=rgiQKdSqYAO743n6jWOy0F76jZyjaGMY7A6qUlHlk64,6753
-maxapi_python-1.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-maxapi_python-1.2.2.dist-info/licenses/LICENSE,sha256=hOR249ItqMdcly1A0amqEWRNRTq4Gv5NJtmQ3A5qK4E,1070
-maxapi_python-1.2.2.dist-info/RECORD,,
+pymax/static/enum.py,sha256=mraN6FK_gcVXdTHBdK8Zf6-92AzVFGAWRnQLA4rzYBA,4672
+maxapi_python-1.2.3.dist-info/METADATA,sha256=0NSb43LEMf9-M1KLeETofzdcjsGJ68lpZ15xP9GouI0,6753
+maxapi_python-1.2.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+maxapi_python-1.2.3.dist-info/licenses/LICENSE,sha256=hOR249ItqMdcly1A0amqEWRNRTq4Gv5NJtmQ3A5qK4E,1070
+maxapi_python-1.2.3.dist-info/RECORD,,

pymax/core.py

@@ -116,6 +116,7 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
         self.dialogs: list[Dialog] = []
         self.channels: list[Channel] = []
         self.me: Me | None = None
+        self.contacts: list[User] = []
         self._users: dict[int, User] = {}
 
         self._work_dir: str = work_dir

pymax/files.py

@@ -46,6 +46,11 @@ class Photo(BaseFile):
     }  # FIXME: костыль ✅
 
     def __init__(self, url: str | None = None, path: str | None = None) -> None:
+        if path:
+            self.file_name = Path(path).name
+        elif url:
+            self.file_name = Path(url).name
+
         super().__init__(url, path)
 
     def validate_photo(self) -> tuple[str, str] | None:

pymax/interfaces.py

@@ -45,6 +45,7 @@ class ClientProtocol(ABC):
         self.phone: str
         self.dialogs: list[Dialog] = []
         self.channels: list[Channel] = []
+        self.contacts: list[User] = []
         self.me: Me | None = None
         self.host: str
         self.port: int

pymax/mixins/group.py

@@ -95,9 +95,7 @@ class GroupMixin(ClientProtocol):
             operation="add",
         ).model_dump(by_alias=True)
 
-        data = await self._send_and_wait(
-            opcode=Opcode.CHAT_MEMBERS_UPDATE, payload=payload
-        )
+        data = await self._send_and_wait(opcode=Opcode.CHAT_MEMBERS_UPDATE, payload=payload)
 
         if data.get("payload", {}).get("error"):
             MixinsUtils.handle_error(data)
@@ -155,9 +153,7 @@ class GroupMixin(ClientProtocol):
             clean_msg_period=clean_msg_period,
         ).model_dump(by_alias=True)
 
-        data = await self._send_and_wait(
-            opcode=Opcode.CHAT_MEMBERS_UPDATE, payload=payload
-        )
+        data = await self._send_and_wait(opcode=Opcode.CHAT_MEMBERS_UPDATE, payload=payload)
 
         if data.get("payload", {}).get("error"):
             MixinsUtils.handle_error(data)
@@ -293,6 +289,33 @@ class GroupMixin(ClientProtocol):
 
         return chat
 
+    async def resolve_group_by_link(self, link: str) -> Chat | None:
+        """
+        Разрешает группу по ссылке
+
+        Args:
+            link (str): Ссылка на группу.
+
+        Returns:
+            Chat | None: Объект чата группы или None, если не найдено.
+        """
+        proceed_link = self._process_chat_join_link(link)
+        if proceed_link is None:
+            raise ValueError("Invalid group link")
+
+        data = await self._send_and_wait(
+            opcode=Opcode.LINK_INFO,
+            payload={
+                "link": proceed_link,
+            },
+        )
+
+        if data.get("payload", {}).get("error"):
+            MixinsUtils.handle_error(data)
+
+        chat = Chat.from_dict(data["payload"].get("chat", {}))
+        return chat
+
     async def rework_invite_link(self, chat_id: int) -> Chat:
         """
         Пересоздает ссылку для приглашения в группу
@@ -329,14 +352,10 @@ class GroupMixin(ClientProtocol):
             chat_id for chat_id in chat_ids if await self._get_chat(chat_id) is None
         ]
         if missed_chat_ids:
-            payload = GetChatInfoPayload(chat_ids=missed_chat_ids).model_dump(
-                by_alias=True
-            )
+            payload = GetChatInfoPayload(chat_ids=missed_chat_ids).model_dump(by_alias=True)
         else:
             chats: list[Chat] = [
-                chat
-                for chat_id in chat_ids
-                if (chat := await self._get_chat(chat_id)) is not None
+                chat for chat_id in chat_ids if (chat := await self._get_chat(chat_id)) is not None
             ]
             return chats
 

pymax/mixins/self.py

@@ -1,7 +1,13 @@
+import urllib.parse
+from http import HTTPStatus
 from typing import Any
+from urllib.parse import parse_qs, urlparse
 from uuid import uuid4
 
+import aiohttp
+
 from pymax.exceptions import Error
+from pymax.files import Photo
 from pymax.interfaces import ClientProtocol
 from pymax.mixins.utils import MixinsUtils
 from pymax.payloads import (
@@ -10,17 +16,60 @@ from pymax.payloads import (
     DeleteFolderPayload,
     GetFolderPayload,
     UpdateFolderPayload,
+    UploadPayload,
 )
 from pymax.static.enum import Opcode
-from pymax.types import Folder, FolderList, FolderUpdate
+from pymax.types import Folder, FolderList, FolderUpdate, Me
 
 
 class SelfMixin(ClientProtocol):
+    async def _request_photo_upload_url(self) -> str:
+        self.logger.info("Requesting profile photo upload URL")
+
+        data = await self._send_and_wait(
+            opcode=Opcode.PHOTO_UPLOAD,
+            payload=UploadPayload(profile=True).model_dump(by_alias=True),
+        )
+
+        if data.get("payload", {}).get("error"):
+            MixinsUtils.handle_error(data)
+
+        return data["payload"]["url"]
+
+    async def _upload_profile_photo(self, upload_url: str, photo: Photo) -> str:
+        self.logger.info("Uploading profile photo")
+
+        parsed_url = urlparse(upload_url)
+        photo_id = parse_qs(parsed_url.query)["photoIds"][0]
+
+        form = aiohttp.FormData()
+        form.add_field(
+            "file",
+            await photo.read(),
+            filename=photo.file_name,
+        )
+
+        async with (
+            aiohttp.ClientSession() as session,
+            session.post(upload_url, data=form) as response,
+        ):
+            if response.status != HTTPStatus.OK:
+                raise Error(
+                    "Failed to upload profile photo.", message="UploadError", title="Upload Error"
+                )
+
+            self.logger.info("Upload successful")
+            data = await response.json()
+            return data["photos"][photo_id][
+                "token"
+            ]  # TODO: сделать нормальную типизацию и чекнинг ответа
+
     async def change_profile(
         self,
         first_name: str,
         last_name: str | None = None,
         description: str | None = None,
+        photo: Photo | None = None,
     ) -> bool:
         """
         Изменяет информацию профиля текущего пользователя.
@@ -35,20 +84,36 @@ class SelfMixin(ClientProtocol):
         :rtype: bool
         """
 
-        payload = ChangeProfilePayload(
-            first_name=first_name,
-            last_name=last_name,
-            description=description,
-        ).model_dump(
-            by_alias=True,
-            exclude_none=True,
-        )
+        if photo:
+            upload_url = await self._request_photo_upload_url()
+            photo_token = await self._upload_profile_photo(upload_url, photo)
+
+            payload = ChangeProfilePayload(
+                first_name=first_name,
+                last_name=last_name,
+                description=description,
+                photo_token=photo_token,
+            ).model_dump(
+                by_alias=True,
+                exclude_none=True,
+            )
+        else:
+            payload = ChangeProfilePayload(
+                first_name=first_name,
+                last_name=last_name,
+                description=description,
+            ).model_dump(
+                by_alias=True,
+                exclude_none=True,
+            )
 
         data = await self._send_and_wait(opcode=Opcode.PROFILE, payload=payload)
 
         if data.get("payload", {}).get("error"):
             MixinsUtils.handle_error(data)
 
+        self.me = Me.from_dict(data["payload"]["profile"]["contact"])
+
         return True
 
     async def create_folder(

pymax/mixins/socket.py

@@ -28,6 +28,7 @@ from pymax.types import (
     Message,
     ReactionCounter,
     ReactionInfo,
+    User,
 )
 
 
@@ -603,6 +604,15 @@ Socket connections may be unstable, SSL issues are possible.
                     self.channels.append(Channel.from_dict(raw_chat))
             except Exception:
                 self.logger.exception("Error parsing chat entry (socket)")
+
+        for raw_user in raw_payload.get("contacts", []):
+            try:
+                user = User.from_dict(raw_user)
+                if user:
+                    self.contacts.append(user)
+            except Exception:
+                self.logger.exception("Error parsing contact entry (socket)")
+
         if raw_payload.get("profile", {}).get("contact"):
             self.me = Me.from_dict(raw_payload.get("profile", {}).get("contact", {}))
         self.logger.info(

pymax/mixins/websocket.py

@@ -27,6 +27,7 @@ from pymax.types import (
     Message,
     ReactionCounter,
     ReactionInfo,
+    User,
 )
 
 
@@ -465,6 +466,14 @@ class WebSocketMixin(ClientProtocol):
                 except Exception:
                     self.logger.exception("Error parsing chat entry")
 
+            for raw_user in raw_payload.get("contacts", []):
+                try:
+                    user = User.from_dict(raw_user)
+                    if user:
+                        self.contacts.append(user)
+                except Exception:
+                    self.logger.exception("Error parsing contact entry")
+
             if raw_payload.get("profile", {}).get("contact"):
                 self.me = Me.from_dict(raw_payload.get("profile", {}).get("contact", {}))
 

pymax/payloads.py

@@ -97,6 +97,7 @@ class ReplyLink(CamelModel):
 
 class UploadPayload(CamelModel):
     count: int = 1
+    profile: bool = False
 
 
 class AttachPhotoPayload(CamelModel):
@@ -168,6 +169,8 @@ class ChangeProfilePayload(CamelModel):
     first_name: str
     last_name: str | None = None
     description: str | None = None
+    photo_token: str | None = None
+    avatar_type: str = "USER_AVATAR"  # TODO: вынести гада в энам
 
 
 class ResolveLinkPayload(CamelModel):

pymax/static/enum.py

@@ -196,6 +196,7 @@ class AttachType(str, Enum):
     STICKER = "STICKER"
     AUDIO = "AUDIO"
     CONTROL = "CONTROL"
+    CONTACT = "CONTACT"
 
 
 class FormattingType(str, Enum):

pymax/types.py

@@ -47,7 +47,7 @@ class Name:
     def __init__(
         self,
         name: str | None,
-        first_name: None,
+        first_name: None | str,
         last_name: str | None,
         type: str | None,
     ) -> None:
@@ -90,16 +90,14 @@ class Names(Name):
     def __init__(
         self,
         name: str | None,
-        first_name: None,
+        first_name: None | str,
         last_name: str | None,
         type: str | None,
     ) -> None:
         """
         Синоним для класса Name.
         """
-        super().__init__(
-            name=name, first_name=first_name, last_name=last_name, type=type
-        )
+        super().__init__(name=name, first_name=first_name, last_name=last_name, type=type)
 
 
 class Contact:
@@ -219,7 +217,7 @@ class StickerAttach:
     def __init__(
         self,
         author_type: str,
-        lottie_url: str,
+        lottie_url: str | None,
         url: str,
         sticker_id: int,
         tags: list[str] | None,
@@ -248,7 +246,7 @@ class StickerAttach:
     def from_dict(cls, data: dict[str, Any]) -> Self:
         return cls(
             author_type=data["authorType"],
-            lottie_url=data["lottieUrl"],
+            lottie_url=data.get("lottieUrl"),
             url=data["url"],
             sticker_id=data["stickerId"],
             tags=data.get("tags"),
@@ -443,9 +441,7 @@ class VideoAttach:
 
 
 class FileAttach:
-    def __init__(
-        self, file_id: int, name: str, size: int, token: str, type: AttachType
-    ) -> None:
+    def __init__(self, file_id: int, name: str, size: int, token: str, type: AttachType) -> None:
         self.file_id = file_id
         self.name = name
         self.size = size
@@ -553,9 +549,7 @@ class Me:
 
 
 class Element:
-    def __init__(
-        self, type: FormattingType | str, length: int, from_: int | None = None
-    ) -> None:
+    def __init__(self, type: FormattingType | str, length: int, from_: int | None = None) -> None:
         self.type = type
         self.length = length
         self.from_ = from_
@@ -566,9 +560,7 @@ class Element:
 
     @override
     def __repr__(self) -> str:
-        return (
-            f"Element(type={self.type!r}, length={self.length!r}, from_={self.from_!r})"
-        )
+        return f"Element(type={self.type!r}, length={self.length!r}, from_={self.from_!r})"
 
     @override
     def __str__(self) -> str:
@@ -591,7 +583,9 @@ class MessageLink:
 
     @override
     def __repr__(self) -> str:
-        return f"MessageLink(chat_id={self.chat_id!r}, message={self.message!r}, type={self.type!r})"
+        return (
+            f"MessageLink(chat_id={self.chat_id!r}, message={self.message!r}, type={self.type!r})"
+        )
 
     @override
     def __str__(self) -> str:
@@ -636,6 +630,36 @@ class ReactionInfo:
         )
 
 
+class ContactAttach:
+    def __init__(
+        self, contact_id: int, first_name: str, last_name: str, name: str, photo_url: str
+    ) -> None:
+        self.contact_id = contact_id
+        self.first_name = first_name
+        self.last_name = last_name
+        self.name = name
+        self.photo_url = photo_url
+        self.type = AttachType.CONTACT
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any]) -> Self:
+        return cls(
+            contact_id=data["contactId"],
+            first_name=data["firstName"],
+            last_name=data["lastName"],
+            name=data["name"],
+            photo_url=data["photoUrl"],
+        )
+
+    @override
+    def __repr__(self) -> str:
+        return f"ContactAttach(contact_id={self.contact_id!r}, first_name={self.first_name!r}, last_name={self.last_name!r}, name={self.name!r}, photo_url={self.photo_url!r})"
+
+    @override
+    def __str__(self) -> str:
+        return f"ContactAttach: {self.name}"
+
+
 class Message:
     def __init__(
         self,
@@ -658,6 +682,7 @@ class Message:
                 | ControlAttach
                 | StickerAttach
                 | AudioAttach
+                | ContactAttach
             ]
             | None
         ),
@@ -679,7 +704,13 @@ class Message:
     def from_dict(cls, data: dict[Any, Any]) -> Self:
         message = data["message"] if data.get("message") else data
         attaches: list[
-            PhotoAttach | VideoAttach | FileAttach | ControlAttach | StickerAttach
+            PhotoAttach
+            | VideoAttach
+            | FileAttach
+            | ControlAttach
+            | StickerAttach
+            | AudioAttach
+            | ContactAttach
         ] = []
         for a in message.get("attaches", []):
             if a["_type"] == AttachType.PHOTO:
@@ -694,6 +725,8 @@ class Message:
                 attaches.append(StickerAttach.from_dict(a))
             elif a["_type"] == AttachType.AUDIO:
                 attaches.append(AudioAttach.from_dict(a))
+            elif a["_type"] == AttachType.CONTACT:
+                attaches.append(ContactAttach.from_dict(a))
         link_value = message.get("link")
         if isinstance(link_value, dict):
             link = MessageLink.from_dict(link_value)
@@ -778,9 +811,7 @@ class Dialog:
             join_time=data["joinTime"],
             created=data["created"],
             last_message=(
-                Message.from_dict(data["lastMessage"])
-                if data.get("lastMessage")
-                else None
+                Message.from_dict(data["lastMessage"]) if data.get("lastMessage") else None
             ),
             type=ChatType(data["type"]),
             last_fire_delayed_error_time=data["lastFireDelayedErrorTime"],
@@ -865,14 +896,10 @@ class Chat:
     @classmethod
     def from_dict(cls, data: dict[Any, Any]) -> Self:
         raw_admins = data.get("adminParticipants", {}) or {}
-        admin_participants: dict[int, dict[Any, Any]] = {
-            int(k): v for k, v in raw_admins.items()
-        }
+        admin_participants: dict[int, dict[Any, Any]] = {int(k): v for k, v in raw_admins.items()}
         raw_participants = data.get("participants", {}) or {}
         participants: dict[int, int] = {int(k): v for k, v in raw_participants.items()}
-        last_msg = (
-            Message.from_dict(data["lastMessage"]) if data.get("lastMessage") else None
-        )
+        last_msg = Message.from_dict(data["lastMessage"]) if data.get("lastMessage") else None
         return cls(
             participants_count=data.get("participantsCount", 0),
             access=AccessType(data.get("access", AccessType.PUBLIC.value)),
@@ -1051,7 +1078,9 @@ class Session:
 
     @override
     def __str__(self) -> str:
-        return f"Session: {self.client} from {self.location} at {self.time} (current={self.current})"
+        return (
+            f"Session: {self.client} from {self.location} at {self.time} (current={self.current})"
+        )
 
 
 class Folder: