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

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

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

@@ -1,11 +1,11 @@
-pymax/__init__.py,sha256=6Fe_FJ1NgKBmqSWmix3_fmVbhFWFiLekXEjyH7rDIds,1255
-pymax/app.py,sha256=QzvHYsSGOu00f6GrN4a_AiLJkuFLb6RN81FRKk9togw,9814
+pymax/__init__.py,sha256=M6NWntSBu0SbcYNaVeUkhx9cYmTRMWTqZyybgA8LP9c,1255
+pymax/app.py,sha256=4faFC8y6CHVRH_FJX_3bfFthOMqxC8fObFxw4Sb0MHY,10263
 pymax/base.py,sha256=Q6FR5K1nOaeVnYlzRgqC6_v7AWUiJJCkI4TuzCYbj-U,7255
-pymax/client.py,sha256=KiDEiUL49IGxRtq4-Sr3IABa8Rh1TRPq41Gv5jH2m_Q,4013
+pymax/client.py,sha256=YCOZI_BIUvDKGNXBxnVErVTZ8cXr8DE8SS9UqGD85VA,3967
 pymax/client_web.py,sha256=iTwlsY75d_wg-vUGObTq7SVinp0L__2r8cvG49BtmUI,3041
 pymax/config.py,sha256=CkswnDfDjDIlYg1v0Ra3czjZvceePIaobJP51qHMdTg,8615
 pymax/exceptions.py,sha256=8pxjZsfgrMPrZfE3zedIbabqP75diEr2_6Xg3PGjiSQ,963
-pymax/logging.py,sha256=K0dsOMN4LPxybIvCeo5q1yWNRL-TSbu2r5IB25lhYb0,3410
+pymax/logging.py,sha256=u7fJ3-O8K7DRgohDFIyCefxz7yhy_0qxGD-tD7d0ZIw,4548
 pymax/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymax/routers.py,sha256=UvIEWcBF1VPBmUFrubBQ7uo3DZylf4qdbnQGDkUYjyE,225
 pymax/api/__init__.py,sha256=oWC09vGaP6S7_nnTJ4y5PbTkbA4U29DhafpwIqD2QGI,356
@@ -53,7 +53,7 @@ pymax/auth/qr.py,sha256=17VTtcwNcpuzbR_1t1bpwmdDFxLniNidakOYSKjOJNc,4309
 pymax/auth/service.py,sha256=cUZxs5UW9ysSaJ-UXSOz0ug3fDo1eN0xAjO7VP1MdTU,619
 pymax/auth/sms.py,sha256=34L9Od_0RYitK9G4xxFDJAq-3vf_AfzIGfBShwVNSRk,4185
 pymax/connection/__init__.py,sha256=YTboFk9AfYkRUw2Hf4oxn63LTGV475fxp_oel1j4gas,42
-pymax/connection/connection.py,sha256=mLqQOE7eeIJEOE2Nx7hZibCgDar1evgo5IksGGyfzvM,6859
+pymax/connection/connection.py,sha256=zuaTo117cqoOaknCXvTaDhJQlMc0-J2XBilwH9Z1BU4,7868
 pymax/connection/pending.py,sha256=qezxL019d1E6oiCmSgCSfojLj7sxR1BEGgcKBWSFhok,1328
 pymax/connection/readers/__init__.py,sha256=9g5ZbcWiHxW1kAi2ckiNqejoGHwoDwFd4WvtYQSyRzU,52
 pymax/connection/readers/base.py,sha256=FlvyMUFoZ4FORAh0vBU6_I0BnrQ9_1twpUIKz-Vkj58,126
@@ -68,7 +68,7 @@ pymax/dispatch/router.py,sha256=0R_Z-YP9yLAyWlBaBgevgHP0BmZGr4N8JIRtjob8KSA,6592
 pymax/files/__init__.py,sha256=TR0N6YXX4IHBsXQo8uiK68C-Xg3LSj48d4Zsv71CWZE,126
 pymax/files/base.py,sha256=0aksCGxmrvqEKJdhRWcuPZJfEn7RWcl5tn5gn63q1os,2689
 pymax/files/file.py,sha256=JSkuKx0fdGxzcsyMajWTosFzTlfgZYvQbh-RDp9OZyQ,2337
