RubigramClient 1.5.5__py3-none-any.whl → 1.5.7__py3-none-any.whl

rubigram/client.py

@@ -1,159 +1,115 @@
-from __future__ import annotations
-from typing import Optional, Callable, Literal
-from aiohttp import web
-from functools import wraps
+from typing import Optional, Callable, Literal, Union
 from rubigram.models import Update, InlineMessage
 from rubigram.method import Method
 from rubigram.filters import Filter
 from rubigram.state import StateManager
 from datetime import datetime
+from aiohttp import web
 import asyncio
-import logging
-
-
-logger = logging.getLogger(__name__)
 
 
 class Client(Method):
-    def __init__(self, token: str, endpoint: Optional[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.endpoint = endpoint
         self.host = host
         self.port = port
         self.offset_id = None
+        self.MESSAGE_HANDLER = []
+        self.INLINE_HANDLER = []
         self.state = StateManager()
-        self.routes = web.RouteTableDef()
-        self.message_handlers = []
-        self.inline_handlers = []
-        super().__init__(token)
-
-    def on_message(self, *filters: Filter):
+        super().__init__(token)     
+            
+    def create_handler(self, type: Literal["message", "inline"], filters: Optional[Filter] = None):
         def decorator(func: Callable) -> Callable:
-            @wraps(func)
             async def wrapper(client: Client, update: Update):
-                try:
-                    combined_filter = filters[0] if filters else None
-                    for filter in filters[1:]:
-                        combined_filter = combined_filter & filter
-
-                    if combined_filter is None or await combined_filter(update):
-                        await func(client, update)
-                        return True
-                    return False
-                except Exception as error:
-                    logger.exception("Error {}: {}".format(func.__name__, error))
-
-            self.message_handlers.append(wrapper)
+                if filters is None or await filters(update):
+                    await func(client, update)
+                    return True
+                return False
+            self.MESSAGE_HANDLER.append(wrapper) if type == "message" else self.INLINE_HANDLER.append(wrapper)
             return func
         return decorator
-
-    def on_inline_message(self, *filters: Filter):
-        def decorator(func: Callable) -> Callable:
-            @wraps(func)
-            async def wrapper(client: Client, update: InlineMessage):
-                try:
-                    combined_filter = filters[0] if filters else None
-                    for filter in filters[1:]:
-                        combined_filter = combined_filter & filter
-
-                    if combined_filter is None or await combined_filter(update):
-                        await func(client, update)
-                        return True
-                    return False
-                except Exception as error:
-                    logger.exception("Error {}: {}".format(func.__name__, error))
-
-            self.inline_handlers.append(wrapper)
-            return func
-        return decorator
-
-    async def dispatch(self, update: Update, type: Literal["update", "inline_message"] = "update"):
-        handlers = self.message_handlers if type == "update" else self.inline_handlers
+    
+    def on_message(self, filters: Optional[Filter] = None):
+        return self.create_handler("message", filters)
+
+    def on_inline_message(self, filters: Optional[Filter] = None):
+        return self.create_handler("inline", filters)
+        
+    async def dispatch(self, update: Union[Update, InlineMessage], type: Literal["message", "inline"]):
+        handlers = self.MESSAGE_HANDLER if type == "message" else self.INLINE_HANDLER
         for handler in handlers:
-            try:
-                matched = await handler(self, update)
-                if matched:
-                    return
-            except Exception as error:
-                logger.exception(f"Dispatch Error in handler [ {handler.__name__} ] : {error}")
+            matched = await handler(self, update)
+            if matched:
+                return
 
     async def updater(self, data: dict):
         if "inline_message" in data:
-            event = InlineMessage.from_dict(data.get("inline_message", {}))
-            event.client = self
-            await self.dispatch(event, "inline_message")
+            event = InlineMessage.from_dict(data["inline_message"])
+            type = "inline"
         elif "update" in data:
-            event = Update.from_dict(data.get("update", {}))
-            event.client = self
-            await self.dispatch(event)
-        else:
-            return
-
+            event = Update.from_dict(data["update"])
+            type = "message"
+        else: return
+        event.client = self
+        await self.dispatch(event, type)
+    
     async def set_endpoints(self):
+        endpoint_type = ["ReceiveUpdate", "ReceiveInlineMessage"]
         if self.endpoint:
-            await self.update_bot_endpoint(f"{self.endpoint}/ReceiveUpdate", "ReceiveUpdate")
-            await self.update_bot_endpoint(f"{self.endpoint}/ReceiveInlineMessage", "ReceiveInlineMessage")
-
+            for i in endpoint_type:
+                await self.update_bot_endpoint(f"{self.endpoint}/{i}", i)
+    
+    async def on_startup(self, app):
+        await self.set_endpoints()
+        await self.state.start()
+        await self.start()
+
+    async def on_cleanup(self, app):
+        await self.state.stop()
+        await self.stop()
+        
+    def create_request_handler(self):
+        async def wrapper(request: web.Request):
+            data = await request.json()
+            await self.updater(data)
+            return web.json_response({"status": "OK"})
+        return wrapper
+    
+    async def runner(self):
+        try:
+            await self.state.start()
+            while True:
+                get_updates = await self.get_update(100, self.offset_id)
+                if get_updates.updates:
+                    updates = get_updates.updates
+                    for update in updates:
+                        time = int(update.new_message.time) if update.type == "NewMessage" else int(update.updated_message.time) if update.type == "UpdatedMessage" else None
+                        now = int(datetime.now().timestamp())
+                        if time and time >= now or time + 2 >= now:
+                            update.client = self
+                            await self.dispatch(update, "message")
+                    self.offset_id = get_updates.next_offset_id
+        except Exception as error:
+            print(f"ERROR : {error}")
+        finally:
+            await self.state.stop()
+            await self.stop()
+    
     def run(self):
         if self.endpoint:
-            @self.routes.post("/ReceiveUpdate")
-            async def receive_update(request: web.Request):
-                data = await request.json()
-                await self.updater(data)
-                return web.json_response({"status": "OK"})
-
-            @self.routes.post("/ReceiveInlineMessage")
-            async def receive_inline_message(request: web.Request):
-                data = await request.json()
-                await self.updater(data)
-                return web.json_response({"status": "OK"})
-
-            app = web.Application()
-            app.add_routes(self.routes)
-
-            async def on_startup(app):
-                await self.set_endpoints()
-                await self.state.start()
-                await self.start()
-
-            async def on_cleanup(app):
-                await self.state.stop()
-                await self.stop()
-
-            app.on_startup.append(on_startup)
-            app.on_cleanup.append(on_cleanup)
+            app = web.Application()            
+            app.router.add_post("/ReceiveUpdate", self.create_request_handler())
+            app.router.add_post("/ReceiveInlineMessage", self.create_request_handler())
             web.run_app(app, host=self.host, port=self.port)
-
         else:
-            async def polling():
-                try:
-                    await self.state.start()
-                    while True:
-                        try:
-                            get_update = await self.get_update(100, self.offset_id)
-                            if get_update.updates:
-                                updates = get_update.updates
-                                for update in updates:
-                                    if update.type == "NewMessage":
-                                        message_time = int(update.new_message.time)
-                                    elif update.type == "UpdatedMessage":
-                                        message_time = int(update.updated_message.time)
-                                    else:continue
-
-                                    now = int(datetime.now().timestamp())
-                                    if message_time >= now or message_time + 2 >= now:
-                                        if isinstance(update, Update):
-                                            update.client = self
-                                        await self.dispatch(update)
-
-                                self.offset_id = get_update.next_offset_id
-                        except Exception as error:
-                            logger.exception("Polling Error : {}".format(error))
-                            await asyncio.sleep(1)
-
-                except:
-                    pass
-                finally:
-                    await self.state.stop()
-                    await self.stop()
-            asyncio.run(polling())
+            try:
+                asyncio.run(self.runner())
+            except:pass

rubigram/filters.py

@@ -1,27 +1,110 @@
 from rubigram.models import Update, InlineMessage
-from typing import Union, Callable, Awaitable
+from typing import Union
 import re
 
 
+
 class Filter:
-    def __init__(self, func: Callable[[Union[Update, InlineMessage]], Union[bool, Awaitable[bool]]]):
+    def __init__(self, func):
         self.func = func
+    
+    async def __call__(self, update: Union[Update, InlineMessage]):
+        return await self.func(update)
+    
+    async def __and__(self, other: "Filter"):
+        async def filter(update):
+            return await self(update) and await other(update)
+        return Filter(filter)
+    
+    async def __or__(self, other: "Filter"):
+        async def filter(update):
+            return await self(update) or await other(update)
+        return Filter(filter)
 
-    async def __call__(self, update: Union[Update, InlineMessage]) -> bool:
-        result = self.func(update)
-        if isinstance(result, Awaitable):
-            return await result
-        return result
 
-    def __and__(self, other: "Filter"):
-        async def combined(update):
-            return await self(update) and await other(update)
-        return Filter(combined)
 
-    def __or__(self, other: "Filter"):
-        async def combined(update):
-            return await self(update) or await other(update)
-        return Filter(combined)
+async def TEXT(message: Update):
+    if isinstance(message, Update):
+        return True if message.new_message and message.new_message.text else False
+    return False
+
+async def FILE(message: Update):
+    if isinstance(message, Update):
+        return True if message.new_message and message.new_message.file else False
+    return False
+
+async def LIVE(message: Update):
+    if isinstance(message, Update):
+        return True if message.new_message and message.new_message.live_location else False
+    return False
+
+async def POLL(message: Update):
+    if isinstance(message, Update):
+        return True if message.new_message and message.new_message.poll else False
+    return False
+
+async def CONTACT(message: Update):
+    if isinstance(message, Update):
+        return True if message.new_message and message.new_message.contact_message else False
+    return False
+
+async def STICKER(message: Update):
+    if isinstance(message, Update):
+        return True if message.new_message and message.new_message.sticker else False
+    return False
+
+async def LOCATION(message: Update):
+    if isinstance(message, Update):
+        return True if message.new_message and message.new_message.location else False
+    return False
+
+async def FORWARD(message: Update):
+    if isinstance(message, Update):
+        return True if message.new_message and message.new_message.forwarded_from else False
+    return False
+
+async def EDITED(message: Update):
+    if isinstance(message, Update):
+        return True if message.updated_message else False
+    return False
+
+async def PRIVATE(message: Union[Update, InlineMessage]):
+    return True if message.chat_id.startswith("b0") else False
+    
+async def GROUP(message: Union[Update, InlineMessage]):
+    return True if message.chat_id.startswith("g0") else False
+
+async def CHANNEL(message: Union[Update, InlineMessage]):
+    return True if message.chat_id.startswith("c0") else False
+
+async def FORWARD_BOT(message: Update):
+    if isinstance(message, Update) and message.new_message:
+        return True if message.new_message.forwarded_from and message.new_message.forwarded_from.type_from == "Bot" else False
+
+async def FORWARD_USER(message: Update):
+    if isinstance(message, Update) and message.new_message:
+        return True if message.new_message.forwarded_from and message.new_message.forwarded_from.type_from == "User" else False
+    
+async def FORWARD_CHANNEL(message: Update):
+    if isinstance(message, Update) and message.new_message:
+        return True if message.new_message.forwarded_from and message.new_message.forwarded_from.type_from == "Channel" else False
+
+
+text = Filter(TEXT)
+file = Filter(FILE)
+live = Filter(LIVE)
+poll = Filter(POLL)
+contact = Filter(CONTACT)
+sticker = Filter(STICKER)
+location = Filter(LOCATION)
+forward = Filter(FORWARD)
+edited = Filter(EDITED)
+private = Filter(PRIVATE)
+group = Filter(GROUP)
+channel = Filter(CHANNEL)
+forward_bot = Filter(FORWARD_BOT)
+forward_user = Filter(FORWARD_USER)
+forward_channel = Filter(FORWARD_CHANNEL)
 
 
 class state(Filter):
@@ -29,12 +112,10 @@ class state(Filter):
         self.states = states
         super().__init__(self.filter)
         
-    async def filter(self, update: Update):
+    async def filter(self, update: Union[Update, InlineMessage]):
         states = self.states if isinstance(self.states, list) else [self.states]
-        if isinstance(update, Update):
-            user = await update.client.state.get_state(update.chat_id)
-            return user.lower() in states if user else False
-        return False
+        user = await update.client.state.get_state(update.chat_id)
+        return user.lower() in states if user else False
             
 
 class command(Filter):
@@ -43,7 +124,7 @@ class command(Filter):
         self.prefix = prefix
         super().__init__(self.filter)
 
-    def filter(self, update: Update):
+    async def filter(self, update: Update):
         commands = self.cmd if isinstance(self.cmd, list) else [self.cmd]
         text = ""
         if isinstance(update, Update):
@@ -63,7 +144,7 @@ class regex(Filter):
         self.pattern = pattern
         super().__init__(self.filter)
 
-    def filter(self, update: Union[Update, InlineMessage]):
+    async def filter(self, update: Union[Update, InlineMessage]):
         text = ""
         if isinstance(update, Update):
             if update.type == "NewMessage":
@@ -83,7 +164,7 @@ class chat(Filter):
         self.chat_id = chat_id
         super().__init__(self.filter)
 
-    def filter(self, update: Union[Update, InlineMessage]):
+    async def filter(self, update: Union[Update, InlineMessage]):
         chat_ids = self.chat_id if isinstance(self.chat_id, list) else [self.chat_id]
         return update.chat_id in chat_ids
 
@@ -93,97 +174,7 @@ class button(Filter):
         self.button_id = button_id
         super().__init__(self.filter)
 
-    def filter(self, update: InlineMessage):
+    async def filter(self, update: InlineMessage):
         if isinstance(update, InlineMessage):
             button_ids = self.button_id if isinstance(self.button_id, list) else [self.button_id]
-            return update.aux_data.button_id in button_ids
-
-
-
-def TEXT(update: Update):
-    return bool(update.new_message and getattr(update.new_message, "text", None))
-
-
-def FILE(update: Update):
-    return bool(update.new_message and getattr(update.new_message, "file", None))
-
-
-def LIVE(update: Update):
-    return bool(update.new_message and getattr(update.new_message, "live_location", None))
-
-
-def POLL(update: Update):
-    return bool(update.new_message and getattr(update.new_message, "poll", None))
-
-
-def CONTACT(update: Update):
-    return bool(update.new_message and getattr(update.new_message, "contact_message", None))
-
-
-def STICKER(update: Update):
-    return bool(update.new_message and getattr(update.new_message, "sticker", None))
-
-
-def LOCATION(update: Update):
-    return bool(update.new_message and getattr(update.new_message, "location", None))
-
-
-def FORWARD(update: Update):
-    return bool(update.new_message and getattr(update.new_message, "forwarded_from", None))
-
-
-def EDITED(update: Update):
-    if isinstance(update, Update) and update.type == "UpdatedMessage":
-        return update.updated_message.is_edited
-
-
-def PRIVATE(update: Update):
-    if isinstance(update, Update) and update.type == "NewMessage":
-        return update.new_message.sender_type in ["User", "Bot"]
-    return False
-
-
-def FORWARD_BOT(update: Update):
-    if isinstance(update, Update) and update.type == "NewMessage" and update.new_message.forwarded_from:
-        return update.new_message.forwarded_from.type_from == "Bot"
-    return False
-
-
-def FORWARD_USER(update: Update):
-    if isinstance(update, Update) and update.type == "NewMessage" and update.new_message.forwarded_from:
-        return update.new_message.forwarded_from.type_from == "User"
-    return False
-
-
-def FORWARD_CHANNEL(update: Update):
-    if isinstance(update, Update) and update.type == "NewMessage" and update.new_message.forwarded_from:
-        return update.new_message.forwarded_from.type_from == "Channel"
-    return False
-
-def GROUP(update: Update):
-    if isinstance(update, Update):
-        return update.chat_id.startswith("g0")
-    return False
-
-
-def CHANNEL(update: Update):
-    if isinstance(update, Update):
-        return update.chat_id.startswith("c0")
-    return False
-    
-
-text = Filter(TEXT)
-file = Filter(FILE)
-live = Filter(LIVE)
-poll = Filter(POLL)
-group = Filter(GROUP)
-channel = Filter(CHANNEL)
-edited = Filter(EDITED)
-contact = Filter(CONTACT)
-sticker = Filter(STICKER)
-location = Filter(LOCATION)
-forward = Filter(FORWARD)
-private = Filter(PRIVATE)
-forward_bot = Filter(FORWARD_BOT)
-forward_user = Filter(FORWARD_USER)
-forward_channel = Filter(FORWARD_CHANNEL)
+            return update.aux_data.button_id in button_ids

rubigram/method.py

@@ -3,12 +3,10 @@ from typing import Literal, Optional
 from rubigram.models import Bot, Chat, Keypad, MessageId, Updates
 
 
-
 class Method(Network):
     def __init__(self, token: str):
         super().__init__(token)
 
-
     async def get_me(self) -> "Bot":
         response = await self.request("getMe", {})
         return Bot.from_dict(response["bot"])

rubigram/network.py

@@ -3,7 +3,6 @@ from typing import Any, Optional
 import aiofiles, re, os
 
 
-
 class Network:
     def __init__(self, token: str) -> None:
         self.token: str = token

rubigram/state.py

@@ -62,7 +62,6 @@ class ManageDB:
                 data = await cursor.fetchall()
             return {k: v for k, v in data} if data else {}
 
-          
             
     async def remove_data(self, user_id: str, key: str = None):
         await self.connect()
@@ -71,8 +70,7 @@ class ManageDB:
         else:
             await self.connection.execute("DELETE FROM user_data WHERE user_id = ?", (user_id,))
         await self.connection.commit()
-        
-        
+              
         
 class StateManager:
     def __init__(self):

{rubigramclient-1.5.5.dist-info → rubigramclient-1.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.5.5
+Version: 1.5.7
 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
@@ -27,7 +27,7 @@ pip install RubigramClient
 from rubigram import Client, filters
 from rubigram.models import Update
 
-bot = Client("your_bot_token", "you_endpoint_url")
+bot = Client("your_bot_token")
 
 @bot.on_message(filters.command("start") & filters.private)
 async def start_handler(client, message: Update):    
@@ -51,8 +51,8 @@ async def start(_, message: Update):
         rows=[
             KeypadRow(
                 buttons=[
-                    Button("1", "Simple", "Button 1"),
-                    Button("2", "Simple", "Button 2")
+                    Button("1", "Button 1"),
+                    Button("2", "Button 2")
                 ]
             )
         ]

rubigramclient-1.5.7.dist-info/RECORD

@@ -0,0 +1,12 @@
+rubigram/__init__.py,sha256=IWNCN7oDaIBzaP54cGiA-4Sa31ehGBlqj0SuqhNQVgU,162
+rubigram/client.py,sha256=ET5L9Lzj0qbUO4IYZ647q_sXrLeFpLqH-ySU2zUISN0,4466
+rubigram/filters.py,sha256=T1As4tVr4EsZAun4wJBf3tgpQ-1lbuF8QwRsLryFKOo,6430
+rubigram/method.py,sha256=VfhxOoYQmNZjvAodXWqnSIin1vpc6478bj5_3IAxZP0,10609
+rubigram/models.py,sha256=42WK68VPKqgKCy14jrRyoP_XRsZ-04S5rUbdpO_UfaQ,13831
+rubigram/network.py,sha256=6_kLFg9Uw_MHwxoDff53HYtPD-PSTqqWC3qtgbZbmfY,2362
+rubigram/state.py,sha256=jpr0ovuBk9Cnvj5JsPbE2tgv0KrEkrrv-_THHTxlYYw,4065
+rubigramclient-1.5.7.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rubigramclient-1.5.7.dist-info/METADATA,sha256=CfJ5mlhnpH32vh37EKhldGekqQVoIPGVhv2p7VR57e8,2280
+rubigramclient-1.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rubigramclient-1.5.7.dist-info/top_level.txt,sha256=Mhg5HfkL6rLec5sI4ClGmwoqYUANAZUz8sVa1sT_cas,9
+rubigramclient-1.5.7.dist-info/RECORD,,

rubigramclient-1.5.5.dist-info/RECORD

@@ -1,12 +0,0 @@
-rubigram/__init__.py,sha256=IWNCN7oDaIBzaP54cGiA-4Sa31ehGBlqj0SuqhNQVgU,162
-rubigram/client.py,sha256=GDdlGzCeSwBAzEP3Truat1g2il5l3nPWbmFw2hRhYoc,6511
-rubigram/filters.py,sha256=EyrcKbEIwqDwf18lucusUoZYP0KIkaKkZc7PnaA0GcU,6218
-rubigram/method.py,sha256=PUP9DTX6XpWVbersiLv12GdlwOFaXzrgx582nJd4i_I,10613
-rubigram/models.py,sha256=42WK68VPKqgKCy14jrRyoP_XRsZ-04S5rUbdpO_UfaQ,13831
-rubigram/network.py,sha256=ErrGwtKpMHN1Dq4IvPHSrMOcDN-TFjUk1CfU-2EuPAY,2364
-rubigram/state.py,sha256=oRk5xXuO4k-cK0qRI2Rz2mdoivJkANlo20zQAkdqFSY,4081
-rubigramclient-1.5.5.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rubigramclient-1.5.5.dist-info/METADATA,sha256=Abido_4uhjv1iK3kIoUv49ulhGE8DmKfgzfRPoVcED8,2320
-rubigramclient-1.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rubigramclient-1.5.5.dist-info/top_level.txt,sha256=Mhg5HfkL6rLec5sI4ClGmwoqYUANAZUz8sVa1sT_cas,9
-rubigramclient-1.5.5.dist-info/RECORD,,