RubigramClient 1.3.9__py3-none-any.whl → 1.4.1__py3-none-any.whl

rubigram/__init__.py

@@ -1,4 +1,5 @@
-from .client import Client
+from .network import Network
 from .method import Method
-from .network import NetWork
-from . import filters
+from .client import Client
+from . import filters
+from . import state

rubigram/client.py

@@ -1,72 +1,92 @@
+from __future__ import annotations
+from typing import Callable, Awaitable, Optional
+from aiohttp import web
+from functools import wraps
 from rubigram.types import Update, InlineMessage
 from rubigram.method import Method
-from aiohttp import web
+import asyncio
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 class Client(Method):
-    def __init__(self, token: str, endpoint: str = None, host: str = "0.0.0.0", port: int = 8000):
+    def __init__(
+        self,
+        token: str,
+        endpoint: Optional[str] = None,
+        host: str = "0.0.0.0",
+        port: int = 8000
+    ):
         self.token = token
         self.port = port
         self.host = host
         self.endpoint = endpoint
-        self.messages_handler = []
-        self.inlines_handler = []
+        self.messages_handler: list[Callable[[Client, Update], Awaitable]] = []
+        self.inlines_handler: list[Callable[[Client, InlineMessage], Awaitable]] = []
         self.routes = web.RouteTableDef()
-        self.api = f"https://botapi.rubika.ir/v3/{self.token}/"
         super().__init__(token)
 
-    
-    def on_message(self, *filters):
-        def decorator(func):
-            async def wrapper(client, update):
-                if all(f(update) for f in filters):
-                    await func(client, update)
+    def on_message(self, *filters: Callable[[Update], bool]):
+        def decorator(func: Callable[[Client, Update], Awaitable]):
+            @wraps(func)
+            async def wrapper(client: Client, update: Update):
+                try:
+                    if all(f(update) for f in filters):
+                        await func(client, update)
+                except Exception as e:
+                    logger.exception(f"Error in message handler {func.__name__}: {e}")
             self.messages_handler.append(wrapper)
             return func
         return decorator
-    
-    def on_inline_message(self, *filters):
-        def decorator(func):
-            async def wrapper(client, update):
-                if all(f(update) for f in filters):
-                    await func(client, update)
+
+    def on_inline_message(self, *filters: Callable[[InlineMessage], bool]):
+        def decorator(func: Callable[[Client, InlineMessage], Awaitable]):
+            @wraps(func)
+            async def wrapper(client: Client, update: InlineMessage):
+                try:
+                    if all(f(update) for f in filters):
+                        await func(client, update)
+                except Exception as e:
+                    logger.exception(f"Error in inline handler {func.__name__}: {e}")
             self.inlines_handler.append(wrapper)
             return func
         return decorator
-    
-    async def update(self, data: dict):
+
+    async def handle_update(self, data: dict):
         if "inline_message" in data:
-            event = InlineMessage.read(data["inline_message"])
-            for handler in self.inlines_handler:
-                await handler(self, event)
-        else:
-            event = Update.read(data["update"], self)
-            for handler in self.messages_handler:
-                await handler(self, event)
-    
+            event = InlineMessage.from_dict(data["inline_message"])
+            await asyncio.gather(*(h(self, event) for h in self.inlines_handler))
+        elif "update" in data:
+            event = Update.from_dict(data["update"])
+            event.client = self
+            await asyncio.gather(*(h(self, event) for h in self.messages_handler))
+            
+
     async def set_endpoints(self):
-        await self.update_bot_endpoint(self.endpoint + "/ReceiveUpdate", "ReceiveUpdate")
-        await self.update_bot_endpoint(self.endpoint + "/ReceiveInlineMessage", "ReceiveInlineMessage")
+        if not self.endpoint:
+            return
+        await self.update_bot_endpoint(f"{self.endpoint}/ReceiveUpdate", "ReceiveUpdate")
+        await self.update_bot_endpoint(f"{self.endpoint}/ReceiveInlineMessage", "ReceiveInlineMessage")
 
     def run(self):
         @self.routes.post("/ReceiveUpdate")