-pymax/files/photo.py,sha256=TeGBzVXFpiExhMjKCLHFjCu3DYKFZ6-jub-RZ_SiCco,3523
+pymax/files/photo.py,sha256=jvHihuyghDljY9PLh3ymJfoj5KksIRBWIK3z9Dmgjuk,3604
 pymax/files/static.py,sha256=U_KfM0rbGMEWcsBnWIhIXzzk46hHYQ7KJnrGnfDLoMs,142
 pymax/files/video.py,sha256=fGXgSY5zH-voYPVjbDBnkGI1TeP-KOSq3DZEDFNnn68,2153
 pymax/formatting/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -89,8 +89,8 @@ pymax/protocol/models.py,sha256=kno-09OoPoLKBMixS9nrDkCbxcIwvU37RlZgaq5MfVo,584
 pymax/protocol/tcp/__init__.py,sha256=ivIZZ-UoT_MiRIUWTLiyeKSBOzf9XztSprHPHgoWNuI,34
 pymax/protocol/tcp/compression.py,sha256=K0xf8W_pVB-CFD0cJs3SrpTK3WXeZom3ToMo8Iu3Qug,3028
 pymax/protocol/tcp/framing.py,sha256=Zp-glGsPqYODOnkmKdf6Ux8dcjleyuPWudQdHeO5PXQ,1652
-pymax/protocol/tcp/payload.py,sha256=dKAriFuWoonCmfogijv7FTXEKlNPz8vOwI6xO6INJG0,4301
-pymax/protocol/tcp/protocol.py,sha256=T5N2qoCoYxcHqPylBqpLW3ej1Ew3XBvoKWMuXyc0qLc,2322
+pymax/protocol/tcp/payload.py,sha256=86-NJ5MVvxpgD2ffQqJGaSbDhVBFhaNOH91-k1IQJk8,3515
+pymax/protocol/tcp/protocol.py,sha256=-8JQe5rhXXtBMNeCWM8XJXmlnL-0lNSEUCP6LU2zU7c,2244
 pymax/protocol/ws/__init__.py,sha256=oQK0h28B6gGItf7eHanWy_XsgUA_L9Lclnuz9ZQL9YI,33
 pymax/protocol/ws/protocol.py,sha256=Ob90-jLDwGqo8ymwDPvwUnWacWyQtneKEjCThfpqbKE,1003
 pymax/session/__init__.py,sha256=natjnLjPjTvkfvSYtoiPxzmU44XJi0MpjWiOPD-On4g,100
@@ -111,37 +111,38 @@ pymax/types/domain/auth.py,sha256=8p4qX9RAJ6dIsAmoKFrfxlq6dct689qXgrngcep48a4,52
 pymax/types/domain/base.py,sha256=Q32PcKR3gtrISySowR3zPyl9KeQCoUL6lfyTR3ulMzo,623
 pymax/types/domain/bots.py,sha256=dErZZbvspznU6yUupzCs4R55pEWgoeps7NEhZFrb-Uo,333
 pymax/types/domain/chat.py,sha256=xpLutj9uCIQupAO1zu2eXzEEXL8DcQ4N6tkZQeQUsCM,18329
-pymax/types/domain/element.py,sha256=slMVlp5Fn1H1hFUinruuP7s2wawkSrS5c1eCeY31p-g,620
+pymax/types/domain/element.py,sha256=Hks0MulMcPAhbpuUmJa5c2d9Emwy3garh1k6bd4QHKA,655
 pymax/types/domain/enums.py,sha256=eGMWnlv0mYJ8K-0FsC_wp4Co2M6YWyKI1Lx90MJ6s4g,412
 pymax/types/domain/error.py,sha256=WZoDAXf5vt8O4VYy7iEHLGBfH6hZQZ1fVkTz9rVCTN0,584
 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/message.py,sha256=U1ZC9E3tuEbxM0bir82VksyLzqAfLZXn1tw2AaSIJ_8,14475
 pymax/types/domain/name.py,sha256=qMIshIqgWkVuROxmiCRhwfJf8XtmhSBoEU6nXs_gEh0,523
 pymax/types/domain/presence.py,sha256=NdI2wHLxc3UOSUyTallGb6Cw4xRlh6DniW2ee-aZdWI,466
 pymax/types/domain/profile.py,sha256=taN5PjlKp4EDypVhDx89vmBDpSKh-kT-ISpu1tR2cY8,471
 pymax/types/domain/session.py,sha256=T0b0qjI65kNQOCgx3nIkaIqynD4eGKyqnscbIlPFVnQ,2002
 pymax/types/domain/sync.py,sha256=3hNN2Dwle-rD7YxJW00n5GPR6vmLdhW5GhiJsaC9ekc,3498
 pymax/types/domain/user.py,sha256=NjJfQtkRBrsmB-JGg2nsXWLvgqu3q5YKx2BALkoDrOI,5120
