multibotkit 0.1.14__py3-none-any.whl → 0.1.16__py3-none-any.whl

multibotkit/helpers/telegram.py

@@ -26,7 +26,9 @@ from multibotkit.schemas.telegram.outgoing import (
     WebhookInfo,
     MediaGroup,
     ReplyKeyboardRemove,
-    Sticker, Video,
+    Sticker,
+    Video,
+    Location,
 )
 
 
@@ -67,6 +69,46 @@ class TelegramHelper(BaseHelper):
         r = await self._perform_async_request(url, data)
         return r
 
+    def sync_send_locations(
+        self,
+        chat_id: int,
+        latitude: float,
+        longitude: float,
+        reply_markup: Optional[
+            Union[InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove]
+        ] = None,
+    ):
+        url = self.tg_base_url + "sendLocation"
+        params = Location(
+            chat_id=chat_id,
+            latitude=latitude,
+            longitude=longitude,
+            reply_markup=reply_markup,
+        )
+        data = params.dict(exclude_none=True)
+        r = self._perform_sync_request(url, data)
+        return r
+
+    async def async_send_locations(
+        self,
+        chat_id: int,
+        latitude: float,
+        longitude: float,
+        reply_markup: Optional[
+            Union[InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove]
+        ] = None,
+    ):
+        url = self.tg_base_url + "sendLocation"
+        params = Location(
+            chat_id=chat_id,
+            latitude=latitude,
+            longitude=longitude,
+            reply_markup=reply_markup,
+        )
+        data = params.dict(exclude_none=True)
+        r = await self._perform_async_request(url, data)
+        return r
+
     def sync_send_message(
         self,
         chat_id: int,

multibotkit/schemas/telegram/incoming.py

@@ -224,6 +224,18 @@ class User(BaseModel):
     )
 
 
+class WebAppData(BaseModel):
+    data: str = Field(
+        ...,
+        title="The data. Be aware that a bad client can send arbitrary data in this field.",
+    )
+    button_text: str = Field(
+        ...,
+        title="Text of the web_app keyboard button from which the Web App was opened. Be aware that a bad client can "
+              "send arbitrary data in this field.",
+    )
+
+
 class Message(BaseModel):
     message_id: int = Field(..., title="Unique message identifier inside this chat")
     date: int = Field(..., title="Date the message was sent in Unix time")
@@ -268,6 +280,9 @@ video message",
         title="Message is a shared location, information about \
 the location",
     )
+    web_app_data: Optional[WebAppData] = Field(
+        None, title="Service message: data sent by a Web App"
+    )
 
     class Config:
         fields = {"from_": "from"}

multibotkit/schemas/telegram/outgoing.py

@@ -84,6 +84,12 @@ 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(
@@ -96,6 +102,9 @@ contact when the button is pressed",
         title="If True, the user's current location will be sent \
 when the button is pressed",
     )
+    web_app: Optional[WebAppInfo] = Field(
+        None, title="Info about WebApp to be started when button is pressed"
+    )
 
 
 class ReplyKeyboardMarkup(BaseModel):
@@ -124,6 +133,15 @@ class ReplyKeyboardRemove(BaseModel):
     remove_keyboard: bool = Field(True, title="Remove reply keyboard")
 
 
+class Location(BaseModel):
+    chat_id: int = Field(..., title="Unique identifier for the chat")
+    latitude: float = Field(..., title="Latitude of the location")
+    longitude: float = Field(..., title="Longitude of the location")
+    reply_markup: Optional[
+        Union[InlineKeyboardMarkup, ReplyKeyboardMarkup, ReplyKeyboardRemove]
+    ] = Field(None, title="Inline or Reply keyboard attached to the message")
+
+
 class Message(BaseModel):
     chat_id: int = Field(..., title="Unique identifier for the chat")
     text: str = Field(

{multibotkit-0.1.14.dist-info → multibotkit-0.1.16.dist-info}/METADATA

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

{multibotkit-0.1.14.dist-info → multibotkit-0.1.16.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=8VnLF5AAkt0_rawdNnjMetF2wHME918V_TTQLcbOMvo,50855
+multibotkit/helpers/telegram.py,sha256=hghsllqnj3cg1jbRZUWnefxf4uwnN_aL5bOBJrdoP3Q,52059
 multibotkit/helpers/viber.py,sha256=74UQ3RtHS3iR8qA5XVeMOYfXaaMq2pF0cpItwehdr4o,9246
 multibotkit/helpers/vk.py,sha256=QlI9rGEjhzqS-jcFrnZJ651lDbC4m33SSHAC1zWDyUU,5930
 multibotkit/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,8 +16,8 @@ multibotkit/schemas/fb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 multibotkit/schemas/fb/incoming.py,sha256=sp4CeQohaDMOxz113dNxJDv_fSaGW5i8qzVS7FKdvcU,3158
 multibotkit/schemas/fb/outgoing.py,sha256=Qm0gPHHipAolXpnOJC4J4bfYjQEWpX54vYygSwKtIV4,8036
 multibotkit/schemas/telegram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-multibotkit/schemas/telegram/incoming.py,sha256=mLZ55IHvalbI_CpSv1QhtsWEBjPKYAH9FP2uYWfDSqE,10379
-multibotkit/schemas/telegram/outgoing.py,sha256=fepZWcSeTmllMUjoTYcAeQgmxtCkW0tD2mO2rHmGBNU,10888
+multibotkit/schemas/telegram/incoming.py,sha256=ba67RQT5phOEIWTMG72SomUQrdxiuoKlXOxiz5fiaeA,10881
+multibotkit/schemas/telegram/outgoing.py,sha256=hCQP7UKRfSh-hX6F5KDfZwxWItBkOWCo5zHRVtIYECk,11569
 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=C9HTjfVvttzOizycprWHd2C86DfKqd2Nyq5-5CqQNDI,1659
-multibotkit-0.1.14.dist-info/LICENSE,sha256=3iCLdX93Z5F6PpDqN6q7wufsBixXuTAYwgzntBQjYBQ,1069
-multibotkit-0.1.14.dist-info/METADATA,sha256=1CUik_t4gRkHO9jgYvqpealRsIHX5U48cLzIuJYHzpQ,837
-multibotkit-0.1.14.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-multibotkit-0.1.14.dist-info/top_level.txt,sha256=Meo5tTNdc5pf6_qwW6x4Cqz5iJJlXFqUDMti96pzV2I,12
-multibotkit-0.1.14.dist-info/RECORD,,
+multibotkit-0.1.16.dist-info/LICENSE,sha256=3iCLdX93Z5F6PpDqN6q7wufsBixXuTAYwgzntBQjYBQ,1069
+multibotkit-0.1.16.dist-info/METADATA,sha256=FTmehEFIiy7O3uD7dmN2anZhiqJ8NqduiW1qJfk2X6w,837
+multibotkit-0.1.16.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+multibotkit-0.1.16.dist-info/top_level.txt,sha256=Meo5tTNdc5pf6_qwW6x4Cqz5iJJlXFqUDMti96pzV2I,12
+multibotkit-0.1.16.dist-info/RECORD,,