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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxapi-python
-Version: 1.2.1
+Version: 1.2.2
 Summary: Python wrapper для API мессенджера Max
 Project-URL: Homepage, https://github.com/ink-developer/PyMax
 Project-URL: Repository, https://github.com/ink-developer/PyMax
@@ -19,6 +19,13 @@ Requires-Dist: msgpack>=1.1.1
 Requires-Dist: qrcode>=8.2
 Requires-Dist: sqlmodel>=0.0.24
 Requires-Dist: websockets>=15.0
+Provides-Extra: test
+Requires-Dist: flake8; extra == 'test'
+Requires-Dist: mypy; extra == 'test'
+Requires-Dist: pytest-asyncio>=0.24.0; extra == 'test'
+Requires-Dist: pytest-cov>=5.0.0; extra == 'test'
+Requires-Dist: pytest-timeout>=2.1.0; extra == 'test'
+Requires-Dist: pytest>=8.0.0; extra == 'test'
 Description-Content-Type: text/markdown
 
 <p align="center">
@@ -36,11 +43,6 @@ Description-Content-Type: text/markdown
     <img src="https://img.shields.io/badge/packaging-uv-D7FF64.svg" alt="Packaging">
 </p>
 
-> [!IMPORTANT]
-> (20.12.25) Из за резкого изменения апи большая часть библиотеки не работает.
-Смотрите [новость](https://t.me/pymax_news/111)
-> 
-> P.s добавил логин по qr в dev/1.2.1
 
 ---
 > ⚠️ **Дисклеймер**
@@ -82,6 +84,41 @@ uv add -U maxapi-python
 
 ## Быстрый старт
 
+### Аутентификация (`device_type`)
+
+> [!IMPORTANT]
+> Параметр `device_type` в `UserAgentPayload` **критически важен** для выбора способа авторизации:
+
+**Вход по номеру телефона (DESKTOP):**
+
+```python
+from pymax import MaxClient
+from pymax.payloads import UserAgentPayload
+
+ua = UserAgentPayload(device_type="DESKTOP", app_version="25.12.13")
+
+client = MaxClient(
+    phone="+79111111111",
+    work_dir="cache",
+    headers=ua,
+)
+```
+
+**Вход через QR-код (WEB)** — токен совместим с веб-версией Max:
+
+```python
+from pymax import MaxClient
+from pymax.payloads import UserAgentPayload
+
+ua = UserAgentPayload(device_type="WEB", app_version="25.12.13")
+
+client = MaxClient(
+    phone="+7911111111",
+    work_dir="cache",
+    headers=ua,
+)
+```
+
 ### Базовый пример использования
 
 ```python

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

@@ -1,5 +1,5 @@
 pymax/__init__.py,sha256=6wUKKwsyxFpWG3b7kwptOvHd-w78C-ygw42iCDBYQvc,1915
-pymax/core.py,sha256=Y4sXaUEtK4pVyYiKf5folyhW_xMFUJ3W-5Hc33b8v0E,14892
+pymax/core.py,sha256=OXGNaQ0pDaf6Ofr1Fb9m7vh5ffpbiMyvUMM0EfwlnIQ,14907
 pymax/crud.py,sha256=YC92TyhA2mr1tJCcfd-tvh8umtXKgqJfgiLo7nXUl3Q,3076
 pymax/exceptions.py,sha256=nDUNx7bM-Yjugj-qfIllcrnwLg9JpZroYqfXapjYbMQ,3178
 pymax/files.py,sha256=AvFIr34Desq2p4CNWXIngRqeyTBKMT98VmcnI-zvUU0,3462
@@ -9,7 +9,7 @@ pymax/formatting.py,sha256=XRtuXJGweuNZevJFdPxksDftIrfuMGEA-AOUc_v6IhQ,2484
 pymax/interfaces.py,sha256=wKF1z1QRw8LcjvM9rzSHWXTK6gPb6sDt2UGiQLvyMf8,8790
 pymax/models.py,sha256=PsPGbOkERxesZZltjNrmqhOfRcO44Is2ThbEToREcB8,201
 pymax/navigation.py,sha256=4ia6RGY2pXMArboNhHkbWlWX7LtcYK1VGVXorPX0Pb4,5747
-pymax/payloads.py,sha256=-GEJVXXlmJiFSTX4ToVNzmSZSrvSRe-BLOwYyRxGkWY,7280
+pymax/payloads.py,sha256=GuTLK6HYe_bLW3ardgpKeZ98f79j349tD_6B6EwkGww,7879
 pymax/types.py,sha256=_ARcVXLGHyiGAJKYPd6EU9QDKzz4VwS6kjTu3YEH_u4,35523
 pymax/mixins/__init__.py,sha256=5sXJME34S1EssuDETaN4DLRH7vhMw_Q3Jmay9myAIZM,775
 pymax/mixins/auth.py,sha256=e90vIpEOwAjUxgYMYaG7R6jR_5t9rKsei_mTBQUirL4,14716
@@ -23,10 +23,10 @@ pymax/mixins/socket.py,sha256=tdHgd1NwWoEZhHCDd74XLOHFKUq-rladxhXV8Z_-APU,22860
 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=m2swhSHIcFG6iABAik_oWxIpHfr0sxZ74I6VRU-iVO8,17809
-pymax/static/constant.py,sha256=-qJz65V_ESagy7DYHRj3QsfKwyAyVofWzZh0AqBJtXo,1112
+pymax/mixins/websocket.py,sha256=GpdboEVWzyN1qLTcsgKZym6TlPnklcQuNeXJ5YKwg8c,17724
+pymax/static/constant.py,sha256=nM0svv3VpsVxK-RqoADn9qsTdQvB-IYv0Sgv-bQcWs4,1116
 pymax/static/enum.py,sha256=Hk0e6zSbGOJC_9Aw7gNXX3hcavnjzQfDyr8vjW22cFo,4648
-maxapi_python-1.2.1.dist-info/METADATA,sha256=JU86mxRn8zdfsRGWFnNvJ6ea6KHKmmADCvDWvuvIZb4,5855
-maxapi_python-1.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-maxapi_python-1.2.1.dist-info/licenses/LICENSE,sha256=hOR249ItqMdcly1A0amqEWRNRTq4Gv5NJtmQ3A5qK4E,1070
-maxapi_python-1.2.1.dist-info/RECORD,,
+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/core.py

@@ -295,7 +295,7 @@ class MaxClient(ApiMixin, WebSocketMixin, BaseClient):
                 if self._token is None:
                     await self._login()
 
-                await self._sync()
+                await self._sync(self.user_agent)
 
                 await self._post_login_tasks(sync=False)
 

pymax/mixins/websocket.py

@@ -50,9 +50,7 @@ class WebSocketMixin(ClientProtocol):
             payload=payload,
         ).model_dump(by_alias=True)
 
-        self.logger.debug(
-            "make_message opcode=%s cmd=%s seq=%s", opcode, cmd, self._seq
-        )
+        self.logger.debug("make_message opcode=%s cmd=%s seq=%s", opcode, cmd, self._seq)
         return msg
 
     async def _send_interactive_ping(self) -> None:
@@ -68,9 +66,7 @@ class WebSocketMixin(ClientProtocol):
                 self.logger.warning("Interactive ping failed", exc_info=True)
             await asyncio.sleep(DEFAULT_PING_INTERVAL)
 
-    async def connect(
-        self, user_agent: UserAgentPayload | None = None
-    ) -> dict[str, Any] | None:
+    async def connect(self, user_agent: UserAgentPayload | None = None) -> dict[str, Any] | None:
         """
         Устанавливает соединение WebSocket с сервером и выполняет handshake.
 
@@ -173,9 +169,7 @@ class WebSocketMixin(ClientProtocol):
                 fut = self._file_upload_waiters.pop(id_, None)
                 if fut and not fut.done():
                     fut.set_result(data)
-                    self.logger.debug(
-                        "Fulfilled file upload waiter for %s=%s", key, id_
-                    )
+                    self.logger.debug("Fulfilled file upload waiter for %s=%s", key, id_)
 
     async def _handle_message_notifications(self, data: dict) -> None:
         if data.get("opcode") != Opcode.NOTIF_MESSAGE.value:
@@ -359,9 +353,7 @@ class WebSocketMixin(ClientProtocol):
             )
             return data
         except Exception:
-            self.logger.exception(
-                "Send and wait failed (opcode=%s, seq=%s)", opcode, msg["seq"]
-            )
+            self.logger.exception("Send and wait failed (opcode=%s, seq=%s)", opcode, msg["seq"])
             raise RuntimeError("Send and wait failed")
         finally:
             self._pending.pop(msg["seq"], None)
@@ -442,7 +434,7 @@ class WebSocketMixin(ClientProtocol):
         else:
             return float(2**retry_count)
 
-    async def _sync(self) -> None:
+    async def _sync(self, user_agent: UserAgentPayload) -> None:
         self.logger.info("Starting initial sync")
 
         payload = SyncPayload(
@@ -453,6 +445,7 @@ class WebSocketMixin(ClientProtocol):
             presence_sync=0,
             drafts_sync=0,
             chats_count=40,
+            user_agent=user_agent,
         ).model_dump(by_alias=True)
         try:
             data = await self._send_and_wait(opcode=Opcode.LOGIN, payload=payload)
@@ -473,9 +466,7 @@ class WebSocketMixin(ClientProtocol):
                     self.logger.exception("Error parsing chat entry")
 
             if raw_payload.get("profile", {}).get("contact"):
-                self.me = Me.from_dict(
-                    raw_payload.get("profile", {}).get("contact", {})
-                )
+                self.me = Me.from_dict(raw_payload.get("profile", {}).get("contact", {}))
 
             self.logger.info(
                 "Sync completed: dialogs=%d chats=%d channels=%d",

pymax/payloads.py

@@ -39,6 +39,20 @@ class BaseWebSocketMessage(BaseModel):
     payload: dict[str, Any]
 
 
+class UserAgentPayload(CamelModel):
+    device_type: str = Field(default=DEFAULT_DEVICE_TYPE)
+    locale: str = Field(default=DEFAULT_LOCALE)
+    device_locale: str = Field(default=DEFAULT_DEVICE_LOCALE)
+    os_version: str = Field(default=DEFAULT_OS_VERSION)
+    device_name: str = Field(default=DEFAULT_DEVICE_NAME)
+    header_user_agent: str = Field(default=DEFAULT_USER_AGENT)
+    app_version: str = Field(default=DEFAULT_APP_VERSION)
+    screen: str = Field(default=DEFAULT_SCREEN)
+    timezone: str = Field(default=DEFAULT_TIMEZONE)
+    client_session_id: int = Field(default=DEFAULT_CLIENT_SESSION_ID)
+    build_number: int = Field(default=DEFAULT_BUILD_NUMBER)
+
+
 class RequestCodePayload(CamelModel):
     phone: str
     type: AuthType = AuthType.START_AUTH
@@ -59,6 +73,21 @@ class SyncPayload(CamelModel):
     presence_sync: int = 0
     drafts_sync: int = 0
     chats_count: int = 40
+    user_agent: UserAgentPayload = Field(
+        default_factory=lambda: UserAgentPayload(
+            device_type=DEFAULT_DEVICE_TYPE,
+            locale=DEFAULT_LOCALE,
+            device_locale=DEFAULT_DEVICE_LOCALE,
+            os_version=DEFAULT_OS_VERSION,
+            device_name=DEFAULT_DEVICE_NAME,
+            header_user_agent=DEFAULT_USER_AGENT,
+            app_version=DEFAULT_APP_VERSION,
+            screen=DEFAULT_SCREEN,
+            timezone=DEFAULT_TIMEZONE,
+            client_session_id=DEFAULT_CLIENT_SESSION_ID,
+            build_number=DEFAULT_BUILD_NUMBER,
+        ),
+    )
 
 
 class ReplyLink(CamelModel):
@@ -276,20 +305,6 @@ class RemoveReactionPayload(CamelModel):
     message_id: str
 
 
-class UserAgentPayload(CamelModel):
-    device_type: str = Field(default=DEFAULT_DEVICE_TYPE)
-    locale: str = Field(default=DEFAULT_LOCALE)
-    device_locale: str = Field(default=DEFAULT_DEVICE_LOCALE)
-    os_version: str = Field(default=DEFAULT_OS_VERSION)
-    device_name: str = Field(default=DEFAULT_DEVICE_NAME)
-    header_user_agent: str = Field(default=DEFAULT_USER_AGENT)
-    app_version: str = Field(default=DEFAULT_APP_VERSION)
-    screen: str = Field(default=DEFAULT_SCREEN)
-    timezone: str = Field(default=DEFAULT_TIMEZONE)
-    client_session_id: int = Field(default=DEFAULT_CLIENT_SESSION_ID)
-    build_number: int = Field(default=DEFAULT_BUILD_NUMBER)
-
-
 class ReworkInviteLinkPayload(CamelModel):
     revoke_private_link: bool = True
     chat_id: int

pymax/static/constant.py

@@ -9,7 +9,7 @@ WEBSOCKET_ORIGIN: Final[Origin] = Origin("https://web.max.ru")
 HOST: Final[str] = "api.oneme.ru"
 PORT: Final[int] = 443
 DEFAULT_TIMEOUT: Final[float] = 20.0
-DEFAULT_DEVICE_TYPE: Final[str] = "WEB"
+DEFAULT_DEVICE_TYPE: Final[str] = "DESKTOP"
 DEFAULT_LOCALE: Final[str] = "ru"
 DEFAULT_DEVICE_LOCALE: Final[str] = "ru"
 DEFAULT_DEVICE_NAME: Final[str] = "Chrome"