maxapi-python 1.2.2__py3-none-any.whl → 1.2.4__py3-none-any.whl

pymax/types.py

@@ -47,7 +47,7 @@ class Name:
     def __init__(
         self,
         name: str | None,
-        first_name: None,
+        first_name: None | str,
         last_name: str | None,
         type: str | None,
     ) -> None:
@@ -90,16 +90,14 @@ class Names(Name):
     def __init__(
         self,
         name: str | None,
-        first_name: None,
+        first_name: None | str,
         last_name: str | None,
         type: str | None,
     ) -> None:
         """
         Синоним для класса Name.
         """
-        super().__init__(
-            name=name, first_name=first_name, last_name=last_name, type=type
-        )
+        super().__init__(name=name, first_name=first_name, last_name=last_name, type=type)
 
 
 class Contact:
@@ -219,7 +217,7 @@ class StickerAttach:
     def __init__(
         self,
         author_type: str,
-        lottie_url: str,
+        lottie_url: str | None,
         url: str,
         sticker_id: int,
         tags: list[str] | None,
@@ -248,7 +246,7 @@ class StickerAttach:
     def from_dict(cls, data: dict[str, Any]) -> Self:
         return cls(
             author_type=data["authorType"],
-            lottie_url=data["lottieUrl"],
+            lottie_url=data.get("lottieUrl"),
             url=data["url"],
             sticker_id=data["stickerId"],
             tags=data.get("tags"),
@@ -443,9 +441,7 @@ class VideoAttach:
 
 
 class FileAttach:
-    def __init__(
-        self, file_id: int, name: str, size: int, token: str, type: AttachType
-    ) -> None:
+    def __init__(self, file_id: int, name: str, size: int, token: str, type: AttachType) -> None:
         self.file_id = file_id
         self.name = name
         self.size = size
@@ -553,9 +549,7 @@ class Me:
 
 
 class Element:
-    def __init__(
-        self, type: FormattingType | str, length: int, from_: int | None = None
-    ) -> None:
+    def __init__(self, type: FormattingType | str, length: int, from_: int | None = None) -> None:
         self.type = type
         self.length = length
         self.from_ = from_
@@ -566,9 +560,7 @@ class Element:
 
     @override
     def __repr__(self) -> str:
-        return (
-            f"Element(type={self.type!r}, length={self.length!r}, from_={self.from_!r})"
-        )
+        return f"Element(type={self.type!r}, length={self.length!r}, from_={self.from_!r})"
 
     @override
     def __str__(self) -> str:
@@ -591,7 +583,9 @@ class MessageLink:
 
     @override
     def __repr__(self) -> str:
-        return f"MessageLink(chat_id={self.chat_id!r}, message={self.message!r}, type={self.type!r})"
+        return (
+            f"MessageLink(chat_id={self.chat_id!r}, message={self.message!r}, type={self.type!r})"
+        )
 
     @override
     def __str__(self) -> str:
@@ -636,6 +630,36 @@ class ReactionInfo:
         )
 
 
+class ContactAttach:
+    def __init__(
+        self, contact_id: int, first_name: str, last_name: str, name: str, photo_url: str
+    ) -> None:
+        self.contact_id = contact_id
+        self.first_name = first_name
+        self.last_name = last_name
+        self.name = name
+        self.photo_url = photo_url
+        self.type = AttachType.CONTACT
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any]) -> Self:
+        return cls(
+            contact_id=data["contactId"],
+            first_name=data["firstName"],
+            last_name=data["lastName"],
+            name=data["name"],
+            photo_url=data["photoUrl"],
+        )
+
+    @override
+    def __repr__(self) -> str:
+        return f"ContactAttach(contact_id={self.contact_id!r}, first_name={self.first_name!r}, last_name={self.last_name!r}, name={self.name!r}, photo_url={self.photo_url!r})"
+
+    @override
+    def __str__(self) -> str:
+        return f"ContactAttach: {self.name}"
+
+
 class Message:
     def __init__(
         self,
@@ -658,6 +682,7 @@ class Message:
                 | ControlAttach
                 | StickerAttach
                 | AudioAttach
+                | ContactAttach
             ]
             | None
         ),
