RubigramClient 1.4.0__py3-none-any.whl → 1.4.2__py3-none-any.whl

rubigram/method.py

@@ -1,86 +1,79 @@
-from rubigram.network import NetWork
+from .network import Network
 from typing import Literal, Optional
-from rubigram.types import Bot, Chat, Update, Keypad, MessageId
+from .types import Bot, Chat, Keypad, MessageId, Updates
 
-class Method(NetWork):
+
+class Method(Network):
     def __init__(self, token: str):
         super().__init__(token)
-        
+
     async def get_me(self) -> "Bot":
         response = await self.request("getMe", {})
-        return Bot.read(response["data"]["bot"])
+        return Bot.from_dict(response["bot"])
 
     async def get_chat(self, chat_id: str) -> "Chat":
         response = await self.request("getChat", {"chat_id": chat_id})
-        return Chat.read(response["data"]["chat"])
-    
-    async def get_update(self, limit: int = 1, offset_id: Optional[int] = None) -> list[Update]:
+        return Chat.from_dict(response["chat"])
+
+    async def get_update(self, limit: int = 1, offset_id: Optional[int] = None) -> "Updates":
         response = await self.request("getUpdates", {"limit": limit, "offset_id": offset_id})
-        return [Update.read(update) for update in response["data"]["updates"]]
-    
+        return Updates.from_dict(response)
+
     async def get_file(self, file_id: str) -> str:
         response = await self.request("getFile", {"file_id": file_id})
-        return response["data"]["download_url"]
-    
+        return response["download_url"]
+
     async def set_command(self, command: list):
         response = await self.request("setCommands", {"bot_commands": command})
         return response
-    
+
     async def update_bot_endpoint(self, url: str, type: Literal["ReceiveUpdate", "ReceiveInlineMessage", "ReceiveQuery", "GetSelectionItem", "SearchSelectionItems"]):
         response = await self.request("updateBotEndpoints", {"url": url, "type": type})
         return response
-    
-    async def request_send_file(self, type: str):
-        response = await self.request("requestSendFile", {"type": type})
-        return response["data"]["upload_url"]
-    
-    async def upload_file(self, path: str, name: str, type: str):
-        upload_url = await self.request_send_file(type)
-        response = await self.request_upload_file(upload_url, path, name)
-        return response
-    
-    async def forward_message(self, from_chat_id: str, message_id: str, to_chat_id: str, disable_notification: bool = False) -> "MessageId":
-        data = {"from_chat_id": from_chat_id, "message_id": message_id, "to_chat_id": to_chat_id, "disable_notification": disable_notification}
-        response = await self.request("forwardMessage", data)
-        return MessageId.read(response["data"])
-    
+
     async def delete_message(self, chat_id: str, message_id: str):
         await self.request("deleteMessage", {"chat_id": chat_id, "message_id": message_id})
-    
+
     async def remove_chat_keypad(self, chat_id: str):
         await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "Remove"})
-        
+
     async def edit_chat_keypad(self, chat_id: str, chat_keypad):
         await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "New", "chat_keypad": chat_keypad})
 
     async def edit_message_keypad(self, chat_id: str, message_id: str, inline_keypad):
         await self.request("editMessageKeypad", {"chat_id": chat_id, "message_id": message_id, "inline_keypad": inline_keypad})
-    
+
     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})
-    
+
+    async def forward_message(self, from_chat_id: str, message_id: str, to_chat_id: str, disable_notification: bool = False) -> "MessageId":
+        data = {"from_chat_id": from_chat_id, "message_id": message_id,
+                "to_chat_id": to_chat_id, "disable_notification": disable_notification}
+        response = await self.request("forwardMessage", data)
+        return MessageId.from_dict(response)
+
     async def send_message(
         self,
         chat_id: str,
         text: str,
         chat_keypad: Keypad = None,
-        inline_keypad: Keypad= None,
+        inline_keypad: Keypad = None,
         chat_keypad_type: Literal["New", "Remove"] = None,
         disable_notification: bool = None,
-        reply_to_message_id = None
+        reply_to_message_id=None
     ) -> "MessageId":
         data = {
             "chat_id": chat_id,
             "text": text,
-            "chat_keypad": chat_keypad._dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad._dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
             "chat_keypad_type": chat_keypad_type,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id
         }
         response = await self.request("sendMessage", data)
