RubigramClient 1.6.5__py3-none-any.whl → 1.6.7__py3-none-any.whl

rubigram/__init__.py

@@ -1,5 +1,3 @@
-from .network import Network
-from .method import Method
 from .client import Client
 from .state import StateManager
 from . import enums

rubigram/client.py

@@ -1,15 +1,22 @@
-from typing import Optional, Callable, Literal, Union
+from typing import Optional, Callable, Union
 from rubigram.types 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
+from aiohttp.web import Application, Request, json_response, run_app
 import asyncio
 import logging
 
 
-logging.basicConfig(format=("%(levelname)s | %(message)s"))
+logging.basicConfig(
+    format="%(asctime)s | %(levelname)s : %(message)s",
+    datefmt="%Y-%m-%d %H:%M:%S",
+    level=logging.DEBUG
+)
+
+logging.getLogger("asyncio").setLevel(logging.WARNING)
+logging.getLogger("aiohttp").setLevel(logging.WARNING)
 
 
 class Client(Method):
@@ -25,106 +32,129 @@ class Client(Method):
         self.host = host
         self.port = port
         self.offset_id = None
+        self.set_endpoint = True
         self.ROUTES = []
         self.MESSAGE_HANDLER = []
         self.INLINE_HANDLER = []
         self.state = StateManager()
-        super().__init__(token)     
-            
-
-    def create_handler(self, type: Literal["message", "inline"], filters: Optional[Filter] = None):
+        super().__init__(token)
+        
+    
+    def on_message(self, 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)
+            self.MESSAGE_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
+        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.INLINE_HANDLER.append(wrapper)
+            return func
+        return decorator
+
+    def on_create_app(self, path: str, method: str = "GET"):
+        def decorator(func):
+            self.ROUTES.append((path, func, method.upper()))
+            return func
+        return decorator
+    
+    async def dispatch(self, update: Union[Update, InlineMessage]):
+        handlers = self.MESSAGE_HANDLER if isinstance(update, Update) 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)
-    
+        await self.dispatch(event)
+        
     async def set_endpoints(self):
         endpoint_type = ["ReceiveUpdate", "ReceiveInlineMessage"]
-        for i in endpoint_type: await self.update_bot_endpoint(f"{self.endpoint}/{i}", i)
-    
+        for i in endpoint_type:
+            set_endpoint = await self.update_bot_endpoint(f"{self.endpoint}/{i}", i)
+            logging.info(f"status set endpoint for {i} : {set_endpoint["status"]}")
+        
     async def on_startup(self, app):
-        await self.set_endpoints()
+        if self.set_endpoint:
+            await self.set_endpoints()
         await self.start()
 
     async def on_cleanup(self, app):
         await self.stop()
         
     def create_request_handler(self):
-        async def wrapper(request: web.Request):
+        async def wrapper(request: Request):
             data = await request.json()
             await self.updater(data)
-            return web.json_response({"status": "OK"})
+            return json_response({"status": "OK"})
         return wrapper
-    
-    async def runner(self):
+
+
+    async def update_runner(self):
         try:
             while True:
-                get_updates = await self.get_update(100, self.offset_id)
-                if get_updates.updates:
-                    updates = get_updates.updates
+                get_update = await self.get_update(100, self.offset_id)
+                updates = get_update.updates
+                if 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
+                        time = update.new_message.time if update.type == "NewMessage" else update.updated_message.time if update.type == "UpdatedMessage" else None
+                        time = int(time)
                         now = int(datetime.now().timestamp())
-                        if time and time >= now or time + 2 >= now:
+                        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
+                            await self.dispatch(update)
+                    self.offset_id = get_update.next_offset_id
         except Exception as error:
             logging.error(error)
         finally:
             await self.stop()
     
-    def create_app(self, path: str, method: str = "Get"):
-        def decorator(func):
-            self.ROUTES.append((path, func, method))
-            return func
-        return decorator
-            
-    def run(self):
+    def run(self, set_endpoint = True):
+        self.set_endpoint = set_endpoint
         if self.endpoint:
-            app = web.Application()
+            app = Application()
             app.on_startup(self.on_startup)
             app.on_cleanup(self.on_cleanup)
-            for path, func, method in self.ROUTES:
-                if method.upper() == "GET":
-                    app.router.add_get(path, func)
-                elif method.upper() == "POST":
-                    app.router.add_post(path, func)
+            
             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)
