PySPlusthon 0.5.1__tar.gz → 0.5.4__tar.gz

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySPlusthon
-Version: 0.5.1
+Version: 0.5.4
 Summary: a Python library for Soroush Plus Bot API
 Author-email: Mohammad Saleh Peyravi <akhbari87@gmail.com>
 License-Expression: MIT

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/client/attachments/send_animation.py

@@ -24,7 +24,8 @@ class SendAnimation:
             height: int = None,
             caption: str = None,
             reply_markup: ReplyMarkup = None,
-            reply_to_message_id: int = None
+            reply_to_message_id: int = None,
+            parse_mode: str = None
     ) -> Message:
         animation = resolve_media(animation)
         filename = _extract_filename_media(animation)

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/client/attachments/send_audio.py

@@ -14,7 +14,8 @@ class SendAudio:
             duration: int = None,
             title: str = None,
             reply_markup: ReplyMarkup = None,
-            reply_to_message_id: int = None
+            reply_to_message_id: int = None,
+            parse_mode: str = None
     ) -> Message:
         audio = resolve_media(audio)
 

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/client/attachments/send_contact.py

@@ -15,7 +15,8 @@ class SendContact:
             last_name: str = None,
             vcard : bytes = None,
             reply_markup: ReplyMarkup = None,
-            reply_to_message_id: int = None
+            reply_to_message_id: int = None,
+            parse_mode: str = None
     ) -> Message:
         if self.is_userbot():
             from PySPlusthon.proto import requests, structs

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/client/attachments/send_document.py

@@ -23,7 +23,8 @@ class SendDocument:
             document: Union[str, bytes, BinaryIO, InputMedia],
             caption: str = None,
             reply_markup: ReplyMarkup = None,
-            reply_to_message_id: int = None
+            reply_to_message_id: int = None,
+            parse_mode: str = None
     ) -> Message:
         document = resolve_media(document)
         filename = _extract_filename(document)

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/client/attachments/send_location.py

@@ -13,7 +13,8 @@ class SendLocation:
             latitude: float,
             longitude: float,
             reply_markup: ReplyMarkup = None,
-            reply_to_message_id: int = None
+            reply_to_message_id: int = None,
+            parse_mode: str = None
     ) -> Message:
         if self.is_userbot():
             from PySPlusthon.proto import requests, structs

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/client/attachments/send_media_group.py

@@ -14,7 +14,8 @@ class SendMediaGroup:
             chat_id: Union[int, str],
             media: List["objects.InputMedia"],
             reply_markup: ReplyMarkup = None,
-            reply_to_message_id: int = None
+            reply_to_message_id: int = None,
+            parse_mode: str = None
     ) -> List[Message]:
         if self.is_userbot():
             from ...proto import requests, structs, enums

pysplusthon-0.5.4/PySPlusthon/client/attachments/send_photo.py

@@ -0,0 +1,37 @@
+from typing import Union, BinaryIO, Optional
+import os
+
+import PySPlusthon
+from ...objects import InputMedia, resolve_media, Message, ReplyMarkup
+
+
+def _extract_filename_media(media) -> Optional[str]:
+    if isinstance(media, InputMedia):
+        return getattr(media.media, 'name', None) if hasattr(media.media, 'name') else None
+    if isinstance(media, str):
+        return os.path.basename(media)
+    return None
+
+
+class SendPhoto:
+
+    async def send_photo(
+            self: "PySPlusthon.Client",
+            chat_id: Union[int, str],
+            photo: Union[str, bytes, BinaryIO, InputMedia],
+            caption: str = None,
+            reply_markup: ReplyMarkup = None,
+            reply_to_message_id: int = None,
+            parse_mode: str = None
+    ) -> Message:
+        photo = resolve_media(photo)
+        filename = _extract_filename_media(photo)
+        chat_id = await self.resolve_peer_id(chat_id)
+        params = {"chat_id": chat_id, "photo": photo}
+        if caption is not None:
+            params["caption"] = caption
+        if filename is not None:
+            params["filename"] = filename
+        if parse_mode is not None:
+            params['parse_mode'] = parse_mode
+        return await self.auto_execute("sendPhoto", params)

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/client/attachments/send_sticker.py

