maxapi-python 2.1.0__py3-none-any.whl → 2.1.2__py3-none-any.whl

{maxapi_python-2.1.0.dist-info → maxapi_python-2.1.2.dist-info}/METADATA

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

{maxapi_python-2.1.0.dist-info → maxapi_python-2.1.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pymax/__init__.py,sha256=-f9yJXBxQn-YB5JLrX3VrTKV7_vFjPJs13AQqraH2ao,1255
-pymax/app.py,sha256=SZMvhC237H1N58b5XcjRNGjwK-FiTgsevHnpzt-sdvg,9643
+pymax/__init__.py,sha256=6Fe_FJ1NgKBmqSWmix3_fmVbhFWFiLekXEjyH7rDIds,1255
+pymax/app.py,sha256=QzvHYsSGOu00f6GrN4a_AiLJkuFLb6RN81FRKk9togw,9814
 pymax/base.py,sha256=Q6FR5K1nOaeVnYlzRgqC6_v7AWUiJJCkI4TuzCYbj-U,7255
 pymax/client.py,sha256=KiDEiUL49IGxRtq4-Sr3IABa8Rh1TRPq41Gv5jH2m_Q,4013
 pymax/client_web.py,sha256=iTwlsY75d_wg-vUGObTq7SVinp0L__2r8cvG49BtmUI,3041
@@ -18,8 +18,8 @@ pymax/api/auth/payloads.py,sha256=XxrVdNcz1uV6hUxDp9Dt_stENECi_eDlxuiqt44DHeo,30
 pymax/api/auth/service.py,sha256=sjZcMyP6siH0dR19eYwkhhLU09bVJD4FCNeSra2Rjac,11639
 pymax/api/auth/types.py,sha256=VrYR7rIZOrW45yKnQmC5MSe9kxgXmqPzh9VG_y1tSEs,200
 pymax/api/bots/__init__.py,sha256=4P7rM-XeeDOElEktov1Vbfo8nzjJgmyA4_pQl4WvzRQ,33
-pymax/api/bots/payloads.py,sha256=-vrswY_VlQrLKoqOxrFBl7pE8QG4dLQSaGOtKs4Lq1o,152
-pymax/api/bots/service.py,sha256=ssVty2_4WMQbecQGcIJYEeYZ0RT6VgMu5qzqgAcegWo,877
+pymax/api/bots/payloads.py,sha256=aXriolCN_YvBvDZO_MPmD-fkrIVJIpVDXkOkOZVes_c,166
+pymax/api/bots/service.py,sha256=ziqVlQUMFHjQydMDFyWcQMIATboQTvIdGtJhf-AK9tA,847
 pymax/api/chats/__init__.py,sha256=UMp3uKdB3tZlnWckndgF3jaU-3-49OJE18z2d0OlmIU,155
 pymax/api/chats/enums.py,sha256=FdByRiHYX9Xs7RyNabKqxGugNs9tJ3VBXwTb_43XGC8,627
 pymax/api/chats/payloads.py,sha256=Y4S2x60i3txeA75GV_pGJ3ov7pLMp4GjGuhoqlRI2ow,2824
@@ -31,7 +31,7 @@ pymax/api/messages/service.py,sha256=N5_KYArZB-VX7kOLMfkrwzrpNgvqNFLRLOym_ghM6IQ
 pymax/api/self/__init__.py,sha256=TfbqL4xLb5IMhbW8mlAK-AwVFqqPWMADogKZeWtkw0A,79
 pymax/api/self/enums.py,sha256=iKEqPy44LyQKvAPfyhpkSXgmWWohxry73F0CVgtekwY,180
 pymax/api/self/payloads.py,sha256=-SFqkNxC5ZLKnLty_Gyz_b_P3X1esu_7Urb4HjrQxM4,774
-pymax/api/self/service.py,sha256=3TBB-wxGTJ9jRCJJNfitk0hJNtWQDn9gWS_sap1Hou8,4685
+pymax/api/self/service.py,sha256=Fr4PlGT4Vn50kVQC9rleZu5UTvxLjTAsfR5mxY2IIUw,4921
 pymax/api/session/__init__.py,sha256=zo-rCKBVBsFK-810T-Le4VbAYKt109cQ6elf0UkgiNk,36
 pymax/api/session/enums.py,sha256=InBdwAu_filqW3rMfGrOkHgmFfqgB1ytjnCcxDq29xc,236
 pymax/api/session/payloads.py,sha256=mDXgI_oVfqLim7J9F9BMUwKx9Vs8EknJ02kstrF3ClE,2340
@@ -39,7 +39,7 @@ pymax/api/session/service.py,sha256=8ELcsnKNHLT8hgExw5laZvHF6SIOSQB6RpXoxf1rbbI,
 pymax/api/uploads/__init__.py,sha256=E7INNsBeMStze2VWMADX4mrswsQeJb85C71sSuiOpv0,35
 pymax/api/uploads/models.py,sha256=c2Yunnl9nRkDZuItXGKlY0Oi5DjnB4f5bcruQ49ARZk,934
 pymax/api/uploads/payloads.py,sha256=hf0MwLdtTHnt5KGONbV4hnByjy5X0PJLqer6uq9nuuw,694
-pymax/api/uploads/service.py,sha256=5wa4MI3jL7BFWCWbMLWZBP-NTOqRcblUq4Iz19ekXx4,19481
+pymax/api/uploads/service.py,sha256=qiYYPqryWr9h0EOWrglWz6z70I3UYXgBglTn0e0USFY,19533
 pymax/api/users/__init__.py,sha256=CDakgSKwVAkX-kNoDmIo2JsFPsS7Nx3j2vIMwQnPRck,82
 pymax/api/users/enums.py,sha256=m3d225sjWkBIRF5NNi3ChnyZ6BgKUEbPYoYwVjpifZ4,205
 pymax/api/users/payloads.py,sha256=VoXXctQDl7WXt5zqoRKzdONqmris5Cxf7-6Hy_Gcd-A,288
@@ -80,7 +80,7 @@ pymax/infra/bots.py,sha256=IJs4ErFxjbMeiHfQgpDiDhtEu9ws-lIp8fb8I96szy8,1202
 pymax/infra/chat.py,sha256=gZdkciUl_BCnPucxb8JubQ6phPCTcmVfX9C3edKXZRM,12690
 pymax/infra/message.py,sha256=Hee5z9a47aZRnSAvTMdTaa5BzwMnOnSoB-z3JVX3J3o,8518
 pymax/infra/protocol.py,sha256=I2WrAeAgATuNSdK2gvHU-MhhxdRBfSMGMovF5HPFsQw,208
-pymax/infra/self.py,sha256=w2eHIgmKkarhfbtAdGo_iZ4Qbs2DaSzzm-TLzXKNn8E,4963
+pymax/infra/self.py,sha256=h2GnzcCF2-FeY9-qBjtHjrSCx7elc4RjuCXPaewDkgg,4828
 pymax/infra/user.py,sha256=nv9jkWpWvCWETHZsyUMmm5FWkzLTJT2SHXZ7SglZE8M,4331
 pymax/protocol/__init__.py,sha256=rDn1Twi1iBDUk1155YI9jyeQyaGVDRuPoWdlaaLZnsw,242
 pymax/protocol/base.py,sha256=_bisk1BU_GSMSPIqfnizSCgm_qBrdbB5cJw6foAa2tc,294
@@ -103,7 +103,7 @@ pymax/telemetry/payloads.py,sha256=MCKYGpQ4Tvx_8LH86Et0yevea2Th2z3b7a9pfmrQRys,3
 pymax/telemetry/service.py,sha256=xuAUsLt0QOwypxn8NjSUtSTfcZxgIY9YVWnvZ-KawZY,7120
 pymax/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymax/transport/base.py,sha256=0D3srQ36F0s23pIjqd6YzRGKK9wCmXKr3wfe2XYYlos,448
-pymax/transport/tcp.py,sha256=9HCmPK-qBC5AvFINW4jHyzXQPTWvIYFiwxDmVHA8-og,2998
+pymax/transport/tcp.py,sha256=aV7KzjAbjtQ7irTKsdlfDyZWhREW1QqOe_fBZSxMekE,3097
 pymax/transport/websocket.py,sha256=0ezkSoENWKV00EATIizGx16-ihCnaTC76zzGnwbS_3c,1504
 pymax/types/__init__.py,sha256=y77mfDRgxmfcamobi0rj2d3PsxhH0zxyvKPhL2iUdS8,44
 pymax/types/domain/__init__.py,sha256=R4iJv0b5gnNVG3MrerVlGVzPvNR-n36QZFukEX64fn4,470
@@ -114,8 +114,8 @@ pymax/types/domain/chat.py,sha256=xpLutj9uCIQupAO1zu2eXzEEXL8DcQ4N6tkZQeQUsCM,18
 pymax/types/domain/element.py,sha256=slMVlp5Fn1H1hFUinruuP7s2wawkSrS5c1eCeY31p-g,620
 pymax/types/domain/enums.py,sha256=eGMWnlv0mYJ8K-0FsC_wp4Co2M6YWyKI1Lx90MJ6s4g,412
 pymax/types/domain/error.py,sha256=WZoDAXf5vt8O4VYy7iEHLGBfH6hZQZ1fVkTz9rVCTN0,584
-pymax/types/domain/folder.py,sha256=Xe1CmWfh3BhjpPNV-aWqT2JA4sX6ya2HaC3BSDMEqL8,2445
-pymax/types/domain/login.py,sha256=mpGWNcFi5pwRsZbPA_GCtC1b-dreZA1hxayz5P7eL90,1451
+pymax/types/domain/folder.py,sha256=Z9pXMzOTfxuhUfrJpLjl5LPnVXqqFsBVfKBQm4IbGWM,2225
+pymax/types/domain/login.py,sha256=FBKpRhNPv6Zdjo6Wfl-lK8JpzpMx7zh84f1qrq6Z0og,1301
 pymax/types/domain/member.py,sha256=8gUNn4fBS_S2ap45A40lRlrDXYFMoq0Kx-dh57hMWQc,490
 pymax/types/domain/message.py,sha256=vb1Rmxnz145EP5_C1fpjvGLrenATN6HBivrst9M8OOc,14387
 pymax/types/domain/name.py,sha256=qMIshIqgWkVuROxmiCRhwfJf8XtmhSBoEU6nXs_gEh0,523
@@ -141,7 +141,7 @@ pymax/types/events/__init__.py,sha256=fNLP_8zYRsew2k-1s8wXCJeSPm8QQ4gmiZ86B51SuC
 pymax/types/events/file.py,sha256=XhpXn0Vt9OODkx1OkGb9jfQwc1uNgz1NTn_j9FZnQ8s,102
 pymax/types/events/message.py,sha256=d4dlnpu3VCtZ4vFdRXaACvydAE9sbGGkk52E48K0U_U,1248
 pymax/types/events/video.py,sha256=swBHYadmDS0SjLXGqVqRYsuMoVZ6MjD2aYR2fbM-AJc,104
-maxapi_python-2.1.0.dist-info/METADATA,sha256=kmE4GpooJO7S8X4GH8qELBv0cQZqDJvXZlBH_t2vktE,7637
-maxapi_python-2.1.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-maxapi_python-2.1.0.dist-info/licenses/LICENSE,sha256=hOR249ItqMdcly1A0amqEWRNRTq4Gv5NJtmQ3A5qK4E,1070
-maxapi_python-2.1.0.dist-info/RECORD,,
+maxapi_python-2.1.2.dist-info/METADATA,sha256=3jzi0v-s6AoiHhnIWurSxL6LLtBOcr3ZGDZGWcBshpU,7637
+maxapi_python-2.1.2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+maxapi_python-2.1.2.dist-info/licenses/LICENSE,sha256=hOR249ItqMdcly1A0amqEWRNRTq4Gv5NJtmQ3A5qK4E,1070
+maxapi_python-2.1.2.dist-info/RECORD,,

{maxapi_python-2.1.0.dist-info → maxapi_python-2.1.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.30.1
 Root-Is-Purelib: true
 Tag: py3-none-any

pymax/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.1.0"
+__version__ = "2.1.2"
 
 
 from .auth import (

pymax/api/bots/payloads.py

@@ -3,5 +3,5 @@ from pymax.api.models import CamelModel
 
 class RequestInitDataPayload(CamelModel):
     bot_id: int
-    chat_id: int
+    chat_id: int | None = None
     start_param: str | None = None

pymax/api/bots/service.py

@@ -23,13 +23,9 @@ class BotsService:
     async def get_init_data(
         self,
         bot_id: int,
-        chat_id: int,
+        chat_id: int | None = None,
         start_param: str | None = None,
     ) -> InitData:
-        frame = RequestInitDataPayload(
-            bot_id=bot_id, chat_id=chat_id, start_param=start_param
-        )
-        response = await self.app.invoke(
-            Opcode.WEB_APP_INIT_DATA, frame.to_payload()
-        )
+        frame = RequestInitDataPayload(bot_id=bot_id, chat_id=chat_id, start_param=start_param)
+        response = await self.app.invoke(Opcode.WEB_APP_INIT_DATA, frame.to_payload())
         return require_payload_model(response, InitData)

pymax/api/self/service.py

@@ -9,6 +9,7 @@ from pymax.api.response import (
     require_payload_item_model,
     require_payload_model,
 )
+from pymax.files import Photo
 from pymax.logging import get_logger
 from pymax.protocol import Opcode
 from pymax.types.domain import FolderList, FolderUpdate, Profile
@@ -47,15 +48,20 @@ class SelfService:
         first_name: str,
         last_name: str | None = None,
         description: str | None = None,
-        photo: Any | None = None,
+        photo: Photo | None = None,
         *,
         photo_token: str | None = None,
     ) -> bool:
         if photo is not None:
-            raise NotImplementedError(
-                "Profile photo upload is not implemented without upload infra. "
-                "Pass photo_token instead."
+            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 = attach.photo_token
 
         frame = ChangeProfilePayload(
             first_name=first_name,
@@ -145,6 +151,7 @@ class SelfService:
             return False
 
         await self.app.store.update_token(self.app.session.token, token)
+        self.app.session.token = token
 
         return True
 

pymax/api/uploads/service.py

@@ -51,11 +51,13 @@ class UploadService:
             self.on_file_attach
         )
 
-    async def upload_photo(self, photo: Photo) -> AttachPhotoPayload:
+    async def upload_photo(
+        self, photo: Photo, profile: bool = False
+    ) -> AttachPhotoPayload:
         logger.info("Uploading photo")
         logger.debug("Preparing photo upload payload")
 
-        payload = UploadPayload().model_dump()
+        payload = UploadPayload(profile=profile).model_dump()
 
         try:
             data = await self.app.invoke(

pymax/app.py

@@ -33,9 +33,7 @@ class App(Generic[ClientT]):
         self.dispatcher: Dispatcher[ClientT] = Dispatcher(self, root_router)
         self.api = ApiFacade(self)
         self.config = config
-        self.store = self.config.store or SessionStore(
-            config.work_dir, config.session_name
-        )
+        self.store = self.config.store or SessionStore(config.work_dir, config.session_name)
         self.auth_flow = auth_flow
 
         self.me: Profile | None = None
@@ -76,18 +74,14 @@ class App(Generic[ClientT]):
             await self.connection.open()
 
             handshake_device_id = (
-                session_data.device_id
-                if session_data
-                else self.config.device.device_id
+                session_data.device_id if session_data else self.config.device.device_id
             )
             logger.debug("running handshake")
             await self.handshake(handshake_device_id)
         except (ConnectionError, EOFError, OSError, TimeoutError) as e:
             logger.exception("failed to connect or handshake")
             await self.connection.close()
-            raise ConnectionError(
-                f"Failed to connect and handshake: {e}"
-            ) from e
+            raise ConnectionError(f"Failed to connect and handshake: {e}") from e
 
         self._ping_task = asyncio.create_task(self._ping_loop())
 
@@ -108,9 +102,7 @@ class App(Generic[ClientT]):
 
                 if not auth_result.token:
                     logger.error("authentication finished without token")
-                    raise RuntimeError(
-                        "Authentication failed: no token received"
-                    )
+                    raise RuntimeError("Authentication failed: no token received")
 
                 await self.store.save_session(
                     session_data := SessionInfo(
@@ -135,6 +127,10 @@ class App(Generic[ClientT]):
             self.config.device.user_agent,
         )
 
+        if response.token is not None and response.token != self.session.token:
+            await self.store.update_token(self.session.token, response.token)
+            self.session.token = response.token
+
         self.me = response.profile
         self.chats = response.chats
         self.users[self.me.contact.id] = self.me.contact
@@ -185,7 +181,7 @@ class App(Generic[ClientT]):
         opcode: int,
         payload: dict[str, Any],
         cmd: int = Command.REQUEST,
-        timeout: float | None = 30.0,
+        timeout: float | None = None,
         compress: bool = False,
     ) -> InboundFrame:
         seq = self.connection.next_seq()
@@ -207,10 +203,11 @@ class App(Generic[ClientT]):
             payload_keys,
         )
         logger.debug("Request data=%s", frame.model_dump())
-        response = await self.connection.request(frame, timeout=timeout)
-        response_keys = (
-            sorted(response.payload.keys()) if response.payload else []
+        request_timeout = (
+            self.config.request_timeout if timeout is None else timeout
         )
+        response = await self.connection.request(frame, timeout=request_timeout)
+        response_keys = sorted(response.payload.keys()) if response.payload else []
         logger.debug(
             "response opcode=%s cmd=%s seq=%s payload_keys=%s",
             response.opcode,

pymax/infra/self.py

@@ -29,17 +29,13 @@ class SelfMixin(IClientProtocol):
             first_name: Имя профиля.
             last_name: Фамилия профиля.
             description: Описание профиля.
-            photo: Файл или объект фото. Прямая загрузка через этот
-                параметр пока не реализована.
+            photo: Файл или объект фото, который нужно загрузить как новую
+                фотографию профиля.
             photo_token: Токен фотографии, уже загруженной через API Max.
 
         Returns:
             ``True`` после успешного обновления. Клиент также обновит
             ``client.me`` и кеш текущего контакта.
-
-        Raises:
-            NotImplementedError: Если передан ``photo`` вместо
-                ``photo_token``.
         """
         return await self._app.api.account.change_profile(
             first_name=first_name,

pymax/transport/tcp.py

@@ -33,10 +33,12 @@ class TCPTransport(Transport):
             sock = await proxy.connect(
                 dest_host=self._host,
                 dest_port=self._port,
-                ssl=self._use_ssl,
             )
+            server_hostname = self._host if self._use_ssl else None
             self._reader, self._writer = await asyncio.open_connection(
-                sock=sock, ssl=self._use_ssl
+                sock=sock,
+                ssl=self._use_ssl,
+                server_hostname=server_hostname,
             )
             logger.info(
                 "tcp connected via proxy %s host=%s port=%s ssl=%s",

pymax/types/domain/folder.py

@@ -1,8 +1,6 @@
-from collections.abc import Iterator
 from typing import Any
 
 from pydantic import Field
-from typing_extensions import override
 
 from .base import CamelModel
 
@@ -68,7 +66,3 @@ class FolderList(CamelModel):
     folders: list[Folder] = Field(default_factory=list)
     all_filter_exclude_folders: list[Any] = Field(default_factory=list)
     folder_sync: int = 0
-
-    @override
-    def __iter__(self) -> Iterator[Folder]:  # pyright: ignore[reportIncompatibleMethodOverride]
-        yield from self.folders

pymax/types/domain/login.py

@@ -16,11 +16,9 @@ class LoginConfig(CamelModel):
 class LoginResponse(CamelModel):
     chats: list[Chat] = Field(default_factory=list)
     profile: Profile
-    messages: dict[int, list[Message]] = Field(
-        default_factory=dict
-    )  # chat_id -> [message]
+    messages: dict[int, list[Message]] = Field(default_factory=dict)  # chat_id -> [message]
     contacts: list[User | None] = Field(default_factory=list)
-    token: str
+    token: str | None = None
     time: int | None = None
     config: LoginConfig | None = None
 
@@ -29,19 +27,9 @@ class LoginResponse(CamelModel):
         config_hash = self.config.hash if self.config is not None else None
 
         return SyncState(
-            chats_sync=(
-                sync_time if sync_time is not None else current.chats_sync
-            ),
-            contacts_sync=(
-                sync_time if sync_time is not None else current.contacts_sync
-            ),
-            drafts_sync=(
-                sync_time if sync_time is not None else current.drafts_sync
-            ),
-            presence_sync=(
-                sync_time if sync_time is not None else current.presence_sync
-            ),
-            config_hash=(
-                config_hash if config_hash is not None else current.config_hash
-            ),
+            chats_sync=(sync_time if sync_time is not None else current.chats_sync),
+            contacts_sync=(sync_time if sync_time is not None else current.contacts_sync),
+            drafts_sync=(sync_time if sync_time is not None else current.drafts_sync),
+            presence_sync=(sync_time if sync_time is not None else current.presence_sync),
+            config_hash=(config_hash if config_hash is not None else current.config_hash),
         )