+            
+            for path, func, method in self.ROUTES:
+                match method:
+                    case "GET":
+                        app.router.add_get(path, func)
+                    case "POST":
+                        app.router.add_post(path, func)
+                    case "DELETE":
+                        app.router.add_delete(path, func)
+                    case "PUT":
+                        app.router.add_put(path, func)
+                    case "PATCH":
+                        app.router.add_patch(path, func)
+                        
+            run_app(app, host=self.host, port=self.port)
+
         else:
             try:
-                asyncio.run(self.runner())
-            except KeyboardInterrupt:pass
+                logging.info("Start Bot")
+                asyncio.run(self.update_runner())
+            except KeyboardInterrupt:
+                logging.info("Stop Bot")
             except Exception as error:
                 logging.error(error)

rubigram/method.py

@@ -1,6 +1,6 @@
 from .network import Network
-from . import enums
-from typing import Optional
+from rubigram import enums
+from typing import Optional, Union
 from rubigram.types import Bot, Chat, Keypad, MessageId, Updates, BotCommand
 
 
@@ -28,7 +28,7 @@ class Method(Network):
         return response["download_url"]
 
     async def set_command(self, commands: list[BotCommand]):
-        response = await self.request("setCommands", {"bot_commands": [command.to_dict() for command in commands]})
+        response = await self.request("setCommands", {"bot_commands": [command.asdict() for command in commands]})
         return response
 
     async def update_bot_endpoint(self, url: str, type: enums.UpdateEndpointType):
@@ -42,10 +42,10 @@ class Method(Network):
         await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "Remove"})
 
     async def edit_chat_keypad(self, chat_id: str, chat_keypad: Keypad):
-        await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "New", "chat_keypad": chat_keypad.to_dict()})
+        await self.request("editChatKeypad", {"chat_id": chat_id, "chat_keypad_type": "New", "chat_keypad": chat_keypad.asdict()})
 
     async def edit_message_keypad(self, chat_id: str, message_id: str, inline_keypad: Keypad):
-        await self.request("editMessageKeypad", {"chat_id": chat_id, "message_id": message_id, "inline_keypad": inline_keypad.to_dict()})
+        await self.request("editMessageKeypad", {"chat_id": chat_id, "message_id": message_id, "inline_keypad": inline_keypad.asdict()})
 
     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})
