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

pymax/transport/tcp.py

@@ -10,7 +10,9 @@ logger = get_logger(__name__)
 
 
 class TCPTransport(Transport):
-    def __init__(self, host: str, port: int, proxy: str | None, use_ssl: bool = True) -> None:
+    def __init__(
+        self, host: str, port: int, proxy: str | None, use_ssl: bool = True
+    ) -> None:
         self._host = host
         self._port = port
         self._proxy = proxy
@@ -31,10 +33,12 @@ class TCPTransport(Transport):
             sock = await proxy.connect(
                 dest_host=self._host,
                 dest_port=self._port,
-                ssl=self._use_ssl,
             )
+            server_hostname = self._host if self._use_ssl else None
             self._reader, self._writer = await asyncio.open_connection(
-                sock=sock, ssl=self._use_ssl
+                sock=sock,
+                ssl=self._use_ssl,
+                server_hostname=server_hostname,
             )
             logger.info(
                 "tcp connected via proxy %s host=%s port=%s ssl=%s",
@@ -57,10 +61,14 @@ class TCPTransport(Transport):
         )
 
     async def close(self) -> None:
-        if self._writer:
+        writer = self._writer
+        self._reader = None
+        self._writer = None
+
+        if writer:
             logger.debug("tcp close")
-            self._writer.close()
-            await self._writer.wait_closed()
+            writer.close()
+            await writer.wait_closed()
             logger.debug("tcp closed")
 
     async def send(self, data: bytes | str) -> None:

pymax/transport/websocket.py

@@ -1,5 +1,3 @@
-import asyncio
-
 from websockets import ClientConnection, Origin
 from websockets.asyncio import client
 

pymax/types/domain/__init__.py

@@ -1,10 +1,13 @@
 from .attachments import *
+from .bots import InitData
 from .chat import Chat
 from .error import MaxApiError
 from .folder import Folder, FolderList, FolderUpdate
 from .login import LoginResponse
+from .member import Member
 from .message import Message, ReactionCounter, ReactionInfo, ReadState
 from .name import Name
+from .presence import Presence
 from .profile import Profile
 from .session import Session
 from .sync import SyncOverrides, SyncState

pymax/types/domain/bots.py

@@ -0,0 +1,14 @@
+from .base import CamelModel
+
+
+class InitData(CamelModel):
+    """Начальные данные web app-бота.
+
+    :ivar query_id: ID запроса инициализации.
+    :vartype query_id: str
+    :ivar url: URL для открытия web app-бота.
+    :vartype url: str
+    """
+
+    query_id: str
+    url: str

pymax/types/domain/error.py

@@ -9,12 +9,12 @@ class MaxApiError(CamelModel):
     :ivar message: Сообщение ошибки.
     :vartype message: str
     :ivar title: Заголовок ошибки.