-pymax/types/domain/attachments/__init__.py,sha256=7QS5881emGVJ4YBMxHkzxYWWwRjPH9-VKWu9xzGnr8s,432
-pymax/types/domain/attachments/audio.py,sha256=X_GR68yDCDqRlLcO4qtZPQigfmQfkRFb9OF-TZgoDkw,1075
+pymax/types/domain/attachments/__init__.py,sha256=ZVSb7sSAwabSB8A8BWF_JbooPOMIP1r6gF_NUASgGGk,471
+pymax/types/domain/attachments/audio.py,sha256=I_Qq1qQ9bXsEzWwxEbQbkiY8CEjSKqGqinDFYY_5DY8,1117
 pymax/types/domain/attachments/call.py,sha256=RV-BFutymZFinzUiRdaIryqx6ubku2v6y6brc-qsHOQ,818
 pymax/types/domain/attachments/contact.py,sha256=EO-B0klgUMITL05fBgFXi99i8VzxBj3D2pLB0JBWy_M,996
 pymax/types/domain/attachments/control.py,sha256=1Zr0pM1ODZgYRX3CDw7yGzqEgb6R_JjRSQOSI_FDpDE,502
-pymax/types/domain/attachments/enums.py,sha256=O55YcZtpuTxu2i3MLXh0-rbwNltOkzEj9F9hygfi_hc,619
+pymax/types/domain/attachments/enums.py,sha256=JYX5xoefm0BmRqVjOZs0-xQpI9bddphps_wZX34tK14,643
 pymax/types/domain/attachments/file.py,sha256=3lqsPIkg75-AmcaEbXwc1eiQHIv9JpWzMc0z4u2MupE,1595
 pymax/types/domain/attachments/photo.py,sha256=8q79OuQ0V8t-s9pZM8ClAmgJI71m-bgES4Bd5ZSNVI0,1413
 pymax/types/domain/attachments/share.py,sha256=BHJIVjTC99wfbUn8wSN4j0aSNlEpojzv87uwbmhPPt0,924
 pymax/types/domain/attachments/sticker.py,sha256=2CFqoUAuUjA6nclRXZUCBO2mKZd24BaBY3wz2XoR7kE,1530
-pymax/types/domain/attachments/video.py,sha256=Jdh0ZKC6R2crbQUD8LEhMnNDYIM_gCoxDazMA_DjVNU,2888
+pymax/types/domain/attachments/unknown.py,sha256=4VTLLcZJJA3QS81z_yZhlSLJW4wQLQ5YkJDwzQ9Tjyw,947
+pymax/types/domain/attachments/video.py,sha256=82stz0MYkypJOP0JAwNGPEV783ODMJabYxRzTqGxmuE,2909
 pymax/types/domain/attachments/keyboards/__init__.py,sha256=1X5UGBe5E_DO7e4p8_JmJEocHLzXOezutieRuQsVpRA,45
 pymax/types/domain/attachments/keyboards/inline.py,sha256=3RNubcqx7RZ1f6zfJ7JaNFCPx5mnmJ5vYsL1i7lSMAM,577
 pymax/types/events/__init__.py,sha256=fNLP_8zYRsew2k-1s8wXCJeSPm8QQ4gmiZ86B51SuCw,112
 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.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.3.dist-info/METADATA,sha256=S790dHMIPc8eOIwrWMzw0pTllSB_Sxc4lR2BMrnHotM,7637
