maxapi-python 2.2.0__py3-none-any.whl → 2.3.0__py3-none-any.whl

{maxapi_python-2.2.0.dist-info → maxapi_python-2.3.0.dist-info}/METADATA

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

{maxapi_python-2.2.0.dist-info → maxapi_python-2.3.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-pymax/__init__.py,sha256=57UYiquQpEkanZR7Y4wQTzYnfd9KyvZTsNxDKb6dM9g,1500
-pymax/app.py,sha256=3OwH2pT4Wv-ocAhEFZNo2DleZRnC8VNUmQQprRGAG58,10265
-pymax/base.py,sha256=23kcR8rFjxfAqDJhOaxyOpS-TQrOSpLQlldzmx21sD0,8679
+pymax/__init__.py,sha256=xPT-McHyAWLyFFEbepaDbmT65hBkHiQUPD3u-jOdFgY,1500
+pymax/app.py,sha256=QQldPh1YYpFeKBOMfCQZA0BFW5bUQQO7hFBYtwpioZQ,10847
+pymax/base.py,sha256=--6VwKUvqlocFAUbPWn_CfXQ-8CYfyCigXQ70ipXOgI,10500
 pymax/client.py,sha256=ePDxR6wEeHJbk23wI_PkOVFQuyy5tQyckV-OmKEwz5U,3985
 pymax/client_web.py,sha256=VASqNmMvAfdpIaR6cpdtjv3UN4GoqWkiDOXdn7QmZQ0,3025
 pymax/config.py,sha256=1dttAfxjcuWVrr939iYLDowQknvl_eOhNpJP8ugnWTg,10047
@@ -23,12 +23,12 @@ pymax/api/bots/payloads.py,sha256=aXriolCN_YvBvDZO_MPmD-fkrIVJIpVDXkOkOZVes_c,16
 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
-pymax/api/chats/service.py,sha256=l6yReFxIj9Pfn96wOW3n60MRHRp4rq9nM569fs2gfvU,11535
+pymax/api/chats/payloads.py,sha256=qA46Q984FgHaXenPmvtotm7ZJOKM07aiP7dBYF_0gqQ,2930
+pymax/api/chats/service.py,sha256=jNQUlSdILR5afeTYFQmQ6mvx-rgQlWjhzmOWUA0vDcg,12064
 pymax/api/messages/__init__.py,sha256=fw_uF6tgSbkxvqaSVE65wU0KWsu47u1CtR0Y4BbD-K0,36
 pymax/api/messages/enums.py,sha256=tp5S2Q97a-FILcqpRhQiIRKdj0P_KSEBiCqWmb05dHs,368
 pymax/api/messages/payloads.py,sha256=wqseGNfqWYKeoRJhdzrRV855IboChaYU1dJLPGZg71I,2257
-pymax/api/messages/service.py,sha256=Zur05Rklq2LrssIWLE5tThAXPXK9b7MsvFW8BklSoHU,12422
+pymax/api/messages/service.py,sha256=61reqCHswh7QiP3KvofEeo_96CylozWaoPaqik2iDSI,12117
 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
@@ -43,8 +43,8 @@ pymax/api/uploads/payloads.py,sha256=OqsfFJIRe2io7mltHPbDPORT8U5t27H6pvqrdNKPRHY
 pymax/api/uploads/service.py,sha256=83VrmMGZG4QPnKfSdVrWoIOvER4CvegrbZ2ddxmGsq8,18551
 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
-pymax/api/users/service.py,sha256=q-juReMH8Fz5a4eOEvxkpIknRHiKrlowRSByeB9nrkQ,4144
+pymax/api/users/payloads.py,sha256=mWrbhu3KzrsxmBdRQU3bG8W46vtFq_Kdfb2YA7_QkNI,876
+pymax/api/users/service.py,sha256=ndYv60kKkqZPnFOgvfau2LAjgOf-NsLQ7P4xxoWBAr4,4663
 pymax/auth/__init__.py,sha256=KgghKg0CPcJzX_D14TvxuDzhNmoVoFGjv414NouJVgk,512
 pymax/auth/base.py,sha256=v492FMUmSKft6oJRmCdIr33sy50Z0kqBwu5t7cVLQe4,1222
 pymax/auth/email.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -60,12 +60,12 @@ pymax/connection/readers/__init__.py,sha256=9g5ZbcWiHxW1kAi2ckiNqejoGHwoDwFd4Wvt
 pymax/connection/readers/base.py,sha256=FlvyMUFoZ4FORAh0vBU6_I0BnrQ9_1twpUIKz-Vkj58,126
 pymax/connection/readers/tcp.py,sha256=62nqlllE0gjQQQYVfjBt0arAJ8tEHH_SMZOOjtXNYdw,1073
 pymax/connection/readers/ws.py,sha256=IjeH5CoXvBWde46tZLx6uKONkjhCU6NeC79x3Swfw8E,368
-pymax/dispatch/__init__.py,sha256=bvHjlw2ltujMAiegW-Sv2fSGKUnkmtPcYINUZ-Ty8qo,189
-pymax/dispatch/dispatcher.py,sha256=OPEyFKLYfUs2xRjjNH_EvMCMJYLhJaPu5szZwEFATgk,7865
-pymax/dispatch/enums.py,sha256=_gPWDdBpCCgkfRcAqz-zIMptavV7SRxArpRtW3MudPA,420
+pymax/dispatch/__init__.py,sha256=Big4ZqRSP4fzNAKc5mISkqQbWcYhjYMfg7UtHHCGZJw,376
+pymax/dispatch/dispatcher.py,sha256=xk_8ZbJRoRUOTPg5idlZPCAAZ_kOBbrrcT2LuI57SdE,11782
+pymax/dispatch/enums.py,sha256=LxX6tCxkB7mNnHr3AydKX-s-iZ8_bjoMl8IxhC7gdhQ,446
 pymax/dispatch/mapping.py,sha256=wO9BPl3meCWE7AA0XdC0iGt-4zuGVozcCqnleCTFdI0,3303
 pymax/dispatch/resolvers.py,sha256=FZvjYxQwy5CnTl6QwdfRRodK9cGrAn6MuXTZqcsJkPE,1987
-pymax/dispatch/router.py,sha256=thwbOgulhgFpgdP76r5ZAttGNLo3FKaXIGNWQmCrWSg,7967
+pymax/dispatch/router.py,sha256=0dwXCR7TgAGNiq9oryXIuyAsJ15DJ3OMt9hrRenUBio,10453
 pymax/files/__init__.py,sha256=TR0N6YXX4IHBsXQo8uiK68C-Xg3LSj48d4Zsv71CWZE,126
 pymax/files/base.py,sha256=0aksCGxmrvqEKJdhRWcuPZJfEn7RWcl5tn5gn63q1os,2689
 pymax/files/file.py,sha256=JSkuKx0fdGxzcsyMajWTosFzTlfgZYvQbh-RDp9OZyQ,2337
@@ -78,11 +78,11 @@ pymax/infra/__init__.py,sha256=lKq6cehhB87HltV53TD0kr0p7ekWlZlrKTpaYiq0XFw,28
 pymax/infra/auth.py,sha256=YuYH_NWNz8UfPyko6bv_cIzXDIvFeivDrxZCIpGoANU,3648
 pymax/infra/base.py,sha256=sOo40Qkp14bE6CxVKppJhy3e0F5VhFPhnL3iBs8y5dA,368
 pymax/infra/bots.py,sha256=IJs4ErFxjbMeiHfQgpDiDhtEu9ws-lIp8fb8I96szy8,1202
-pymax/infra/chat.py,sha256=tMyzCEhOWmGqMXRLmV0_jPrKQXyowkHxzUwyVEdlztc,13134
-pymax/infra/message.py,sha256=pZga2B_PUoQMGhJuGRbtvU7XUpOeibjDvFPbJptn1Fk,10886
+pymax/infra/chat.py,sha256=Jb5kzUnHtCg98glS4Jf-WEHIzZg4oIcS-MA8aGeJuKk,13884
+pymax/infra/message.py,sha256=RW5LwaLDwekKNC_8s-12TM1PbCmXyFD_l5muAvX_rLg,10701
 pymax/infra/protocol.py,sha256=I2WrAeAgATuNSdK2gvHU-MhhxdRBfSMGMovF5HPFsQw,208
 pymax/infra/self.py,sha256=h2GnzcCF2-FeY9-qBjtHjrSCx7elc4RjuCXPaewDkgg,4828
-pymax/infra/user.py,sha256=nv9jkWpWvCWETHZsyUMmm5FWkzLTJT2SHXZ7SglZE8M,4331
+pymax/infra/user.py,sha256=wy6lElmJx7Ypjkk48kDrlLiL3V3p7pzO2MevsgCNy1k,4801
 pymax/protocol/__init__.py,sha256=rDn1Twi1iBDUk1155YI9jyeQyaGVDRuPoWdlaaLZnsw,242
 pymax/protocol/base.py,sha256=_bisk1BU_GSMSPIqfnizSCgm_qBrdbB5cJw6foAa2tc,294
 pymax/protocol/enums.py,sha256=9y4kn9y2pKinaT_twdeW5MXVH3O-sJF6h0v5KbC9VkA,4376
@@ -97,7 +97,7 @@ pymax/protocol/ws/protocol.py,sha256=z6zzBQTlJfzwOmLsJYoYQ2L1AYpY5wYMJyPir_zfNBQ
 pymax/session/__init__.py,sha256=natjnLjPjTvkfvSYtoiPxzmU44XJi0MpjWiOPD-On4g,100
 pymax/session/models.py,sha256=jvnTHfjCX1p5TcANfWZ0vUJlciuqumatwdrgYiKm4kY,250
 pymax/session/protocol.py,sha256=8ibp-HiaJaGmx23v7GeL0GFsvLPZZqWOuIOJnanqoCM,612
-pymax/session/store.py,sha256=FkhrG0J2ueU2Z4PxJQxFPOcunKnpVavnAaJgPb2bx-E,7770
+pymax/session/store.py,sha256=xzUpLuS8OpcYNB1lNvUwzOJIcsGz516_aOXBh2jIWT4,8087
 pymax/telemetry/__init__.py,sha256=6mP5y-iTbVIlqpSWIKWCTz2fFNBwkAEYwS4PFbyv9xM,71
 pymax/telemetry/navigation.py,sha256=vlP7d863s9aIBpt9SPpjEbTXLoq3uqpuhD-VWj0w9hI,5441
 pymax/telemetry/payloads.py,sha256=MCKYGpQ4Tvx_8LH86Et0yevea2Th2z3b7a9pfmrQRys,3959
@@ -107,24 +107,24 @@ pymax/transport/base.py,sha256=0D3srQ36F0s23pIjqd6YzRGKK9wCmXKr3wfe2XYYlos,448
 pymax/transport/tcp.py,sha256=Nl-voifBze4TGB25xjf93XxU77zvFL8rsPCjBpXYd_4,3083
 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
+pymax/types/domain/__init__.py,sha256=tdC1Vs4lH-oqDrSXS_Oc5JlnJC7RTJ2I3B63EVfiLiI,483
 pymax/types/domain/auth.py,sha256=RmEXFS7TAgtFhnfXaiJH5XDb__2MUVgQ_Noavo9hFRY,6019
 pymax/types/domain/base.py,sha256=Q32PcKR3gtrISySowR3zPyl9KeQCoUL6lfyTR3ulMzo,623
 pymax/types/domain/bots.py,sha256=dErZZbvspznU6yUupzCs4R55pEWgoeps7NEhZFrb-Uo,333
-pymax/types/domain/chat.py,sha256=QYuE0jN7wKpjJm3BfDY8KHO_S-4XPN5FRQrtWEZjmkk,19781
+pymax/types/domain/chat.py,sha256=mkee157TESCqxC_1NXveHLFLxtLOT7up22IvBnN__2o,20547
 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=UF88nXBTubAKKQKP4qR_qtHOMS8uRdXCCTm8jtsu0wA,15678
+pymax/types/domain/message.py,sha256=2klOqUolng2NUjO3zxhmv-Mq55X6EhoBV3NO5oywkEE,15503
 pymax/types/domain/name.py,sha256=qMIshIqgWkVuROxmiCRhwfJf8XtmhSBoEU6nXs_gEh0,523
 pymax/types/domain/presence.py,sha256=lKvkK0uYwY0gTSEEkaVdI-tEpWjxLOtH7gp2dy5Uh-0,534
 pymax/types/domain/profile.py,sha256=taN5PjlKp4EDypVhDx89vmBDpSKh-kT-ISpu1tR2cY8,471
 pymax/types/domain/session.py,sha256=T0b0qjI65kNQOCgx3nIkaIqynD4eGKyqnscbIlPFVnQ,2002
 pymax/types/domain/sync.py,sha256=lBDWo4ACLq2ov5XBccfnI8s_dsGEA7O4mIJVBSUpyrc,3248
-pymax/types/domain/user.py,sha256=NjJfQtkRBrsmB-JGg2nsXWLvgqu3q5YKx2BALkoDrOI,5120
+pymax/types/domain/user.py,sha256=dh9NNPQuvIT74W-2URkFfylSWmo8VkfdHsO4_AqDzsQ,5337
 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
@@ -147,7 +147,7 @@ pymax/types/events/presence.py,sha256=77Cy352CdfIkbH6ZfLijHffF8gcMz-AZk5OCeESQeD
 pymax/types/events/reaction.py,sha256=7kauScAH8O-K79xS6Q3b6Vi0KwRl4lGCKGeAMAH9sEU,672
 pymax/types/events/typing.py,sha256=vDMgqYE0jz8dN2YfqsNaJLB8k7pMd6kaDEdR_KrLk5g,376
 pymax/types/events/video.py,sha256=swBHYadmDS0SjLXGqVqRYsuMoVZ6MjD2aYR2fbM-AJc,104
-maxapi_python-2.2.0.dist-info/METADATA,sha256=TU_EpqMK4HYj7DC-m9UbjhUeDSq2n0WsomqomY5wbD4,7276
-maxapi_python-2.2.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-maxapi_python-2.2.0.dist-info/licenses/LICENSE,sha256=hOR249ItqMdcly1A0amqEWRNRTq4Gv5NJtmQ3A5qK4E,1070
-maxapi_python-2.2.0.dist-info/RECORD,,
+maxapi_python-2.3.0.dist-info/METADATA,sha256=2OJj5PZgaKs9M_5UOLdtC0z9MdVWbASx5jx5XWMB5Kw,7276
+maxapi_python-2.3.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+maxapi_python-2.3.0.dist-info/licenses/LICENSE,sha256=hOR249ItqMdcly1A0amqEWRNRTq4Gv5NJtmQ3A5qK4E,1070
+maxapi_python-2.3.0.dist-info/RECORD,,

pymax/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2.0"
+__version__ = "2.3.0"
 
 
 from .auth import (

pymax/api/chats/payloads.py

@@ -115,3 +115,9 @@ class JoinRequestActionPayload(CamelModel):
     type: str = "JOIN_REQUEST"  # TODO: ENUMM!!!
     show_history: bool | None = True
     operation: ChatMemberOperation
+
+
+class DeleteChatPayload(CamelModel):
+    chat_id: int
+    last_event_time: int
+    for_all: bool = True

pymax/api/chats/service.py

@@ -23,6 +23,7 @@ from .payloads import (
     CreateGroupAttach,
     CreateGroupMessage,
     CreateGroupPayload,
+    DeleteChatPayload,
     FetchChatsPayload,
     FetchJoinRequests,
     GetChatInfoPayload,
@@ -362,3 +363,20 @@ class ChatService:
             chat_id=chat_id,
             user_ids=[user_id],
         )
+
+    async def delete_chat(
+        self,
+        chat_id: int,
+        last_event_time: int | None = None,
+        for_all: bool = True,
+    ) -> None:
+        frame = DeleteChatPayload(
+            chat_id=chat_id,
+            last_event_time=(
+                last_event_time if last_event_time is not None else int(time.time() * 1000)
+            ),
+            for_all=for_all,
+        )
+
+        await self.app.invoke(Opcode.CHAT_DELETE, frame.to_payload())
+        self._remove_cached_chat(chat_id)

pymax/api/messages/service.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import time
+from collections.abc import Sequence
 from typing import TYPE_CHECKING, TypeAlias
 
 from pymax.api.binding import bind_api_model, bind_api_models
@@ -52,7 +53,7 @@ if TYPE_CHECKING:
     from pymax.app import App
 
 SendAttachment: TypeAlias = Photo | File | Video
-SendAttachments: TypeAlias = list[SendAttachment] | None
+SendAttachments: TypeAlias = Sequence[SendAttachment] | None
 
 logger = get_logger(__name__)
 
@@ -169,24 +170,15 @@ class MessageService:
         chat_id: int,
         message_id: int,
         text: str,
-        attachment: SendAttachment | None = None,
         attachments: SendAttachments = None,
     ) -> Message:
-        if attachment is not None and attachments:
-            logger.warning("both attachment and attachments provided; using attachments")
-            attachment = None
-
-        edit_attachments = attachments
-        if attachment is not None:
-            edit_attachments = [attachment]
-
         clean_text, elements = Formatter.format_markdown(text)
         frame = EditMessagePayload(
             chat_id=chat_id,
             message_id=message_id,
             text=clean_text,
             elements=elements,
-            attachments=await self._upload_attachments(edit_attachments),
+            attachments=await self._upload_attachments(attachments),
         )
 
         response = await self.app.invoke(Opcode.MSG_EDIT, frame.to_payload())

pymax/api/users/payloads.py

@@ -1,4 +1,7 @@
+from collections.abc import Iterable
+
 from pymax.api.models import CamelModel
+from pymax.types.domain import ContactInfo
 
 from .enums import ContactAction
 
@@ -14,3 +17,22 @@ class SearchByPhonePayload(CamelModel):
 class ContactActionPayload(CamelModel):
     contact_id: int
     action: ContactAction
+
+
+class _ContactPayload(CamelModel):
+    first_name: str
+
+
+class ImportContactsPayload(CamelModel):
+    contact_list: dict[str, _ContactPayload]  # phone -> contact payload
+
+    @classmethod
+    def from_contacts(cls, contacts: Iterable[ContactInfo]) -> "ImportContactsPayload":
+        return cls(
+            contact_list={
+                contact.phone: _ContactPayload(
+                    first_name=contact.first_name,
+                )
+                for contact in contacts
+            }
+        )

pymax/api/users/service.py

@@ -10,12 +10,13 @@ from pymax.api.response import (
 )
 from pymax.logging import get_logger
 from pymax.protocol import InboundFrame, Opcode
-from pymax.types.domain import Session, User
+from pymax.types.domain import ContactInfo, Session, User
 
 from .enums import ContactAction, UserPayloadKey
 from .payloads import (
     ContactActionPayload,
     FetchContactsPayload,
+    ImportContactsPayload,
     SearchByPhonePayload,
 )
 
@@ -122,5 +123,17 @@ class UserService:
         self.app.users.pop(contact_id, None)
         return True
 
+    async def import_contacts(self, contacts: list[ContactInfo]) -> list[User]:
+        frame = ImportContactsPayload.from_contacts(contacts)
+
+        response = await self.app.invoke(Opcode.SYNC, frame.to_payload())
+
+        users = parse_payload_list(
+            response, UserPayloadKey.CONTACTS, User
+        )  # TODO: maybe also return phone mapping?
+
+        # {contacts: [...], phones: {data[0]: server_phone}}
+        return [self._cache_user(user) for user in users]
+
     def get_chat_id(self, first_user_id: int, second_user_id: int) -> int:
         return first_user_id ^ second_user_id

pymax/app.py

@@ -1,12 +1,12 @@
 import asyncio
-from typing import Any, Generic, TypeVar
+from typing import TYPE_CHECKING, Any, Generic, TypeVar
 
 from pymax.api import ApiFacade
 from pymax.auth import AuthFlow
 from pymax.config import ClientConfig
 from pymax.connection import ConnectionManager
 from pymax.dispatch import Dispatcher
-from pymax.dispatch.router import Router
+from pymax.dispatch.router import EventType, Router
 from pymax.exceptions import ApiError
 from pymax.logging import get_logger
 from pymax.protocol import Command, InboundFrame, OutboundFrame
@@ -17,8 +17,11 @@ from pymax.telemetry import TelemetryService
 from pymax.types import MaxApiError, Message
 from pymax.types.domain import Chat, Profile, User
 
+if TYPE_CHECKING:
+    from pymax.base import BaseClient
+
 logger = get_logger(__name__)
-ClientT = TypeVar("ClientT")
+ClientT = TypeVar("ClientT", bound="BaseClient")
 
 
 class App(Generic[ClientT]):
@@ -124,9 +127,26 @@ class App(Generic[ClientT]):
         self.session = session_data
 
         logger.debug("logging in")
-        response = await self.api.auth.login(
-            self.config.device.user_agent,
-        )
+
+        try:
+            response = await self.api.auth.login(
+                self.config.device.user_agent,
+            )
+        except Exception as e:
+            handled = False
+            if self.dispatcher.client is not None:
+                handled = await self.dispatcher.emit_error(
+                    e,
+                    EventType.ON_START,
+                    None,
+                    self.dispatcher.root_router,
+                    None,
+                )
+            if not handled:
+                raise
+
+            await self.close()
+            return
 
         if response.token is not None and response.token != self.session.token:
             await self.store.update_token(self.session.token, response.token)

pymax/base.py

@@ -5,7 +5,8 @@ from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any, Generic, TypeVar
 from uuid import uuid4
 
-from pymax.dispatch import Router
+from pymax.dispatch import ErrorScope, Router
+from pymax.dispatch.router import DisconnectDecorator, ErrorDecorator
 from pymax.infra import BaseMixin
 from pymax.logging import get_logger
 
@@ -128,6 +129,10 @@ class BaseClient(BaseMixin, ABC, Generic[ClientT]):
         while True:
             try:
                 await self._app.start()
+                if not self._app.started:
+                    await self.close()
+                    return
+
                 await self._app.dispatcher.emit_start(self)
                 await self._connection.wait_closed()
             except asyncio.CancelledError:
@@ -138,14 +143,21 @@ class BaseClient(BaseMixin, ABC, Generic[ClientT]):
                 EOFError,
                 OSError,
                 TimeoutError,
-            ):
+            ) as e:
                 await self.close()
