Rubka 1.5.0__tar.gz → 1.7.2__tar.gz

{rubka-1.5.0 → rubka-1.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 1.5.0
+Version: 1.7.2
 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.5.0 → rubka-1.7.2}/Rubka.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 1.5.0
+Version: 1.7.2
 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.5.0 → rubka-1.7.2}/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 MessageContext
+from .context import Message
 API_URL = "https://botapi.rubika.ir/v3"
 
 class Robot:
@@ -24,18 +24,24 @@ 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", {})
-    def on_message(self, filters: Optional[Callable[[MessageContext], bool]] = None, commands: Optional[List[str]] = None):
-        def decorator(func: Callable[[Any, MessageContext], None]):
+    def on_message(self, filters: Optional[Callable[[Message], bool]] = None, commands: Optional[List[str]] = None):
+        def decorator(func: Callable[[Any, Message], None]):
             self._message_handler = {
                 "func": func,
                 "filters": filters,
@@ -47,18 +53,16 @@ class Robot:
 
 
     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') == '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 = MessageContext(self, chat_id, message_id, sender_id, text)
-
+                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("/"):
@@ -78,19 +82,21 @@ class Robot:
 
 
 
+
     def run(self):
         print("Bot started running...")
         while True:
             try:
                 updates = self.get_updates(offset_id=self._offset_id, limit=10)
                 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.7.2/rubka/context.py

@@ -0,0 +1,294 @@
+from typing import Any, Dict, List,Optional
+
+class File:
+    def __init__(self, data: dict):
+        self.file_id: str = data.get("file_id")
+        self.file_name: str = data.get("file_name")
+        self.size: str = data.get("size")
+
+
+class Sticker:
+    def __init__(self, data: dict):
+        self.sticker_id: str = data.get("sticker_id")
+        self.emoji_character: str = data.get("emoji_character")
+        self.file = File(data.get("file", {}))
+
+
+# =========================
+# Poll
+# =========================
+class PollStatus:
+    def __init__(self, data: dict):
+        self.state: str = data.get("state")
+        self.selection_index: int = data.get("selection_index")
+        self.percent_vote_options: List[int] = data.get("percent_vote_options", [])
+        self.total_vote: int = data.get("total_vote")
+        self.show_total_votes: bool = data.get("show_total_votes")
+
+
+class Poll:
+    def __init__(self, data: dict):
+        self.question: str = data.get("question")
+        self.options: List[str] = data.get("options", [])
+        self.poll_status = PollStatus(data.get("poll_status", {}))
+
+
+# =========================
+# Location & Contact & ForwardedFrom
+# =========================
+class Location:
+    def __init__(self, data: dict):
+        self.latitude: str = data.get("latitude")
+        self.longitude: str = data.get("longitude")
+
+
+class LiveLocation:
+    def __init__(self, data: dict):
+        self.start_time: str = data.get("start_time")
+        self.live_period: int = data.get("live_period")
+        self.current_location = Location(data.get("current_location", {}))
+        self.user_id: str = data.get("user_id")
+        self.status: str = data.get("status")
+        self.last_update_time: str = data.get("last_update_time")
+
+
+class ContactMessage:
+    def __init__(self, data: dict):
+        self.phone_number: str = data.get("phone_number")
+        self.first_name: str = data.get("first_name")
+        self.last_name: str = data.get("last_name")
+
+
+class ForwardedFrom:
+    def __init__(self, data: dict):
+        self.type_from: str = data.get("type_from")
+        self.message_id: str = data.get("message_id")
+        self.from_chat_id: str = data.get("from_chat_id")
+        self.from_sender_id: str = data.get("from_sender_id")
+
+
+# =========================
+# AuxData
+# =========================
+class AuxData:
+    def __init__(self, data: dict):
+        self.start_id: str = data.get("start_id")
+        self.button_id: str = data.get("button_id")
+
+
+# =========================
+# Button Models
+# =========================
+class ButtonTextbox:
+    def __init__(self, data: dict):
+        self.type_line: str = data.get("type_line")
+        self.type_keypad: str = data.get("type_keypad")
+        self.place_holder: Optional[str] = data.get("place_holder")
+        self.title: Optional[str] = data.get("title")
+        self.default_value: Optional[str] = data.get("default_value")
+
+
+class ButtonNumberPicker:
+    def __init__(self, data: dict):
+        self.min_value: str = data.get("min_value")
+        self.max_value: str = data.get("max_value")
+        self.default_value: Optional[str] = data.get("default_value")
+        self.title: str = data.get("title")
+
+
+class ButtonStringPicker:
+    def __init__(self, data: dict):
+        self.items: List[str] = data.get("items", [])
+        self.default_value: Optional[str] = data.get("default_value")
+        self.title: Optional[str] = data.get("title")
+
+
+class ButtonCalendar:
+    def __init__(self, data: dict):
+        self.default_value: Optional[str] = data.get("default_value")
+        self.type: str = data.get("type")
+        self.min_year: str = data.get("min_year")
+        self.max_year: str = data.get("max_year")
+        self.title: str = data.get("title")
+
+
+class ButtonLocation:
+    def __init__(self, data: dict):
+        self.default_pointer_location = Location(data.get("default_pointer_location", {}))
+        self.default_map_location = Location(data.get("default_map_location", {}))
+        self.type: str = data.get("type")
+        self.title: Optional[str] = data.get("title")
+        self.location_image_url: str = data.get("location_image_url")
+
+
+class ButtonSelectionItem:
+    def __init__(self, data: dict):
+        self.text: str = data.get("text")
+        self.image_url: str = data.get("image_url")
+        self.type: str = data.get("type")
+
+
+class ButtonSelection:
+    def __init__(self, data: dict):
+        self.selection_id: str = data.get("selection_id")
+        self.search_type: str = data.get("search_type")
+        self.get_type: str = data.get("get_type")
+        self.items: List[ButtonSelectionItem] = [ButtonSelectionItem(i) for i in data.get("items", [])]
+        self.is_multi_selection: bool = data.get("is_multi_selection")
+        self.columns_count: str = data.get("columns_count")
+        self.title: str = data.get("title")
+
+
+class Button:
+    def __init__(self, data: dict):
+        self.id: str = data.get("id")
+        self.type: str = data.get("type")
+        self.button_text: str = data.get("button_text")
+        self.button_selection = ButtonSelection(data.get("button_selection", {})) if "button_selection" in data else None
+        self.button_calendar = ButtonCalendar(data.get("button_calendar", {})) if "button_calendar" in data else None
+        self.button_number_picker = ButtonNumberPicker(data.get("button_number_picker", {})) if "button_number_picker" in data else None
+        self.button_string_picker = ButtonStringPicker(data.get("button_string_picker", {})) if "button_string_picker" in data else None
+        self.button_location = ButtonLocation(data.get("button_location", {})) if "button_location" in data else None
+        self.button_textbox = ButtonTextbox(data.get("button_textbox", {})) if "button_textbox" in data else None
+
+
+class KeypadRow:
+    def __init__(self, data: dict):
+        self.buttons: List[Button] = [Button(btn) for btn in data.get("buttons", [])]
+
+
+class Keypad:
+    def __init__(self, data: dict):
+        self.rows: List[KeypadRow] = [KeypadRow(r) for r in data.get("rows", [])]
+        self.resize_keyboard: bool = data.get("resize_keyboard", False)
+        self.on_time_keyboard: bool = data.get("on_time_keyboard", False)
+
+
+class Chat:
+    def __init__(self, data: dict):
+        self.chat_id: str = data.get("chat_id")
+        self.chat_type: str = data.get("chat_type")
+        self.user_id: str = data.get("user_id")
+        self.first_name: str = data.get("first_name")
+        self.last_name: str = data.get("last_name")
+        self.title: str = data.get("title")
+        self.username: str = data.get("username")
+
+
+class Bot:
+    def __init__(self, data: dict):
+        self.bot_id: str = data.get("bot_id")
+        self.bot_title: str = data.get("bot_title")
+        self.avatar = File(data.get("avatar", {}))
+        self.description: str = data.get("description")
+        self.username: str = data.get("username")
+        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):
+        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.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
+        self.sticker = Sticker(self.raw_data["sticker"]) if "sticker" in self.raw_data else None
+        self.contact_message = ContactMessage(self.raw_data["contact_message"]) if "contact_message" in self.raw_data else None
+        self.poll = Poll(self.raw_data["poll"]) if "poll" in self.raw_data else None
+        self.location = Location(self.raw_data["location"]) if "location" in self.raw_data else None
+        self.live_location = LiveLocation(self.raw_data["live_location"]) if "live_location" in self.raw_data else None
+        self.aux_data = AuxData(self.raw_data["aux_data"]) if "aux_data" in self.raw_data else None
+
+    @property
+    def session(self):
+        if self.chat_id not in self.bot.sessions:
+            self.bot.sessions[self.chat_id] = {}
+        return self.bot.sessions[self.chat_id]
+    def reply(self, text: str, **kwargs):
+        return self.bot.send_message(
+            self.chat_id,
+            text,
+            reply_to_message_id=self.message_id,
+            **kwargs
+        )
+
+    def reply_poll(self, question: str, options: List[str], **kwargs) -> Dict[str, Any]:
+        return self.bot._post("sendPoll", {
+            "chat_id": self.chat_id,
+            "question": question,
+            "options": options,
+            "reply_to_message_id": self.message_id,
+            **kwargs
+        })
+
+    def reply_location(self, latitude: str, longitude: str, **kwargs) -> Dict[str, Any]:
+        return self.bot.send_location(
+            chat_id=self.chat_id,
+            latitude=latitude,
+            longitude=longitude,
+            reply_to_message_id=self.message_id,
+            **kwargs
+        )
+
+    def reply_contact(self, first_name: str, last_name: str, phone_number: str, **kwargs) -> Dict[str, Any]:
+        return self.bot.send_contact(
+            chat_id=self.chat_id,
+            first_name=first_name,
+            last_name=last_name,
+            phone_number=phone_number,
+            reply_to_message_id=self.message_id,
+            **kwargs
+        )
+
+    def reply_keypad(self, text: str, keypad: Dict[str, Any], **kwargs) -> Dict[str, Any]:
+        return self.bot.send_message(
+            chat_id=self.chat_id,
+            text=text,
+            chat_keypad_type="New",
+            chat_keypad=keypad,
+            reply_to_message_id=self.message_id,
+            **kwargs
+        )
+
+    def reply_inline(self, text: str, inline_keypad: Dict[str, Any], **kwargs) -> Dict[str, Any]:
+        return self.bot.send_message(
+            chat_id=self.chat_id,
+            text=text,
+            inline_keypad=inline_keypad,
+            reply_to_message_id=self.message_id,
+            **kwargs
+        )
+
+    def reply_sticker(self, sticker_id: str, **kwargs) -> Dict[str, Any]:
+        return self.bot._post("sendSticker", {
+            "chat_id": self.chat_id,
+            "sticker_id": sticker_id,
+            "reply_to_message_id": self.message_id,
+            **kwargs
+        })
+
+    def reply_file(self, file_id: str, **kwargs) -> Dict[str, Any]:
+        return self.bot._post("sendFile", {
+            "chat_id": self.chat_id,
+            "file_id": file_id,
+            "reply_to_message_id": self.message_id,
+            **kwargs
+        })
+
+    def edit(self, new_text: str) -> Dict[str, Any]:
+        return self.bot.edit_message_text(
+            chat_id=self.chat_id,
+            message_id=self.message_id,
+            text=new_text
+        )
+
+    def delete(self) -> Dict[str, Any]:
+        return self.bot.delete_message(
+            chat_id=self.chat_id,
+            message_id=self.message_id
+        )