+maxapi_python-2.1.3.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+maxapi_python-2.1.3.dist-info/licenses/LICENSE,sha256=hOR249ItqMdcly1A0amqEWRNRTq4Gv5NJtmQ3A5qK4E,1070
+maxapi_python-2.1.3.dist-info/RECORD,,

pymax/__init__.py

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

pymax/app.py

@@ -49,6 +49,7 @@ class App(Generic[ClientT]):
         self._telemetry = TelemetryService(self) if config.telemetry else None
 
         self.connection.on_event = self.on_event
+        self.connection.on_close = self.on_connection_lost
         logger.debug(
             "app initialized session=%s work_dir=%s auth_flow=%s",
             config.session_name,
@@ -174,6 +175,7 @@ class App(Generic[ClientT]):
         await self.dispatcher.stop_startup_tasks()
         await self.connection.close()
         await self.store.close()
+
         self.started = False
 
     async def invoke(
@@ -203,9 +205,7 @@ class App(Generic[ClientT]):
             payload_keys,
         )
         logger.debug("Request data=%s", frame.model_dump())
-        request_timeout = (
-            self.config.request_timeout if timeout is None else timeout
-        )
+        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(
@@ -231,9 +231,23 @@ class App(Generic[ClientT]):
         except asyncio.CancelledError:
             raise
         except Exception as e:
-            logger.exception("ping loop failed; closing transport")
+            logger.warning("ping loop failed; closing transport: %s", e)
             await self.connection.fail(ConnectionError(f"Ping failed: {e}"))
 
+    def on_connection_lost(self, exc: Exception | None = None) -> None:
+        if self.started:
+            logger.warning("connection lost; marking app as stopped: %s", exc)
+
+        self.started = False
+
+        task = self._ping_task
+        if task is None or task.done():
+            return
+
+        current_task = asyncio.current_task()
+        if task is not current_task:
+            task.cancel()
+
     def _build_api_error(self, response: InboundFrame) -> ApiError:
         try:
             error = MaxApiError.model_validate(response.payload)

pymax/client.py

@@ -66,10 +66,7 @@ class Client(BaseClient["Client"]):
 
         self._config = self._build_config(
             phone=phone,
-            user_agent=(
-                self.extra_config.user_agent
-                or self.extra_config.generate_user_agent()
-            ),
+            user_agent=(self.extra_config.user_agent or self.extra_config.generate_user_agent()),
         )
 
         if auth_flow is None:

pymax/connection/connection.py

@@ -20,16 +20,19 @@ class ConnectionManager:
         transport: Transport,
         protocol: BaseProtocol,
         on_event: Callable[[InboundFrame], Awaitable[None]] | None = None,
+        on_close: Callable[[Exception | None], None] | None = None,
     ) -> None:
         self.reader = reader
         self.transport = transport
         self.protocol = protocol
         self.on_event = on_event
+        self.on_close = on_close
 
         self.requests = PendingRequests()
 
         self._is_open = False
         self._connection_lost = False
+        self._close_reported = False
         self._seq = -1
 
         self._recv_task: asyncio.Task[None] | None = None
@@ -44,6 +47,7 @@ class ConnectionManager:
         await self.transport.connect()
         self._is_open = True
         self._connection_lost = False
+        self._close_reported = False
 
         self._recv_task = asyncio.create_task(self._recv_loop())
         logger.debug("receive loop started")
@@ -80,7 +84,7 @@ class ConnectionManager:
         self._connection_lost = True
         self.requests.cancel_all(exc=exc)
         await self.transport.close()
-        self._is_open = False
+        self._mark_closed(exc)
 
     async def send(self, frame: OutboundFrame) -> None:
         if not self._is_open:
@@ -116,20 +120,38 @@ class ConnectionManager:
             )
             await self.transport.send(raw)
             return await asyncio.wait_for(future, timeout)
