Rubka 1.6.0__tar.gz → 1.7.4__tar.gz

{rubka-1.6.0 → rubka-1.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 1.6.0
+Version: 1.7.4
 Summary: A Python library for interacting with Rubika Bot API.
 Home-page: https://github.com/Mahdy-Ahmadi/Rubka
 Download-URL: https://github.com/Mahdy-Ahmadi/Rubka/archive/refs/tags/v0.1.0.tar.gz

{rubka-1.6.0 → rubka-1.7.4}/Rubka.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 1.6.0
+Version: 1.7.4
 Summary: A Python library for interacting with Rubika Bot API.
 Home-page: https://github.com/Mahdy-Ahmadi/Rubka
 Download-URL: https://github.com/Mahdy-Ahmadi/Rubka/archive/refs/tags/v0.1.0.tar.gz

{rubka-1.6.0 → rubka-1.7.4}/rubka/api.py

@@ -3,7 +3,7 @@ from typing import List, Optional, Dict, Any, Literal
 from .exceptions import APIRequestError
 from .logger import logger
 from typing import Callable
-from .context import Message
+from .context import Message,InlineMessage
 API_URL = "https://botapi.rubika.ir/v3"
 
 class Robot:
@@ -17,6 +17,11 @@ class Robot:
         self._offset_id = None
         self.session = requests.Session()
         self.sessions: Dict[str, Dict[str, Any]] = {}
+        self._callback_handler = None
+        self._message_handler = None
+        self._inline_query_handler = None
+
+
         logger.info(f"Initialized RubikaBot with token: {token[:8]}***")
 
     def _post(self, method: str, data: Dict[str, Any]) -> Dict[str, Any]:
@@ -24,13 +29,19 @@ class Robot:
         try:
             response = self.session.post(url, json=data, timeout=10)
             response.raise_for_status()
-            json_resp = response.json()
-            logger.debug(f"API Response from {method}: {json_resp}")
+            try:
+                json_resp = response.json()
+            except ValueError:
+                logger.error(f"Invalid JSON response from {method}: {response.text}")
+                raise APIRequestError(f"Invalid JSON response: {response.text}")
+            if method != "getUpdates":logger.debug(f"API Response from {method}: {json_resp}")
+            
             return json_resp
         except requests.RequestException as e:
             logger.error(f"API request failed: {e}")
             raise APIRequestError(f"API request failed: {e}") from e
 
+
     def get_me(self) -> Dict[str, Any]:
         """Get info about the bot itself."""
         return self._post("getMe", {})
@@ -45,21 +56,30 @@ class Robot:
         return decorator
 
 
+    def on_inline_query(self):
+        def decorator(func: Callable[[Any, InlineMessage], None]):
+            self._inline_query_handler = func
+            return func
+        return decorator
+
+
 
     def _process_update(self, update: Dict[str, Any]):
-        update_data = update.get('update', {})
-        if update_data.get('type') == 'NewMessage':
-            msg = update_data.get('new_message', {})
-            chat_id = update_data.get('chat_id')
+        if update.get('type') == 'ReceiveQuery':
+            msg = update.get("inline_message", {})
+            if self._inline_query_handler:
+                context = InlineMessage(bot=self, raw_data=msg)
+                self._inline_query_handler(self, context)
+        if update.get('type') == 'NewMessage':
+            msg = update.get('new_message', {})
+            chat_id = update.get('chat_id')
             message_id = msg.get('message_id')
             sender_id = msg.get('sender_id')
             text = msg.get('text')
 
             if self._message_handler:
                 handler = self._message_handler
-                context = Message(bot=self,chat_id=chat_id,message_id=message_id,sender_id=sender_id,text=text,raw_data=msg)
-
-
+                context = Message(bot=self, chat_id=chat_id, message_id=message_id, sender_id=sender_id, text=text, raw_data=msg)
 
                 if handler["commands"]:
                     if not context.text or not context.text.startswith("/"):
@@ -75,6 +95,17 @@ class Robot:
                         return
 
                 handler["func"](self, context)
+        elif update.get('type') == 'ReceiveQuery':
+            msg = update.get("inline_message", {})
+            chat_id = msg.get("chat_id")
+            message_id = msg.get("message_id")
+            sender_id = msg.get("sender_id")
+            text = msg.get("text")
+
+            if hasattr(self, "_callback_handler"):
+                context = Message(bot=self, chat_id=chat_id, message_id=message_id, sender_id=sender_id, text=text, raw_data=msg)
+                self._callback_handler(self, context)
+
 
 
 
@@ -83,15 +114,16 @@ class Robot:
         print("Bot started running...")
         while True:
             try:
-                updates = self.get_updates(offset_id=self._offset_id, limit=10)
+                updates = self.get_updates(offset_id=self._offset_id, limit=2)
                 if updates and updates.get('data'):
-                    for update in updates['data']:
+                    for update in updates['data'].get('updates', []):
                         self._process_update(update)
-                        self._offset_id = update.get('update_id', self._offset_id)
+                        self._offset_id = updates['data'].get('next_offset_id', self._offset_id)
             except Exception as e:
                 print(f"Error in run loop: {e}")
-                logger.error(f"API request failed: {e}")
+                #logger.error(f"API request failed: {e}")
                 raise APIRequestError(f"API request failed: {e}") from e
+
     def send_message(
         self,
         chat_id: str,

{rubka-1.6.0 → rubka-1.7.4}/rubka/context.py

@@ -185,15 +185,18 @@ class Bot:
         self.start_message: str = data.get("start_message")
         self.share_url: str = data.get("share_url")
 class Message:
-    def __init__(self, bot, chat_id, message_id, sender_id, text, raw_data=None):
+    def __init__(self, bot, chat_id, message_id, sender_id, text=None, raw_data=None):
         self.bot = bot
         self.chat_id = chat_id
-        self.message_id = message_id
-        self.sender_id = sender_id
-        self.text = text
-        self.args = []
         self.raw_data = raw_data or {}
+        self.message_id: str = self.raw_data.get("message_id", message_id)
+        self.text: str = self.raw_data.get("text", text)
+        self.sender_id: str = self.raw_data.get("sender_id", sender_id)
+        self.time: str = self.raw_data.get("time")
+        self.is_edited: bool = self.raw_data.get("is_edited", False)
+        self.sender_type: str = self.raw_data.get("sender_type")
 
+        self.args = []
         self.reply_to_message_id: Optional[str] = self.raw_data.get("reply_to_message_id")
         self.forwarded_from = ForwardedFrom(self.raw_data["forwarded_from"]) if "forwarded_from" in self.raw_data else None
         self.file = File(self.raw_data["file"]) if "file" in self.raw_data else None
@@ -292,3 +295,34 @@ class Message:
             chat_id=self.chat_id,
             message_id=self.message_id
         )
+class InlineMessage:
+    def __init__(self, bot, raw_data: dict):
+        self.bot = bot
+        self.raw_data = raw_data
+
+        self.chat_id: str = raw_data.get("chat_id")
+        self.message_id: str = raw_data.get("message_id")
+        self.sender_id: str = raw_data.get("sender_id")
+        self.text: str = raw_data.get("text")
+        self.aux_data = AuxData(raw_data.get("aux_data", {})) if "aux_data" in raw_data else None
+
+    def reply(self, text: str, **kwargs):
+        return self.bot.send_message(
+            chat_id=self.chat_id,
+            text=text,
+            reply_to_message_id=self.message_id,
+            **kwargs
+        )
+
+    def edit(self, new_text: str):
+        return self.bot.edit_message_text(
+            chat_id=self.chat_id,
+            message_id=self.message_id,
+            text=new_text
+        )
+
+    def delete(self):
+        return self.bot.delete_message(
+            chat_id=self.chat_id,
+            message_id=self.message_id
+        )

rubka-1.7.4/rubka/keypad.py

@@ -0,0 +1,48 @@
+from typing import Dict
+
+class InlineBuilder:
+    def __init__(self):
+        self.rows = []
+
+    def row(self, *buttons: Dict[str, str]):
+        self.rows.append({"buttons": list(buttons)})
+        return self
+
+    def button(self, id: str, text: str, type: str = "Simple") -> Dict[str, str]:
+        return {"id": id, "type": type, "button_text": text}
+
+    def build(self):
+        return {"rows": self.rows}
+from typing import List, Dict, Optional
+
+class ChatKeypadBuilder:
+    def __init__(self):
+        self.rows: List[Dict[str, List[Dict[str, str]]]] = []
+
+    def row(self, *buttons: Dict[str, str]) -> "ChatKeypadBuilder":
+        """
+        یک ردیف دکمه به کی‌پد اضافه می‌کند.
+        ورودی: چند دیکشنری که نماینده دکمه‌ها هستند.
+        """
+        self.rows.append({"buttons": list(buttons)})
+        return self
+
+    def button(self, id: str, text: str, type: str = "Simple") -> Dict[str, str]:
+        """
+        دیکشنری یک دکمه می‌سازد.
+        """
+        return {"id": id, "type": type, "button_text": text}
+
+    def build(
+        self,
+        resize_keyboard: bool = True,
+        on_time_keyboard: bool = False
+    ) -> Dict[str, object]:
+        """
+        ساختار نهایی chat_keypad را می‌سازد.
+        """
+        return {
+            "rows": self.rows,
+            "resize_keyboard": resize_keyboard,
+            "on_time_keyboard": on_time_keyboard
+        }

{rubka-1.6.0 → rubka-1.7.4}/rubka/logger.py

@@ -1,10 +1,10 @@
 import logging
 
 logger = logging.getLogger("rubka")
-logger.setLevel(logging.DEBUG)
+logger.setLevel(logging.ERROR)
 
 ch = logging.StreamHandler()
-ch.setLevel(logging.DEBUG)
+ch.setLevel(logging.ERROR)
 
 formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 ch.setFormatter(formatter)

{rubka-1.6.0 → rubka-1.7.4}/setup.py

@@ -8,7 +8,7 @@ except FileNotFoundError:
 
 setup(
     name='Rubka',
-    version='1.6.0',
+    version='1.7.4',
     description='A Python library for interacting with Rubika Bot API.',
     long_description=long_description,
     long_description_content_type='text/markdown',

rubka-1.6.0/rubka/keypad.py

@@ -1,15 +0,0 @@
-from typing import Dict
-
-class InlineBuilder:
-    def __init__(self):
-        self.rows = []
-
-    def row(self, *buttons: Dict[str, str]):
-        self.rows.append({"buttons": list(buttons)})
-        return self
-
-    def button(self, id: str, text: str, type: str = "Simple") -> Dict[str, str]:
-        return {"id": id, "type": type, "button_text": text}
-
-    def build(self):
-        return {"rows": self.rows}