{rubka-1.5.0 → rubka-1.7.2}/setup.py

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

rubka-1.5.0/rubka/context.py

@@ -1,99 +0,0 @@
-from typing import Any, Dict, List
-
-
-class Message:
-    def __init__(self, bot, chat_id, message_id, sender_id, text):
-        self.bot = bot
-        self.chat_id = chat_id
-        self.message_id = message_id
-        self.sender_id = sender_id
-        self.text = text
-        self.args = []
-    @property
-    def session(self):
-        if self.chat_id not in self.bot.sessions:
-            self.bot.sessions[self.chat_id] = {}
-        return self.bot.sessions[self.chat_id]
-    def reply(self, text: str, **kwargs):
-        return self.bot.send_message(
-            self.chat_id,
-            text,
-            reply_to_message_id=self.message_id,
-            **kwargs
-        )
-
-    def reply_poll(self, question: str, options: List[str], **kwargs) -> Dict[str, Any]:
-        return self.bot._post("sendPoll", {
-            "chat_id": self.chat_id,
-            "question": question,
-            "options": options,
-            "reply_to_message_id": self.message_id,
-            **kwargs
-        })
-
-    def reply_location(self, latitude: str, longitude: str, **kwargs) -> Dict[str, Any]:
-        return self.bot.send_location(
-            chat_id=self.chat_id,
-            latitude=latitude,
-            longitude=longitude,
-            reply_to_message_id=self.message_id,
-            **kwargs
-        )
-
-    def reply_contact(self, first_name: str, last_name: str, phone_number: str, **kwargs) -> Dict[str, Any]:
-        return self.bot.send_contact(
-            chat_id=self.chat_id,
-            first_name=first_name,
-            last_name=last_name,
-            phone_number=phone_number,
-            reply_to_message_id=self.message_id,
-            **kwargs
-        )
-
-    def reply_keypad(self, text: str, keypad: Dict[str, Any], **kwargs) -> Dict[str, Any]:
-        return self.bot.send_message(
-            chat_id=self.chat_id,
-            text=text,
-            chat_keypad_type="New",
-            chat_keypad=keypad,
-            reply_to_message_id=self.message_id,
-            **kwargs
-        )
-
-    def reply_inline(self, text: str, inline_keypad: Dict[str, Any], **kwargs) -> Dict[str, Any]:
-        return self.bot.send_message(
-            chat_id=self.chat_id,
-            text=text,
-            inline_keypad=inline_keypad,
-            reply_to_message_id=self.message_id,
-            **kwargs
-        )
-
-    def reply_sticker(self, sticker_id: str, **kwargs) -> Dict[str, Any]:
-        return self.bot._post("sendSticker", {
-            "chat_id": self.chat_id,
-            "sticker_id": sticker_id,
-            "reply_to_message_id": self.message_id,
-            **kwargs
-        })
-
-    def reply_file(self, file_id: str, **kwargs) -> Dict[str, Any]:
-        return self.bot._post("sendFile", {
-            "chat_id": self.chat_id,
-            "file_id": file_id,
-            "reply_to_message_id": self.message_id,
-            **kwargs
-        })
-
-    def edit(self, new_text: str) -> Dict[str, Any]:
-        return self.bot.edit_message_text(
-            chat_id=self.chat_id,
-            message_id=self.message_id,
-            text=new_text
-        )
-
-    def delete(self) -> Dict[str, Any]:
-        return self.bot.delete_message(
-            chat_id=self.chat_id,
-            message_id=self.message_id
-        )