-        except Exception as e:
+        except asyncio.CancelledError:
+            self.requests.discard(frame.seq)
+            raise
+        except (ConnectionError, EOFError, OSError, TimeoutError) as e:
+            logger.warning(
+                "request failed seq=%s opcode=%s error=%s",
+                frame.seq,
+                frame.opcode,
+                e,
+            )
+            self.requests.discard(frame.seq)
+            raise
+        except Exception:
             logger.exception(
                 "request failed seq=%s opcode=%s",
                 frame.seq,
                 frame.opcode,
             )
-            self.requests.reject(frame.seq, e)
+            self.requests.discard(frame.seq)
             raise
 
     async def wait_closed(self) -> None:
         if not self._recv_task:
             return
 
-        await self._recv_task
+        try:
+            await self._recv_task
+        except Exception as e:
+            if self._connection_lost:
+                raise ConnectionError("Connection lost") from e
+            raise
+
         if self._connection_lost:
             raise ConnectionError("Connection lost")
 
@@ -147,27 +169,23 @@ class ConnectionManager:
                 await self._handle_inbound(model)
 
         except EOFError:
+            exc = ConnectionError("Connection closed by the server")
             logger.warning("connection closed by server")
-            self.requests.cancel_all(
-                exc=ConnectionError("Connection closed by the server")
-            )
+            self.requests.cancel_all(exc=exc)
             self._connection_lost = True
-            self._is_open = False
-        except TimeoutError as e:
-            logger.exception("connection timed out")
-            self.requests.cancel_all(
-                exc=ConnectionError("Connection timed out")
-            )
+            self._mark_closed(exc)
+        except (ConnectionError, OSError, TimeoutError) as e:
+            exc = ConnectionError(f"Connection error: {e}")
+            logger.warning("connection closed while reading payload: %s", e)
+            self.requests.cancel_all(exc=exc)
             self._connection_lost = True
-            self._is_open = False
-            raise e
+            self._mark_closed(exc)
         except Exception as e:
+            exc = ConnectionError(f"Connection error: {e}")
             logger.exception("connection receive loop failed")
-            self.requests.cancel_all(
-                exc=ConnectionError(f"Connection error: {e}")
-            )
+            self.requests.cancel_all(exc=exc)
             self._connection_lost = True
-            self._is_open = False
+            self._mark_closed(exc)
             raise e
 
     async def _handle_inbound(self, frame: InboundFrame) -> None:
@@ -210,6 +228,15 @@ class ConnectionManager:
         self._seq = (self._seq + 1) % 0x10000
         return self._seq
 
+    def _mark_closed(self, exc: Exception | None = None) -> None:
+        self._is_open = False
+        if self._close_reported:
+            return
+
+        self._close_reported = True
+        if self.on_close:
+            self.on_close(exc)
+
     @property
     def is_open(self) -> bool:
         return self._is_open

pymax/files/photo.py

@@ -1,6 +1,7 @@
 import mimetypes
 from collections.abc import AsyncGenerator
 from pathlib import Path
+from urllib.parse import urlsplit
 
 from .base import BaseFile
 from .static import ALLOWED_EXTENSIONS
@@ -66,12 +67,13 @@ class Photo(BaseFile):
                 raise ValueError(msg)
             return (extension[1:], ("image/" + extension[1:]).lower())
         if self.url:
-            extension = Path(self.url).suffix.lower()
+            url_path = urlsplit(self.url).path
+            extension = Path(url_path).suffix.lower()
             if extension not in ALLOWED_EXTENSIONS:
                 msg = f"Invalid photo extension: {extension}. Allowed: {ALLOWED_EXTENSIONS}"
                 raise ValueError(msg)
 
-            mime_type = mimetypes.guess_type(self.url)[0]
+            mime_type = mimetypes.guess_type(url_path)[0]
 
             if not mime_type or not mime_type.startswith("image/"):
                 msg = f"URL does not appear to be an image: {self.url}"

pymax/logging.py

@@ -4,6 +4,7 @@ import sys
 from typing import TextIO
 
 DATE_FORMAT = "%H:%M:%S"
+PYMAX_HANDLER_ATTR = "_pymax_pretty_handler"
 
 RESET = "\x1b[0m"
 DIM = "\x1b[2m"