@@ -679,7 +704,13 @@ class Message:
     def from_dict(cls, data: dict[Any, Any]) -> Self:
         message = data["message"] if data.get("message") else data
         attaches: list[
-            PhotoAttach | VideoAttach | FileAttach | ControlAttach | StickerAttach
+            PhotoAttach
+            | VideoAttach
+            | FileAttach
+            | ControlAttach
+            | StickerAttach
+            | AudioAttach
+            | ContactAttach
         ] = []
         for a in message.get("attaches", []):
             if a["_type"] == AttachType.PHOTO:
@@ -694,6 +725,8 @@ class Message:
                 attaches.append(StickerAttach.from_dict(a))
             elif a["_type"] == AttachType.AUDIO:
                 attaches.append(AudioAttach.from_dict(a))
+            elif a["_type"] == AttachType.CONTACT:
+                attaches.append(ContactAttach.from_dict(a))
         link_value = message.get("link")
         if isinstance(link_value, dict):
             link = MessageLink.from_dict(link_value)
@@ -778,9 +811,7 @@ class Dialog:
             join_time=data["joinTime"],
             created=data["created"],
             last_message=(
-                Message.from_dict(data["lastMessage"])
-                if data.get("lastMessage")
-                else None
+                Message.from_dict(data["lastMessage"]) if data.get("lastMessage") else None
             ),
             type=ChatType(data["type"]),
             last_fire_delayed_error_time=data["lastFireDelayedErrorTime"],
@@ -865,14 +896,10 @@ class Chat:
     @classmethod
     def from_dict(cls, data: dict[Any, Any]) -> Self:
         raw_admins = data.get("adminParticipants", {}) or {}
-        admin_participants: dict[int, dict[Any, Any]] = {
-            int(k): v for k, v in raw_admins.items()
-        }
+        admin_participants: dict[int, dict[Any, Any]] = {int(k): v for k, v in raw_admins.items()}
         raw_participants = data.get("participants", {}) or {}
         participants: dict[int, int] = {int(k): v for k, v in raw_participants.items()}