@@ -11,7 +11,8 @@ class SendSticker:
             chat_id: Union[int, str],
             sticker: Union[str, bytes, BinaryIO, InputMedia],
             reply_markup: ReplyMarkup = None,
-            reply_to_message_id: int = None
+            reply_to_message_id: int = None,
+            parse_mode: str = None
     ) -> Message:
         if self.is_userbot():
             from ...proto import requests, structs

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/client/attachments/send_video.py

@@ -15,7 +15,8 @@ class SendVideo:
             height: int = None,
             caption: str = None,
             reply_markup: ReplyMarkup = None,
-            reply_to_message_id: int = None
+            reply_to_message_id: int = None,
+            parse_mode: str = None
     ) -> Message:
         video = resolve_media(video)
 

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/client/attachments/send_voice.py

@@ -13,7 +13,8 @@ class SendVoice:
             caption: str = None,
             duration: int = None,
             reply_markup: ReplyMarkup = None,
-            reply_to_message_id: int = None
+            reply_to_message_id: int = None,
+            parse_mode: str = None,
     ) -> Message:
         voice = resolve_media(voice)
 

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/client/client.py

@@ -143,11 +143,8 @@ class Client(Chain, Messages, Updates, Users, Attachments, Chats, InviteLinks, S
                     return await self.http_connection.request(service, json=data)
                 return await self.http_connection.request(service, data=data, files=files)
             except RPCError as error:
-                if error.seconds <= self.sleep_threshold:
-                    print(f"[Too many requests] retry after: {error.seconds} (caused by {service})")
-                    await sleep(error.seconds)
-                else:
-                    raise error
+                print(f"Too many requests (caused by {service})")
+                raise error
 
     async def execute(self, service: str, json: bool = None, **data):
         return await self.execute_http(service, json=json, **data)

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/client/messages/send_message.py

@@ -12,7 +12,8 @@ class SendMessage:
             chat_id: Union[int, str],
             text: str,
             reply_markup: "objects.ReplyMarkup" = None,
-            reply_to_message_id: int = None
+            reply_to_message_id: int = None,
+            parse_mode:str=None
     ) -> Message:
         if self.is_userbot():
             from PySPlusthon.proto import requests, structs

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/objects/__init__.py

@@ -36,7 +36,6 @@ from .webhook_info import WebhookInfo
 from .chat_photo import ChatPhoto
 from .invite_link import InviteLink
 from .list import List
-from .copy_text_button import CopyTextButton
 from .poll_option import PollOption
 from .poll import Poll
 from .forward_origin import ForwardOrigin

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/objects/inline_keyboard_button.py

@@ -12,20 +12,12 @@ class InlineKeyboardButton(Object):
             text: str = None,
             callback_data: str = None,
             url: str = None,
-            copy_text: Union["objects.CopyTextButton", str] = None,
-            switch_inline_query: str = None,
-            switch_inline_query_current_chat: str = None,
-            pay: bool = None,
             **kwargs
     ):
         super().__init__(**kwargs)
         self.text: str = text
         self.callback_data: str = callback_data
         self.url: str = url
-        self.copy_text = objects.CopyTextButton(copy_text) if isinstance(copy_text, str) else copy_text
-        self.switch_inline_query: str = switch_inline_query
-        self.switch_inline_query_current_chat: str = switch_inline_query_current_chat
-        self.pay: bool = pay
 
     def format(self, *args, **kwargs):
         button = deepcopy(self)
@@ -35,8 +27,4 @@ class InlineKeyboardButton(Object):
             button.callback_data = button.callback_data.format(*args, **kwargs)
         if button.url:
             button.url = button.url.format(*args, **kwargs)
-        if button.web_app:
-            button.web_app = button.web_app.format(*args, **kwargs)
-        if button.copy_text:
-            button.copy_text = button.copy_text.format(*args, **kwargs)
         return button

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon/objects/reply_keyboard_button.py

