Rubka 6.4.2__py3-none-any.whl → 6.4.6__py3-none-any.whl

rubka/api.py

@@ -621,7 +621,7 @@ class Robot:
                         continue
 
                     threading.Thread(target=handler["func"], args=(self, context), daemon=True).start()
-                    return
+                    continue
 
     def get_updates(
         self,
@@ -1191,17 +1191,7 @@ class Robot:
             raise ValueError(f"Invalid media type. Must be one of {allowed}")
         result = self._post("requestSendFile", {"type": media_type})
         return result.get("data", {}).get("upload_url")
-    def _send_uploaded_file(
-        self,
-        chat_id: str,
-        file_id: str,
-        text: Optional[str] = None,
-        chat_keypad: Optional[Dict[str, Any]] = None,
-        inline_keypad: Optional[Dict[str, Any]] = None,
-        disable_notification: bool = False,
-        reply_to_message_id: Optional[str] = None,
-        chat_keypad_type: Optional[Literal["New", "Removed", "None"]] = "None"
-    ) -> Dict[str, Any]:
+    def _send_uploaded_file(self, chat_id: str, file_id: str,type_file : str = "file",text: Optional[str] = None, chat_keypad: Optional[Dict[str, Any]] = None, inline_keypad: Optional[Dict[str, Any]] = None, disable_notification: bool = False, reply_to_message_id: Optional[str] = None, chat_keypad_type: Optional[Literal["New", "Removed", "None"]] = "None") -> Dict[str, Any]:
         payload = {
             "chat_id": chat_id,
             "file_id": file_id,
@@ -1216,7 +1206,25 @@ class Robot:
         if reply_to_message_id:
             payload["reply_to_message_id"] = str(reply_to_message_id)
 
-        return self._post("sendFile", payload)
+        resp = self._post("sendFile", payload)
+        message_id_put = resp["data"]["message_id"]
+        result = {
+            "status": resp.get("status"),
+            "status_det": resp.get("status_det"),
+            "file_id": file_id,
+            "text":text,
+            "message_id": message_id_put,
+            "send_to_chat_id": chat_id,
+            "reply_to_message_id": reply_to_message_id,
+            "disable_notification": disable_notification,
+            "type_file": type_file,
+            "raw_response": resp,
+            "chat_keypad":chat_keypad,
+            "inline_keypad":inline_keypad,
+            "chat_keypad_type":chat_keypad_type
+        }
+        import json
+        return json.dumps(result, ensure_ascii=False, indent=4)
     def send_file(
         self,
         chat_id: str,

rubka/asynco.py

@@ -9,6 +9,8 @@ try:
     from .context import Message, InlineMessage
 except (ImportError, ModuleNotFoundError):
     from context import Message, InlineMessage
+class FeatureNotAvailableError(Exception):
+    pass
 
 from tqdm.asyncio import tqdm
 from urllib.parse import urlparse, parse_qs
@@ -16,7 +18,7 @@ class InvalidTokenError(Exception):pass
 import mimetypes
 from pathlib import Path
 import time
-import datetime
+import datetime,json
 import tempfile
 from tqdm import tqdm
 import os
@@ -32,7 +34,31 @@ def install_package(package_name: str) -> bool:
         return True
     except Exception:
         return False
-
+class MessageResponse:
+    def __init__(self, resp: dict, chat_id: str, file_id: str,
+                 type_file: str, reply_to_message_id: str,
+                 disable_notification: bool, text: str = None,
+                 chat_keypad=None, inline_keypad=None, chat_keypad_type="None"):
+        
+        self.status = resp.get("status")
+        self.status_det = resp.get("status_det")
+        self.file_id = file_id
+        self.message_id = resp["data"].get("message_id")
+        self.send_to_chat_id = chat_id
+        self.reply_to_message_id = reply_to_message_id
+        self.disable_notification = disable_notification
+        self.type_file = type_file
+        self.text = text
+        self.chat_keypad = chat_keypad
+        self.inline_keypad = inline_keypad
+        self.chat_keypad_type = chat_keypad_type
+        self.raw_response = resp
+
+    def to_dict(self):
+        return self.__dict__
+
+    def to_json(self):
+        return json.dumps(self.__dict__, ensure_ascii=False, indent=4)
 def get_importlib_metadata():
     """Dynamically imports and returns metadata functions from importlib."""
     try:
@@ -677,12 +703,12 @@ class Robot:
                     
                     if not handler_info["commands"] and not handler_info["filters"]:
                         asyncio.create_task(handler_info["func"](self, context))
-                        return 
+                        continue 
                     
                     
                     if handler_info["commands"] or handler_info["filters"]:
-                        asyncio.create_task(handler_info["func"](self, context))
-                        return 
+                        asyncio.create_task(handler_info["func"](self, context))#jaq
+                        continue 
 
     async def get_updates(self, offset_id: Optional[str] = None, limit: Optional[int] = None) -> Dict[str, Any]:
         data = {}
@@ -1481,17 +1507,19 @@ class Robot:
         
         data = aiohttp.FormData()
         data.add_field('file', file_progress_generator(path), filename=name, content_type='application/octet-stream')
-
-        async with session.post(upload_url, data=data) as response:
-            progress_bar.close()
-            if response.status != 200:
-                raise Exception(f"Upload failed ({response.status}): {await response.text()}")
-            
-            json_data = await response.json()
-            if is_temp_file:
-                os.remove(path)
-            print(json_data)
-            return json_data.get('data', {}).get('file_id')
+        try:
+            async with session.post(upload_url, data=data) as response:
+                progress_bar.close()
+                if response.status != 200:
+                    raise Exception(f"Upload failed ({response.status}): {await response.text()}")
+                
+                json_data = await response.json()
+                if is_temp_file:
+                    os.remove(path)
+                print(json_data)
+                return json_data.get('data', {}).get('file_id')
+        except :
+            raise FeatureNotAvailableError(f"files is not currently supported by the server.")
 
 
     def get_extension(content_type: str) -> str:
@@ -1584,19 +1612,37 @@ class Robot:
         except Exception as e:
             raise Exception(f"An error occurred while downloading the file: {e}")
 
-    async def get_upload_url(self, media_type: Literal['File', 'Image', 'Voice', 'Music', 'Gif', 'Video']) -> str:
-        allowed = ['File', 'Image', 'Voice', 'Music', 'Gif', 'Video']
+    async def get_upload_url(self, media_type: Literal['File', 'Image', 'voice', 'Music', 'Gif', 'Video']) -> str:
+        allowed = ['File', 'Image', 'voice', 'Music', 'Gif', 'Video']
         if media_type not in allowed:
             raise ValueError(f"Invalid media type. Must be one of {allowed}")
         result = await self._post("requestSendFile", {"type": media_type})
         return result.get("data", {}).get("upload_url")
 
-    async def _send_uploaded_file(self, chat_id: str, file_id: str, text: Optional[str] = None, chat_keypad: Optional[Dict[str, Any]] = None, inline_keypad: Optional[Dict[str, Any]] = None, disable_notification: bool = False, reply_to_message_id: Optional[str] = None, chat_keypad_type: Optional[Literal["New", "Removed", "None"]] = "None") -> Dict[str, Any]:
+    async def _send_uploaded_file(self, chat_id: str, file_id: str,type_file : str = "file",text: Optional[str] = None, chat_keypad: Optional[Dict[str, Any]] = None, inline_keypad: Optional[Dict[str, Any]] = None, disable_notification: bool = False, reply_to_message_id: Optional[str] = None, chat_keypad_type: Optional[Literal["New", "Removed", "None"]] = "None") -> Dict[str, Any]:
         payload = {"chat_id": chat_id, "file_id": file_id, "text": text, "disable_notification": disable_notification, "chat_keypad_type": chat_keypad_type}
         if chat_keypad: payload["chat_keypad"] = chat_keypad
         if inline_keypad: payload["inline_keypad"] = inline_keypad
         if reply_to_message_id: payload["reply_to_message_id"] = str(reply_to_message_id)
-        return await self._post("sendFile", payload)
+        payload["time"] = "10"
+        resp = await self._post("sendFile", payload)
+        message_id_put = resp["data"]["message_id"]
+        result = {
+            "status": resp.get("status"),
+            "status_det": resp.get("status_det"),
+            "file_id": file_id,
+            "text":text,
+            "message_id": message_id_put,
+            "send_to_chat_id": chat_id,
+            "reply_to_message_id": reply_to_message_id,
+            "disable_notification": disable_notification,
+            "type_file": type_file,
+            "raw_response": resp,
+            "chat_keypad":chat_keypad,
+            "inline_keypad":inline_keypad,
+            "chat_keypad_type":chat_keypad_type
+        }
+        return json.dumps(result, ensure_ascii=False, indent=4)
 
     async def _send_file_generic(self, media_type, chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type):
         if path:
@@ -1605,7 +1651,7 @@ class Robot:
             file_id = await self.upload_media_file(upload_url, file_name, path)
         if not file_id:
             raise ValueError("Either path or file_id must be provided.")
-        return await self._send_uploaded_file(chat_id=chat_id, file_id=file_id, text=text, inline_keypad=inline_keypad, chat_keypad=chat_keypad, reply_to_message_id=reply_to_message_id, disable_notification=disable_notification, chat_keypad_type=chat_keypad_type)
+        return await self._send_uploaded_file(chat_id=chat_id, file_id=file_id, text=text, inline_keypad=inline_keypad, chat_keypad=chat_keypad, reply_to_message_id=reply_to_message_id, disable_notification=disable_notification, chat_keypad_type=chat_keypad_type,type_file=media_type)
 
     async def send_document(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Removed", "None"]] = "None") -> Dict[str, Any]:
         return await self._send_file_generic("File", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type)
@@ -1613,14 +1659,14 @@ class Robot:
         return await self._send_file_generic("File", chat_id, path, file_id, caption, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type)
     async def re_send(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, caption: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Removed", "None"]] = "None") -> Dict[str, Any]:
         return await self._send_file_generic("File", chat_id, path, file_id, caption, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type)  
-    async def send_music(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Removed", "None"]] = "None") -> Dict[str, Any]:
-        return await self._send_file_generic("Music", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type)
+    async def send_music(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = "music", inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Removed", "None"]] = "None") -> Dict[str, Any]:
+        return await self._send_file_generic("File", chat_id, path, file_id, text, f"{file_name}.ogg", inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type)
 
     async def send_video(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Removed", "None"]] = "None") -> Dict[str, Any]:
         return await self._send_file_generic("Video", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type)
 
     async def send_voice(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Removed", "None"]] = "None") -> Dict[str, Any]:
-        return await self._send_file_generic("Video", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type)
+        return await self._send_file_generic("voice", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type)
 
     async def send_image(self, chat_id: str, path: Optional[Union[str, Path]] = None, file_id: Optional[str] = None, text: Optional[str] = None, file_name: Optional[str] = None, inline_keypad: Optional[Dict[str, Any]] = None, chat_keypad: Optional[Dict[str, Any]] = None, reply_to_message_id: Optional[str] = None, disable_notification: bool = False, chat_keypad_type: Optional[Literal["New", "Removed", "None"]] = "None") -> Dict[str, Any]:
         return await self._send_file_generic("Image", chat_id, path, file_id, text, file_name, inline_keypad, chat_keypad, reply_to_message_id, disable_notification, chat_keypad_type)

{rubka-6.4.2.dist-info → rubka-6.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 6.4.2
+Version: 6.4.6
 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/blob/main/project_library.zip

{rubka-6.4.2.dist-info → rubka-6.4.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 rubka/__init__.py,sha256=TR1DABU5Maz2eO62ZEFiwOqNU0dH6l6HZfqRUxeo4eY,194
-rubka/api.py,sha256=3Iahq3f6OzVf3op_d6RTFUtTvCfjB4NnqSVnC7dkgzo,61232
-rubka/asynco.py,sha256=WWB_-00KVEcAa1su3zj-9-NJfZhx45yCngF8bv4B6FA,75779
+rubka/api.py,sha256=o5YM_KnDdoS0GRKYAXjy9d3xij2gdgmaDmn18ht9cok,61898
+rubka/asynco.py,sha256=CcqSxKvfA1JSG1UDVn78GnImLS0LDdUic2xqCXK_9Cw,77829
 rubka/button.py,sha256=vU9OvWXCD4MRrTJ8Xmivd4L471-06zrD2qpZBTw5vjY,13305
 rubka/config.py,sha256=Bck59xkOiqioLv0GkQ1qPGnBXVctz1hKk6LT4h2EPx0,78
 rubka/context.py,sha256=2HWMy5yaPWE0lJFjRkVzG-8wUgPyugRHz25t4hpF0Ko,18341
@@ -34,7 +34,7 @@ rubka/adaptorrubka/types/socket/message.py,sha256=0WgLMZh4eow8Zn7AiSX4C3GZjQTkIg
 rubka/adaptorrubka/utils/__init__.py,sha256=OgCFkXdNFh379quNwIVOAWY2NP5cIOxU5gDRRALTk4o,54
 rubka/adaptorrubka/utils/configs.py,sha256=nMUEOJh1NqDJsf9W9PurkN_DLYjO6kKPMm923i4Jj_A,492
 rubka/adaptorrubka/utils/utils.py,sha256=5-LioLNYX_TIbQGDeT50j7Sg9nAWH2LJUUs-iEXpsUY,8816
-rubka-6.4.2.dist-info/METADATA,sha256=bUdDVVG9yIiuk65hUKPmfHvVo6_iTKbnIk8Pv3BnvIs,33335
-rubka-6.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rubka-6.4.2.dist-info/top_level.txt,sha256=vy2A4lot11cRMdQS-F4HDCIXL3JK8RKfu7HMDkezJW4,6
-rubka-6.4.2.dist-info/RECORD,,
+rubka-6.4.6.dist-info/METADATA,sha256=tQy-9qciKVwDM4aLWdhR13Tkc-SLf1FxpsgLxRh0gKQ,33335
+rubka-6.4.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rubka-6.4.6.dist-info/top_level.txt,sha256=vy2A4lot11cRMdQS-F4HDCIXL3JK8RKfu7HMDkezJW4,6
+rubka-6.4.6.dist-info/RECORD,,