-        last_msg = (
-            Message.from_dict(data["lastMessage"]) if data.get("lastMessage") else None
-        )
+        last_msg = Message.from_dict(data["lastMessage"]) if data.get("lastMessage") else None
         return cls(
             participants_count=data.get("participantsCount", 0),
             access=AccessType(data.get("access", AccessType.PUBLIC.value)),
@@ -1051,7 +1078,9 @@ class Session:
 
     @override
     def __str__(self) -> str:
-        return f"Session: {self.client} from {self.location} at {self.time} (current={self.current})"
+        return (
+            f"Session: {self.client} from {self.location} at {self.time} (current={self.current})"
+        )
 
 
 class Folder:
@@ -1164,3 +1193,28 @@ class FolderList:
     @override
     def __str__(self) -> str:
         return f"FolderList: {len(self.folders)} folders"
+
+
+class ReadState:
+    def __init__(
+        self,
+        unread: int,
+        mark: int,
+    ) -> None:
+        self.unread = unread
+        self.mark = mark
+
+    @classmethod
+    def from_dict(cls, data: dict[str, Any]) -> Self:
+        return cls(
+            unread=data["unread"],
+            mark=data["mark"],
+        )
+
+    @override
+    def __repr__(self) -> str:
+        return f"ReadState(unread={self.unread!r}, mark={self.mark!r})"
+
+    @override
+    def __str__(self) -> str:
+        return f"ReadState: unread={self.unread}, mark={self.mark}"

pymax/utils.py

@@ -0,0 +1,90 @@
+import re
+import time
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from typing import Any, NoReturn
+
+import requests
+
+from pymax.exceptions import Error, RateLimitError
+
+
+class MixinsUtils:
+    @staticmethod
+    def handle_error(data: dict[str, Any]) -> NoReturn:
+        error = data.get("payload", {}).get("error")
+        localized_message = data.get("payload", {}).get("localizedMessage")
+        title = data.get("payload", {}).get("title")
+        message = data.get("payload", {}).get("message")
+
+        if error == "too.many.requests":  # TODO: вынести в статик
+            raise RateLimitError(
+                error=error,
+                message=message,
+                title=title,
+                localized_message=localized_message,
+            )
+
+        raise Error(
+            error=error,
+            message=message,
+            title=title,
+            localized_message=localized_message,
+        )
+
+    @staticmethod
+    def _fetch_and_extract(url: str, session: requests.Session) -> str | None:
+        try:
+            js_code = session.get(url, timeout=10).text
+        except requests.RequestException:
+            return None
+        return MixinsUtils._extract_version(js_code)
+
+    @staticmethod
+    def _extract_version(js_code: str) -> str | None:
+        ws_anchor = "wss://ws-api.oneme.ru/websocket"
+        pos = js_code.find(ws_anchor)
+        if pos == -1:
+            return None
+
+        snippet = js_code[pos : pos + 2000]
+
+        match = re.search(r'[:=]\s*"(\d{1,2}\.\d{1,2}\.\d{1,2})"', snippet)
+        if match:
+            version = match.group(1)
+            return version
+
+        return None
+
+    @staticmethod
+    def get_current_web_version() -> str | None:
+        try:
+            html = requests.get("https://web.max.ru/", timeout=10).text
+        except requests.RequestException:
+            return None
+
+        main_chunk_import = html.split("import(")[2].split(")")[0].strip("\"'")
+        main_chunk_url = f"https://web.max.ru{main_chunk_import}"
+        try:
+            main_chunk_code = requests.get(main_chunk_url, timeout=10).text
+        except requests.exceptions.RequestException as e:
+            return None
+
+        arr = main_chunk_code.split("\n")[0].split("[")[1].split("]")[0].split(",")
+        urls = []
+        for i in arr:
+            if "/chunks/" in i:
+                url = "https://web.max.ru/_app/immutable" + i[3 : len(i) - 1]
+                urls.append(url)
+
+        session = requests.Session()
+        session.headers["User-Agent"] = "Mozilla/5.0"
+        if urls:
+            with ThreadPoolExecutor(max_workers=8) as pool:
+                futures = [
+                    pool.submit(MixinsUtils._fetch_and_extract, url, session) for url in urls
+                ]
+                for f in as_completed(futures):
+                    ver = f.result()
+                    if ver:
+                        return ver
+        return None

maxapi_python-1.2.2.dist-info/RECORD

@@ -1,32 +0,0 @@
-pymax/__init__.py,sha256=6wUKKwsyxFpWG3b7kwptOvHd-w78C-ygw42iCDBYQvc,1915
-pymax/core.py,sha256=OXGNaQ0pDaf6Ofr1Fb9m7vh5ffpbiMyvUMM0EfwlnIQ,14907
-pymax/crud.py,sha256=YC92TyhA2mr1tJCcfd-tvh8umtXKgqJfgiLo7nXUl3Q,3076
-pymax/exceptions.py,sha256=nDUNx7bM-Yjugj-qfIllcrnwLg9JpZroYqfXapjYbMQ,3178
-pymax/files.py,sha256=AvFIr34Desq2p4CNWXIngRqeyTBKMT98VmcnI-zvUU0,3462
-pymax/filters.py,sha256=gSHPJ1Vi37HKPxf0jRRv9Q3iGwhiQjw1MGrCaouqHzs,4325
-pymax/formatter.py,sha256=RJ_5VbY7Li8UM3xL1AvcXo8v1iYnY8GvDDkreaFqtnY,860
-pymax/formatting.py,sha256=XRtuXJGweuNZevJFdPxksDftIrfuMGEA-AOUc_v6IhQ,2484
-pymax/interfaces.py,sha256=wKF1z1QRw8LcjvM9rzSHWXTK6gPb6sDt2UGiQLvyMf8,8790
-pymax/models.py,sha256=PsPGbOkERxesZZltjNrmqhOfRcO44Is2ThbEToREcB8,201
-pymax/navigation.py,sha256=4ia6RGY2pXMArboNhHkbWlWX7LtcYK1VGVXorPX0Pb4,5747
-pymax/payloads.py,sha256=GuTLK6HYe_bLW3ardgpKeZ98f79j349tD_6B6EwkGww,7879
-pymax/types.py,sha256=_ARcVXLGHyiGAJKYPd6EU9QDKzz4VwS6kjTu3YEH_u4,35523
-pymax/mixins/__init__.py,sha256=5sXJME34S1EssuDETaN4DLRH7vhMw_Q3Jmay9myAIZM,775
-pymax/mixins/auth.py,sha256=e90vIpEOwAjUxgYMYaG7R6jR_5t9rKsei_mTBQUirL4,14716
-pymax/mixins/channel.py,sha256=W52YnBay1sUYXxF9oAWsz44ZUh_s45jSvKmAyjTbULM,5357
-pymax/mixins/group.py,sha256=LqI1QHmZlmtuQ0-4H1MrNeBV-O9SMDMfHT9f4B_2poE,15189
-pymax/mixins/handler.py,sha256=ETnI8fA386LYJGjWtUhhWzQHREUA78di1aO1oWwtscA,12523
-pymax/mixins/message.py,sha256=AznKKmTMxdzsYl8IecT43RjWpGvlQM85GzSNGFbI8BA,33279
-pymax/mixins/scheduler.py,sha256=rcMfgfZnzu5V6MkcCg6uRgbi-jkc7UyqOjemulydWbc,964
-pymax/mixins/self.py,sha256=Be5L64eNYylGM-NmoxFpQZv1ohsC1Dx_Cs3Om__V96s,6976
-pymax/mixins/socket.py,sha256=tdHgd1NwWoEZhHCDd74XLOHFKUq-rladxhXV8Z_-APU,22860
-pymax/mixins/telemetry.py,sha256=LWr68DNQkPhAjGRDYQ5lORXxC3Yw6M9E8sF0TCNISTE,3609
-pymax/mixins/user.py,sha256=RSZd4t-aq8P2k3cVzNVWBkUf-_xTWILrBzwxLRgk1pw,9450
-pymax/mixins/utils.py,sha256=s3FUf3i_wjn2Gbg5YY1rWZB-90ZEGrrcUuND_MqqSTE,853
-pymax/mixins/websocket.py,sha256=GpdboEVWzyN1qLTcsgKZym6TlPnklcQuNeXJ5YKwg8c,17724
-pymax/static/constant.py,sha256=nM0svv3VpsVxK-RqoADn9qsTdQvB-IYv0Sgv-bQcWs4,1116
-pymax/static/enum.py,sha256=Hk0e6zSbGOJC_9Aw7gNXX3hcavnjzQfDyr8vjW22cFo,4648
-maxapi_python-1.2.2.dist-info/METADATA,sha256=rgiQKdSqYAO743n6jWOy0F76jZyjaGMY7A6qUlHlk64,6753
-maxapi_python-1.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-maxapi_python-1.2.2.dist-info/licenses/LICENSE,sha256=hOR249ItqMdcly1A0amqEWRNRTq4Gv5NJtmQ3A5qK4E,1070
-maxapi_python-1.2.2.dist-info/RECORD,,

pymax/mixins/utils.py

@@ -1,27 +0,0 @@
-from typing import Any, NoReturn
-
-from pymax.exceptions import Error, RateLimitError
-
-
-class MixinsUtils:
-    @staticmethod
-    def handle_error(data: dict[str, Any]) -> NoReturn:
-        error = data.get("payload", {}).get("error")
-        localized_message = data.get("payload", {}).get("localizedMessage")
-        title = data.get("payload", {}).get("title")
-        message = data.get("payload", {}).get("message")
-
-        if error == "too.many.requests":  # TODO: вынести в статик
-            raise RateLimitError(
-                error=error,
-                message=message,
-                title=title,
-                localized_message=localized_message,
-            )
-
-        raise Error(
-            error=error,
-            message=message,
-            title=title,
-            localized_message=localized_message,
-        )