@@ -56,17 +57,22 @@ def configure_logging(
     *,
     stream: TextIO | None = None,
     use_colors: bool | None = None,
+    force: bool = False,
 ) -> None:
     """Настраивает pretty-логи для logger-а ``pymax``.
 
     Обычно уровень логов задают через ``ExtraConfig(log_level="DEBUG")``.
-    Вызывайте эту функцию вручную, если хотите управлять stream или цветами.
+    PyMax ставит свой handler только если приложение еще не настроило logging.
+    Вызывайте эту функцию с ``force=True``, если хотите принудительно включить
+    pretty-логи PyMax.
 
     Args:
         level: Уровень логирования: строка вроде ``"DEBUG"`` или число из
             модуля ``logging``.
         stream: Поток для вывода. По умолчанию ``sys.stderr``.
         use_colors: Включить ANSI-цвета. Если ``None``, определяется по TTY.
+        force: Заменить существующие handler-ы logger-а ``pymax`` на pretty
+            handler PyMax.
 
     Returns:
         ``None``.
@@ -84,17 +90,25 @@ def configure_logging(
         use_colors = hasattr(stream, "isatty") and stream.isatty()
 
     logger = logging.getLogger("pymax")
+    level_value = _normalize_level(level)
+    logger.setLevel(level_value)
+
+    if not force and _logging_already_configured(logger):
+        if logging.getLogger().handlers and not _has_non_null_handlers(logger):
+            logger.propagate = True
+        return
+
     logger.handlers.clear()
-    logger.setLevel(_normalize_level(level))
     logger.propagate = False
 
     handler = logging.StreamHandler(stream)
-    handler.setLevel(_normalize_level(level))
+    handler.setLevel(level_value)
     handler.setFormatter(
         PrettyFormatter(
             use_colors=use_colors,
         )
     )
+    setattr(handler, PYMAX_HANDLER_ATTR, True)
 
     logger.addHandler(handler)
 
@@ -126,4 +140,20 @@ def _strip_ansi(text: str) -> str:
     return re.sub(r"\x1b\[[0-9;]*m", "", text)
 
 
+def _logging_already_configured(logger: logging.Logger) -> bool:
+    return bool(logging.getLogger().handlers or _has_external_handlers(logger))
+
+
+def _has_non_null_handlers(logger: logging.Logger) -> bool:
+    return any(not isinstance(handler, logging.NullHandler) for handler in logger.handlers)
+
+
+def _has_external_handlers(logger: logging.Logger) -> bool:
+    return any(
+        not isinstance(handler, logging.NullHandler)
+        and not getattr(handler, PYMAX_HANDLER_ATTR, False)
+        for handler in logger.handlers
+    )
+
+
 logging.getLogger("pymax").addHandler(logging.NullHandler())

pymax/protocol/tcp/payload.py

@@ -15,10 +15,7 @@ class MsgpackPayloadCodec:
         if isinstance(value, Enum):
             return value.value
         if isinstance(value, dict):
-            return {
-                self._to_msgpack_value(k): self._to_msgpack_value(v)
-                for k, v in value.items()
-            }
+            return {self._to_msgpack_value(k): self._to_msgpack_value(v) for k, v in value.items()}
         if isinstance(value, list):
             return [self._to_msgpack_value(item) for item in value]
         if isinstance(value, tuple):
@@ -28,56 +25,42 @@ class MsgpackPayloadCodec:
     def encode(self, payload: object) -> bytes:
         if payload is None:
             return b""
-        return (
-            msgpack.packb(self._to_msgpack_value(payload), use_bin_type=True)
-            or b""
-        )
+        return msgpack.packb(self._to_msgpack_value(payload), use_bin_type=True) or b""
 
-    def _unpack_stream(self, payload_bytes: bytes, *, raw: bool) -> list[Any]:
+    def _unpack_stream(
+        self, payload_bytes: bytes, *, raw: bool
+    ) -> list[Any]:  # TODO: deprecate? idk
         unpacker = msgpack.Unpacker(raw=raw, strict_map_key=False)
         unpacker.feed(payload_bytes)
         return list(unpacker)
 
-    def decode(self, payload_bytes: bytes) -> dict[Any, Any]:
+    def decode(self, payload_bytes: bytes) -> Any:
         if not payload_bytes:
             return {}
 
         try:
             return msgpack.unpackb(
-                payload_bytes, raw=False, strict_map_key=False
+                payload_bytes,
+                raw=False,
+                strict_map_key=False,
             )
-        except msgpack.exceptions.ExtraData as e:
-            if isinstance(e.unpacked, dict):
-                logger.debug(
-                    "msgpack payload has trailing data unpacked_type=%s extra_bytes=%s extra_head=%s",
-                    type(e.unpacked).__name__,
-                    len(e.extra),
-                    e.extra[:16].hex(),
-                )
-                return e.unpacked
 
-            try:
-                values = self._unpack_stream(payload_bytes, raw=False)
-            except UnicodeDecodeError:
-                values = self._unpack_stream(payload_bytes, raw=True)
+        except msgpack.exceptions.ExtraData as e:
             logger.debug(
-                "msgpack payload has extra data objects=%s extra_bytes=%s",
-                [type(value).__name__ for value in values],
+                "msgpack extra data: unpacked_type=%s extra_len=%s extra_head=%s payload_head=%s",
+                type(e.unpacked).__name__,
                 len(e.extra),
+                e.extra[:64].hex(),
+                payload_bytes[:128].hex(),
             )
-            for value in values:
-                if isinstance(value, dict):
-                    return value
-            raise
-        except UnicodeDecodeError:
-            values = self._unpack_stream(payload_bytes, raw=True)
-            logger.debug(
-                "msgpack payload decoded with raw bytes objects=%s",
-                [type(value).__name__ for value in values],
+            return e.unpacked
+
+        except Exception:
+            logger.exception(
+                "msgpack decode failed: payload_len=%s payload_head=%s",
+                len(payload_bytes),
+                payload_bytes[:128].hex(),
             )
-            for value in values:
-                if isinstance(value, dict):
-                    return value
             raise
 
 
@@ -93,10 +76,7 @@ class TcpPayloadDecoder:
 
     def _normalize_keys(self, obj: Any) -> Any:
         if isinstance(obj, dict):
-            return {
-                self._normalize_key(k): self._normalize_keys(v)
-                for k, v in obj.items()
-            }
+            return {self._normalize_key(k): self._normalize_keys(v) for k, v in obj.items()}
         if isinstance(obj, list):
             return [self._normalize_keys(item) for item in obj]
         if isinstance(obj, tuple):

pymax/protocol/tcp/protocol.py

@@ -25,11 +25,7 @@ class TcpProtocol(BaseProtocol):
         )
 
     def encode(self, frame: OutboundFrame) -> bytes:
-        payload_bytes = (
-            self.serializer.encode(frame.payload)
-            if frame.payload is not None
-            else b""
-        )
+        payload_bytes = self.serializer.encode(frame.payload) if frame.payload is not None else b""
 
         flags = 0
 
@@ -52,9 +48,7 @@ class TcpProtocol(BaseProtocol):
 
         packed_packet = self.framer.unpack(raw)
         if not packed_packet:
-            return InboundFrame(
-                opcode=0, cmd=0, seq=None, payload=None, raw=None
-            )
+            return InboundFrame(opcode=0, cmd=0, seq=None, payload=None, raw=None)
 
         logger.debug(
             "tcp frame decoded header ver=%s cmd=%s seq=%s opcode=%s flags=%s payload_len=%s",

pymax/types/domain/attachments/__init__.py

@@ -8,4 +8,5 @@ from .keyboards import InlineKeyboardAttachment
 from .photo import PhotoAttachment
 from .share import ShareAttachment
 from .sticker import StickerAttachment
+from .unknown import UnknownAttachment
 from .video import VideoAttachment, VideoRequest

pymax/types/domain/attachments/audio.py

@@ -11,9 +11,9 @@ class AudioAttachment(CamelModel):
     """Аудио-вложение сообщения.
 
     :ivar duration: Длительность аудио.