-        return MessageId.read(response["data"])
-    
+        return MessageId.from_dict(response)
+
     async def send_poll(
         self,
         chat_id: str,
@@ -96,15 +89,15 @@ class Method(NetWork):
             "chat_id": chat_id,
             "question": question,
             "options": options,
-            "chat_keypad": chat_keypad._dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad._dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
         }
         response = await self.request("sendPoll", data)
-        return MessageId.read(response["data"])
-    
+        return MessageId.from_dict(response)
+
     async def send_location(
         self,
         chat_id: str,
@@ -120,15 +113,15 @@ class Method(NetWork):
             "chat_id": chat_id,
             "latitude": latitude,
             "longitude": longitude,
-            "chat_keypad": chat_keypad._dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad._dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
         }
         response = await self.request("sendLocation", data)
-        return MessageId.read(response["data"])
-    
+        return MessageId.from_dict(response)
+
     async def send_contact(
         self,
         chat_id: str,
@@ -146,15 +139,15 @@ class Method(NetWork):
             "first_name": first_name,
             "last_name": last_name,
             "phone_number": phone_number,
-            "chat_keypad": chat_keypad._dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad._dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
         }
         response = await self.request("sendContact", data)
-        return MessageId.read(response["data"])
-    
+        return MessageId.from_dict(response)
+
     async def send_sticker(
         self,
         chat_id: str,
@@ -168,41 +161,70 @@ class Method(NetWork):
         data = {
             "chat_id": chat_id,
             "sticker_id": sticker_id,
-            "chat_keypad": chat_keypad._dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad._dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
         }
+
         response = await self.request("sendSticker", data)
-        return MessageId.read(response["data"])
-    
+        return MessageId.from_dict(response)
+
+    async def request_send_file(self, type: str):
+        response = await self.request("requestSendFile", {"type": type})
+        return response["upload_url"]
+
+    async def upload_file(self, file: str, name: str, type: str):
+        upload_url = await self.request_send_file(type)
+        response = await self.request_upload_file(upload_url, file, name)
+        return response
+
+    async def download_file(self, file_id: str, file_name: str):
+        download_url = await self.get_file(file_id)
+        response = await self.request_download_file(download_url, file_name)
+        return response
+
     async def send_file(
         self,
         chat_id: str,
-        path: str,
+        file: str,
         file_name: str,
-        type: Literal["File", "Image", "Voice", "Music", "Gif", "Video"] = "File",
+        type: Literal["File", "Image", "Voice",
+                      "Music", "Gif", "Video"] = "File",
         chat_keypad: Keypad = None,
         inline_keypad: Keypad = None,
+        chat_keypad_type: Literal["New", "Remove"] = None,
         disable_notification: bool = False,
         reply_to_message_id: str = None,
-        chat_keypad_type: Literal["New", "Remove"] = None,
     ) -> "MessageId":
-        file_id = await self.upload_file(path, file_name, type)
+        file_id = await self.upload_file(file, file_name, type)
         data = {
             "chat_id": chat_id,
             "file_id": file_id,
-            "chat_keypad": chat_keypad._dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad._dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type,
         }
         response = await self.request("sendFile", data)
-        return MessageId.read(response["data"])
-    
-    async def download_file(self, file_id: str, file_name: str):
-        download_url = await self.get_file(file_id)
-        response = await self.request_download_file(download_url, file_name)
-        return response
+        return MessageId.from_dict(response)
+
+    async def send_document(self, chat_id: str, document: str, name: str, **kwargs):
+        return await self.send_file(chat_id, document, name, "File", **kwargs)
+
+    async def send_photo(self, chat_id: str, photo: str, name: str, **kwargs):
+        return await self.send_file(chat_id, photo, name, "Image", **kwargs)
+
+    async def send_video(self, chat_id: str, video: str, name: str, **kwargs):
+        return await self.send_file(chat_id, video, name, "Video", **kwargs)
+
+    async def send_gif(self, chat_id: str, gif: str, name: str, **kwargs):
+        return await self.send_file(chat_id, gif, name, "Gif", **kwargs)
+
+    async def send_music(self, chat_id: str, music: str, name: str, **kwargs):
+        return await self.send_file(chat_id, music, name, "Music", **kwargs)
+
+    async def send_voice(self, chat_id: str, voice: str, name: str, **kwargs):
+        return await self.send_file(chat_id, voice, name, "Voice", **kwargs)

rubigram/network.py

@@ -1,30 +1,58 @@
 from aiohttp import ClientSession, FormData
+from typing import Any, Optional, Dict, Union
 import aiofiles
+import re
+import os
 
-class NetWork:
-    def __init__(self, token: str):
-        self.token = token
-        self.api = f"https://botapi.rubika.ir/v3/{self.token}/"
-        
-    async def request(self, method: str, json: dict) -> dict:
-        async with ClientSession() as session:
-            async with session.post(self.api + method, json=json) as response:
-                response.raise_for_status()
-                return await response.json()
+
+class Network:
+    def __init__(self, token: str) -> None:
+        self.token: str = token
+        self.session: Optional[ClientSession] = None
+        self.api: str = f"https://botapi.rubika.ir/v3/{self.token}/"
+
+    async def get_session(self) -> ClientSession:
+        if self.session is None or self.session.closed:
+            self.session = ClientSession()
+        return self.session
+
+    async def close(self) -> None:
+        if self.session and not self.session.closed:
+            await self.session.close()
+
+    async def request(self, method: str, json: Dict[str, Any]) -> Optional[Dict[str, Any]]:
+        session = await self.get_session()
+        async with session.post(self.api + method, json=json) as response:
+            response.raise_for_status()
+            data: dict = await response.json()
+            return data.get("data")
+
+    async def request_bytes_file(self, url: str) -> bytes:
+        session = await self.get_session()
+        async with session.get(url) as response:
+            response.raise_for_status()
+            return await response.read()
+
+    async def request_upload_file(self, upload_url: str, file: Union[str], name: str) -> str:
+        session = await self.get_session()
+
+        if isinstance(file, str) and re.match(r"^https?://", file):
+            file = await self.request_bytes_file(file)
             
-    async def request_upload_file(self, url: str, path: str, name: str) -> str:
+        elif isinstance(file, str) and os.path.isfile(file):
+            async with aiofiles.open(file, "rb") as f:
+                file = await f.read()
+
         form = FormData()
-        form.add_field("file", open(path, "rb"), filename=name, content_type="application/octet-stream")
-        async with ClientSession() as session:
-            async with session.post(url, data=form) as response:
-                response.raise_for_status()
-                result = await response.json()
-                return result["data"]["file_id"]
-            
-    async def request_download_file(self, url: str, name: str):
-        async with ClientSession() as session:
-            async with session.get(url) as response:
-                response.raise_for_status()
-                async with aiofiles.open(name, mode="wb") as file:
-                    await file.write(await response.read())
-                    return {"status": True, "file": name}
+        form.add_field("file", file, filename=name, content_type="application/octet-stream")
+
+        async with session.post(upload_url, data=form) as response:
+            response.raise_for_status()
+            data = await response.json()
+            return data["data"]["file_id"]
+        
+    async def request_download_file(self, url: str, name: str) -> dict[str, Union[str, bool]]:
+        file = await self.request_bytes_file(url)
+        async with aiofiles.open(name, "wb") as f:
+            await f.write(file)
+            return {"status": True, "file": name}