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

rubigram/client.py

@@ -1,72 +1,90 @@
+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:
+            await asyncio.gather(*(h(self, event) for h in self.inlines_handler))
+        elif "update" in data:
             event = Update.read(data["update"], self)
-            for handler in self.messages_handler:
-                await handler(self, event)
-    
+            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,22 @@
 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 command(commands: Union[str, list[str]], prefix: str = "/"):
     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.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

rubigramclient-1.4.0.dist-info/METADATA

@@ -0,0 +1,70 @@
+Metadata-Version: 2.4
+Name: RubigramClient
+Version: 1.4.0
+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 <Javad.Py1385@gmail.com>
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: aiohttp
+Requires-Dist: aiofiles
+Dynamic: license-file
+
+# Rubigram
+A lightweight Python library to build Rubika bots easily.
+
+## Installation
+```bash
+pip install RubigramClient
+```
+
+## Send Message
+```python
+from rubigram import Client, filters
+from rubigram.types import Update
+
+bot = Client("your_bot_token", "you_endpoint_url")
+
+@bot.on_message(filters.command("start"))
+async def start_handler(client, message: Update):    
+    await message.reply("Hi, WELCOME TO RUBIGRAM")
+
+bot.run()
+```
+
+## Send Message & Get receiveInlineMessage
+```python
+from rubigram import Client, filters
+from rubigram.types import Update, Button, Keypad, KeypadRow, InlineMessage
+
+
+bot = Client(token="bot_token", endpoint="endpoint_url")
+
+
+@bot.on_message(filters.command("start"))
+async def start(_, message: Update):
+    inline = Keypad(
+        rows=[
+            KeypadRow(
+                buttons=[
+                    Button("1", "Simple", "Button 1"),
+                    Button("2", "Simple", "Button 2")
+                ]
+            )
+        ]
+    )
+    await bot.send_message(message.chat_id, "Hi", inline_keypad=inline)
+    
+
+@bot.on_inline_message(filters.button(["1", "2"]))
+async def button(_, message: InlineMessage):
+    if message.aux_data.button_id == "1":
+        await bot.send_message(message.chat_id, "You Click Button 1")
+    elif message.aux_data.button_id == "2":
+        await bot.send_message(message.chat_id, "You Click Button 2")
+        
+bot.run()
+```

rubigramclient-1.4.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+rubigram/__init__.py,sha256=4JZ6q8ukflz_izRmJNYcndcKZFCsyJdYoYVoAPwN5V0,107
+rubigram/client.py,sha256=IKyV-9-1WFuKZzspVrJLVok5NVlTTU7RXkW_rFDfHDY,3506
+rubigram/filters.py,sha256=0ocvO9FGDlRAEbmPegsg40Eo6jHj5prfBL-lImTDGXU,4086
+rubigram/method.py,sha256=nm2qfzkanpzDo3yusIXmjYgCYmLzV6nVOyaxPDDqqz4,9074
+rubigram/network.py,sha256=K7vvGikXStvUBqHX2gogy3hJ1eQjLAJ7kdwLbfFuZIg,1399
+rubigram/types.py,sha256=evelh8GGttOHFQjiwXOzwXYFwLXKJSHit60T0T-9VIE,17035
+rubigramclient-1.4.0.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rubigramclient-1.4.0.dist-info/METADATA,sha256=ulFp24wnkZUbLvxDfy3uR_CDnpZgDRbwbvj4UezmmDo,2035
+rubigramclient-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rubigramclient-1.4.0.dist-info/top_level.txt,sha256=Mhg5HfkL6rLec5sI4ClGmwoqYUANAZUz8sVa1sT_cas,9
+rubigramclient-1.4.0.dist-info/RECORD,,

rubigramclient-1.3.9.dist-info/METADATA

@@ -1,35 +0,0 @@
-Metadata-Version: 2.4
-Name: RubigramClient
-Version: 1.3.9
-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 <Javad.Py1385@gmail.com>
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: aiohttp
-Requires-Dist: aiofiles
-Dynamic: license-file
-
-# Rubigram
-A lightweight Python library to build Rubika bots easily.
-
-## Installation
-```bash
-pip install RubigramClient
-```
-## Example
-```python
-from rubigram import Client, filters
-from rubigram.types import Update
-
-bot = Client("your_bot_token", "you_endpoint_url")
-
-@bot.on_message(filters.command("start"))
-async def start_handler(client, message: Update):    
-    await message.reply("Hi, WELCOME TO RUBIGRAM")
-
-bot.run()
-```

rubigramclient-1.3.9.dist-info/RECORD

@@ -1,11 +0,0 @@
-rubigram/__init__.py,sha256=4JZ6q8ukflz_izRmJNYcndcKZFCsyJdYoYVoAPwN5V0,107
-rubigram/client.py,sha256=7XKqygP1v41yfJ7txTcLLBlOqB8B7Ovqfjo3La373FI,2641
-rubigram/filters.py,sha256=ZOP_3Yum41miESITTFCbWI7XElfmKPHqud2mxTo7NdQ,3759
-rubigram/method.py,sha256=nm2qfzkanpzDo3yusIXmjYgCYmLzV6nVOyaxPDDqqz4,9074
-rubigram/network.py,sha256=K7vvGikXStvUBqHX2gogy3hJ1eQjLAJ7kdwLbfFuZIg,1399
-rubigram/types.py,sha256=evelh8GGttOHFQjiwXOzwXYFwLXKJSHit60T0T-9VIE,17035
-rubigramclient-1.3.9.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rubigramclient-1.3.9.dist-info/METADATA,sha256=Qpp5phDEIUsgO7_1-7JCgVffmACSH7SkdPzgAc_4Nb8,1022
-rubigramclient-1.3.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rubigramclient-1.3.9.dist-info/top_level.txt,sha256=Mhg5HfkL6rLec5sI4ClGmwoqYUANAZUz8sVa1sT_cas,9
-rubigramclient-1.3.9.dist-info/RECORD,,