-    :vartype duration: int
+    :vartype duration: int | None
     :ivar audio_id: ID аудио.
-    :vartype audio_id: int
+    :vartype audio_id: int | None
     :ivar wave: Данные waveform.
     :vartype wave: str | None
     :ivar transcription_status: Статус транскрибации.
@@ -26,8 +26,8 @@ class AudioAttachment(CamelModel):
     :vartype token: str | None
     """
 
-    duration: int
-    audio_id: int
+    duration: int | None = None
+    audio_id: int | None = None
     wave: str | None = None
     transcription_status: TranscriptionStatus | None = None
     url: str | None = None

pymax/types/domain/attachments/enums.py

@@ -14,6 +14,7 @@ class AttachmentType(str, Enum):
     CALL = "CALL"
     SHARE = "SHARE"
     INLINE_KEYBOARD = "INLINE_KEYBOARD"
+    UNKNOWN = "UNKNOWN"
 
 
 class TranscriptionStatus(str, Enum):

pymax/types/domain/attachments/unknown.py

@@ -0,0 +1,37 @@
+from typing import Any
+
+from pydantic import Field, model_validator
+
+from pymax.types.domain.base import CamelModel
+
+from .enums import AttachmentType
+
+KNOWN_ATTACHMENT_TYPES = {
+    attachment_type.value
+    for attachment_type in AttachmentType
+    if attachment_type != AttachmentType.UNKNOWN
+}
+
+
+class UnknownAttachment(CamelModel):
+    """Вложение неизвестного типа.
+
+    :ivar type: Тип вложения.
+    :vartype type: str
+    """
+
+    type: str = Field(alias="_type")
+
+    @model_validator(mode="before")
+    @classmethod
+    def reject_known_attachment_type(cls, value: Any) -> Any:
+        if not isinstance(value, dict):
+            return value
+
+        attachment_type = value.get("_type", value.get("type"))
+        if attachment_type in KNOWN_ATTACHMENT_TYPES:
+            raise ValueError(
+                "Known attachment type should be parsed by its own model"
+            )
+
+        return value

pymax/types/domain/attachments/video.py

@@ -31,7 +31,7 @@ class VideoAttachment(CamelModel):
     :ivar video_id: ID видео.
     :vartype video_id: int
     :ivar duration: Длительность видео.
-    :vartype duration: int
+    :vartype duration: int | None
     :ivar preview_data: Данные превью.
     :vartype preview_data: bytes
     :ivar type: Тип вложения.
@@ -47,7 +47,7 @@ class VideoAttachment(CamelModel):
     height: int
     width: int
     video_id: int
-    duration: int
+    duration: int | None = None
     preview_data: bytes
     type: Literal[AttachmentType.VIDEO] = Field(alias="_type")
     thumbnail: str

pymax/types/domain/element.py

@@ -4,7 +4,7 @@ from .base import CamelModel
 
 
 class ElementAttributes(CamelModel):
-    url: str
+    url: str | None = None
 
 
 class Element(CamelModel):
@@ -15,10 +15,10 @@ class Element(CamelModel):
     :ivar from_: Начальная позиция элемента.
     :vartype from_: int | None
     :ivar length: Длина элемента.
-    :vartype length: int
+    :vartype length: int | None
     """
 
     type: str
     from_: int | None = Field(serialization_alias="from", default=None)
-    length: int
+    length: int | None = None
     attributes: ElementAttributes | None = None

pymax/types/domain/message.py

@@ -15,6 +15,7 @@ from pymax.types.domain import (
     PhotoAttachment,
     ShareAttachment,
     StickerAttachment,
+    UnknownAttachment,
     VideoAttachment,
 )
 
@@ -26,7 +27,7 @@ if TYPE_CHECKING:
     from pymax.api.messages.service import MessageService
 
 
-Attachment: TypeAlias = Annotated[
+KnownAttachment: TypeAlias = Annotated[
     PhotoAttachment
     | VideoAttachment
     | FileAttachment
@@ -39,6 +40,7 @@ Attachment: TypeAlias = Annotated[
     | CallAttachment,
     Field(discriminator="type"),
 ]
+Attachment: TypeAlias = KnownAttachment | UnknownAttachment
 SendAttachment: TypeAlias = Photo | File | Video
 SendAttachments: TypeAlias = list[SendAttachment] | None