+                await self._app.dispatcher.emit_disconnect(
+                    e,
+                    self.extra_config.reconnect,
+                    self.extra_config.reconnect_delay,
+                )
+
                 if not self.extra_config.reconnect:
                     raise
 
-                logger.exception(
+                logger.debug(
                     "client connection failed; reconnecting in %s seconds",
                     self.extra_config.reconnect_delay,
+                    exc_info=True,
                 )
                 await asyncio.sleep(self.extra_config.reconnect_delay)
                 self._reset_runtime()
@@ -237,6 +249,39 @@ class BaseClient(BaseMixin, ABC, Generic[ClientT]):
         """Регистрирует обработчик исходных входящих frame-ов."""
         return self._router.on_raw(*filters)
 
+    def on_error(self, scope: ErrorScope = ErrorScope.GLOBAL) -> ErrorDecorator[ClientT]:
+        """Регистрирует обработчик ошибок dispatch-а и запуска клиента."""
+        return self._router.on_error(scope)
+
+    def on_disconnect(self) -> DisconnectDecorator:
+        """Регистрирует обработчик сетевого отключения перед reconnect."""
+        return self._router.on_disconnect()
+
     def include_router(self, router: Router[ClientT]) -> None:
         """Подключает дочерний router к root router клиента."""
         self._router.include_router(router)
+
+    async def relogin(self: ClientT, drop_config_token: bool = True, start: bool = True) -> None:  # noqa: PYI019
+        """Удаляет текущую локальную сессию и запускает авторизацию заново.
+
+        Args:
+            drop_config_token: Сбросить token, переданный через ``ExtraConfig``.
+            start: Сразу запустить клиента после сброса runtime.
+        """
+        store = self._app.store
+        session = self._app.session
+
+        if session is None:
+            raise RuntimeError("Cannot relogin before session is loaded")
+
+        await store.delete_session(session.token)
+        await self.close()
+
+        if drop_config_token:
+            self.extra_config.token = None
+            self._config.token = None
+
+        self._reset_runtime()
+
+        if start:
+            await self.start()

pymax/dispatch/__init__.py

@@ -1,10 +1,21 @@
 from .dispatcher import Dispatcher
 from .enums import EventType
-from .router import ClientRouter, Router
+from .router import (
+    ClientRouter,
+    DisconnectCallback,
+    DisconnectDecorator,
+    ErrorContext,
+    ErrorScope,
+    Router,
+)
 
 __all__ = (
     "ClientRouter",
+    "DisconnectCallback",
+    "DisconnectDecorator",
     "Dispatcher",
+    "ErrorContext",
+    "ErrorScope",
     "EventType",
     "Router",
 )

pymax/dispatch/dispatcher.py

@@ -19,11 +19,19 @@ from pymax.types.events import (
 from .enums import EventType
 from .mapping import EventMapper, EventResolver
 from .router import (
+    DisconnectCallback,
+    DisconnectDecorator,
+    ErrorContext,
+    ErrorDecorator,
+    ErrorEntry,
+    ErrorScope,
+    ErrorSource,
     FilterCallback,
     HandlerCallback,
     HandlerDecorator,
     HandlerEntry,
     Router,
+    StartCallback,
     StartDecorator,
 )
 
@@ -31,11 +39,12 @@ if TYPE_CHECKING:
     from collections.abc import Generator
 
     from pymax.app import App
+    from pymax.base import BaseClient
 
 
 logger = get_logger(__name__)
 
-ClientT = TypeVar("ClientT")
+ClientT = TypeVar("ClientT", bound="BaseClient")
 
 
 class Dispatcher(Generic[ClientT]):
@@ -78,6 +87,13 @@ class Dispatcher(Generic[ClientT]):
         logger.debug("registering handler event=%s filters=%s", event, len(filters))
         return self.root_router.on(event, *filters)
 
+    def on_error(self, scope: ErrorScope = ErrorScope.GLOBAL) -> ErrorDecorator[ClientT]:
+        return self.root_router.on_error(scope)
+
+    def on_disconnect(self) -> DisconnectDecorator:
+        """Регистрирует обработчик сетевого отключения на root router."""
+        return self.root_router.on_disconnect()
+
     def on_message(
         self,
         *filters: FilterCallback[Message],
@@ -146,22 +162,62 @@ class Dispatcher(Generic[ClientT]):
         for child in router.children:
             yield from self._iter_router(child)
 
-    async def emit_start(self, client: ClientT) -> None:
-        tasks: list[asyncio.Task[Any]] = []
+    def iter_error_entries(
+        self,
+    ) -> Generator[tuple[Router[ClientT], ErrorEntry[ClientT]], Any, None]:
+        for router in self.iter_routers():
+            for entry in router.error_handlers:
+                yield router, entry
 
+    def iter_disconnect_handlers(self) -> Generator[DisconnectCallback, Any, None]:
+        """Итерирует обработчики disconnect по root router и его детям."""
         for router in self.iter_routers():
-            handler = router.on_start_handler
-            if handler is None:
+            yield from router.disconnect_handlers
+
+    def iter_error_handlers(
+        self,
+        failed_router: Router[ClientT],
+    ) -> Generator[ErrorEntry[ClientT], Any, None]:
+        for owner_router, entry in self.iter_error_entries():
+            if entry.scope is ErrorScope.LOCAL and owner_router is not failed_router:
                 continue
 
-            result = handler(client)
+            yield entry
 
-            if inspect.iscoroutine(result):
-                task = asyncio.create_task(result)
+    async def emit_start(self, client: ClientT) -> None:
+        tasks: list[asyncio.Task[Any]] = []
+
+        for router in self.iter_routers():  # TODO: create iter_on_start_handlers
+            for handler in router.on_start_handlers:
+                task = asyncio.create_task(self._run_start_handler(router, handler, client))
                 task.add_done_callback(_log_task_error)
                 tasks.append(task)
 
-        self.startup_tasks = tasks
+        self.startup_tasks.extend(tasks)
+
+    async def _run_start_handler(
+        self,
+        router: Router[ClientT],
+        handler: StartCallback[ClientT],
+        client: ClientT,
+    ) -> None:
+        try:
+            result = handler(client)
+
+            if inspect.isawaitable(result):
+                await result
+
+        except Exception as e:
+            handled = await self.emit_error(
+                e,
+                EventType.ON_START,
+                None,
+                router,
+                handler,
+            )
+
+            if not handled:
+                raise
 
     async def stop_startup_tasks(self) -> None:
         if not self.startup_tasks:
@@ -201,13 +257,18 @@ class Dispatcher(Generic[ClientT]):
         event: Any,
     ) -> None:
         for entry in router.handlers.get(event_type, []):
-            if await self._matches(entry, event):
-                logger.debug(
-                    "calling handler event=%s callback=%s",
-                    event_type,
-                    _callback_name(entry.callback),
-                )
-                await self._call(entry.callback, event)
+            try:
+                if await self._matches(entry, event):
+                    logger.debug(
+                        "calling handler event=%s callback=%s",
+                        event_type,
+                        _callback_name(entry.callback),
+                    )
+                    await self._call(entry.callback, event)
+            except Exception as e:  # noqa: PERF203
+                handled = await self.emit_error(e, event_type, event, router, entry)
+                if not handled:
+                    raise
 
         for child in router.children:
             await self._dispatch_to_router(child, event_type, event)
@@ -240,6 +301,63 @@ class Dispatcher(Generic[ClientT]):
 
         return result
 
+    async def emit_error(
+        self,
+        exception: Exception,
+        event_type: EventType,
+        event: Any,
+        router: Router[ClientT],
+        handler: ErrorSource[ClientT] | None,
+    ) -> bool:
+        client = self.client
+        handled = False
+
+        if client is None:
+            raise RuntimeError("client is not bound to dispatcher")
+
+        ctx = ErrorContext[ClientT](
+            client=client,
+            event_type=event_type,
+            event=event,
+            router=router,
+            handler=handler,
+        )
+        for entry in self.iter_error_handlers(router):
+            handled = True
+            try:
+                result = entry.callback(exception, ctx)
+
+                if inspect.isawaitable(result):
+                    await result
+            except Exception as e:
+                logger.exception("Error while error handling: %s", e)
+                return False
+
+        return handled
+
+    async def emit_disconnect(
+        self,
+        exception: Exception,
+        reconnect: bool,
+        delay: float,
+    ) -> None:
+        """Вызывает обработчики потери соединения.
+
+        Ошибки внутри disconnect-handler-ов логируются и не прерывают reconnect.
+        """
+
+        if self.client is None:
+            raise RuntimeError("client is not bound to dispatcher")
+
+        for handler in self.iter_disconnect_handlers():
+            try:
+                result = handler(exception, reconnect, delay)
+
+                if inspect.isawaitable(result):
+                    await result
+            except Exception as e:
+                logger.exception("Error during disconnect handling: %s", e)
+
 
 def _callback_name(callback: Any) -> str:
     return getattr(

pymax/dispatch/enums.py

@@ -14,3 +14,4 @@ class EventType(str, Enum):
     VIDEO_READY = "video_ready"
     FILE_READY = "file_ready"
     RAW = "raw"
+    ON_START = "on_start"

pymax/dispatch/router.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from collections import defaultdict
 from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
+from enum import Enum
 from typing import TYPE_CHECKING, Any, Generic, TypeAlias, TypeVar
 
 from pymax.types import MessageDeleteEvent
@@ -10,7 +11,8 @@ from pymax.types import MessageDeleteEvent
 from .enums import EventType
 
 if TYPE_CHECKING:
-    from pymax.client import Client
+    from pymax import Client
+    from pymax.base import BaseClient
     from pymax.protocol import InboundFrame
     from pymax.types import Chat
     from pymax.types.domain import Message
@@ -22,8 +24,15 @@ if TYPE_CHECKING:
     )
 
 
+class ErrorScope(str, Enum):
+    """Область действия error-handler-а."""
+
+    GLOBAL = "global"
+    LOCAL = "local"
+
+
 _EventT = TypeVar("_EventT")
-ClientT = TypeVar("ClientT")
+ClientT = TypeVar("ClientT", bound="BaseClient")
 
 HandlerCallback: TypeAlias = Callable[
     [_EventT, ClientT],
@@ -47,12 +56,53 @@ StartDecorator: TypeAlias = Callable[
 ]
 
 
+@dataclass(slots=True)
+class ErrorContext(Generic[ClientT]):
+    """Контекст ошибки, передаваемый в ``on_error`` callback."""
+
+    client: ClientT
+    event_type: EventType
+    event: Any
+    handler: HandlerEntry[Any, ClientT] | StartCallback | None
+    router: Router[ClientT]
+
+
+ErrorCallback: TypeAlias = Callable[
+    [Exception, ErrorContext[ClientT]],
+    Awaitable[Any] | Any,
+]
+
+ErrorDecorator: TypeAlias = Callable[
+    [ErrorCallback[ClientT]],
+    ErrorCallback[ClientT],
+]
+
+DisconnectCallback: TypeAlias = Callable[
+    [Exception, bool, float],
+    Awaitable[Any] | Any,
+]
+
+DisconnectDecorator: TypeAlias = Callable[
+    [DisconnectCallback],
+    DisconnectCallback,
+]
+
+
 @dataclass(slots=True)
 class HandlerEntry(Generic[_EventT, ClientT]):
     callback: HandlerCallback[_EventT, ClientT]
     filters: tuple[FilterCallback[_EventT], ...] = ()
 
 
+@dataclass(slots=True)
+class ErrorEntry(Generic[ClientT]):
+    callback: ErrorCallback[ClientT]
+    scope: ErrorScope = ErrorScope.GLOBAL
+
+
+ErrorSource: TypeAlias = HandlerEntry[Any, ClientT] | StartCallback[ClientT]
+
+
 class Router(Generic[ClientT]):
     """Контейнер обработчиков событий PyMax.
 
@@ -85,7 +135,39 @@ class Router(Generic[ClientT]):
         ] = defaultdict(list)
 
         self.children: list[Router[ClientT]] = []
-        self.on_start_handler: StartCallback[ClientT] | None = None
+        self.on_start_handlers: list[StartCallback[ClientT]] = []
+        self.error_handlers: list[ErrorEntry[ClientT]] = []
+        self.disconnect_handlers: list[DisconnectCallback] = []
+
+    def on_error(
+        self,
+        scope: ErrorScope = ErrorScope.GLOBAL,
+    ) -> ErrorDecorator[ClientT]:
+        """Регистрирует обработчик ошибок для текущего router-а.
+
+        ``GLOBAL``-handler видит ошибки всего дерева подключенных router-ов.
+        ``LOCAL``-handler видит только ошибки своего router-а.
+        """
+        scope = ErrorScope(scope)
+
+        def decorator(callback: ErrorCallback[ClientT]) -> ErrorCallback[ClientT]:
+            self.error_handlers.append(ErrorEntry(callback=callback, scope=scope))
+            return callback
+
+        return decorator
+
+    def on_disconnect(self) -> DisconnectDecorator:
+        """Регистрирует обработчик потери соединения.
+
+        Callback вызывается как ``handler(exception, reconnect, delay)``:
+        исходная ошибка, будет ли reconnect и задержка перед ним.
+        """
+
+        def decorator(callback: DisconnectCallback) -> DisconnectCallback:
+            self.disconnect_handlers.append(callback)
+            return callback
+
+        return decorator
 
     def on(
         self,
@@ -145,7 +227,7 @@ class Router(Generic[ClientT]):
         """
 
         def decorator(handler: StartCallback) -> StartCallback:
-            self.on_start_handler = handler
+            self.on_start_handlers.append(handler)
             return handler
 
         return decorator

pymax/infra/chat.py

@@ -227,6 +227,27 @@ class ChatMixin(IClientProtocol):
         """
         await self._app.api.chats.leave_channel(chat_id)
 
+    async def delete_chat(
+        self,
+        chat_id: int,
+        last_event_time: int | None = None,
+        for_all: bool = True,
+    ) -> None:
+        """Удаляет чат.
+
+        Args:
+            chat_id: ID чата.
+            last_event_time: Время последнего события чата. Для объекта
+                ``Chat`` это поле ``Chat.last_event_time``.
+            for_all: Удалить чат для всех участников, если сервер поддерживает
+                такой режим.
+        """
+        await self._app.api.chats.delete_chat(
+            chat_id=chat_id,
+            last_event_time=last_event_time,
+            for_all=for_all,
+        )
+
     async def fetch_chats(self, marker: int | None = None) -> list[Chat]:
         """Загружает список чатов с сервера и обновляет кеш клиента.
 

pymax/infra/message.py

@@ -1,5 +1,5 @@
 from pymax.api.messages.enums import ItemType
-from pymax.api.messages.service import SendAttachment, SendAttachments
+from pymax.api.messages.service import SendAttachments
 from pymax.types import (
     FileRequest,
     Message,
@@ -86,7 +86,6 @@ class MessageMixin(IClientProtocol):
         chat_id: int,
         message_id: int,
         text: str,
-        attachment: SendAttachment | None = None,
         attachments: SendAttachments = None,
     ) -> Message:
         """Редактирует текст и вложения сообщения.
@@ -95,9 +94,7 @@ class MessageMixin(IClientProtocol):
             chat_id: ID чата.
             message_id: ID сообщения.
             text: Новый текст сообщения с поддержкой markdown.
-            attachment: Одно новое вложение.
-            attachments: Список новых вложений. Имеет приоритет над
-                ``attachment``.
+            attachments: Новые файлы, фотографии или видео для сообщения.
 
         Returns:
             Отредактированное сообщение.
@@ -106,7 +103,6 @@ class MessageMixin(IClientProtocol):
             chat_id=chat_id,
             message_id=message_id,
             text=text,
-            attachment=attachment,
             attachments=attachments,
         )
 

pymax/infra/user.py

@@ -1,6 +1,6 @@
 from typing import Literal
 
-from pymax.types import Session, User
+from pymax.types import ContactInfo, Session, User
 
 from .protocol import IClientProtocol
 
@@ -94,6 +94,17 @@ class UserMixin(IClientProtocol):
         """
         return await self._app.api.users.remove_contact(contact_id)
 
+    async def import_contacts(self, contacts: list[ContactInfo]) -> list[User]:
+        """Импортирует контакты из телефонной книги.
+
+        Args:
+            contacts: Контакты с телефоном и именем.
+
+        Returns:
+            Контакты Max, найденные или созданные сервером.
+        """
+        return await self._app.api.users.import_contacts(contacts)
+
     def get_chat_id(self, first_user_id: int, second_user_id: int) -> int:
         """Вычисляет ID личного чата для пары пользователей.
 

pymax/session/store.py

@@ -194,6 +194,17 @@ class SessionStore:
         await conn.commit()
         logger.info("session deleted")
 
+    async def delete_all_sessions(self) -> None:
+        conn = await self._get_connection()
+        logger.warning("deleting all sessions")
+        await conn.execute(
+            """
+            DELETE FROM sessions
+            """
+        )
+        await conn.commit()
+        logger.info("all sessions deleted")
+
     async def update_token(self, old_token: str, new_token: str) -> None:
         conn = await self._get_connection()
         logger.debug(

pymax/types/domain/__init__.py

@@ -11,4 +11,4 @@ from .presence import Presence
 from .profile import Profile
 from .session import Session
 from .sync import SyncOverrides, SyncState
-from .user import User
+from .user import ContactInfo, User

pymax/types/domain/chat.py

@@ -20,7 +20,7 @@ class Chat(CamelModel):
     Объекты чатов, полученные через клиент, обычно уже привязаны к сервисам
     сообщений и чатов. После этого можно вызывать удобные методы объекта:
     :meth:`answer`, :meth:`history`, :meth:`get_message`,
-    :meth:`get_messages`, :meth:`leave`, :meth:`invite`,
+    :meth:`get_messages`, :meth:`leave`, :meth:`delete`, :meth:`invite`,
     :meth:`remove_users`, :meth:`pin_message`, :meth:`update_settings` и
     :meth:`rework_invite_link`.
 
@@ -305,6 +305,26 @@ class Chat(CamelModel):
 
         raise ValueError("Unknown chat type=%s", self.type)
 
+    async def delete(self, *, for_all: bool = True) -> None:
+        """Удаляет этот чат.
+
+        Для ``last_event_time`` используется значение ``Chat.last_event_time``.
+
+        :param for_all: Удалить чат для всех участников, если сервер
+            поддерживает такой режим.
+        :type for_all: bool
+        :returns: ``None``.
+        :rtype: None
+        :raises RuntimeError: Если чат не привязан к клиенту.
+        """
+        _, chat_actions = self._bound()
+
+        return await chat_actions.delete_chat(
+            self.id,
+            last_event_time=self.last_event_time,
+            for_all=for_all,
+        )
+
     async def invite(
         self,
         user_ids: list[int],

pymax/types/domain/message.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections.abc import Sequence
 from typing import TYPE_CHECKING, Annotated, Any, TypeAlias
 
 from pydantic import Field, PrivateAttr, model_validator
@@ -42,7 +43,7 @@ KnownAttachment: TypeAlias = Annotated[
 ]
 Attachment: TypeAlias = KnownAttachment | UnknownAttachment
 SendAttachment: TypeAlias = Photo | File | Video
-SendAttachments: TypeAlias = list[SendAttachment] | None
+SendAttachments: TypeAlias = Sequence[SendAttachment] | None
 
 
 class ReactionCounter(CamelModel):
@@ -264,17 +265,13 @@ class Message(CamelModel):
     async def edit(
         self,
         text: str,
-        attachment: SendAttachment | None = None,
         attachments: SendAttachments = None,
     ) -> Message:
         """Редактирует текст и вложения этого сообщения.
 
         :param text: Новый текст сообщения с поддержкой markdown.
         :type text: str
-        :param attachment: Одно новое вложение.
-        :type attachment: SendAttachment | None
-        :param attachments: Список новых вложений. Имеет приоритет над
-            ``attachment``.
+        :param attachments: Новые файлы, фотографии или видео для сообщения.
         :type attachments: SendAttachments
         :returns: Отредактированное сообщение.
         :rtype: Message
@@ -287,7 +284,6 @@ class Message(CamelModel):
             chat_id=chat_id,
             message_id=self.id,
             text=text,
-            attachment=attachment,
             attachments=attachments,
         )
 

pymax/types/domain/user.py

@@ -11,6 +11,14 @@ if TYPE_CHECKING:
     from pymax.api.users.service import UserService
 
 
+class ContactInfo(CamelModel):  # TODO: move to another file
+    """Контакт телефонной книги для ``import_contacts``."""
+
+    phone: str
+    first_name: str
+    last_name: str | None = None
+
+
 class User(CamelModel):
     """Контакт или пользователь Max.