RubigramClient 1.5.0__tar.gz → 1.5.2__tar.gz

{rubigramclient-1.5.0 → rubigramclient-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.5.0
+Version: 1.5.2
 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
@@ -11,6 +11,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp
 Requires-Dist: aiofiles
+Requires-Dist: aiosqlite
 Dynamic: license-file
 
 # Rubigram
@@ -24,7 +25,7 @@ pip install RubigramClient
 ## Send Message
 ```python
 from rubigram import Client, filters
-from rubigram.types import Update
+from rubigram.models import Update
 
 bot = Client("your_bot_token", "you_endpoint_url")
 
@@ -38,7 +39,7 @@ bot.run()
 ## Send Message & Get receiveInlineMessage
 ```python
 from rubigram import Client, filters
-from rubigram.types import Update, Button, Keypad, KeypadRow, InlineMessage
+from rubigram.models import Update, Button, Keypad, KeypadRow, InlineMessage
 
 
 bot = Client(token="bot_token", endpoint="endpoint_url")

{rubigramclient-1.5.0 → rubigramclient-1.5.2}/README.md

@@ -9,7 +9,7 @@ pip install RubigramClient
 ## Send Message
 ```python
 from rubigram import Client, filters
-from rubigram.types import Update
+from rubigram.models import Update
 
 bot = Client("your_bot_token", "you_endpoint_url")
 
@@ -23,7 +23,7 @@ bot.run()
 ## Send Message & Get receiveInlineMessage
 ```python
 from rubigram import Client, filters
-from rubigram.types import Update, Button, Keypad, KeypadRow, InlineMessage
+from rubigram.models import Update, Button, Keypad, KeypadRow, InlineMessage
 
 
 bot = Client(token="bot_token", endpoint="endpoint_url")

{rubigramclient-1.5.0 → rubigramclient-1.5.2}/RubigramClient.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RubigramClient
-Version: 1.5.0
+Version: 1.5.2
 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
@@ -11,6 +11,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp
 Requires-Dist: aiofiles
+Requires-Dist: aiosqlite
 Dynamic: license-file
 
 # Rubigram
@@ -24,7 +25,7 @@ pip install RubigramClient
 ## Send Message
 ```python
 from rubigram import Client, filters
-from rubigram.types import Update
+from rubigram.models import Update
 
 bot = Client("your_bot_token", "you_endpoint_url")
 
@@ -38,7 +39,7 @@ bot.run()
 ## Send Message & Get receiveInlineMessage
 ```python
 from rubigram import Client, filters
-from rubigram.types import Update, Button, Keypad, KeypadRow, InlineMessage
+from rubigram.models import Update, Button, Keypad, KeypadRow, InlineMessage
 
 
 bot = Client(token="bot_token", endpoint="endpoint_url")

{rubigramclient-1.5.0 → rubigramclient-1.5.2}/RubigramClient.egg-info/SOURCES.txt

@@ -10,5 +10,6 @@ rubigram/__init__.py
 rubigram/client.py
 rubigram/filters.py
 rubigram/method.py
+rubigram/models.py
 rubigram/network.py
-rubigram/types.py
+rubigram/state.py

{rubigramclient-1.5.0 → rubigramclient-1.5.2}/RubigramClient.egg-info/requires.txt

@@ -1,2 +1,3 @@
 aiohttp
 aiofiles
+aiosqlite

{rubigramclient-1.5.0 → rubigramclient-1.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "RubigramClient"
-version = "1.5.0"
+version = "1.5.2"
 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"
@@ -16,5 +16,6 @@ classifiers = [
 dependencies = [
     "aiohttp",
     "aiofiles",
+    "aiosqlite",
     
 ]

{rubigramclient-1.5.0 → rubigramclient-1.5.2}/rubigram/__init__.py

@@ -1,4 +1,6 @@
 from .network import Network
 from .method import Method
 from .client import Client
+from .state import StateManager
+from . import models
 from . import filters

{rubigramclient-1.5.0 → rubigramclient-1.5.2}/rubigram/client.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 from typing import Optional, Callable, Literal
 from aiohttp import web
 from functools import wraps
-from rubigram.types import Update, InlineMessage
+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
@@ -20,6 +21,7 @@ class Client(Method):
         self.host = host
         self.port = port
         self.offset_id = None
+        self.state = StateManager()
         self.routes = web.RouteTableDef()
         self.message_handlers = []
         self.inline_handlers = []
@@ -111,9 +113,11 @@ class Client(Method):
 
             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)
@@ -123,6 +127,7 @@ class Client(Method):
         else:
             async def polling():
                 try:
+                    await self.state.start()
                     while True:
                         try:
                             get_update = await self.get_update(100, self.offset_id)
@@ -132,10 +137,8 @@ class Client(Method):
                                     if update.type == "NewMessage":
                                         message_time = int(update.new_message.time)
                                     elif update.type == "UpdatedMessage":
-                                        message_time = int(
-                                            update.updated_message.time)
-                                    else:
-                                        continue
+                                        message_time = int(update.updated_message.time)
+                                    else:continue
 
                                     now = int(datetime.now().timestamp())
                                     if message_time >= now or message_time + 2 >= now:
@@ -148,6 +151,9 @@ class Client(Method):
                             logger.exception("Polling Error : {}".format(error))
                             await asyncio.sleep(1)
 
-                except: pass
-                finally: await self.stop()
+                except:
+                    pass
+                finally:
+                    await self.state.stop()
+                    await self.stop()
             asyncio.run(polling())

{rubigramclient-1.5.0 → rubigramclient-1.5.2}/rubigram/filters.py

@@ -1,4 +1,4 @@
-from rubigram.types import Update, InlineMessage
+from rubigram.models import Update, InlineMessage
 from typing import Union, Callable, Awaitable
 import re
 
@@ -24,6 +24,19 @@ class Filter:
         return Filter(combined)
 
 
+class state(Filter):
+    def __init__(self, states: Union[str, list[str]]):
+        self.states = states
+        super().__init__(self.filter)
+        
+    async def filter(self, update: Update):
+        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
+            
+
 class command(Filter):
     def __init__(self, cmd: Union[str, list[str]], prefix: str = "/"):
         self.cmd = cmd
@@ -31,7 +44,7 @@ class command(Filter):
         super().__init__(self.filter)
 
     def filter(self, update: Update):
-        commands = [self.cmd] if isinstance(self.cmd, str) else self.cmd
+        commands = self.cmd if isinstance(self.cmd, list) else [self.cmd]
         text = ""
         if isinstance(update, Update):
             if update.type == "NewMessage":
@@ -71,8 +84,7 @@ class chat(Filter):
         super().__init__(self.filter)
 
     def filter(self, update: Union[Update, InlineMessage]):
-        chat_ids = [self.chat_id] if isinstance(
-            self.chat_id, str) else self.chat_id
+        chat_ids = self.chat_id if isinstance(self.chat_id, list) else [self.chat_id]
         return update.chat_id in chat_ids
 
 
@@ -83,8 +95,7 @@ class button(Filter):
 
     def filter(self, update: InlineMessage):
         if isinstance(update, InlineMessage):
-            button_ids = [self.button_id] if isinstance(
-                self.button_id, str) else self.button_id
+            button_ids = self.button_id if isinstance(self.button_id, list) else [self.button_id]
             return update.aux_data.button_id in button_ids
 
 

{rubigramclient-1.5.0 → rubigramclient-1.5.2}/rubigram/method.py

@@ -1,6 +1,6 @@
 from .network import Network
 from typing import Literal, Optional
-from .types import Bot, Chat, Keypad, MessageId, Updates
+from rubigram.models import Bot, Chat, Keypad, MessageId, Updates
 
 
 

rubigramclient-1.5.2/rubigram/state.py

@@ -0,0 +1,107 @@
+from aiosqlite import connect as conn, Connection
+from typing import Optional
+
+
+class ManageDB:
+    def __init__(self, database: str):
+        self.database = database
+        self.connection: Optional[Connection] = None
+    
+    
+    async def connect(self):
+        if not self.connection:
+            self.connection = await conn(self.database)
+    
+    
+    async def disconnect(self):
+        if self.connection:
+            await self.connection.close()
+            self.connection = None
+    
+            
+    async def create(self):
+        await self.connect()
+        await self.connection.execute("""CREATE TABLE IF NOT EXISTS states (user_id TEXT PRIMARY KEY, state TEXT)""")
+        await self.connection.execute("CREATE TABLE IF NOT EXISTS user_data (user_id TEXT, var TEXT, res TEXT, PRIMARY KEY (user_id, var))")
+        await self.connection.commit()
+    
+    
+    async def set_state(self, user_id: str, state: str) -> None:
+        await self.connect()
+        await self.connection.execute("INSERT INTO states (user_id, state) VALUES (?, ?) ON CONFLICT(user_id) DO UPDATE SET state=excluded.state ", (user_id, str(state)))
+        await self.connection.commit()
+        
+        
+    async def get_state(self, user_id: str) -> Optional[str]:
+        await self.connect()
+        async with self.connection.execute("SELECT state FROM states WHERE user_id = ?", (user_id,)) as cursor:
+            data = await cursor.fetchone()
+            return data[0] if data else None
+        
+
+    async def remove_state(self, user_id: str):
+        await self.connect()
+        await self.connection.execute("DELETE FROM states WHERE user_id = ?", (user_id,))
+        await self.connection.commit()
+        
+    
+    async def set_data(self, user_id: str, key: str, value: str):
+        await self.connect()
+        await self.connection.execute("INSERT OR REPLACE INTO user_data (user_id, var, res) VALUES (?, ?, ?)", (user_id, key, str(value)))
+        await self.connection.commit()
+        
+    
+    async def get_data(self, user_id: str, key: str = None):
+        await self.connect()
+        if key:
+            async with self.connection.execute("SELECT res FROM user_data WHERE user_id = ? AND var = ?", (user_id, key)) as cursor:
+                data = await cursor.fetchone()
+                return data[0] if data else None
+        else:
+            async with self.connection.execute("SELECT var, res FROM user_data WHERE user_id = ?", (user_id,)) as cursor:
+                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()
+        if key:
+            await self.connection.execute("DELETE FROM user_data WHERE user_id = ? AND var = ?", (user_id, key))
+        else:
+            await self.connection.execute("DELETE FROM user_data WHERE user_id = ?", (user_id,))
+        await self.connection.commit()
+        
+        
+        
+class StateManager:
+    def __init__(self):
+        self.db = ManageDB("rubigram.db")
+    
+    async def start(self):
+        await self.db.create()
+
+    async def stop(self):
+        await self.db.disconnect()
+        
+    async def set_state(self, user_id: str, state: str):
+        await self.db.set_state(user_id, state)
+    
+    async def get_state(self, user_id: str):
+        return await self.db.get_state(user_id)
+    
+    async def remove_state(self, user_id: str):
+        await self.db.remove_state(user_id)
+        
+    async def set_data(self, user_id: str, **data):
+        data = list(data.items())
+        if not data:
+            return
+        key, value = data[0]
+        await self.db.set_data(user_id, key, value)
+    
+    async def get_data(self, user_id: str, key: str = None):
+        return await self.db.get_data(user_id, key)
+
+    async def remove_data(self, user_id: str, key: str = None):
+        await self.db.remove_data(user_id, key)