RubigramClient 1.3.4__tar.gz → 1.3.5__tar.gz

{rubigramclient-1.3.4 → rubigramclient-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.3.4
+Version: 1.3.5
 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
@@ -9,7 +9,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.8.0
+Requires-Dist: aiohttp
+Requires-Dist: aiofiles
 Dynamic: license-file
 
 # Rubigram
@@ -24,7 +25,7 @@ pip install RubigramClient
 from rubigram import Client, filters
 from rubigram.types import Update
 
-bot = Client("your_bot_token")
+bot = Client("your_bot_token", "you_endpoint_url")
 
 @bot.on_message(filters.command("start"))
 async def start_handler(client, message: Update):    

{rubigramclient-1.3.4 → rubigramclient-1.3.5}/README.md

@@ -10,7 +10,7 @@ pip install RubigramClient
 from rubigram import Client, filters
 from rubigram.types import Update
 
-bot = Client("your_bot_token")
+bot = Client("your_bot_token", "you_endpoint_url")
 
 @bot.on_message(filters.command("start"))
 async def start_handler(client, message: Update):    

{rubigramclient-1.3.4 → rubigramclient-1.3.5}/RubigramClient.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.3.4
+Version: 1.3.5
 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
@@ -9,7 +9,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.8.0
+Requires-Dist: aiohttp
+Requires-Dist: aiofiles
 Dynamic: license-file
 
 # Rubigram
@@ -24,7 +25,7 @@ pip install RubigramClient
 from rubigram import Client, filters
 from rubigram.types import Update
 
-bot = Client("your_bot_token")
+bot = Client("your_bot_token", "you_endpoint_url")
 
 @bot.on_message(filters.command("start"))
 async def start_handler(client, message: Update):    

rubigramclient-1.3.5/RubigramClient.egg-info/requires.txt

@@ -0,0 +1,2 @@
+aiohttp
+aiofiles

{rubigramclient-1.3.4 → rubigramclient-1.3.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "RubigramClient"
-version = "1.3.4"
+version = "1.3.5"
 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"
@@ -14,5 +14,6 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "aiohttp>=3.8.0"
+    "aiohttp",
+    "aiofiles"
 ]

rubigramclient-1.3.5/rubigram/client.py

@@ -0,0 +1,72 @@
+from rubigram.types import Update, InlineMessage
+from rubigram.method import Method
+from aiohttp import web
+
+
+class Client(Method):
+    def __init__(self, token: str, endpoint: str = None, host: str = "0.0.0.0", port: int = 5000):
+        self.token = token
+        self.port = port
+        self.host = host
+        self.endpoint = endpoint
+        self.messages_handler = []
+        self.inlines_handler = []
+        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)
+            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)
+            self.inlines_handler.append(wrapper)
+            return func
+        return decorator
+    
+    async def 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"])
+            for handler in self.messages_handler:
+                await handler(self, event)
+    
+    async def set_endpoints(self):
+        await self.update_bot_endpoint(self.endpoint + "/ReceiveUpdate", "ReceiveUpdate")
+        await self.update_bot_endpoint(self.endpoint + "/ReceiveInlineMessage", "ReceiveInlineMessage")
+
+    def run(self):
+        @self.routes.post("/ReceiveUpdate")
+        async def receive_update(request):
+            data = await request.json()
+            await self.update(data)
+            return web.json_response({"status": "OK"})
+
+        @self.routes.post("/receiveInlineMessage")
+        async def receive_inline_message(request):
+            data = await request.json()
+            await self.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()
+
+        app.on_startup.append(on_startup)
+        web.run_app(app, host = self.host, port = self.port)

{rubigramclient-1.3.4 → rubigramclient-1.3.5}/rubigram/types.py

@@ -3,7 +3,6 @@ from typing import Any, Dict, List, Literal, Optional
 import rubigram
 
 
-
 @dataclass
 class Location:
     longitude: Optional[str] = None
@@ -62,8 +61,8 @@ class ButtonLocation:
     
     def _dict(self) -> Dict:
         return {
-            "default_pointer_location": self.default_pointer_location._dict(),
-            "default_map_location": self.default_map_location._dict(),
+            "default_pointer_location": self.default_pointer_location._dict() if self.default_pointer_location else None,
+            "default_map_location": self.default_map_location._dict() if self.default_map_location else None,
             "type": self.type,
             "title": self.title,
             "location_image_url": self.location_image_url

rubigramclient-1.3.4/RubigramClient.egg-info/requires.txt

@@ -1 +0,0 @@
-aiohttp>=3.8.0

rubigramclient-1.3.4/rubigram/client.py

@@ -1,34 +0,0 @@
-from rubigram.types import Update, InlineMessage
-from rubigram.method import Method
-from aiohttp import web
-
-class Client(Method):
-    def __init__(self, token: str):
-        self.messages_handler = []
-        super().__init__(token)
-        
-    def on_message(self, *filters):
-        def decorator(func):
-            async def wrapped(client, update):
-                if all(f(update) for f in filters):
-                    await func(client, update)
-            self.messages_handler.append(wrapped)
-            return func
-        return decorator
-    
-    async def update(self, data: dict):
-        event = Update.read(data["update"]) if data.get("update") else InlineMessage.read(data["inline_message"])
-        for handler in self.messages_handler:
-            await handler(self, event)
-    
-    def run(self):
-        routes = web.RouteTableDef()
-        @routes.post("/receiveUpdate")
-        @routes.post("/receiveInlineMessage")
-        async def webhook(request):
-            data = await request.json()
-            await self.update(data)
-            return web.json_response({"status": "ok"})
-        app = web.Application()
-        app.add_routes(routes)
-        web.run_app(app, host="0.0.0.0", port=5000)