maxapi-python 2.1.0__tar.gz → 2.1.2__tar.gz

maxapi_python-2.1.2/.github/workflows/publish.yml

@@ -0,0 +1,64 @@
+name: Publish
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: release-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  package:
+    name: Build package
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v8.1.0
+        with:
+          enable-cache: true
+
+      - name: Build package distributions
+        run: uv build
+
+      - name: Validate package distributions
+        run: uv run twine check dist/*
+
+      - name: Upload package distributions
+        uses: actions/upload-artifact@v4
+        with:
+          name: package-distributions
+          path: dist/
+
+  publish:
+    name: Publish to PyPI
+    runs-on: ubuntu-latest
+    needs: [package]
+
+    environment:
+      name: pypi
+
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+      - name: Download package distributions
+        uses: actions/download-artifact@v4
+        with:
+          name: package-distributions
+          path: dist/
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v8.1.0
+
+      - name: Publish package to PyPI
+        run: uv publish

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxapi-python
-Version: 2.1.0
+Version: 2.1.2
 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.0 → maxapi_python-2.1.2}/docs/account.rst

@@ -32,21 +32,26 @@ Account
 Фотография профиля
 ------------------
 
-Сейчас ``change_profile(photo=...)`` не загружает файл напрямую. Для фото
-нужен ``photo_token`` от API Max:
+Передайте ``Photo`` в ``change_profile(photo=...)``, чтобы PyMax сам загрузил
+файл и применил новый токен фотографии:
 
 .. code-block:: python
 
-   upload_url = await client.request_profile_photo_upload_url()
-   print(upload_url)
+   from pymax import Photo
 
    await client.change_profile(
        first_name="Alex",
-       photo_token="PHOTO_TOKEN",
+       photo=Photo(path="avatar.jpg"),
    )
 
-Если передать ``photo`` вместо ``photo_token``, PyMax выбросит
-``NotImplementedError``.
+Если у вас уже есть токен фотографии от API Max, его можно передать напрямую:
+
+.. code-block:: python
+
+   await client.change_profile(
+       first_name="Alex",
+       photo_token="PHOTO_TOKEN",
+   )
 
 Папки чатов
 -----------
@@ -118,9 +123,9 @@ Account
    ``on_start`` или после успешного ``await client.start()`` в собственном
    lifecycle.
 
-``NotImplementedError`` при ``change_profile(photo=...)``
-   Прямая загрузка фото через параметр ``photo`` пока не реализована.
-   Используйте ``photo_token``.
+Фото профиля не обновилось
+   Если переданы и ``photo``, и ``photo_token``, PyMax загрузит ``photo`` и
+   использует новый токен загруженной фотографии.
 
 Папка создалась, но список старый
    Используйте ``get_folders()`` после изменения и сохраняйте новый

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/docs/index.rst

@@ -22,6 +22,8 @@ PyMax - асинхронная Python-библиотека для Max API. Он
    :maxdepth: 1
    :caption: Новости
 
+   release-2-1-2
+   release-2-1-1
    release-2-1-0
 
 .. toctree::

maxapi_python-2.1.2/docs/release-2-1-1.rst

@@ -0,0 +1,16 @@
+PyMax 2.1.1
+===========
+
+Изменения относительно ``2.1.0``.
+
+Добавлено
+---------
+
+* ``change_profile(photo=...)`` теперь загружает фотографию профиля напрямую.
+
+Исправлено
+----------
+
+* TLS-handshake при TCP-подключении через proxy передает ``server_hostname``.
+* Локальный токен обновляется после ``close_all_sessions()`` и при получении
+  нового токена во время handshake.

maxapi_python-2.1.2/docs/release-2-1-2.rst

@@ -0,0 +1,32 @@
+PyMax 2.1.2
+===========
+
+Изменения относительно ``2.1.1``.
+
+Добавлено
+---------
+
+* ``get_bot_init_data()`` теперь можно вызвать без ``chat_id`` для сценариев,
+  где Max запускает web app вне конкретного чата.
+
+Исправлено
+----------
+
+* ``ExtraConfig.request_timeout`` снова применяется к API-запросам по
+  умолчанию, а явный ``timeout`` в низкоуровневом вызове сохраняет приоритет.
+* Login-ответ без нового ``token`` больше не ломает запуск клиента и не
+  перезаписывает сохраненный токен пустым значением.
+* ``FolderList`` больше не переопределяет pydantic-итератор и не ломает
+  ``dict(...)`` / стандартную сериализацию модели.
+
+Изменилось
+----------
+
+* Publish workflow упрощен: сборка, проверка дистрибутивов и публикация в PyPI
+  теперь разделены на понятные шаги с artifact handoff.
+
+Миграция
+--------
+
+* Если код итерировал ``FolderList`` напрямую, замените это на
+  ``folder_list.folders``.

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "maxapi-python"
-version = "2.1.0"
+version = "2.1.2"
 description = "Python wrapper для API мессенджера Max"
 readme = "README.md"
 requires-python = ">=3.10"

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/src/pymax/__init__.py

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

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/src/pymax/api/bots/payloads.py

@@ -3,5 +3,5 @@ from pymax.api.models import CamelModel
 
 class RequestInitDataPayload(CamelModel):
     bot_id: int
-    chat_id: int
+    chat_id: int | None = None
     start_param: str | None = None

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/src/pymax/api/bots/service.py

@@ -23,13 +23,9 @@ class BotsService:
     async def get_init_data(
         self,
         bot_id: int,
-        chat_id: int,
+        chat_id: int | None = None,
         start_param: str | None = None,
     ) -> InitData:
-        frame = RequestInitDataPayload(
-            bot_id=bot_id, chat_id=chat_id, start_param=start_param
-        )
-        response = await self.app.invoke(
-            Opcode.WEB_APP_INIT_DATA, frame.to_payload()
-        )
+        frame = RequestInitDataPayload(bot_id=bot_id, chat_id=chat_id, start_param=start_param)
+        response = await self.app.invoke(Opcode.WEB_APP_INIT_DATA, frame.to_payload())
         return require_payload_model(response, InitData)

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/src/pymax/api/self/service.py

@@ -9,6 +9,7 @@ from pymax.api.response import (
     require_payload_item_model,
     require_payload_model,
 )
+from pymax.files import Photo
 from pymax.logging import get_logger
 from pymax.protocol import Opcode
 from pymax.types.domain import FolderList, FolderUpdate, Profile
@@ -47,15 +48,20 @@ class SelfService:
         first_name: str,
         last_name: str | None = None,
         description: str | None = None,
-        photo: Any | None = None,
+        photo: Photo | None = None,
         *,
         photo_token: str | None = None,
     ) -> bool:
         if photo is not None:
-            raise NotImplementedError(
-                "Profile photo upload is not implemented without upload infra. "
-                "Pass photo_token instead."
+            attach = await self.app.api.uploads.upload_photo(
+                photo, profile=True
             )
+            if photo_token:
+                logger.warning(
+                    "photo_token argument was provided but will be overridden by the uploaded photo token"
+                )
+
+            photo_token = attach.photo_token
 
         frame = ChangeProfilePayload(
             first_name=first_name,
@@ -145,6 +151,7 @@ class SelfService:
             return False
 
         await self.app.store.update_token(self.app.session.token, token)
+        self.app.session.token = token
 
         return True
 

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/src/pymax/api/uploads/service.py

@@ -51,11 +51,13 @@ class UploadService:
             self.on_file_attach
         )
 
-    async def upload_photo(self, photo: Photo) -> AttachPhotoPayload:
+    async def upload_photo(
+        self, photo: Photo, profile: bool = False
+    ) -> AttachPhotoPayload:
         logger.info("Uploading photo")
         logger.debug("Preparing photo upload payload")
 
-        payload = UploadPayload().model_dump()
+        payload = UploadPayload(profile=profile).model_dump()
 
         try:
             data = await self.app.invoke(

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/src/pymax/app.py

@@ -33,9 +33,7 @@ class App(Generic[ClientT]):
         self.dispatcher: Dispatcher[ClientT] = Dispatcher(self, root_router)
         self.api = ApiFacade(self)
         self.config = config
-        self.store = self.config.store or SessionStore(
-            config.work_dir, config.session_name
-        )
+        self.store = self.config.store or SessionStore(config.work_dir, config.session_name)
         self.auth_flow = auth_flow
 
         self.me: Profile | None = None
@@ -76,18 +74,14 @@ class App(Generic[ClientT]):
             await self.connection.open()
 
             handshake_device_id = (
-                session_data.device_id
-                if session_data
-                else self.config.device.device_id
+                session_data.device_id if session_data else self.config.device.device_id
             )
             logger.debug("running handshake")
             await self.handshake(handshake_device_id)
         except (ConnectionError, EOFError, OSError, TimeoutError) as e:
             logger.exception("failed to connect or handshake")
             await self.connection.close()
-            raise ConnectionError(
-                f"Failed to connect and handshake: {e}"
-            ) from e
+            raise ConnectionError(f"Failed to connect and handshake: {e}") from e
 
         self._ping_task = asyncio.create_task(self._ping_loop())
 
@@ -108,9 +102,7 @@ class App(Generic[ClientT]):
 
                 if not auth_result.token:
                     logger.error("authentication finished without token")
-                    raise RuntimeError(
-                        "Authentication failed: no token received"
-                    )
+                    raise RuntimeError("Authentication failed: no token received")
 
                 await self.store.save_session(
                     session_data := SessionInfo(
@@ -135,6 +127,10 @@ class App(Generic[ClientT]):
             self.config.device.user_agent,
         )
 
+        if response.token is not None and response.token != self.session.token:
+            await self.store.update_token(self.session.token, response.token)
+            self.session.token = response.token
+
         self.me = response.profile
         self.chats = response.chats
         self.users[self.me.contact.id] = self.me.contact
@@ -185,7 +181,7 @@ class App(Generic[ClientT]):
         opcode: int,
         payload: dict[str, Any],
         cmd: int = Command.REQUEST,
-        timeout: float | None = 30.0,
+        timeout: float | None = None,
         compress: bool = False,
     ) -> InboundFrame:
         seq = self.connection.next_seq()
@@ -207,10 +203,11 @@ class App(Generic[ClientT]):
             payload_keys,
         )
         logger.debug("Request data=%s", frame.model_dump())
-        response = await self.connection.request(frame, timeout=timeout)
-        response_keys = (
-            sorted(response.payload.keys()) if response.payload else []
+        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",
             response.opcode,

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/src/pymax/infra/self.py

@@ -29,17 +29,13 @@ class SelfMixin(IClientProtocol):
             first_name: Имя профиля.
             last_name: Фамилия профиля.
             description: Описание профиля.
-            photo: Файл или объект фото. Прямая загрузка через этот
-                параметр пока не реализована.
+            photo: Файл или объект фото, который нужно загрузить как новую
+                фотографию профиля.
             photo_token: Токен фотографии, уже загруженной через API Max.
 
         Returns:
             ``True`` после успешного обновления. Клиент также обновит
             ``client.me`` и кеш текущего контакта.
-
-        Raises:
-            NotImplementedError: Если передан ``photo`` вместо
-                ``photo_token``.
         """
         return await self._app.api.account.change_profile(
             first_name=first_name,

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/src/pymax/transport/tcp.py

@@ -33,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",

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/src/pymax/types/domain/folder.py

@@ -1,8 +1,6 @@
-from collections.abc import Iterator
 from typing import Any
 
 from pydantic import Field
-from typing_extensions import override
 
 from .base import CamelModel
 
@@ -68,7 +66,3 @@ class FolderList(CamelModel):
     folders: list[Folder] = Field(default_factory=list)
     all_filter_exclude_folders: list[Any] = Field(default_factory=list)
     folder_sync: int = 0
-
-    @override
-    def __iter__(self) -> Iterator[Folder]:  # pyright: ignore[reportIncompatibleMethodOverride]
-        yield from self.folders

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/src/pymax/types/domain/login.py

@@ -16,11 +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
+    token: str | None = None
     time: int | None = None
     config: LoginConfig | None = None
 
@@ -29,19 +27,9 @@ 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),
         )

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/tests/api/test_chat_user_self_session_services.py

@@ -345,7 +345,7 @@ async def test_self_service_profile_photo_folders_and_logout() -> None:
 
     assert created.folder is not None
     assert created.folder.title == "Work"
-    assert [folder.id for folder in folders] == ["folder-1"]
+    assert [folder.id for folder in folders.folders] == ["folder-1"]
     assert updated.folder is not None
     assert updated.folder.title == "New"
     assert deleted.folder_sync == 4

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/tests/app/test_app_runtime.py

@@ -150,3 +150,21 @@ async def test_app_invoke_turns_error_frames_into_api_error() -> None:
     assert exc_info.value.error == "rate_limited"
     assert exc_info.value.opcode == Opcode.PING
     assert connection.sent[0][0].seq == 0
+
+
+@pytest.mark.asyncio
+async def test_app_invoke_uses_config_timeout_and_allows_override() -> None:
+    store = RuntimeStore(
+        SessionInfo(token="token", device_id="dev", phone="+7")
+    )
+    config = make_config().model_copy(
+        update={"request_timeout": 12.5, "store": store}
+    )
+    connection = RuntimeConnection([frame({}), frame({})])
+    app: App[object] = App(connection, config, StaticAuthFlow())
+
+    await app.invoke(Opcode.PING, {"interactive": True})
+    await app.invoke(Opcode.PING, {"interactive": True}, timeout=3.0)
+
+    assert connection.sent[0][1] == 12.5
+    assert connection.sent[1][1] == 3.0

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/tests/connection/test_readers_and_transports.py

@@ -104,6 +104,53 @@ async def test_tcp_transport_connect_send_recv_and_close(
     assert writer.closed is True
 
 
+@pytest.mark.asyncio
+async def test_tcp_transport_proxy_ssl_passes_server_hostname(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    reader = FakeStreamReader()
+    writer = FakeStreamWriter()
+    sock = object()
+    proxy_connect_kwargs = {}
+    open_connection_kwargs = {}
+
+    class FakeProxy:
+        async def connect(self, **kwargs):
+            proxy_connect_kwargs.update(kwargs)
+            return sock
+
+    async def open_connection(*args, **kwargs):
+        open_connection_kwargs.update(kwargs)
+        return reader, writer
+
+    monkeypatch.setattr(
+        "pymax.transport.tcp.Proxy.from_url",
+        lambda proxy_url: FakeProxy(),
+    )
+    monkeypatch.setattr(
+        "pymax.transport.tcp.asyncio.open_connection", open_connection
+    )
+
+    transport = TCPTransport(
+        "example.test",
+        443,
+        proxy="socks5://localhost:9050",
+        use_ssl=True,
+    )
+
+    await transport.connect()
+
+    assert proxy_connect_kwargs == {
+        "dest_host": "example.test",
+        "dest_port": 443,
+    }
+    assert open_connection_kwargs == {
+        "sock": sock,
+        "ssl": True,
+        "server_hostname": "example.test",
+    }
+
+
 class FakeWebSocket:
     def __init__(self) -> None:
         self.close_code = None

{maxapi_python-2.1.0 → maxapi_python-2.1.2}/uv.lock

@@ -1033,7 +1033,7 @@ wheels = [
 
 [[package]]
 name = "maxapi-python"
-version = "2.1.0"
+version = "2.1.2"
 source = { editable = "." }
 dependencies = [
     { name = "aiofiles" },

maxapi_python-2.1.0/.github/workflows/publish.yml

@@ -1,84 +0,0 @@
-name: Upload Python Package
-
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  release-checks:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Set up uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          python-version: "3.10"
-          enable-cache: true
-
-      - name: Check lint
-        run: uv run ruff check src tests
-
-      - name: Check formatting
-        run: uv run ruff format --check src tests
-
-      - name: Run tests
-        run: uv run pytest
-
-      - name: Build docs
-        run: uv run sphinx-build -b html docs /tmp/pymax-docs
-
-  release-build:
-    runs-on: ubuntu-latest
-    needs: release-checks
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-
-      - name: Set up uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          python-version: "3.10"
-          enable-cache: true
-
-      - name: Build release distributions
-        run: uv build
-
-      - name: Check distributions
-        run: uv run twine check dist/*
-
-      - name: Upload distributions
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-dists
-          path: dist/
-
-  pypi-publish:
-    runs-on: ubuntu-latest
-    needs: release-build
-    environment:
-      name: pypi
-      url: https://pypi.org/project/maxapi-python/
-
-    permissions:
-      contents: read
-      id-token: write
-
-    steps:
-      - name: Retrieve release distributions
-        uses: actions/download-artifact@v4
-        with:
-          name: release-dists
-          path: dist/
-
-      - name: Publish release distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1