multibotkit 0.1.19__tar.gz → 0.1.21__tar.gz

{multibotkit-0.1.19 → multibotkit-0.1.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: multibotkit
-Version: 0.1.19
+Version: 0.1.21
 Summary: Functional library for developing multiplatform chatbots
 Home-page: https://github.com/Appvelox/multibotkit
 Author: Appvelox LLC

{multibotkit-0.1.19 → multibotkit-0.1.21}/multibotkit/helpers/telegram.py

@@ -28,7 +28,7 @@ from multibotkit.schemas.telegram.outgoing import (
     ReplyKeyboardRemove,
     Sticker,
     Video,
-    Location, DeleteWebhookParams,
+    Location, DeleteWebhookParams, DeleteMessage,
 )
 
 
@@ -205,15 +205,55 @@ class TelegramHelper(BaseHelper):
         r = await self._perform_async_request(url, data)
         return r
 
-    def sync_edit_message_text(self, chat_id: int, message_id: int, text: str):
+    def sync_delete_message(
+        self,
+        chat_id: int,
+        message_id: int,
+    ):
+        url = self.tg_base_url + "deleteMessage"
+        delete_message = DeleteMessage(chat_id=chat_id, message_id=message_id)
+
+        r = self._perform_sync_request(url, delete_message.dict())
+        return r
+
+    async def async_delete_message(
+        self,
+        chat_id: int,
+        message_id: int,
+    ):
+        url = self.tg_base_url + "deleteMessage"
+        delete_message = DeleteMessage(chat_id=chat_id, message_id=message_id)
+
+        r = await self._perform_async_request(url, delete_message.dict())
+        return r
+
+    def sync_edit_message_text(
+        self,
+        chat_id: int,
+        message_id: int,
+        text: str,
+        reply_markup: Optional[InlineKeyboardMarkup] = None,
+    ):
         url = self.tg_base_url + "editMessageText"
         data = {"chat_id": chat_id, "message_id": message_id, "text": text}
+        if reply_markup:
+            data["reply_markup"] = reply_markup.dict(exclude_none=True)
+
         r = self._perform_sync_request(url, data)
         return r
 
-    async def async_edit_message_text(self, chat_id: int, message_id: int, text: str):
+    async def async_edit_message_text(
+        self,
+        chat_id: int,
+        message_id: int,
+        text: str,
+        reply_markup: Optional[InlineKeyboardMarkup] = None,
+    ):
         url = self.tg_base_url + "editMessageText"
         data = {"chat_id": chat_id, "message_id": message_id, "text": text}
+        if reply_markup:
+            data["reply_markup"] = reply_markup.dict(exclude_none=True)
+
         r = await self._perform_async_request(url, data)
         return r
 

{multibotkit-0.1.19 → multibotkit-0.1.21}/multibotkit/schemas/telegram/outgoing.py

@@ -33,7 +33,13 @@ updates may be received for a short period of time.",
 
 
 class DeleteWebhookParams(BaseModel):
-    drop_pending_updates: Optional[bool] = Field(None, title="Pass True to drop all pending updates")
+    drop_pending_updates: int = Field(None, title="Unique identifier for the target chat or username of the"
+                                                  " target channel (in the format @channelusername)")
+    message_id: int = Field(None, title="Identifier of the message to delete")
+
+
+class DeleteMessage(BaseModel):
+    chat_id: Optional[bool] = Field(None, title="Pass True to drop all pending updates")
 
 
 class WebhookInfo(BaseModel):
@@ -68,6 +74,12 @@ to the webhook for update delivery",
     )
 
 
+class WebAppInfo(BaseModel):
+    url: str = Field(
+        ..., title="HTTP url of WebApp to be started when button is pressed"
+    )
+
+
 class InlineKeyboardButton(BaseModel):
     text: str = Field(..., title="Label text on the button")
     url: Optional[str] = Field(
@@ -78,6 +90,9 @@ class InlineKeyboardButton(BaseModel):
         title=" Data to be sent in a callback query to the bot \
 when button is pressed, 1-64 bytes",
     )
+    web_app: Optional[WebAppInfo] = Field(
+        None, title="Info about WebApp to be started when button is pressed"
+    )
 
 
 class InlineKeyboardMarkup(BaseModel):
@@ -88,12 +103,6 @@ Array of InlineKeyboardButton objects",
     )
 
 
-class WebAppInfo(BaseModel):
-    url: str = Field(
-        ..., title="HTTP url of WebApp to be started when button is pressed"
-    )
-
-
 class KeyboardButton(BaseModel):
     text: str = Field(..., title="Text of the button")
     request_contact: Optional[bool] = Field(

{multibotkit-0.1.19 → multibotkit-0.1.21}/multibotkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: multibotkit
-Version: 0.1.19
+Version: 0.1.21
 Summary: Functional library for developing multiplatform chatbots
 Home-page: https://github.com/Appvelox/multibotkit
 Author: Appvelox LLC

{multibotkit-0.1.19 → multibotkit-0.1.21}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="multibotkit",
-    version="0.1.19",
+    version="0.1.21",
     author="Appvelox LLC",
     author_email="team@appvelox.ru",
     description="Functional library for developing multiplatform chatbots",