RubigramClient 1.6.5__tar.gz → 1.6.6__tar.gz

{rubigramclient-1.6.5 → rubigramclient-1.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.6.5
+Version: 1.6.6
 Summary: A simple and flexible Python library for building advanced Rubika bots with powerful message handling, inline buttons, and custom filters.
 Author-email: Javad RZ <MrJavad.Email@gmail.com>
 Classifier: Programming Language :: Python :: 3
@@ -11,6 +11,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp
 Requires-Dist: aiofiles
+Requires-Dist: pydantic
 Dynamic: license-file
 
 # Rubigram

{rubigramclient-1.6.5 → rubigramclient-1.6.6}/RubigramClient.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.6.5
+Version: 1.6.6
 Summary: A simple and flexible Python library for building advanced Rubika bots with powerful message handling, inline buttons, and custom filters.
 Author-email: Javad RZ <MrJavad.Email@gmail.com>
 Classifier: Programming Language :: Python :: 3
@@ -11,6 +11,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp
 Requires-Dist: aiofiles
+Requires-Dist: pydantic
 Dynamic: license-file
 
 # Rubigram

{rubigramclient-1.6.5 → rubigramclient-1.6.6}/RubigramClient.egg-info/requires.txt

@@ -1,2 +1,3 @@
 aiohttp
 aiofiles
+pydantic

{rubigramclient-1.6.5 → rubigramclient-1.6.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "RubigramClient"
-version = "1.6.5"
+version = "1.6.6"
 description = "A simple and flexible Python library for building advanced Rubika bots with powerful message handling, inline buttons, and custom filters."
 readme = "README.md"
 requires-python = ">=3.7"
@@ -15,5 +15,6 @@ classifiers = [
 ]
 dependencies = [
     "aiohttp",
-    "aiofiles",    
+    "aiofiles",
+    "pydantic"
 ]

{rubigramclient-1.6.5 → rubigramclient-1.6.6}/rubigram/__init__.py

@@ -1,5 +1,3 @@
-from .network import Network
-from .method import Method
 from .client import Client
 from .state import StateManager
 from . import enums

{rubigramclient-1.6.5 → rubigramclient-1.6.6}/rubigram/method.py

@@ -1,5 +1,5 @@
 from .network import Network
-from . import enums
+from rubigram import enums
 from typing import Optional
 from rubigram.types import Bot, Chat, Keypad, MessageId, Updates, BotCommand
 
@@ -28,7 +28,7 @@ class Method(Network):
         return response["download_url"]
 
     async def set_command(self, commands: list[BotCommand]):
-        response = await self.request("setCommands", {"bot_commands": [command.to_dict() for command in commands]})
+        response = await self.request("setCommands", {"bot_commands": [command.asdict() for command in commands]})
         return response
 
     async def update_bot_endpoint(self, url: str, type: enums.UpdateEndpointType):
@@ -42,10 +42,10 @@ class Method(Network):
         await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "Remove"})
 
     async def edit_chat_keypad(self, chat_id: str, chat_keypad: Keypad):
-        await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "New", "chat_keypad": chat_keypad.to_dict()})
+        await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "New", "chat_keypad": chat_keypad.asdict()})
 
     async def edit_message_keypad(self, chat_id: str, message_id: str, inline_keypad: Keypad):
-        await self.request("editMessageKeypad", {"chat_id": chat_id, "message_id": message_id, "inline_keypad": inline_keypad.to_dict()})
+        await self.request("editMessageKeypad", {"chat_id": chat_id, "message_id": message_id, "inline_keypad": inline_keypad.asdict()})
 
     async def edit_message_text(self, chat_id: str, message_id: str, text: str):
         await self.request("editMessageText", {"chat_id": chat_id, "message_id": message_id, "text": text})
