maxapi-python 1.1.4__tar.gz → 1.1.5__tar.gz

{maxapi_python-1.1.4 → maxapi_python-1.1.5}/.gitignore

@@ -115,3 +115,7 @@ cache/
 # Keep lockfiles and important configs tracked? If you want to track specific lockfiles,
 # remove them from this .gitignore (for example: remove poetry.lock or uv.lock).
 tests/
+
+
+# Bad dev's requirements
+requirements.txt

{maxapi_python-1.1.4 → maxapi_python-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxapi-python
-Version: 1.1.4
+Version: 1.1.5
 Summary: Python wrapper для API мессенджера Max
 Project-URL: Homepage, https://github.com/noxzion/PyMax
 Project-URL: Repository, https://github.com/noxzion/PyMax
@@ -17,7 +17,7 @@ Requires-Dist: aiohttp>=3.12.15
 Requires-Dist: lz4>=4.4.4
 Requires-Dist: msgpack>=1.1.1
 Requires-Dist: sqlmodel>=0.0.24
-Requires-Dist: websockets>=11.0
+Requires-Dist: websockets>=15.0
 Description-Content-Type: text/markdown
 
 <p align="center">

{maxapi_python-1.1.4 → maxapi_python-1.1.5}/examples/example.py

@@ -49,14 +49,22 @@ async def handle_start() -> None:
     history = await client.fetch_history(chat_id=0)
     if history:
         for message in history:
-            user_id = message.sender
-            chat_id = message.chat_id
-            print(chat_id)
-            user = await client.get_user(user_id)
-
-            if user:
-                print(f"{user.names[0].name}: {message.text}")
-
+            if message.attaches:
+                for attach in message.attaches:
+                    if attach.type == AttachType.VIDEO:
+                        vid = await client.get_video_by_id(
+                            chat_id=0,
+                            video_id=attach.video_id,
+                            message_id=message.id,
+                        )
+                        print(vid.url)
+                    elif attach.type == AttachType.FILE:
+                        file = await client.get_file_by_id(
+                            chat_id=0,
+                            file_id=attach.file_id,
+                            message_id=message.id,
+                        )
+                        print(file.url)
     # print(client.me.names[0].first_name)
     # user = await client.get_user(client.me.id)
 

{maxapi_python-1.1.4 → maxapi_python-1.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "maxapi-python"
-version = "1.1.4"
+version = "1.1.5"
 description = "Python wrapper для API мессенджера Max"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -16,7 +16,7 @@ classifiers = [
 ]
 dependencies = [
     "sqlmodel>=0.0.24",
-    "websockets>=11.0",
+    "websockets>=15.0",
     "msgpack>=1.1.1",
     "lz4>=4.4.4",
     "aiohttp>=3.12.15",

{maxapi_python-1.1.4 → maxapi_python-1.1.5}/src/pymax/mixins/message.py

@@ -15,9 +15,11 @@ from pymax.payloads import (
     SendMessagePayload,
     SendMessagePayloadMessage,
     UploadPhotoPayload,
+    GetVideoPayload,
+    GetFilePayload,
 )
 from pymax.static import AttachType, Opcode
-from pymax.types import Attach, Message
+from pymax.types import Attach, Message, FileRequest, VideoRequest
 
 
 class MessageMixin(ClientProtocol):
@@ -283,3 +285,83 @@ class MessageMixin(ClientProtocol):
         except Exception:
             self.logger.exception("Fetch history failed")
             return None
+
+
+    async def get_video_by_id(
+        self,
+        chat_id: int,
+        message_id: int,
+        video_id: str,
+    ) -> VideoRequest | None:
+        """
+        Получает видео
+
+        Args:
+            chat_id (int): ID чата
+            message_id (int): ID сообщения
+            video_id (int): ID видео
+
+        Returns:
+            external (str): Странная ссылка из апи
+            cache (bool): True, если видео кэшировано
+            url (str): Ссылка на видео
+        """
+        try:
+            self.logger.info(
+                "Getting video_id=%s message_id=%s", video_id, message_id
+            )
+
+            payload = GetVideoPayload(
+                chat_id=chat_id,
+                message_id=message_id,
+                video_id=video_id
+            ).model_dump(by_alias=True)
+
+            data = await self._send_and_wait(opcode=Opcode.VIDEO_PLAY, payload=payload)
+
+            if error := data.get("payload", {}).get("error"):
+                self.logger.error("Get video error: %s", error)
+            
+            video = VideoRequest.from_dict(data["payload"]) if data.get("payload") else None 
+            self.logger.debug(" result: %r", video)
+            return video
+        except Exception:
+            self.logger.exception("Get video error")
+            return None
+        
+    async def get_file_by_id(
+        self,
+        chat_id: int,
+        message_id: int,
+        file_id: str,
+    ) -> FileRequest | None:
+        """
+        Получает файл
+
+        Args:
+            chat_id (int): ID чата
+            message_id (int): ID сообщения
+            file_id (int): ID видео
+
+        Returns:
+            unsafe (bool): Проверка файла на безопасность максом
+            url (str): Ссылка на скачивание файла
+        """
+        try:
+            self.logger.info(
+                "Getting file_id=%s message_id=%s", file_id, message_id
+            )
+            payload = GetFilePayload(
+                chat_id=chat_id,
+                message_id=message_id,
+                file_id=file_id
+            ).model_dump(by_alias=True)
+            data = await self._send_and_wait(opcode=Opcode.FILE_DOWNLOAD, payload=payload)
+            if error := data.get("payload", {}).get("error"):
+                self.logger.error("Get file error: %s", error)
+            file = FileRequest.from_dict(data["payload"]) if data.get("payload") else None 
+            self.logger.debug(" result: %r", file)
+            return file
+        except Exception:
+            self.logger.exception("Get video error")
+            return None

{maxapi_python-1.1.4 → maxapi_python-1.1.5}/src/pymax/payloads.py

@@ -193,3 +193,13 @@ class NavigationEventPayload(CamelModel):
 
 class NavigationPayload(CamelModel):
     events: list[NavigationEventPayload]
+
+class GetVideoPayload(CamelModel):
+    chat_id: int
+    message_id: str
+    video_id: int
+
+class GetFilePayload(CamelModel):
+    chat_id: int
+    message_id: str
+    file_id: int

{maxapi_python-1.1.4 → maxapi_python-1.1.5}/src/pymax/types.py

@@ -167,6 +167,46 @@ class FileAttach:
         return f"FileAttach: {self.file_id}"
 
 
+class FileRequest:
+    def __init__(
+        self,
+        unsafe: bool,
+        url: str,
+    ) -> None:
+        self.unsafe = unsafe
+        self.url = url
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any]) -> "FileRequest":
+        return cls(
+            unsafe=data["unsafe"],
+            url=data["url"],
+    )
+
+
+class VideoRequest:
+    def __init__(
+        self,
+        external: str,
+        cache: bool,
+        url: str,
+    ) -> None:
+        self.external = external
+        self.cache = cache
+        self.url = url
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any]) -> "VideoRequest":
+
+        listdata = list(data.values()) # Костыль ✅
+
+        return cls(
+            external=data["EXTERNAL"],
+            cache=data["cache"],
+            url=listdata[2],
+    )
+        
+
 class Me:
     def __init__(
         self,
@@ -538,7 +578,7 @@ class User:
         return f"User {self.id}: {', '.join(str(n) for n in self.names)}"
 
 
-class Attach:  # УБРАТЬ ГАДА!!!
+class Attach:  # УБРАТЬ ГАДА!!! или нет...
     def __init__(
         self,
         _type: AttachType,