maxibot 0.98.1__py3-none-any.whl → 1.0.7__py3-none-any.whl

maxibot/__init__.py

@@ -8,7 +8,7 @@ from typing import Dict, Any, List, Optional, Callable, Union
 from maxibot.apihelper import Api
 from maxibot.types import Message, CallbackQuery, InputMedia
 from maxibot.types import UpdateType, InlineKeyboardMarkup
-from maxibot.util import extract_command, get_text, get_parce_mode
+from maxibot.util import extract_command, get_text, get_parse_mode
 from maxibot.core.attachments.photo import Photo
 from maxibot.core.network.polling import Polling
 
@@ -219,7 +219,8 @@ class MaxiBot:
             # print(f"Full update: {json.dumps(update, indent=2)}")
 
             update_type = update.get("update_type")
-            if update_type == UpdateType.MESSAGE_CREATED and "message" in update.keys():
+            if update_type == UpdateType.MESSAGE_CREATED and "message" in update.keys() or \
+               update_type == UpdateType.BOT_STARTED:
                 context = Message(update, self.api)
                 self._process_text_message(context)
             elif update_type == UpdateType.MESSAGE_CALLBACK:
@@ -412,7 +413,7 @@ class MaxiBot:
         chat_id: Union[str, int],
         message_id: str,
         reply_markup: Union[InlineKeyboardMarkup, Any] = None,
-        parce_mode: Union[str, Any] = None
+        parse_mode: Union[str, Any] = None
     ):
         """
         Метод изменения текстового сообщения `message_id` в чате `chat_id`
@@ -437,7 +438,7 @@ class MaxiBot:
             text=text,
             method="PUT",
             attachments=final_attachments,
-            parse_mode=parce_mode
+            parse_mode=parse_mode
         )
         return {}
 
@@ -447,7 +448,7 @@ class MaxiBot:
         chat_id: Union[str, int],
         message_id: str,
         reply_markup: Union[InlineKeyboardMarkup, Any] = None,
-        parce_mode: Union[str, Any] = "markdown"
+        parse_mode: Union[str, Any] = "markdown"
     ):
         """
         Метод изменения медиа сообщения `message_id` в чате `chat_id`
@@ -474,13 +475,13 @@ class MaxiBot:
             else:
                 final_attachments.append(reply_markup)
         text = get_text(media=media)
-        parce_mode = get_parce_mode(media=media, parse_mode=parce_mode)
+        parse_mode = get_parse_mode(media=media, parse_mode=parse_mode)
         self.api.send_message(
             msg_id=message_id,
             text=text,
             method="PUT",
             attachments=final_attachments,
-            parse_mode=parce_mode
+            parse_mode=parse_mode
         )
         return {}
 
@@ -489,7 +490,7 @@ class MaxiBot:
         chat_id: Union[str, int],
         message_id: str,
         reply_markup: Union[InlineKeyboardMarkup, Any] = None,
-        parce_mode: Union[str, Any] = "markdown"
+        parse_mode: Union[str, Any] = "markdown"
     ):
         """
         Метод изменения клавиатуры сообщения `message_id` в чате `chat_id`
@@ -516,7 +517,7 @@ class MaxiBot:
             msg_id=message_id,
             method="PUT",
             attachments=final_attachments,
-            parse_mode=parce_mode.lower()
+            parse_mode=parse_mode.lower()
         )
         return {}
 
@@ -526,7 +527,7 @@ class MaxiBot:
         text: str,
         attachments: Optional[List[Dict[str, Any]]] = None,
         reply_markup: Optional[Any] = None,
-        parce_mode: str = "markdown",
+        parse_mode: str = "markdown",
         notify: bool = True
     ) -> Message:
         """
@@ -563,7 +564,7 @@ class MaxiBot:
                 chat_id=chat_id,
                 text=text,
                 attachments=final_attachments,
-                parse_mode=parce_mode.lower(),
+                parse_mode=parse_mode.lower(),
                 notify=notify
             ),
             api=self.api

maxibot/types.py

@@ -1,4 +1,4 @@
-from dataclasses import dataclass
+# from dataclasses import dataclass
 from datetime import datetime
 from typing import List, Dict, Any, Optional
 
@@ -6,6 +6,15 @@ from maxibot.apihelper import Api
 from maxibot.util import is_pil_image, pil_image_to_bytes
 
 
