Rubka 7.1.15__tar.gz → 7.1.17__tar.gz

{rubka-7.1.15 → rubka-7.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 7.1.15
+Version: 7.1.17
 Summary: Rubika: A Python library for interacting with the Rubika Bot API. This library provides an easy-to-use interface to send messages, polls, stickers, media files, manage groups and channels, handle inline keyboards, and implement advanced bot features like subscription management, user authentication, and message handling. Ideal for developers looking to automate and extend their Rubika bots with Python.
 Home-page: https://github.com/Mahdy-Ahmadi/Rubka
 Download-URL: https://github.com/Mahdy-Ahmadi/rubka/archive/refs/tags/v6.6.4.zip

{rubka-7.1.15 → rubka-7.1.17}/Rubka.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Rubka
-Version: 7.1.15
+Version: 7.1.17
 Summary: Rubika: A Python library for interacting with the Rubika Bot API. This library provides an easy-to-use interface to send messages, polls, stickers, media files, manage groups and channels, handle inline keyboards, and implement advanced bot features like subscription management, user authentication, and message handling. Ideal for developers looking to automate and extend their Rubika bots with Python.
 Home-page: https://github.com/Mahdy-Ahmadi/Rubka
 Download-URL: https://github.com/Mahdy-Ahmadi/rubka/archive/refs/tags/v6.6.4.zip

{rubka-7.1.15 → rubka-7.1.17}/rubka/asynco.py

@@ -171,7 +171,10 @@ def get_installed_version(package_name: str) -> Optional[str]:
         return version(package_name)
     except PackageNotFoundError:
         return None
-
+BASE_URLS = {
+        "botapi": "https://botapi.rubika.ir/v3",
+        "messenger": "https://messengerg2b1.iranlms.ir/v3"
+    }
 async def get_latest_version(package_name: str) -> Optional[str]:
     url = f"https://pypi.org/pypi/{package_name}/json"
     try:
@@ -265,7 +268,8 @@ safeSendMode ensures reliable message sending even if replying by message_id fai
 max_cache_size and max_msg_age help manage duplicate message processing efficiently.
 """
 
-    def __init__(self, token: str, session_name: str = None, auth: str = None, Key: str = None, platform: str = "web", web_hook: str = None, timeout: int = 10, show_progress: bool = False, raise_errors: bool = True,proxy: str = None,retries: int = 2,retry_delay: float = 0.5,user_agent: str = None,safeSendMode = False,max_cache_size: int = 2000,max_msg_age : int = 60,chunk_size : int = 64 * 1024,parse_mode: Optional[Literal["HTML", "Markdown"]] = "Markdown"):
+
+    def __init__(self, token: str, session_name: str = None, auth: str = None, Key: str = None, platform: str = "web", web_hook: str = None, timeout: int = 10, show_progress: bool = False, raise_errors: bool = True,proxy: str = None,retries: int = 2,retry_delay: float = 0.5,user_agent: str = None,safeSendMode = False,max_cache_size: int = 2000,max_msg_age : int = 60,chunk_size : int = 64 * 1024,parse_mode: Optional[Literal["HTML", "Markdown"]] = "Markdown",api_endpoint: Optional[Literal["botapi", "messenger"]] = "botapi"):
         self.token = token
         self._inline_query_handlers: List[dict] = []
         self.timeout = timeout
@@ -276,6 +280,7 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
         self.proxy = proxy
         self.max_msg_age = max_msg_age
         self.retries = retries
+        
         self.retry_delay = retry_delay
         self.raise_errors = raise_errors
         self.show_progress = show_progress
@@ -297,6 +302,8 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
         self._db_path = os.path.join(os.getcwd(), "RubkaSaveMessage.db")
         self._ensure_db()
         self._message_handlers: List[dict] = []
+        if api_endpoint not in BASE_URLS:raise ValueError(f"api_endpoint must be one of {list(BASE_URLS.keys())}")
+        self.api_endpoint = api_endpoint
 
         logger.info(f"Initialized RubikaBot with token: {token[:8]}***")
     async def _get_session(self) -> aiohttp.ClientSession:
@@ -337,7 +344,9 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
             logger.error(f"Failed to set webhook from {self.web_hook}: {e}")
             self.web_hook = None
     async def _post(self, method: str, data: Dict[str, Any]) -> Dict[str, Any]:
-        url = f"{API_URL}/{self.token}/{method}"
+        base_url = BASE_URLS[self.api_endpoint]
+        url = f"{base_url}/{self.token}/{method}"
+        print(url)
         session = await self._get_session()
         for attempt in range(1, self.retries + 1):
             try:
@@ -2419,8 +2428,19 @@ max_cache_size and max_msg_age help manage duplicate message processing efficien
         return await self._post("leaveChat", {"chat_id": chat_id})
     async def forward_message(self, from_chat_id: str, message_id: str, to_chat_id: str, disable_notification: bool = False) -> Dict[str, Any]:
         return await self._post("forwardMessage", {"from_chat_id": from_chat_id, "message_id": message_id, "to_chat_id": to_chat_id, "disable_notification": disable_notification})
-    async def edit_message_text(self, chat_id: str, message_id: str, text: str) -> Dict[str, Any]:
-        return await self._post("editMessageText", {"chat_id": chat_id, "message_id": message_id, "text": text})
+    async def edit_message_text(self, chat_id: str, message_id: str, text: str, parse_mode: Optional[Literal["HTML", "Markdown"]] = None) -> Dict[str, Any]:
+        payload = {
+            "chat_id": chat_id,
+            "message_id": message_id,
+            "text": text,
+        }
+        parse_mode_to_use = parse_mode or self.parse_mode
+        if text:
+            text, metadata = self._parse_text_metadata(text, parse_mode_to_use)
+            payload["text"] = text
+            if metadata:
+                payload["metadata"] = metadata
+        return await self._post("editMessageText", payload)
     async def edit_inline_keypad(self,chat_id: str,message_id: str,inline_keypad: Dict[str, Any],text: str = None) -> Dict[str, Any]:
         if text is not None:await self._post("editMessageText", {"chat_id": chat_id,"message_id": message_id,"text": text})
         return await self._post("editMessageKeypad", {"chat_id": chat_id,"message_id": message_id,"inline_keypad": inline_keypad})

{rubka-7.1.15 → rubka-7.1.17}/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding="utf-8") as f:
 
 setup(
     name='Rubka',
-    version='7.1.15',
+    version='7.1.17',
     description=(
     "Rubika: A Python library for interacting with the Rubika Bot API. "
     "This library provides an easy-to-use interface to send messages, polls, "