-        async def receive_update(request):
+        async def receive_update(request: web.Request):
             data = await request.json()
-            await self.update(data)
+            await self.handle_update(data)
             return web.json_response({"status": "OK"})
 
         @self.routes.post("/ReceiveInlineMessage")
-        async def receive_inline_message(request):
+        async def receive_inline_message(request: web.Request):
             data = await request.json()
-            await self.update(data)
-            return web.json_response({"status": "ok"})
+            await self.handle_update(data)
+            return web.json_response({"status": "OK"})
 
         app = web.Application()
         app.add_routes(self.routes)
 
-        async def on_startup(app):
-            if self.endpoint:
-                await self.set_endpoints()
+        async def on_startup(_):
+            await self.set_endpoints()
 
         app.on_startup.append(on_startup)
-        web.run_app(app, host = self.host, port = self.port)
+        web.run_app(app, host=self.host, port=self.port)

rubigram/filters.py

@@ -1,14 +1,29 @@
 from rubigram.types import Update, InlineMessage
+from rubigram.state import state_manager
 from typing import Union
 import re
 
-def command(commands: Union[str, list[str]], prefixe: str = "/"):
+
+def state(states: Union[str, list[str]]):
+    def filter(message: Union[Update, InlineMessage]):
+        user_state = state_manager.get_state(message.chat_id)
+        return user_state in states if isinstance(states, list) else user_state == states
+    return filter
+
+def edited():
     def filter(message: Update):
-        if isinstance(message, Update) and message.type == "NewMessage" and message.new_message.text:
-            text = message.new_message.text
-            COMMANDS = commands if isinstance(commands, list) else [commands]
-            for cmd in COMMANDS:
-                if text.lower().startswith(prefixe + cmd):
+        if isinstance(message, Update) and message.updated_message:
+            return message.updated_message.is_edited
+        return False
+    return filter
+
+def command(commands: Union[str, list[str]], prefix: str = "/"):
+    def filter(message: Update):
+        if isinstance(message, Update) and message.new_message and message.new_message.text:
+            text = message.new_message.text.strip()
+            cmds = commands if isinstance(commands, list) else [commands]
+            for cmd in cmds:
+                if text.lower().startswith(prefix + cmd.lower()):
                     return True
         return False
     return filter
@@ -62,6 +77,7 @@ def private():
         return False
     return filter
 
+
 def forward():
     def filter(message: Update):
         if isinstance(message, Update) and message.type == "NewMessage":
@@ -69,6 +85,30 @@ def forward():
         return False
     return filter
 
+def forward_channel():
+    def filter(message: Update):
+        if isinstance(message, Update) and message.type == "NewMessage" and message.new_message.forwarded_from:
+            return message.new_message.forwarded_from.from_sender_id == "Channel"
+        return False
+    return filter
+
+
+def forward_user():
+    def filter(message: Update):
+        if isinstance(message, Update) and message.type == "NewMessage" and message.new_message.forwarded_from:
+            return message.new_message.forwarded_from.from_sender_id == "User"
+        return False
+    return filter
+
+
+def forward_bot():
+    def filter(message: Update):
+        if isinstance(message, Update) and message.type == "NewMessage" and message.new_message.forwarded_from:
+            return message.new_message.forwarded_from.from_sender_id == "Bot"
+        return False
+    return filter
+
+
 def location():
     def filter(message: Update):
         if isinstance(message, Update) and message.type == "NewMessage":

rubigram/method.py

@@ -1,26 +1,27 @@
-from rubigram.network import NetWork
+from rubigram.network import Network
 from typing import Literal, Optional
 from rubigram.types import Bot, Chat, Update, Keypad, MessageId
 
-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"])
+        return Chat.from_dict(response["chat"])
     
     async def get_update(self, limit: int = 1, offset_id: Optional[int] = None) -> list[Update]:
         response = await self.request("getUpdates", {"limit": limit, "offset_id": offset_id})