+class JsonDeserializable(object):
+    def __str__(self):
+        d = {
+            x: y.__dict__ if hasattr(y, '__dict__') else y
+            for x, y in self.__dict__.items()
+        }
+        return str(d)
+
+
 class UpdateType:
     """
     Типы обновлений, которые можно получать от MAX API
@@ -173,7 +182,7 @@ class InlineKeyboardMarkup:
                 )
 
 
-class ImagePayload:
+class ImagePayload(JsonDeserializable):
     """
     Класс для хранения данных изображения
 
@@ -187,7 +196,7 @@ class ImagePayload:
         self.url = payload.get("url")
 
 
-class ImageAttachment:
+class ImageAttachment(JsonDeserializable):
     """
     Класс для работы с вложениями типа "image"
 
@@ -216,7 +225,7 @@ class ImageAttachment:
         }
 
 
-class Recipient:
+class Recipient(JsonDeserializable):
     """
     Класс получателя сообщения
 
@@ -230,7 +239,7 @@ class Recipient:
         self.user_id = rec.get("user_id")
 
 
-class Body:
+class Body(JsonDeserializable):
     """
     Класс тела сообщения
 
@@ -245,7 +254,7 @@ class Body:
         self.attachments = body.get("attachments")
 
 
-class User:
+class User(JsonDeserializable):
     """
     Класс пользователя
 
@@ -262,6 +271,14 @@ class User:
             self.username = update.get("callback").get("user").get("name")
             self.last_name = update.get("callback").get("user").get("last_name")
             self.language_code = update.get("user_locale")
+        elif update.get("update_type") == UpdateType.BOT_STARTED:
+            self.id = update.get("chat_id")
+            self.real_id = update.get("user").get("user_id")
+            self.is_bot = update.get("user").get("is_bot")
+            self.first_name = update.get("user").get("first_name")
+            self.username = update.get("user").get("name")
+            self.last_name = update.get("user").get("last_name")
+            self.language_code = update.get("user_locale")
         else:
             self.id = update.get("message").get("recipient").get("chat_id")
             self.real_id = update.get("message").get("sender").get("user_id")
@@ -272,7 +289,7 @@ class User:
             self.language_code = update.get("user_locale")
 
 
-class Chat:
+class Chat(JsonDeserializable):
     """
     Класс чата
 
@@ -281,12 +298,17 @@ class Chat:
     """
 
     def __init__(self, update: Dict[str, Any]):
-        self.id = update.get("message").get("recipient").get("chat_id")
-        self.type = update.get("message").get("recipient").get("chat_type")
-        self.user_id = update.get("message").get("recipient").get("user_id")
+        if update.get("update_type") == UpdateType.BOT_STARTED:
+            self.id = update.get("chat_id")
+            self.type = None
+            self.user_id = None
+        else:
+            self.id = update.get("message").get("recipient").get("chat_id")
+            self.type = update.get("message").get("recipient").get("chat_type")
+            self.user_id = update.get("message").get("recipient").get("user_id")
 
 
-class ChatLink:
+class ChatLink(JsonDeserializable):
     """
     Класс ссылки на чат
 
@@ -298,7 +320,7 @@ class ChatLink:
         self.id = update.get("chat_id")
 
 
-class Link:
+class Link(JsonDeserializable):
     """
     Класс ссылки на сообщение
 
@@ -314,7 +336,7 @@ class Link:
             self.chat: ChatLink = ChatLink(update=link)
 
 
-class Photo:
+class Photo(JsonDeserializable):
     """
     Класс для работы с фотографиями
 
@@ -323,7 +345,7 @@ class Photo:
     """
 
     def __init__(self, update: Dict[str, Any]):
-        attach = update.get("message").get("body").get("attachments")
+        attach = update.get("message", {}).get("body", {}).get("attachments", None)
         if attach:
             for att in attach:
                 if att.get("type") == "image":
@@ -332,7 +354,7 @@ class Photo:
                     self.url: str = att.get("payload").get("url")
 
 
-class InputMedia:
+class InputMedia(JsonDeserializable):
     """
     Класс формирования объекта attachments для отправки медиа
 
@@ -422,7 +444,7 @@ class InputMedia:
         }
 
 
-class InputMediaPhoto(InputMedia):
+class InputMediaPhoto(InputMedia, JsonDeserializable):
     """
     Класс для отправки фотографий
 