@@ -24,6 +24,4 @@ class ReplyKeyboardButton(Object):
         button = deepcopy(self)
         if button.text:
             button.text = button.text.format(*args, **kwargs)
-        if button.web_app:
-            button.web_app = button.web_app.format(*args, **kwargs)
         return button

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySPlusthon
-Version: 0.5.1
+Version: 0.5.4
 Summary: a Python library for Soroush Plus Bot API
 Author-email: Mohammad Saleh Peyravi <akhbari87@gmail.com>
 License-Expression: MIT

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/PySPlusthon.egg-info/SOURCES.txt

@@ -57,12 +57,6 @@ PySPlusthon/client/messages/edit_message_reply_markup.py
 PySPlusthon/client/messages/edit_message_text.py
 PySPlusthon/client/messages/forward_message.py
 PySPlusthon/client/messages/send_message.py
-PySPlusthon/client/stickers/__init__.py
-PySPlusthon/client/stickers/add_sticker_to_set.py
-PySPlusthon/client/stickers/create_new_sticker_set.py
-PySPlusthon/client/stickers/delete_sticker_from_set.py
-PySPlusthon/client/stickers/get_sticker_set.py
-PySPlusthon/client/stickers/upload_sticker_file.py
 PySPlusthon/client/updates/__init__.py
 PySPlusthon/client/updates/delete_webhook.py
 PySPlusthon/client/updates/get_updates.py
@@ -166,7 +160,6 @@ PySPlusthon/objects/chat_member.py
 PySPlusthon/objects/chat_permissions.py
 PySPlusthon/objects/chat_photo.py
 PySPlusthon/objects/contact.py
-PySPlusthon/objects/copy_text_button.py
 PySPlusthon/objects/date.py
 PySPlusthon/objects/document.py
 PySPlusthon/objects/edited_message.py

