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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxapi-python
-Version: 2.1.1
+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.1.dist-info → maxapi_python-2.1.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pymax/__init__.py,sha256=4tc91HCbTG_Xq6M7IPdc3sF_7bpScpoXEG0CQZyvDAs,1255
-pymax/app.py,sha256=3FlgRT7Lj4LxoRQfSsuw1kHby5au6klhxnjHBXrvmQ0,9819
+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
@@ -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.1.dist-info/METADATA,sha256=2z2avbn6KZLKC63s-N9Gl8Wu78IsT75BMkas8p6rZi0,7637
-maxapi_python-2.1.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-maxapi_python-2.1.1.dist-info/licenses/LICENSE,sha256=hOR249ItqMdcly1A0amqEWRNRTq4Gv5NJtmQ3A5qK4E,1070
-maxapi_python-2.1.1.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.1.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.1"
+__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/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,7 +127,7 @@ class App(Generic[ClientT]):
             self.config.device.user_agent,
         )
 
-        if response.token != self.session.token:
+        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
 
@@ -189,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()
@@ -211,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/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),
         )