@@ -440,7 +462,7 @@ class InputMediaPhoto(InputMedia):
         super().__init__(type="photo", media=media, caption=caption, parse_mode=parse_mode)
 
 
-class InputMediaVideo(InputMedia):
+class InputMediaVideo(InputMedia, JsonDeserializable):
     """
     Класс для отправки видео
 
@@ -458,7 +480,7 @@ class InputMediaVideo(InputMedia):
         super().__init__(type="video", media=media, caption=caption, parse_mode=parse_mode)
 
 
-class Message:
+class Message(JsonDeserializable):
     """
     Класс для работы с сообщениями (аналог telebot.types.Message)
 
@@ -502,13 +524,16 @@ class Message:
         :return: Тип контента
         :rtype: str
         """
-        if update.get("message").get("body").get("attachments"):
-            c_type = update.get("message").get("body").get("attachments")[0].get("type")
-            if c_type == "image":
-                return "photo"
+        try:
+            if update.get("message").get("body").get("attachments"):
+                c_type = update.get("message").get("body").get("attachments")[0].get("type")
+                if c_type == "image":
+                    return "photo"
+                else:
+                    return c_type
             else:
-                return c_type
-        else:
+                return "text"
+        except Exception:
             return "text"
 
     @staticmethod
@@ -522,11 +547,14 @@ class Message:
         :return: ID сообщения или None
         :rtype: Optional[str]
         """
-        if update.get("message").get("body"):
-            return update.get("message").get("body").get("mid")
-        elif update.get("message").get("mid"):
-            return update.get("message").get("mid")
-        else:
+        try:
+            if update.get("message").get("body"):
+                return update.get("message").get("body").get("mid")
+            elif update.get("message").get("mid"):
+                return update.get("message").get("mid")
+            else:
+                return None
+        except Exception:
             return None
 
     @staticmethod
@@ -560,8 +588,10 @@ class Message:
         :return: Текст сообщения или None
         :rtype: Optional[str]
         """
-        if update.get("message").get("body"):
+        if update.get("message", {}).get("body", None):
             return update.get("message").get("body").get("text")
+        elif update.get("update_type") == UpdateType.BOT_STARTED:
+            return "/start"
         else:
             return None
 
@@ -577,7 +607,7 @@ class Message:
         self.from_user: Optional[User] = User(update=update)
         self.date: Optional[datetime] = self._get_msg_timestamp(update=update)
         self.chat: Chat = Chat(update=update)
-        self.reply_to_message: Link = Link(link=update.get("message").get("link"))
+        self.reply_to_message: Link = Link(link=update.get("message", {}).get("link", None))
         self.text: Optional[str] = self._get_msg_text(update=update)
         self.photo: Optional[ImageAttachment] = self._get_photo_from_attachments(update=update)
         self.photo_reply: Photo = Photo(update=update)

maxibot/util.py

@@ -83,7 +83,7 @@ def get_text(media):
         return text
 
 
-def get_parce_mode(media, parse_mode: str):
+def get_parse_mode(media, parse_mode: str):
     """
     Метод получения parce_mode из media
 

{maxibot-0.98.1.dist-info → maxibot-1.0.7.dist-info}/METADATA

@@ -1,14 +1,42 @@
 Metadata-Version: 2.4
 Name: maxibot
-Version: 0.98.1
+Version: 1.0.7
 Summary: Library for build bot in MAX
+Project-URL: Homepage, https://github.com/mrProduktivnyy/maxibot
+Project-URL: Documentation, https://github.com/mrProduktivnyy/maxibot/tree/main/maxibot/docs
+Project-URL: Repository, https://github.com/mrProduktivnyy/maxibot
+Project-URL: Issues, https://github.com/mrProduktivnyy/maxibot/issues
+Keywords: max,bot,api,tools
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Environment :: Console
+Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: requests==2.32.5
 