-        return [Update.read(update) for update in response["data"]["updates"]]
+        return [Update.from_dict(update) for update in response["updates"]]
     
     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})
@@ -30,19 +31,10 @@ class Method(NetWork):
         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"])
+        return MessageId.from_dict(response)
     
     async def delete_message(self, chat_id: str, message_id: str):
         await self.request("deleteMessage", {"chat_id": chat_id, "message_id": message_id})
@@ -72,14 +64,14 @@ class Method(NetWork):
         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,
@@ -96,14 +88,14 @@ 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,
@@ -120,14 +112,14 @@ 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,
@@ -146,14 +138,14 @@ 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,
@@ -168,41 +160,196 @@ 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",
         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,
+    ) -> "MessageId":
+        file_id = await self.upload_file(file, file_name, type)
+        data = {
+            "chat_id": chat_id,
+            "file_id": file_id,
+            "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.from_dict(response)
+        
+        
+    async def send_document(
+        self,
+        chat_id: str,
+        document: str,
+        name: str,
+        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,
     ) -> "MessageId":
-        file_id = await self.upload_file(path, file_name, type)
+        file_id = await self.upload_file(document, name, "File")
         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"])
+        return MessageId.from_dict(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_photo(
+        self,
+        chat_id: str,
+        photo: str,
+        name: str,
+        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,
+    ) -> "MessageId":
+        file_id = await self.upload_file(photo, name, "Image")
+        data = {
+            "chat_id": chat_id,
+            "file_id": file_id,
+            "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.from_dict(response)
+    
+    async def send_video(
+        self,
+        chat_id: str,
+        video: str,
+        name: str,
+        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,
+    ) -> "MessageId":
+        file_id = await self.upload_file(video, name, "Video")
+        data = {
+            "chat_id": chat_id,
+            "file_id": file_id,
+            "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.from_dict(response)
+    
+    async def send_gif(
+        self,
+        chat_id: str,
+        gif: str,
+        name: str,
+        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,
+    ) -> "MessageId":
+        file_id = await self.upload_file(gif, name, "Gif")
+        data = {
+            "chat_id": chat_id,
+            "file_id": file_id,
+            "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.from_dict(response)
+    
+    async def send_music(
+        self,
+        chat_id: str,
+        music: str,
+        name: str,
+        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,
+    ) -> "MessageId":
+        file_id = await self.upload_file(music, name, "Music")
+        data = {
+            "chat_id": chat_id,
+            "file_id": file_id,
+            "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.from_dict(response)
+    
+    async def send_voice(
+        self,
+        chat_id: str,
+        voice: str,
+        name: str,
+        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,
+    ) -> "MessageId":
+        file_id = await self.upload_file(voice, name, "Voice")
+        data = {
+            "chat_id": chat_id,
+            "file_id": file_id,
+            "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.from_dict(response)

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}

rubigram/state.py

@@ -0,0 +1,30 @@
+from typing import Any, Union, Optional
+
+class StateManager:
+    def __init__(self):
+        self.states: dict[str, Any] = {}
+        self.datas: dict[str, dict[str, Any]] = {}
+
+    def set_state(self, user_id: str, state: Any):
+        self.states[user_id] = state
+    
+    def get_state(self, user_id: str):
+        return self.states.get(user_id)
+    
+    def clear_state(self, user_id: str):
+        self.states.pop(user_id, None)
+    
+    def set_data(self, user_id: str, **data):
+        if user_id not in self.datas:
+            self.datas[user_id] = {}
+        self.datas[user_id].update(data)
+        
+    def get_data(self, user_id: str, key: Optional[Union[str, int]] = None):
+        if key is not None:
+            return self.datas.get(user_id, {}).get(key)
+        return self.datas.get(user_id)
+    
+    def clear_data(self, user_id: str):
+        self.datas.pop(user_id, None)
+
+state_manager = StateManager()