multibotkit 0.1.19__py3-none-any.whl → 0.1.21__py3-none-any.whl

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/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.dist-info → multibotkit-0.1.21.dist-info}/METADATA

@@ -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
@@ -12,14 +12,14 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx >=0.23.0
-Requires-Dist: pydantic <2
-Requires-Dist: tenacity >=8.0.1
-Requires-Dist: aiofiles >=22.1.0
+Requires-Dist: httpx>=0.23.0
+Requires-Dist: pydantic<2
+Requires-Dist: tenacity>=8.0.1
+Requires-Dist: aiofiles>=22.1.0
 Provides-Extra: mongo
-Requires-Dist: motor >=3.0.0 ; extra == 'mongo'
+Requires-Dist: motor>=3.0.0; extra == "mongo"
 Provides-Extra: redis
-Requires-Dist: redis >=4.6.0 ; extra == 'redis'
+Requires-Dist: redis>=4.6.0; extra == "redis"
 
 # multibotkit
 Functional library for developing multiplatform chatbots

{multibotkit-0.1.19.dist-info → multibotkit-0.1.21.dist-info}/RECORD

@@ -8,7 +8,7 @@ multibotkit/dispatchers/vk.py,sha256=EsFOL2g3ju-nhsdyRY4JBTJxqQPmaPAB7Mkn462s4tk
 multibotkit/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 multibotkit/helpers/base_helper.py,sha256=b4vlmwELwGUIJE0DvD2Lkk0LO-b-w0VWAnEnnYawOKQ,1462
 multibotkit/helpers/fb.py,sha256=Z2Vo6A_fepVBQNcWCeelmH72zf_eKyXOXheUIlaIiBI,4329
-multibotkit/helpers/telegram.py,sha256=FVwH5anoJ2n-hcGiSiznGKB_2rhJDaUjtYbTGiPmKQ8,53188
+multibotkit/helpers/telegram.py,sha256=5DmMpis9iGueSQ8aqyeM96MQ4RjEbrVkRTA2vArLu38,54235
 multibotkit/helpers/viber.py,sha256=74UQ3RtHS3iR8qA5XVeMOYfXaaMq2pF0cpItwehdr4o,9246
 multibotkit/helpers/vk.py,sha256=QlI9rGEjhzqS-jcFrnZJ651lDbC4m33SSHAC1zWDyUU,5930
 multibotkit/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -17,7 +17,7 @@ multibotkit/schemas/fb/incoming.py,sha256=sp4CeQohaDMOxz113dNxJDv_fSaGW5i8qzVS7F
 multibotkit/schemas/fb/outgoing.py,sha256=Qm0gPHHipAolXpnOJC4J4bfYjQEWpX54vYygSwKtIV4,8036
 multibotkit/schemas/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 multibotkit/schemas/telegram/incoming.py,sha256=ba67RQT5phOEIWTMG72SomUQrdxiuoKlXOxiz5fiaeA,10881
-multibotkit/schemas/telegram/outgoing.py,sha256=9BGRAOQIaQWxL8lJ3_0WUN2N5GVZjlvBSO5EcqwxRDU,11711
+multibotkit/schemas/telegram/outgoing.py,sha256=aSwgszQfp7EvmMToNvXirdiw3Yqeshgd8jR-4Fw-kdo,12148
 multibotkit/schemas/viber/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 multibotkit/schemas/viber/incoming.py,sha256=0sS9g-NmQFl_uoVz8pkbQ9zdNsXvGE52KxmzADoFIRM,4193
 multibotkit/schemas/viber/outgoing.py,sha256=KI73IX-aawtAx3ejW2Hx0ivXBYuMVudUxhwyp1wv6rc,8252
@@ -31,8 +31,8 @@ multibotkit/states/managers/base.py,sha256=KOO-wtbj984-lLq6u6LhxR79NTftQV2c5uUG6
 multibotkit/states/managers/memory.py,sha256=uN064uj2Q0ivK9LGEHJFaaaG6FEyXkIajS87TCAuYsI,1328
 multibotkit/states/managers/mongo.py,sha256=K8upbLT0892YA2Qi9dDPXDP5jvQoS16T8FW-qapv1Xk,1927
 multibotkit/states/managers/redis.py,sha256=XMpQ8LUdO9mZq3cZXlYOcGCC0VsSbsxBsEzVFH7TeEM,1681
-multibotkit-0.1.19.dist-info/LICENSE,sha256=3iCLdX93Z5F6PpDqN6q7wufsBixXuTAYwgzntBQjYBQ,1069
-multibotkit-0.1.19.dist-info/METADATA,sha256=X7eQQVuoi9O0EAWhqiNqmRSalDULVbDJWdB33iTvqe8,834
-multibotkit-0.1.19.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-multibotkit-0.1.19.dist-info/top_level.txt,sha256=Meo5tTNdc5pf6_qwW6x4Cqz5iJJlXFqUDMti96pzV2I,12
-multibotkit-0.1.19.dist-info/RECORD,,
+multibotkit-0.1.21.dist-info/LICENSE,sha256=3iCLdX93Z5F6PpDqN6q7wufsBixXuTAYwgzntBQjYBQ,1069
+multibotkit-0.1.21.dist-info/METADATA,sha256=BJlGsbExzzkvUFoQKxSG4ChaDs45y7nkDb5YDCxyOF0,826
+multibotkit-0.1.21.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+multibotkit-0.1.21.dist-info/top_level.txt,sha256=Meo5tTNdc5pf6_qwW6x4Cqz5iJJlXFqUDMti96pzV2I,12
+multibotkit-0.1.21.dist-info/RECORD,,

{multibotkit-0.1.19.dist-info → multibotkit-0.1.21.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: bdist_wheel (0.45.0)
 Root-Is-Purelib: true
 Tag: py3-none-any