+### **Библиотека для мессенджера Max**<br>
+Её главная цель — позволить разработчикам использовать знакомые методы и классы из pyTelegramBotAPI (telebot) без изменений. Это позволяет переводить существующего телеграм бота на Max, а также создавать нового бота, заменив import telebot на import maxibot.
+
+![tg_to_max](https://github.com/mrProduktivnyy/maxibot/raw/main/maxibot/docs/tg_to_max.png)
+
+[![PyPi Package Version](https://img.shields.io/pypi/v/maxibot.svg)](https://pypi.python.org/pypi/maxibot)
+[![Supported Python versions](https://img.shields.io/pypi/pyversions/maxibot.svg)](https://pypi.python.org/pypi/maxibot)
+[![Documentation Status](https://img.shields.io/badge/docs-passing-green)](https://github.com/mrProduktivnyy/maxibot/tree/main/maxibot/docs)
+[![PyPi downloads](https://img.shields.io/pypi/dm/maxibot.svg)](https://pypi.org/project/maxibot/)
+[![PyPi status](https://img.shields.io/pypi/status/maxibot.svg?style=flat-square)](https://pypi.python.org/pypi/maxibot)
+
+### **Канал связи с разработчиками:** [t.me/maxibot_dev](https://t.me/maxibot_dev)
+
 ## Быстрый старт
 Необходимо установить библиотеку  
 ```sh
-pip install -i https://test.pypi.org/simple/ maxibot
+pip install maxibot
 ```
 ## Просто эхо-бот
 Необходимо создать файл `echo_bot.py` и добавить в него следующий код.

maxibot-1.0.7.dist-info/RECORD

@@ -0,0 +1,11 @@
+maxibot/__init__.py,sha256=rncP36tK_rykvdVtDhYesp79RVWlDMarxVEP2Cpi8nM,24593
+maxibot/apihelper.py,sha256=tX5N7l77GJtCWDXEeCvW2BBDwEnRCYvi_oNm8Hytt1k,9710
+maxibot/types.py,sha256=LYgxK8O9nl_PuzeAC3rmyQ5STq9GseRkDh70g9FlPPk,28258
+maxibot/util.py,sha256=mJ-X99SSDB8Dtdi_SZzG8RjY4ltkc107AmQIA1ybb50,2545
+maxibot/core/attachments/photo.py,sha256=ZaqSHuIw4ik8bxIS3VOQyD949B2AGyY5GSKSbSvf1Dg,1472
+maxibot/core/network/client.py,sha256=-k9fihDINR5tWbU3IIORE4udiliCrLPIpWfDAW1zuEU,3845
+maxibot/core/network/polling.py,sha256=E7z4SWIyiuFv0UMwRpPCQ0ilhbGAQ8VQ9LBFJVdvQDU,2301
+maxibot-1.0.7.dist-info/METADATA,sha256=-KPjlyzqex0Y3yfo-se9A5QUa2d50sWmKwPIlSrGLU0,4903
+maxibot-1.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maxibot-1.0.7.dist-info/top_level.txt,sha256=WNdB_JJYD7kB8YacJAru3eguPKZ5UIlkQS_opytFaSE,8
+maxibot-1.0.7.dist-info/RECORD,,

maxibot-0.98.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-maxibot/__init__.py,sha256=yoJtEuiyiEEMAHve9s3UNiPRMc_kqkwZz6WjX30qdTY,24534
-maxibot/apihelper.py,sha256=tX5N7l77GJtCWDXEeCvW2BBDwEnRCYvi_oNm8Hytt1k,9710
-maxibot/types.py,sha256=pYHk-t6pFNypREEesOtQMvOgZlOy0jGXPOwSBe6l2F0,26769
-maxibot/util.py,sha256=Ps263znGfLrHODi6fvYfibhpGOYOzThoQiZoHduwBi0,2545
-maxibot/core/attachments/photo.py,sha256=ZaqSHuIw4ik8bxIS3VOQyD949B2AGyY5GSKSbSvf1Dg,1472
-maxibot/core/network/client.py,sha256=-k9fihDINR5tWbU3IIORE4udiliCrLPIpWfDAW1zuEU,3845
-maxibot/core/network/polling.py,sha256=E7z4SWIyiuFv0UMwRpPCQ0ilhbGAQ8VQ9LBFJVdvQDU,2301
-maxibot-0.98.1.dist-info/METADATA,sha256=fuu7UJvqwclY-A3pd8LG61fPmoUu6VzIGF3g8emhu6w,2808
-maxibot-0.98.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maxibot-0.98.1.dist-info/top_level.txt,sha256=WNdB_JJYD7kB8YacJAru3eguPKZ5UIlkQS_opytFaSE,8
-maxibot-0.98.1.dist-info/RECORD,,