Rubka 1.6.0__py3-none-any.whl → 1.7.2__py3-none-any.whl

rubka/api.py

@@ -24,13 +24,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", {})
@@ -47,19 +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 = 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("/"):
@@ -79,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.6.0.dist-info → rubka-1.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 1.6.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.6.0.dist-info → rubka-1.7.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 rubka/__init__.py,sha256=3f4H6Uj1ylrfBYlTHmTvzZSvaPJsdNhCocyX3Bbvuv0,254
-rubka/api.py,sha256=-68MTjIHuQ--1LBHW1-mnGVdz6XUOhHsR7F4J2jGo2k,9216
+rubka/api.py,sha256=993Dj325opTfsWnhEd0mFyAbDyxkA9UR9BT2mxmJ4GY,9457
 rubka/config.py,sha256=Bck59xkOiqioLv0GkQ1qPGnBXVctz1hKk6LT4h2EPx0,78
 rubka/context.py,sha256=dv7EJz3xu6N9ktbZnzMlmtgxAB6oCwkGKbs57hTWx64,11526
 rubka/decorators.py,sha256=hGwUoE4q2ImrunJIGJ_kzGYYxQf1ueE0isadqraKEts,1157
@@ -9,7 +9,7 @@ rubka/keyboards.py,sha256=7nr-dT2bQJVQnQ6RMWPTSjML6EEk6dsBx-4d8pab8xk,488
 rubka/keypad.py,sha256=uJ9ocsTR2lPPJDER48h0p-9dU1Cv9FD4Qcm_--u6H1M,428
 rubka/logger.py,sha256=VhxaryxN_SqUmCX39nym2A6JiEPI-jEG22htPBP88Y4,289
 rubka/utils.py,sha256=XUQUZxQt9J2f0X5hmAH_MH1kibTAfdT1T4AaBkBhBBs,148
-rubka-1.6.0.dist-info/METADATA,sha256=C0N9aXmICglQiazwyq9PgvxETjCbemeLvSBBW7VtkJk,8168
-rubka-1.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rubka-1.6.0.dist-info/top_level.txt,sha256=vy2A4lot11cRMdQS-F4HDCIXL3JK8RKfu7HMDkezJW4,6
-rubka-1.6.0.dist-info/RECORD,,
+rubka-1.7.2.dist-info/METADATA,sha256=hsTcLNuC4_5wiqt-kuUIPPri14dVvtm_PErXqMv6Amg,8168
+rubka-1.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rubka-1.7.2.dist-info/top_level.txt,sha256=vy2A4lot11cRMdQS-F4HDCIXL3JK8RKfu7HMDkezJW4,6
+rubka-1.7.2.dist-info/RECORD,,