@@ -71,8 +71,8 @@ class Method(Network):
         data = {
             "chat_id": chat_id,
             "text": text,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "chat_keypad_type": chat_keypad_type,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id
@@ -98,8 +98,8 @@ class Method(Network):
             "chat_id": chat_id,
             "question": question,
             "options": options,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
@@ -125,8 +125,8 @@ class Method(Network):
             "chat_id": chat_id,
             "latitude": latitude,
             "longitude": longitude,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
@@ -154,8 +154,8 @@ class Method(Network):
             "first_name": first_name,
             "last_name": last_name,
             "phone_number": phone_number,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
@@ -179,8 +179,8 @@ class Method(Network):
         data = {
             "chat_id": chat_id,
             "sticker_id": sticker_id,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type
@@ -195,36 +195,37 @@ class Method(Network):
         response = await self.request("requestSendFile", {"type": type})
         return response["upload_url"]
 
-    async def upload_file(self, file: str, name: str, type: str):
+    async def upload_file(self, file: Union[str, bytes], name: Optional[str] = None, type: str = "File"):
         upload_url = await self.request_send_file(type)
-        response = await self.RequestUploadFile(upload_url, file, name)
+        response = await self.requestUpload(upload_url, file, name)
         return response
 
-    async def download_file(self, file_id: str, file_name: str):
+    async def download_file(self, file_id: str, filename: Optional[str] = None):
         download_url = await self.get_file(file_id)
-        response = await self.RequestDownloadFile(download_url, file_name)
+        response = await self.requestDownload(download_url, filename)
         return response
 
     async def send_file(
         self,
         chat_id: str,
-        file: str,
-        file_name: str,
-        caption: str = None,
+        file: Union[str, bytes],
+        caption: Optional[str] = None,
+        file_name: Optional[str] = None,
         type: enums.FileType = enums.FileType.File,
         chat_keypad: Keypad = None,
         inline_keypad: Keypad = None,
         chat_keypad_type: Optional[enums.ChatKeypadType] = None,
         disable_notification: bool = False,
-        reply_to_message_id: str = None,
+        reply_to_message_id: Optional[str] = None,
     ) -> "MessageId":
         file_id = await self.upload_file(file, file_name, type)
+        
         data = {
             "chat_id": chat_id,
             "file_id": file_id,
             "text": caption,
-            "chat_keypad": chat_keypad.to_dict() if chat_keypad else None,
-            "inline_keypad": inline_keypad.to_dict() if inline_keypad else None,
+            "chat_keypad": chat_keypad.asdict() if chat_keypad else None,
+            "inline_keypad": inline_keypad.asdict() if inline_keypad else None,
             "disable_notification": disable_notification,
             "reply_to_message_id": reply_to_message_id,
             "chat_keypad_type": chat_keypad_type,
@@ -236,20 +237,22 @@ class Method(Network):
         message.client = self
         return message
 
-    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, 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, caption: str = None, **kwargs):
-        return await self.send_file(chat_id, video, name, caption, "Video", **kwargs)
+    async def send_document(self, chat_id: str, document: Union[str, bytes], caption: Optional[str] = None, file_name: Optional[str] = None, **kwargs):
+        return await self.send_file(chat_id, document, caption, file_name, "File", **kwargs)
+
+    async def send_photo(self, chat_id: str, photo: Union[str, bytes], caption: Optional[str] = None, file_name: Optional[str] = None, **kwargs):
+        return await self.send_file(chat_id, photo, caption, file_name, "Image", **kwargs)
+
+    async def send_video(self, chat_id: str, video: Union[str, bytes], caption: Optional[str] = None, file_name: Optional[str] = None, **kwargs):
+        return await self.send_file(chat_id, video, caption, file_name, "Video", **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_gif(self, chat_id: str, gif: Union[str, bytes], caption: Optional[str] = None, file_name: Optional[str] = None, **kwargs):
+        return await self.send_file(chat_id, gif, caption, file_name, "Gif", **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_music(self, chat_id: str, music: Union[str, bytes], caption: Optional[str] = None, file_name: Optional[str] = None, **kwargs):
+        return await self.send_file(chat_id, music, caption, file_name, "Music", **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)
+    async def send_voice(self, chat_id: str, voice: Union[str, bytes], caption: Optional[str] = None, file_name: Optional[str] = None, **kwargs):
+        return await self.send_file(chat_id, voice, caption, file_name, "Voice", **kwargs)

rubigram/network.py

@@ -1,6 +1,9 @@
 from aiohttp import ClientSession, FormData
-from typing import Any, Optional
-import aiofiles, re, os
+from typing import Any, Optional, Union
+from pathlib import Path
+from urllib.parse import urlparse
+import aiofiles
+import os
 
 
 class Network:
@@ -32,34 +35,46 @@ class Network:
             data: dict = await response.json()
             return data.get("data")
 
-    async def ContentFile(self, url: str) -> bytes:
+    async def getBytes(self, url: str) -> bytes:
         await self.start()
         async with self.session.get(url) as response:
             response.raise_for_status()
             return await response.read()
 
-    async def RequestUploadFile(self, upload_url: str, file: str, name: str):
+    async def getName(self, url: str) -> str:
+        parser = urlparse(url)
+        return os.path.basename(parser.path)
+
+    async def requestUpload(self, upload_url: str, file: Union[str, bytes], name: Optional[str] = None):
+        data, filename = None, None
         if isinstance(file, str):
-            if re.match(r"^https://", file):
-                file = await self.ContentFile(file)
-            elif os.path.isfile(file):
-                async with aiofiles.open(file, "rb") as f:
-                    file = await f.read()
-            else:
-                raise Exception("file not found : {}".format(file))
+            path = Path(file)
+
+            if path.is_file():
+                data, filename = path.read_bytes(), name if name else path.name
 
-            form = FormData()
-            form.add_field("file", file, filename=name, content_type="application/octet-stream")
-            await self.start()
-            async with self.session.post(upload_url, data=form) as response:
-                response.raise_for_status()
-                data: dict = await response.json()
-                return data.get("data", {}).get("file_id")
+            elif file.startswith("http"):
+                data, filename = await self.getBytes(file), name if name else await self.getName(file)
+
+            else:
+                raise Exception(f"Can't find this file : {file}")
 
-        raise Exception("Format Of file is invalid")
+        elif isinstance(file, bytes):
+            if name:
+                data, filename = file, name
+            else:
+                raise Exception("choice name for bytes file")
+        
+        form = FormData()
+        form.add_field("file", data, filename=filename, content_type="application/octet-stream")
+        await self.start()
+        async with self.session.post(upload_url, data=form) as response:
+            response.raise_for_status()
+            data: dict = await response.json()
+            return data.get("data", {})["file_id"]
 
-    async def RequestDownloadFile(self, url: str, name: str):
-        file = await self.ContentFile(url)
+    async def requestDownload(self, url: str, filename: Optional[str] = None):
+        file, name = await self.getBytes(url), filename if filename else await self.getName(url)
         async with aiofiles.open(name, "wb") as f:
             await f.write(file)
-        return name
+            return name