{pysplusthon-0.5.1 → pysplusthon-0.5.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PySPlusthon"
-version = "0.5.1"
+version = "0.5.4"
 description = "a Python library for Soroush Plus Bot API"
 readme = "README.md"
 requires-python = ">=3.10"

pysplusthon-0.5.1/PySPlusthon/client/attachments/send_photo.py

@@ -1,67 +0,0 @@
-from typing import Union, BinaryIO, Optional
-import os
-
-import PySPlusthon
-from ...objects import InputMedia, resolve_media, Message, ReplyMarkup
-
-
-def _extract_filename_media(media) -> Optional[str]:
-    if isinstance(media, InputMedia):
-        return getattr(media.media, 'name', None) if hasattr(media.media, 'name') else None
-    if isinstance(media, str):
-        return os.path.basename(media)
-    return None
-
-
-class SendPhoto:
-
-    async def send_photo(
-            self: "PySPlusthon.Client",
-            chat_id: Union[int, str],
-            photo: Union[str, bytes, BinaryIO, InputMedia],
-            caption: str = None,
-            reply_markup: ReplyMarkup = None,
-            reply_to_message_id: int = None
-    ) -> Message:
-        photo = resolve_media(photo)
-        filename = _extract_filename_media(photo)
-
-        if self.is_userbot():
-            from ...proto import requests, structs, enums
-            peer_id, peer_type = map(int, chat_id.split("|"))
-            file = await self.upload_file(chat_id, photo, enums.SEND_TYPE_PHOTO)
-            return await self.execute(requests.SendMessage(
-                peer=structs.Peer(
-                    type=peer_type,
-                    id=peer_id
-                ),
-                rid=self.ws_connection.create_rid(),
-                message=structs.Message(
-                    document_message=structs.DocumentMessage(
-                        file_id=file.id,
-                        access_hash=peer_id,
-                        file_size=file.size,
-                        name=file.name,
-                        mime_type=file.mime_type,
-                        ext=structs.DocumentEx(
-                            document_ex_photo=structs.DocumentExPhoto(
-                                w=100,
-                                h=100
-                            )
-                        ),
-                        caption=structs.TextMessage(text=caption)
-                    )
-                ),
-                ex_peer=structs.Peer(
-                    type=peer_type,
-                    id=peer_id
-                )
-            ))
-
-        chat_id = await self.resolve_peer_id(chat_id)
-        params = {"chat_id": chat_id, "photo": photo}
-        if caption is not None:
-            params["caption"] = caption
-        if filename is not None:
-            params["filename"] = filename
-        return await self.auto_execute("sendPhoto", params)

pysplusthon-0.5.1/PySPlusthon/client/stickers/__init__.py

@@ -1,9 +0,0 @@
-from .delete_sticker_from_set import DeleteStickerFromSet
-from .get_sticker_set import GetStickerSet
-from .create_new_sticker_set import CreateNewStickerSet
-from .upload_sticker_file import UploadStickerFile
-from .add_sticker_to_set import AddStickerToSet
-
-
-class Stickers(GetStickerSet, CreateNewStickerSet, DeleteStickerFromSet, UploadStickerFile, AddStickerToSet):
-    pass

pysplusthon-0.5.1/PySPlusthon/client/stickers/add_sticker_to_set.py

@@ -1,15 +0,0 @@
-from typing import Union
-
-import PySPlusthon
-
-
-class AddStickerToSet:
-
-    async def add_sticker_to_set(
-            self: "PySPlusthon.Client",
-            user_id: Union[int, str],
-            name: str,
-            sticker: str
-    ) -> bool:
-        user_id = await self.resolve_peer_id(user_id)
-        return await self.auto_execute("addStickerToSet", locals())

pysplusthon-0.5.1/PySPlusthon/client/stickers/create_new_sticker_set.py

@@ -1,16 +0,0 @@
-from typing import Union
-
-import PySPlusthon
-
-
-class CreateNewStickerSet:
-
-    async def create_new_sticker_set(
-            self: "PySPlusthon.Client",
-            user_id: Union[int, str],
-            name: str,
-            title: str,
-            sticker=None
-    ) -> bool:
-        user_id = await self.resolve_peer_id(user_id)
-        return await self.auto_execute("createNewStickerSet", locals())

pysplusthon-0.5.1/PySPlusthon/client/stickers/delete_sticker_from_set.py

@@ -1,10 +0,0 @@
-import PySPlusthon
-
-
-class DeleteStickerFromSet:
-
-    async def delete_sticker_from_set(
-            self: "PySPlusthon.Client",
-            sticker: str
-    ) -> bool:
-        return await self.auto_execute("deleteStickerToSet", locals())

pysplusthon-0.5.1/PySPlusthon/client/stickers/get_sticker_set.py

@@ -1,11 +0,0 @@
-import PySPlusthon
-from ...objects import StickerSet
-
-
-class GetStickerSet:
-
-    async def get_sticker_set(
-            self: "PySPlusthon.Client",
-            name: str
-    ) -> StickerSet:
-        return await self.auto_execute("getStickerSet", locals())

pysplusthon-0.5.1/PySPlusthon/client/stickers/upload_sticker_file.py

@@ -1,16 +0,0 @@
-from typing import Union, BinaryIO
-
-import PySPlusthon
-from ...objects import InputMedia, resolve_media
-
-
-class UploadStickerFile:
-
-    async def upload_sticker_file(
-            self: "PySPlusthon.Client",
-            user_id: Union[int, str],
-            sticker: Union[str, bytes, BinaryIO, InputMedia]
-    ) -> str:
-        user_id = await self.resolve_peer_id(user_id)
-        sticker = resolve_media(sticker)
-        return await self.auto_execute("uploadStickerFile", locals())

pysplusthon-0.5.1/PySPlusthon/objects/copy_text_button.py

@@ -1,18 +0,0 @@
-from copy import deepcopy
-
-from PySPlusthon.objects import Object
-
-
-class CopyTextButton(Object):
-    def __init__(
-            self,
-            text: str = None,
-            **kwargs
-    ):
-        super().__init__(**kwargs)
-        self.text: str = text
-
-    def format(self, *args, **kwargs):
-        copy_text_button = deepcopy(self)
-        copy_text_button.text = copy_text_button.text.format(*args, **kwargs)
-        return copy_text_button