-    :vartype title: str
+    :vartype title: str | None
     :ivar localized_message: Локализованное сообщение ошибки.
     :vartype localized_message: str | None
     """
 
     error: str
     message: str
-    title: str
-    localized_message: str | None
+    title: str | None = None
+    localized_message: str | None = None

pymax/types/domain/folder.py

@@ -1,4 +1,4 @@
-from collections.abc import Generator, Iterator
+from collections.abc import Iterator
 from typing import Any
 
 from pydantic import Field

pymax/types/domain/login.py

@@ -16,7 +16,9 @@ class LoginConfig(CamelModel):
 class LoginResponse(CamelModel):
     chats: list[Chat] = Field(default_factory=list)
     profile: Profile
-    messages: dict[int, list[Message]] = Field(default_factory=dict)  # chat_id -> [message]
+    messages: dict[int, list[Message]] = Field(
+        default_factory=dict
+    )  # chat_id -> [message]
     contacts: list[User | None] = Field(default_factory=list)
     token: str
     time: int | None = None
@@ -27,9 +29,19 @@ class LoginResponse(CamelModel):
         config_hash = self.config.hash if self.config is not None else None
 
         return SyncState(
-            chats_sync=(sync_time if sync_time is not None else current.chats_sync),
-            contacts_sync=(sync_time if sync_time is not None else current.contacts_sync),
-            drafts_sync=(sync_time if sync_time is not None else current.drafts_sync),
-            presence_sync=(sync_time if sync_time is not None else current.presence_sync),
-            config_hash=(config_hash if config_hash is not None else current.config_hash),
+            chats_sync=(
+                sync_time if sync_time is not None else current.chats_sync
+            ),
+            contacts_sync=(
+                sync_time if sync_time is not None else current.contacts_sync
+            ),
+            drafts_sync=(
+                sync_time if sync_time is not None else current.drafts_sync
+            ),
+            presence_sync=(
+                sync_time if sync_time is not None else current.presence_sync
+            ),
+            config_hash=(
+                config_hash if config_hash is not None else current.config_hash
+            ),
         )

pymax/types/domain/member.py

@@ -0,0 +1,16 @@
+from .base import CamelModel
+from .presence import Presence
+from .user import User
+
+
+class Member(CamelModel):
+    """Пользователь из списка участников или заявок на вступление.
+
+    :ivar contact: Данные пользователя.
+    :vartype contact: User
+    :ivar presence: Информация о присутствии пользователя.
+    :vartype presence: Presence
+    """
+
+    contact: User
+    presence: Presence

pymax/types/domain/presence.py

@@ -0,0 +1,15 @@
+from .base import CamelModel
+
+
+class Presence(CamelModel):
+    """Состояние присутствия пользователя.
+
+    :ivar seen: Время последней активности в формате Unix time, если оно
+        передано сервером.
+    :vartype seen: int | None
+    :ivar status: Код статуса присутствия Max.
+    :vartype status: int
+    """
+
+    seen: int | None = None
+    status: int

pymax/types/domain/sync.py

@@ -68,13 +68,29 @@ class SyncOverrides(BaseModel):
         :rtype: SyncState
         """
         return SyncState(
-            chats_sync=(self.chats_sync if self.chats_sync is not None else saved.chats_sync),
+            chats_sync=(
+                self.chats_sync
+                if self.chats_sync is not None
+                else saved.chats_sync
+            ),
             contacts_sync=(
-                self.contacts_sync if self.contacts_sync is not None else saved.contacts_sync
+                self.contacts_sync
+                if self.contacts_sync is not None
+                else saved.contacts_sync
+            ),
+            drafts_sync=(
+                self.drafts_sync
+                if self.drafts_sync is not None
+                else saved.drafts_sync
             ),
-            drafts_sync=(self.drafts_sync if self.drafts_sync is not None else saved.drafts_sync),
             presence_sync=(
-                self.presence_sync if self.presence_sync is not None else saved.presence_sync
+                self.presence_sync
+                if self.presence_sync is not None
+                else saved.presence_sync
+            ),
+            config_hash=(
+                self.config_hash
+                if self.config_hash is not None
+                else saved.config_hash
             ),
-            config_hash=(self.config_hash if self.config_hash is not None else saved.config_hash),
         )

pymax/types/domain/user.py

@@ -18,6 +18,10 @@ class User(CamelModel):
     :vartype id: int
     :ivar account_status: Статус аккаунта в кодировке Max.
     :vartype account_status: int | None
+    :ivar registration_time: Время регистрации в формате Unix time.
+    :vartype registration_time: int | None
+    :ivar country: Код страны пользователя.
+    :vartype country: str | None
     :ivar base_raw_url: Исходный URL аватара.
     :vartype base_raw_url: str | None
     :ivar base_url: URL аватара.
@@ -30,6 +34,10 @@ class User(CamelModel):
     :vartype photo_id: int | None
     :ivar update_time: Время обновления в формате Unix time.
     :vartype update_time: int | None
+    :ivar phone: Телефон пользователя, если возвращен API.
+    :vartype phone: int | None
+    :ivar status: Статус контакта, если возвращен API.
+    :vartype status: str | None
     :ivar description: Описание профиля.
     :vartype description: str | None
     :ivar gender: Пол пользователя.
@@ -44,12 +52,16 @@ class User(CamelModel):
 
     id: int
     account_status: int | None = None
+    registration_time: int | None = None
+    country: str | None = None
     base_raw_url: str | None = None
     base_url: str | None = None
     names: list[Name] = Field(default_factory=list)
     options: list[str] = Field(default_factory=list)
     photo_id: int | None = None
     update_time: int | None = None
+    phone: int | None = None
+    status: str | None = None
     description: str | None = None
     gender: str | None = None
     link: str | None = None