@@ -71,8 +71,8 @@ class Method(Network):
         data = {
             "chat_id": chat_id,
             "text": text,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "chat_keypad_type": chat_keypad_type,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id
@@ -98,8 +98,8 @@ class Method(Network):
             "chat_id": chat_id,
             "question": question,
             "options": options,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
@@ -125,8 +125,8 @@ class Method(Network):
             "chat_id": chat_id,
             "latitude": latitude,
             "longitude": longitude,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
@@ -154,8 +154,8 @@ class Method(Network):
             "first_name": first_name,
             "last_name": last_name,
             "phone_number": phone_number,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
@@ -179,8 +179,8 @@ class Method(Network):
         data = {
             "chat_id": chat_id,
             "sticker_id": sticker_id,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
@@ -223,8 +223,8 @@ class Method(Network):
             "chat_id": chat_id,
             "file_id": file_id,
             "text": caption,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type,

{rubigramclient-1.6.5 → rubigramclient-1.6.6}/rubigram/types.py

@@ -1,82 +1,24 @@
-from dataclasses import dataclass, is_dataclass, fields
-from typing import Type, TypeVar, Union, Optional, get_origin, get_args
-from json import dumps
-from enum import Enum
-from . import enums
-import rubigram
-
-
-T = TypeVar("T", bound="DataManager")
-
-
-@dataclass
-class DataManager:
-    def to_dict(self) -> dict:
-        data = {}
-        for field in fields(self):
-            value = getattr(self, field.name)
-            if isinstance(value, Enum):
-                data[field.name] = value.value
-            elif is_dataclass(value):
-                data[field.name] = value.to_dict()
-            elif isinstance(value, list):
-                data[field.name] = [i.to_dict() if is_dataclass(i) else i for i in value]
-            else:
-                data[field.name] = value
-        return data
+from typing import Optional, Any
+from pydantic import BaseModel
+from rubigram import enums
 
 
+class DataManager(BaseModel):
+    class Config:
+        use_enum_values = True
+        arbitrary_types_allowed = True
+
     @classmethod
-    def from_dict(Class: Type[T], data: dict) -> T:
-        data = data or {}
-        init_data = {}
-
-        for field in fields(Class):
-            value = data.get(field.name)
-            field_type = field.type
-            origin = get_origin(field_type)
-
-            if isinstance(value, dict) and isinstance(field_type, type) and issubclass(field_type, DataManager):
-                init_data[field.name] = field_type.from_dict(value)
-
-            elif origin == list:
-                inner_type = get_args(field_type)[0]
-                if isinstance(inner_type, type) and issubclass(inner_type, DataManager):
-                    init_data[field.name] = [inner_type.from_dict(
-                        v) if isinstance(v, dict) else v for v in (value or [])]
-                else:
-                    init_data[field.name] = value or []
-
-            elif origin == Union:
-                args = get_args(field_type)
-                dict_type = next((a for a in args if isinstance(
-                    a, type) and issubclass(a, DataManager)), None)
-                if dict_type and isinstance(value, dict):
-                    init_data[field.name] = dict_type.from_dict(value)
-                else:
-                    init_data[field.name] = value
-
-            else:
-                init_data[field.name] = value
-
-        return Class(**init_data)
-
-    def json(self):
-        def clear(object):
-            if isinstance(object, dict):
-                return {key: clear(value) for key, value in object.items() if value is not None}
-            elif isinstance(object, list):
-                return [clear(i) for i in object if i is not None]
-            else:
-                return object
-
-        data = self.to_dict()
-        data.pop("client", None)
-        clean_data = clear(data)
-        return dumps(clean_data, ensure_ascii=False, indent=4)
-
-
-@dataclass
+    def from_dict(cls, data: dict):
+        return cls.model_validate(data or {})
+
+    def asdict(self, exclude_none: bool = True) -> dict:
+        return self.model_dump(exclude_none=exclude_none, exclude={"client"})
+
+    def asjson(self, exclude_none: bool = True) -> str:
+        return self.model_dump_json(indent=4, exclude_none=exclude_none, exclude={"client"})
+
+
 class Chat(DataManager):
     chat_id: Optional[str] = None
     chat_type: Optional[enums.ChatType] = None
@@ -86,50 +28,30 @@ class Chat(DataManager):
     title: Optional[str] = None
     username: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class File(DataManager):
     file_id: Optional[str] = None
     file_name: Optional[str] = None
     size: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
 
-
-@dataclass
 class ForwardedFrom(DataManager):
     type_from: Optional[enums.ForwardedFrom] = None
     message_id: Optional[str] = None
     from_chat_id: Optional[str] = None
     from_sender_id: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class PaymentStatus(DataManager):
     payment_id: Optional[str] = None
     status: Optional[enums.PaymentStatus] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class MessageTextUpdate(DataManager):
     message_id: Optional[str] = None
     text: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
 
-
-@dataclass
 class Bot(DataManager):
     bot_id: Optional[str] = None
     bot_title: Optional[str] = None
@@ -139,40 +61,24 @@ class Bot(DataManager):
     start_message: Optional[str] = None
     share_url: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class BotCommand(DataManager):
     command: Optional[str] = None
     description: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class Sticker(DataManager):
     sticker_id: Optional[str] = None
     file: Optional[File] = None
     emoji_character: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
 
-
-@dataclass
 class ContactMessage(DataManager):
     phone_number: Optional[str] = None
     first_name: Optional[str] = None
     last_name: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class PollStatus(DataManager):
     state: Optional[enums.PollStatus] = None
     selection_index: Optional[int] = None
@@ -180,30 +86,18 @@ class PollStatus(DataManager):
     total_vote: Optional[int] = None
     show_total_votes: Optional[bool] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class Poll(DataManager):
     question: Optional[str] = None
     options: Optional[list[str]] = None
     poll_status: Optional[PollStatus] = None
 
-    def __repr__(self):
-        return self.json()
 
-
-@dataclass
 class Location(DataManager):
     longitude: Optional[str] = None
     latitude: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class LiveLocation(DataManager):
     start_time: Optional[str] = None
     live_period: Optional[int] = None
@@ -212,21 +106,13 @@ class LiveLocation(DataManager):
     status: Optional[enums.LiveLocationStatus] = None
     last_update_time: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class ButtonSelectionItem(DataManager):
     text: Optional[str] = None
     image_url: Optional[str] = None
     type: Optional[enums.ButtonSelectionType] = None
 
-    def __repr__(self):
-        return self.json()
 
-
-@dataclass
 class ButtonSelection(DataManager):
     selection_id: Optional[str] = None
     search_type: Optional[str] = None
@@ -236,11 +122,7 @@ class ButtonSelection(DataManager):
     columns_count: Optional[str] = None
     title: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class ButtonCalendar(DataManager):
     default_value: Optional[str] = None
     type: Optional[enums.ButtonCalendarType] = None
@@ -248,32 +130,20 @@ class ButtonCalendar(DataManager):
     max_year: Optional[str] = None
     title: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class ButtonNumberPicker(DataManager):
     min_value: Optional[str] = None
     max_value: Optional[str] = None
     default_value: Optional[str] = None
     title: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
 
-
-@dataclass
 class ButtonStringPicker(DataManager):
     items: Optional[list[str]] = None
     default_value: Optional[str] = None
     title: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class ButtonTextbox(DataManager):
     type_line: Optional[enums.ButtonTextboxTypeLine] = None
     type_keypad: Optional[enums.ButtonTextboxTypeKeypad] = None
@@ -281,11 +151,7 @@ class ButtonTextbox(DataManager):
     title: Optional[str] = None
     default_value: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
 
-
-@dataclass
 class ButtonLocation(DataManager):
     default_pointer_location: Optional[Location] = None
     default_map_location: Optional[Location] = None
@@ -293,49 +159,29 @@ class ButtonLocation(DataManager):
     title: Optional[str] = None
     location_image_url: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class OpenChatData(DataManager):
     object_guid: Optional[str] = None
     object_type: Optional[enums.ChatType] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class JoinChannelData(DataManager):
     username: Optional[str] = None
     ask_join: bool = False
 
-    def __repr__(self):
-        return self.json()
 
-
-@dataclass
 class ButtonLink(DataManager):
     type: Optional[enums.ButtonLinkType] = None
     link_url: Optional[str] = None
     joinchannel_data: Optional[JoinChannelData] = None
     open_chat_data: Optional[OpenChatData] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class AuxData(DataManager):
     start_id: Optional[str] = None
     button_id: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class Button(DataManager):
     id: Optional[str] = None
     button_text: Optional[str] = None
@@ -349,34 +195,21 @@ class Button(DataManager):
     button_link: Optional[ButtonLink] = None
 
 
-@dataclass
 class KeypadRow(DataManager):
     buttons: list[Button]
 
-    def __repr__(self):
-        return self.json()
 
-
-@dataclass
 class Keypad(DataManager):
     rows: list[KeypadRow]
     resize_keyboard: bool = True
     on_time_keyboard: bool = False
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class MessageKeypadUpdate(DataManager):
     message_id: Optional[str] = None
     inline_keypad: Optional[Keypad] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class Message(DataManager):
     message_id: Optional[str] = None
     text: Optional[str] = None
@@ -395,19 +228,12 @@ class Message(DataManager):
     poll: Optional[Poll] = None
     live_location: Optional[LiveLocation] = None
 
-    def __repr__(self):
-        return self.json()
 
-
-@dataclass
 class MessageId(DataManager):
     message_id: Optional[str] = None
     file_id: Optional[str] = None
     chat_id: Optional[str] = None
-    client: Optional["rubigram.Client"] = None
-
-    def __repr__(self):
-        return self.json()
+    client: Optional[Any] = None
 
     async def delete(self):
         return await self.client.delete_message(self.chat_id, self.message_id)
@@ -422,9 +248,8 @@ class MessageId(DataManager):
         return await self.client.forward_message(self.chat_id, self.message_id, chat_id)
 
 
-@dataclass
 class Update(DataManager):
-    client: Optional["rubigram.Client"] = None
+    client: Optional[Any] = None
     type: Optional[enums.UpdateType] = None
     chat_id: Optional[str] = None
     removed_message_id: Optional[str] = None
@@ -432,12 +257,12 @@ class Update(DataManager):
     updated_message: Optional[Message] = None
     updated_payment: Optional[PaymentStatus] = None
 
-    def __repr__(self):
-        return self.json()
-
     async def download(self, file_name: str):
         return await self.client.download_file(self.new_message.file.file_id, file_name)
 
+    async def forward(self, chat_id: str):
+        return await self.client.forward_message(self.chat_id, self.new_message.message_id, chat_id)
+
     async def reply(
         self,
         text: str,
@@ -446,8 +271,16 @@ class Update(DataManager):
         chat_keypad_type: Optional[enums.ChatKeypadType] = None,
         disable_notification: bool = None,
     ) -> "MessageId":
-        return await self.client.send_message(self.chat_id, text, chat_keypad, inline_keypad, chat_keypad_type, disable_notification, self.new_message.message_id)
-    
+        return await self.client.send_message(
+            self.chat_id,
+            text,
+            chat_keypad,
+            inline_keypad,
+            chat_keypad_type,
+            disable_notification,
+            self.new_message.message_id,
+        )
+
     async def reply_poll(
         self,
         question: str,
@@ -455,10 +288,19 @@ class Update(DataManager):
         chat_keypad: Keypad = None,
         inline_keypad: Keypad = None,
         chat_keypad_type: Optional[enums.ChatKeypadType] = None,
-        disable_notification: bool = False
+        disable_notification: bool = False,
     ) -> "MessageId":
-        return await self.client.send_poll(self.chat_id, question, options, chat_keypad, inline_keypad, chat_keypad_type, disable_notification, self.new_message.message_id)
-    
+        return await self.client.send_poll(
+            self.chat_id,
+            question,
+            options,
+            chat_keypad,
+            inline_keypad,
+            chat_keypad_type,
+            disable_notification,
+            self.new_message.message_id,
+        )
+
     async def reply_location(
         self,
         latitude: str,
@@ -468,8 +310,17 @@ class Update(DataManager):
         chat_keypad_type: Optional[enums.ChatKeypadType] = None,
         disable_notification: bool = False,
     ) -> "MessageId":
-        return await self.client.send_location(self.chat_id, latitude, longitude, chat_keypad, inline_keypad, chat_keypad_type, disable_notification, self.new_message.message_id)
-    
+        return await self.client.send_location(
+            self.chat_id,
+            latitude,
+            longitude,
+            chat_keypad,
+            inline_keypad,
+            chat_keypad_type,
+            disable_notification,
+            self.new_message.message_id,
+        )
+
     async def reply_contact(
         self,
         first_name: str,
@@ -480,8 +331,18 @@ class Update(DataManager):
         chat_keypad_type: Optional[enums.ChatKeypadType] = None,
         disable_notification: bool = False,
     ) -> "MessageId":
-        return await self.client.send_location(self.chat_id, first_name, last_name, phone_number, chat_keypad, inline_keypad, chat_keypad_type, disable_notification, self.new_message.message_id)
-    
+        return await self.client.send_location(
+            self.chat_id,
+            first_name,
+            last_name,
+            phone_number,
+            chat_keypad,
+            inline_keypad,
+            chat_keypad_type,
+            disable_notification,
+            self.new_message.message_id,
+        )
+
     async def reply_sticker(
         self,
         sticker_id: str,
@@ -490,7 +351,15 @@ class Update(DataManager):
         chat_keypad_type: Optional[enums.ChatKeypadType] = None,
         disable_notification: bool = False,
     ) -> "MessageId":
-        return await self.client.send_message(self.chat_id, sticker_id, chat_keypad, inline_keypad, chat_keypad_type, disable_notification, self.new_message.message_id)
+        return await self.client.send_message(
+            self.chat_id,
+            sticker_id,
+            chat_keypad,
+            inline_keypad,
+            chat_keypad_type,
+            disable_notification,
+            self.new_message.message_id,
+        )
 
     async def reply_file(
         self,
@@ -503,7 +372,18 @@ class Update(DataManager):
         chat_keypad_type: Optional[enums.ChatKeypadType] = None,
         disable_notification: bool = False,
     ) -> "MessageId":
-        return await self.client.send_file(self.chat_id, file, file_name, caption, type, chat_keypad, inline_keypad, chat_keypad_type, disable_notification, self.new_message.message_id)
+        return await self.client.send_file(
+            self.chat_id,
+            file,
+            file_name,
+            caption,
+            type,
+            chat_keypad,
+            inline_keypad,
+            chat_keypad_type,
+            disable_notification,
+            self.new_message.message_id,
+        )
 
     async def reply_document(self, document: str, name: str, caption: Optional[str] = None, **kwargs) -> "MessageId":
         return await self.reply_file(document, name, caption, "File", **kwargs)
@@ -524,25 +404,17 @@ class Update(DataManager):
         return await self.reply_file(voice, name, caption, "Voice", **kwargs)
 
 
-@dataclass
 class Updates(DataManager):
-    updates: list[Update] = None
+    updates: Optional[list[Update]] = None
     next_offset_id: Optional[str] = None
 
-    def __repr__(self):
-        return self.json()
-
 
-@dataclass
 class InlineMessage(DataManager):
-    client: Optional["rubigram.Client"] = None
+    client: Optional[Any] = None
     sender_id: Optional[str] = None
     text: Optional[str] = None
     message_id: Optional[str] = None
     chat_id: Optional[str] = None
     file: Optional[File] = None
     location: Optional[Location] = None
-    aux_data: Optional[AuxData] = None
-
-    def __repr__(self):
-        return self.json()
+    aux_data: Optional[AuxData] = None