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

pymax/api/uploads/service.py

@@ -38,22 +38,12 @@ logger = get_logger(__name__)
 class UploadService:
     def __init__(self, app: App) -> None:
         self.app = app
-        self.video_upload_waiters: dict[
-            int, asyncio.Future[VideoUploadSignal]
-        ] = {}
-        self.file_upload_waiters: dict[
-            int, asyncio.Future[FileUploadSignal]
-        ] = {}
-        self.app.dispatcher.on_internal(EventType.VIDEO_READY)(
-            self.on_video_attach
-        )
-        self.app.dispatcher.on_internal(EventType.FILE_READY)(
-            self.on_file_attach
-        )
+        self.video_upload_waiters: dict[int, asyncio.Future[VideoUploadSignal]] = {}
+        self.file_upload_waiters: dict[int, asyncio.Future[FileUploadSignal]] = {}
+        self.app.dispatcher.on_internal(EventType.VIDEO_READY)(self.on_video_attach)
+        self.app.dispatcher.on_internal(EventType.FILE_READY)(self.on_file_attach)
 
-    async def upload_photo(
-        self, photo: Photo, profile: bool = False
-    ) -> AttachPhotoPayload:
+    async def upload_photo(self, photo: Photo, profile: bool = False) -> AttachPhotoPayload:
         logger.info("Uploading photo")
         logger.debug("Preparing photo upload payload")
 
@@ -72,9 +62,7 @@ class UploadService:
             url = payload_item(data, "url", str)  # TODO: ENUM!!!!
         except Exception as e:
             logger.exception("Failed to parse photo upload URL from response")
-            raise UploadError(
-                "Failed to parse photo upload URL from response"
-            ) from e
+            raise UploadError("Failed to parse photo upload URL from response") from e
 
         if not url:
             logger.error("No upload URL received")
@@ -92,15 +80,11 @@ class UploadService:
         except (KeyError, IndexError) as e:
             logger.exception("Photo upload URL does not contain photoIds")
             logger.debug("Invalid photo upload URL=%s", url)
-            raise UploadError(
-                "Photo upload URL does not contain photoIds"
-            ) from e
+            raise UploadError("Photo upload URL does not contain photoIds") from e
         except Exception as e:
             logger.exception("Failed to parse photo id from upload URL")
             logger.debug("Invalid photo upload URL=%s", url)
-            raise UploadError(
-                "Failed to parse photo id from upload URL"
-            ) from e
+            raise UploadError("Failed to parse photo id from upload URL") from e
 
         logger.debug("Photo upload id parsed photo_id=%s", photo_id)
 
@@ -144,27 +128,17 @@ class UploadService:
                     data=form,
                 ) as response,
             ):
-                logger.debug(
-                    "Photo upload HTTP response status=%s", response.status
-                )
+                logger.debug("Photo upload HTTP response status=%s", response.status)
 
                 if response.status != HTTPStatus.OK:
-                    logger.error(
-                        "Photo upload failed with status %s", response.status
-                    )
-                    raise UploadError(
-                        f"Photo upload failed with status {response.status}"
-                    )
+                    logger.error("Photo upload failed with status %s", response.status)
+                    raise UploadError(f"Photo upload failed with status {response.status}")
 
                 try:
                     result = await response.json()
                 except Exception as e:
-                    logger.exception(
-                        "Failed to decode photo upload response JSON"
-                    )
-                    raise UploadError(
-                        "Failed to decode photo upload response JSON"
-                    ) from e
+                    logger.exception("Failed to decode photo upload response JSON")
+                    raise UploadError("Failed to decode photo upload response JSON") from e
 
         except UploadError:
             raise
@@ -280,9 +254,7 @@ class UploadService:
             async with aiohttp.ClientSession(
                 timeout=timeout, proxy=self.app.config.proxy
             ) as session:
-                logger.debug(
-                    "Starting video upload HTTP request video_id=%s", video_id
-                )
+                logger.debug("Starting video upload HTTP request video_id=%s", video_id)
 
                 async with session.post(
                     url=upload_info.url,
@@ -327,26 +299,14 @@ class UploadService:
         except UploadError:
             raise
         except aiohttp.ClientError as e:
-            logger.exception(
-                "HTTP error during video upload video_id=%s", video_id
-            )
-            raise UploadError(
-                f"HTTP error during video upload video_id={video_id}"
-            ) from e
+            logger.exception("HTTP error during video upload video_id=%s", video_id)
+            raise UploadError(f"HTTP error during video upload video_id={video_id}") from e
         except asyncio.TimeoutError as e:
-            logger.exception(
-                "Timed out during video upload video_id=%s", video_id
-            )
-            raise UploadError(
-                f"Timed out during video upload video_id={video_id}"
-            ) from e
+            logger.exception("Timed out during video upload video_id=%s", video_id)
+            raise UploadError(f"Timed out during video upload video_id={video_id}") from e
         except Exception as e:
-            logger.exception(
-                "Unexpected error during video upload video_id=%s", video_id
-            )
-            raise UploadError(
-                f"Unexpected error during video upload video_id={video_id}"
-            ) from e
+            logger.exception("Unexpected error during video upload video_id=%s", video_id)
+            raise UploadError(f"Unexpected error during video upload video_id={video_id}") from e
         finally:
             self.video_upload_waiters.pop(video_id, None)
             logger.debug("Video upload waiter removed video_id=%s", video_id)
@@ -458,70 +418,44 @@ class UploadService:
         except UploadError:
             raise
         except aiohttp.ClientError as e:
-            logger.exception(
-                "HTTP error during file upload file_id=%s", file_id
-            )
-            raise UploadError(
-                f"HTTP error during file upload file_id={file_id}"
-            ) from e
+            logger.exception("HTTP error during file upload file_id=%s", file_id)
+            raise UploadError(f"HTTP error during file upload file_id={file_id}") from e
         except asyncio.TimeoutError as e:
-            logger.exception(
-                "Timed out during file upload file_id=%s", file_id
-            )
-            raise UploadError(
-                f"Timed out during file upload file_id={file_id}"
-            ) from e
+            logger.exception("Timed out during file upload file_id=%s", file_id)
+            raise UploadError(f"Timed out during file upload file_id={file_id}") from e
         except Exception as e:
-            logger.exception(
-                "Unexpected error during file upload file_id=%s", file_id
-            )
-            raise UploadError(
-                f"Unexpected error during file upload file_id={file_id}"
-            ) from e
+            logger.exception("Unexpected error during file upload file_id=%s", file_id)
+            raise UploadError(f"Unexpected error during file upload file_id={file_id}") from e
         finally:
             self.file_upload_waiters.pop(file_id, None)
             logger.debug("File upload waiter removed file=%s", file_id)
 
-    async def on_video_attach(
-        self, attach: VideoUploadSignal, _: Client
-    ) -> None:
+    async def on_video_attach(self, attach: VideoUploadSignal, _: Client) -> None:
         logger.debug("Received attach event video_id=%s", attach.video_id)
 
         future = self.video_upload_waiters.pop(attach.video_id, None)
 
         if not future:
-            logger.debug(
-                "No video upload waiter found video_id=%s", attach.video_id
-            )
+            logger.debug("No video upload waiter found video_id=%s", attach.video_id)
             return
 
         if future.done():
-            logger.debug(
-                "Video upload waiter already done video_id=%s", attach.video_id
-            )
+            logger.debug("Video upload waiter already done video_id=%s", attach.video_id)
             return
 
         future.set_result(attach)
-        logger.debug(
-            "Video upload waiter resolved video_id=%s", attach.video_id
-        )
+        logger.debug("Video upload waiter resolved video_id=%s", attach.video_id)
 
-    async def on_file_attach(
-        self, attach: FileUploadSignal, _: Client
-    ) -> None:
+    async def on_file_attach(self, attach: FileUploadSignal, _: Client) -> None:
         logger.debug("Received attach event file_id=%s", attach.file_id)
         future = self.file_upload_waiters.pop(attach.file_id, None)
 
         if not future:
-            logger.debug(
-                "No file upload waiter found file_id=%s", attach.file_id
-            )
+            logger.debug("No file upload waiter found file_id=%s", attach.file_id)
             return
 
         if future.done():
-            logger.debug(
-                "File upload waiter already done file_id=%s", attach.file_id
-            )
+            logger.debug("File upload waiter already done file_id=%s", attach.file_id)
             return
 
         future.set_result(attach)

pymax/api/users/service.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Literal
 
+from pymax.api.binding import bind_api_model
 from pymax.api.response import (
     parse_payload_list,
     require_payload_dict,
@@ -30,13 +31,14 @@ class UserService:
         self.app = app
 
     def _cache_user(self, user: User) -> User:
+        user = bind_api_model(self.app, user)
         self.app.users[user.id] = user
         return user
 
     def get_cached_user(self, user_id: int) -> User | None:
         user = self.app.users.get(user_id)
         logger.debug("get_cached_user id=%s hit=%s", user_id, bool(user))
-        return user
+        return bind_api_model(self.app, user) if user is not None else None
 
     async def get_users(self, user_ids: list[int]) -> list[User]:
         cached = {
@@ -44,9 +46,7 @@ class UserService:
             for user_id in user_ids
             if (user := self.get_cached_user(user_id)) is not None
         }
-        missing_ids = [
-            user_id for user_id in user_ids if user_id not in cached
-        ]
+        missing_ids = [user_id for user_id in user_ids if user_id not in cached]
 
         if missing_ids:
             for user in await self.fetch_users(missing_ids):
@@ -64,15 +64,11 @@ class UserService:
     async def fetch_users(self, user_ids: list[int]) -> list[User]:
         logger.info("fetching users count=%s", len(user_ids))
         frame = FetchContactsPayload(contact_ids=user_ids)
-        response = await self.app.invoke(
-            Opcode.CONTACT_INFO, frame.to_payload()
-        )
+        response = await self.app.invoke(Opcode.CONTACT_INFO, frame.to_payload())
 
         users = [
             self._cache_user(user)
-            for user in parse_payload_list(
-                response, UserPayloadKey.CONTACTS, User
-            )
+            for user in parse_payload_list(response, UserPayloadKey.CONTACTS, User)
         ]
         logger.debug("fetched users count=%s", len(users))
         return users
@@ -97,12 +93,8 @@ class UserService:
         response = await self.app.invoke(Opcode.SESSIONS_INFO, {})
         return parse_payload_list(response, UserPayloadKey.SESSIONS, Session)
 
-    async def _contact_action(
-        self, payload: ContactActionPayload
-    ) -> InboundFrame:
-        response = await self.app.invoke(
-            Opcode.CONTACT_UPDATE, payload.to_payload()
-        )
+    async def _contact_action(self, payload: ContactActionPayload) -> InboundFrame:
+        response = await self.app.invoke(Opcode.CONTACT_UPDATE, payload.to_payload())
         require_payload_dict(response)
         return response
 

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,10 +205,10 @@ 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(
             "response opcode=%s cmd=%s seq=%s payload_keys=%s",
@@ -231,9 +233,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/auth/qr.py

@@ -118,23 +118,17 @@ class QrAuthFlow(AuthFlow):
                 continue
 
             try:
-                response = await app.api.auth.check_password(
-                    track_id, password
-                )
+                response = await app.api.auth.check_password(track_id, password)
             except ApiError as e:
                 logger.error("2fa password check failed: %s", e)
                 continue
 
             if response.error:
-                logger.error(
-                    "2fa password check failed error=%s", response.error
-                )
+                logger.error("2fa password check failed error=%s", response.error)
                 continue
 
             if response.login_token:
                 logger.info("2fa password authentication completed")
                 return response.login_token
 
-            logger.error(
-                "2fa password response did not contain login token; retrying"
-            )
+            logger.error("2fa password response did not contain login token; retrying")

pymax/auth/sms.py

@@ -75,13 +75,31 @@ class SmsAuthFlow(AuthFlow):
         logger.debug("sms code provider returned code_set=%s", bool(code))
         result = await app.api.auth.send_code(start.token, code)
 
-        token = result.login_token
-        if not token and result.password_challenge:
+        if result.login_token:
+            token = result.login_token
+        elif not result.login_token and result.password_challenge:
             token = await self._authenticate_with_password(
                 app,
                 track_id=result.password_challenge.track_id,
                 hint=result.password_challenge.hint,
             )
+        elif result.register_token:
+            if not app.config.registration_config:
+                raise RuntimeError("RegistrationConfig is required to register a new account")
+            else:
+                registration_config = app.config.registration_config
+                response = await app.api.auth.confirm_registration(
+                    first_name=registration_config.first_name,
+                    last_name=registration_config.last_name,
+                    token=result.register_token,
+                )
+                token = response.token
+        else:
+            logger.error(
+                "Authentication failed: server returned no login token, "
+                "password challenge, or registration token"
+            )
+            token = None
 
         logger.info(
             "sms authentication completed token_set=%s",
@@ -109,23 +127,17 @@ class SmsAuthFlow(AuthFlow):
                 continue
 
             try:
-                response = await app.api.auth.check_password(
-                    track_id, password
-                )
+                response = await app.api.auth.check_password(track_id, password)
             except ApiError as e:
                 logger.error("2fa password check failed: %s", e)
                 continue
 
             if response.error:
-                logger.error(
-                    "2fa password check failed error=%s", response.error
-                )
+                logger.error("2fa password check failed error=%s", response.error)
                 continue
 
             if response.login_token:
                 logger.info("2fa password authentication completed")
                 return response.login_token
 
-            logger.error(
-                "2fa password response did not contain login token; retrying"
-            )
+            logger.error("2fa password response did not contain login token; retrying")

pymax/base.py

@@ -22,7 +22,15 @@ if TYPE_CHECKING:
         StartDecorator,
     )
     from pymax.protocol import InboundFrame
-    from pymax.types import Chat, MessageDeleteEvent, User
+    from pymax.types import (
+        Chat,
+        MessageDeleteEvent,
+        MessageReadEvent,
+        PresenceEvent,
+        ReactionUpdateEvent,
+        TypingEvent,
+        User,
+    )
     from pymax.types.domain import Message, Profile
 
 logger = get_logger(__name__)
@@ -83,6 +91,7 @@ class BaseClient(BaseMixin, ABC, Generic[ClientT]):
             sync=self.extra_config.sync,
             store=self.extra_config.store,
             proxy=self.extra_config.proxy,
+            registration_config=self.extra_config.registration_config,
             device=DeviceConfig(
                 mt_instance_id=self.extra_config.mt_instance_id,
                 device_id=self.extra_config.device_id or str(uuid4()),
@@ -186,6 +195,34 @@ class BaseClient(BaseMixin, ABC, Generic[ClientT]):
         """Регистрирует обработчик удаления сообщений."""
         return self._router.on_message_delete(*filters)
 
+    def on_message_read(
+        self,
+        *filters: FilterCallback[MessageReadEvent],
+    ) -> HandlerDecorator[MessageReadEvent, ClientT]:
+        """Регистрирует обработчик изменения отметки прочтения."""
+        return self._router.on_message_read(*filters)
+
+    def on_typing(
+        self,
+        *filters: FilterCallback[TypingEvent],
+    ) -> HandlerDecorator[TypingEvent, ClientT]:
+        """Регистрирует обработчик набора текста."""
+        return self._router.on_typing(*filters)
+
+    def on_presence(
+        self,
+        *filters: FilterCallback[PresenceEvent],
+    ) -> HandlerDecorator[PresenceEvent, ClientT]:
+        """Регистрирует обработчик изменения присутствия пользователя."""
+        return self._router.on_presence(*filters)
+
+    def on_reaction_update(
+        self,
+        *filters: FilterCallback[ReactionUpdateEvent],
+    ) -> HandlerDecorator[ReactionUpdateEvent, ClientT]:
+        """Регистрирует обработчик обновления реакций сообщения."""
+        return self._router.on_reaction_update(*filters)
+
     def on_chat_update(
         self,
         *filters: FilterCallback[Chat],

pymax/client.py

@@ -39,7 +39,7 @@ class Client(BaseClient["Client"]):
         password_provider: Провайдер пароля 2FA, если аккаунт его требует.
     """
 
-    def __init__(
+    def __init__(  # noqa: PLR0913
         self,
         phone: str,
         session_name: str = "session.db",
@@ -49,6 +49,7 @@ class Client(BaseClient["Client"]):
         sms_code_provider: SmsCodeProvider | None = None,
         password_provider: PasswordProvider | None = None,
     ) -> None:
+
         self.phone = phone
         self.extra_config = extra_config or ExtraConfig()
         self.session_name = session_name
@@ -66,10 +67,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/client_web.py

@@ -54,8 +54,7 @@ class WebClient(BaseClient["WebClient"]):
         self._config = self._build_config(
             phone=None,
             user_agent=(
-                self.extra_config.user_agent
-                or self.extra_config.generate_web_user_agent()
+                self.extra_config.user_agent or self.extra_config.generate_web_user_agent()
             ),
         )
 

pymax/config.py

@@ -84,6 +84,21 @@ class DeviceConfig(BaseModel):
     client_session_id: int = Field(default_factory=lambda: randint(1, 70))
 
 
+class RegistrationConfig(BaseModel):
+    """Данные профиля для регистрации нового аккаунта по SMS.
+
+    Передайте объект через ``ExtraConfig.registration_config``. Он используется
+    только если после подтверждения SMS-кода Max вернул токен регистрации.
+
+    Args:
+        first_name: Имя нового пользователя.
+        last_name: Фамилия нового пользователя.
+    """
+
+    first_name: str
+    last_name: str | None = None
+
+
 class ClientConfig(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
@@ -93,6 +108,7 @@ class ClientConfig(BaseModel):
     device: DeviceConfig
     token: str | None = None
     proxy: str | None = None
+    registration_config: RegistrationConfig | None = None
 
     host: str = "api.oneme.ru"
     port: int = 443
@@ -109,9 +125,7 @@ class ClientConfig(BaseModel):
 
     def ensure_config(self) -> None:
         if not self.phone:
-            raise ValueError(
-                "Phone must be provided when no saved session exists."
-            )
+            raise ValueError("Phone must be provided when no saved session exists.")
 
 
 class ExtraConfig(BaseModel):
@@ -122,6 +136,8 @@ class ExtraConfig(BaseModel):
 
     Args:
         token: Готовый token для создания сессии без SMS/QR.
+        registration_config: Имя и фамилия для автоматического завершения
+            регистрации нового аккаунта по SMS.
         host: TCP host Max API.
         port: TCP port Max API.
         url: WebSocket URL для ``WebClient``.
@@ -156,6 +172,7 @@ class ExtraConfig(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
     token: str | None = None
+    registration_config: RegistrationConfig | None = None
 
     host: str = "api.oneme.ru"
     port: int = 443
@@ -221,3 +238,25 @@ class ExtraConfig(BaseModel):
             device_locale=locale,
             header_user_agent=DEFAULT_WEB_HEADER_USER_AGENT,
         )
+
+
+# ignore. for future upd
+
+# class TcpOptions(BaseModel):
+#     host: str = "api.oneme.ru"
+#     port: int = 443
+#     use_ssl: bool = True
+#     proxy: str | None = None
+
+
+# class RuntimeOptions(BaseModel):
+#     request_timeout: float = 30.0
+#     reconnect: bool = True
+#     reconnect_delay: float = 1.0
+
+
+# class DeviceOptions(BaseModel):
+#     device_id: str | None = None
+#     device_type: DeviceType = DeviceType.ANDROID
+#     user_agent: MobileUserAgentPayload | None = None
+#     mt_instance_id: str = Field(default_factory=lambda: str(uuid4()))