RubigramClient 1.5.4__tar.gz → 1.5.6__tar.gz

{rubigramclient-1.5.4 → rubigramclient-1.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.5.4
+Version: 1.5.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 <Javad.Py1385@gmail.com>
 Classifier: Programming Language :: Python :: 3
@@ -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.4 → rubigramclient-1.5.6}/README.md

@@ -35,8 +35,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.4 → rubigramclient-1.5.6}/RubigramClient.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.5.4
+Version: 1.5.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 <Javad.Py1385@gmail.com>
 Classifier: Programming Language :: Python :: 3
@@ -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.4 → rubigramclient-1.5.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "RubigramClient"
-version = "1.5.4"
+version = "1.5.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"

rubigramclient-1.5.6/rubigram/client.py

@@ -0,0 +1,115 @@
+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
+
+class Client(Method):
+    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()
+        super().__init__(token)
+        
+            
+    def create_handler(self, type: Literal["message", "inline"], filters: Optional[Filter] = None):
+        def decorator(func: Callable) -> Callable:
+            async def wrapper(client: Client, update: Update):
+                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_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:
+            matched = await handler(self, update)
+            if matched:
+                return
+
+    async def updater(self, data: dict):
+        if "inline_message" in data:
+            event = InlineMessage.from_dict(data["inline_message"])
+            type = "inline"
+        elif "update" in data:
+            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:
+            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:
+            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:
+            try:
+                asyncio.run(self.runner())
+            except:pass

{rubigramclient-1.5.4 → rubigramclient-1.5.6}/rubigram/filters.py

@@ -3,6 +3,9 @@ from typing import Union, Callable, Awaitable
 import re
 
 
+
+
+
 class Filter:
     def __init__(self, func: Callable[[Union[Update, InlineMessage]], Union[bool, Awaitable[bool]]]):
         self.func = func

{rubigramclient-1.5.4 → rubigramclient-1.5.6}/rubigram/method.py

@@ -195,7 +195,7 @@ class Method(Network):
         chat_id: str,
         file: str,
         file_name: str,
-        text: str = None,
+        caption: str = None,
         type: Literal["File", "Image", "Voice", "Music", "Gif", "Video"] = "File",
         chat_keypad: Keypad = None,
         inline_keypad: Keypad = None,
@@ -207,7 +207,7 @@ class Method(Network):
         data = {
             "chat_id": chat_id,
             "file_id": file_id,
-            "text": text,
+            "text": caption,
             "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,
@@ -218,20 +218,20 @@ class Method(Network):
         response = await self.request("sendFile", data)
         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_document(self, chat_id: str, document: str, name: str, caption: str = None, **kwargs):
+        return await self.send_file(chat_id, document, name, caption, "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_photo(self, chat_id: str, photo: str, name: str, caption: str = None, **kwargs):
+        return await self.send_file(chat_id, photo, name, caption, "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_video(self, chat_id: str, video: str, name: str, caption: str = None, **kwargs):
+        return await self.send_file(chat_id, video, name, caption, "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_gif(self, chat_id: str, gif: str, name: str, caption: str = None, **kwargs):
+        return await self.send_file(chat_id, gif, name, caption, "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_music(self, chat_id: str, music: str, name: str, caption: str = None, **kwargs):
+        return await self.send_file(chat_id, music, name, caption, "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)
+    async def send_voice(self, chat_id: str, voice: str, name: str, caption: str = None, **kwargs):
+        return await self.send_file(chat_id, voice, name, caption, "Voice", **kwargs)

{rubigramclient-1.5.4 → rubigramclient-1.5.6}/rubigram/models.py

@@ -386,8 +386,7 @@ class MessageId(Dict):
 @dataclass
 class Update(Dict):
     client: Optional["rubigram.Client"] = None
-    type: Optional[Literal["NewMessage", "UpdatedMessage", "RemovedMessage",
-                           "StartedBot", "StoppedBot", "UpdatedPayment"]] = None
+    type: Optional[Literal["NewMessage", "UpdatedMessage", "RemovedMessage", "StartedBot", "StoppedBot", "UpdatedPayment"]] = None
     chat_id: Optional[str] = None
     removed_message_id: Optional[str] = None
     new_message: Optional[Message] = None
@@ -417,32 +416,32 @@ class Update(Dict):
         self,
         file: str,
         file_name: str,
-        text: str = None,
+        caption: str = None,
         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,
     ) -> "MessageId":
-        return await self.client.send_file(self.chat_id, file, file_name, text, 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, **kwargs) -> "MessageId":
-        return await self.reply_file(document, name, "File", **kwargs)
+    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)
 
-    async def reply_photo(self, photo: str, name: str, **kwargs) -> "MessageId":
-        return await self.reply_file(photo, name, "Image", **kwargs)
+    async def reply_photo(self, photo: str, name: str, caption: Optional[str] = None, **kwargs) -> "MessageId":
+        return await self.reply_file(photo, name, caption, "Image", **kwargs)
 
-    async def reply_video(self, video: str, name: str, **kwargs) -> "MessageId":
-        return await self.reply_file(video, name, "Video", **kwargs)
+    async def reply_video(self, video: str, name: str, caption: Optional[str] = None, **kwargs) -> "MessageId":
+        return await self.reply_file(video, name, caption, "Video", **kwargs)
 
-    async def reply_gif(self, gif: str, name: str, **kwargs) -> "MessageId":
-        return await self.reply_file(gif, name, "Gif", **kwargs)
+    async def reply_gif(self, gif: str, name: str, caption: Optional[str] = None, **kwargs) -> "MessageId":
+        return await self.reply_file(gif, name, caption, "Gif", **kwargs)
 
-    async def reply_music(self, music: str, name: str, **kwargs) -> "MessageId":
-        return await self.reply_file(music, name, "Music", **kwargs)
+    async def reply_music(self, music: str, name: str, caption: Optional[str] = None, **kwargs) -> "MessageId":
+        return await self.reply_file(music, name, caption, "Music", **kwargs)
 
-    async def reply_voice(self, voice: str, name: str, **kwargs) -> "MessageId":
-        return await self.reply_file(voice, name, "Voice", **kwargs)
+    async def reply_voice(self, voice: str, name: str, caption: Optional[str] = None, **kwargs) -> "MessageId":
+        return await self.reply_file(voice, name, caption, "Voice", **kwargs)
 
 
 @dataclass

rubigramclient-1.5.4/rubigram/client.py

@@ -1,159 +0,0 @@
-from __future__ import annotations
-from typing import Optional, Callable, Literal
-from aiohttp import web
-from functools import wraps
-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
-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):
-        self.token = token
-        self.endpoint = endpoint
-        self.host = host
-        self.port = port
-        self.offset_id = None
-        self.state = StateManager()
-        self.routes = web.RouteTableDef()
-        self.message_handlers = []
-        self.inline_handlers = []
-        super().__init__(token)
-
-    def on_message(self, *filters: Filter):
-        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)
-            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
-        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}")
-
-    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")
-        elif "update" in data:
-            event = Update.from_dict(data.get("update", {}))
-            event.client = self
-            await self.dispatch(event)
-        else:
-            return
-
-    async def set_endpoints(self):
-        if self.endpoint:
-            await self.update_bot_endpoint(f"{self.endpoint}/ReceiveUpdate", "ReceiveUpdate")
-            await self.update_bot_endpoint(f"{self.endpoint}/ReceiveInlineMessage", "ReceiveInlineMessage")
-
-    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)
-            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())