PyRubikaBotAPI 1.0.0__tar.gz → 1.0.1__tar.gz

{pyrubikabotapi-1.0.0 → pyrubikabotapi-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyRubikaBotAPI
-Version: 1.0.0
+Version: 1.0.1
 Summary: A Python library with a simple and familiar interface for working with the official Rubika bot API
 Home-page: https://github.com/alireza-sadeghian/PyRubikaBotAPI
 Author: Alireza Sadeghian
@@ -9,14 +9,14 @@ License: MIT
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENCE
 Requires-Dist: requests
 
 # PyRubikaBotAPI
 
-یک کتابخانه برای ساخت ربات‌های روبیکا با پایتون
+کتابخانه قدرتمند و آشنا برای ساخت ربات های تخصصی روبیکا
 
 ## نصب
 ```bash
@@ -38,17 +38,8 @@ def start(message):
 bot.polling()
 ```
 
-## مثال پیشرفته تر
-```py
-@bot.message_handler(content_types=['file'])
-def handle(msg):
-    file_id = msg.file.id
-    file_url = bot.get_file(file_id)
-    file = bot.download_file(file_url)
-    with open('file.format', 'wb') as f
-        f.write(file)
-    # استفاده از فایل ارسالی
-```
+برای استفاده دقیقتر حتما مستندات رو مطالعه بفرمایید و یا برای دریافت سورس کد ها 
+و مثال ها به کانال روبیکای ما سر بزنید
 
 ## مستندات:
 

{pyrubikabotapi-1.0.0 → pyrubikabotapi-1.0.1}/PyRubikaBotAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyRubikaBotAPI
-Version: 1.0.0
+Version: 1.0.1
 Summary: A Python library with a simple and familiar interface for working with the official Rubika bot API
 Home-page: https://github.com/alireza-sadeghian/PyRubikaBotAPI
 Author: Alireza Sadeghian
@@ -9,14 +9,14 @@ License: MIT
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENCE
 Requires-Dist: requests
 
 # PyRubikaBotAPI
 
-یک کتابخانه برای ساخت ربات‌های روبیکا با پایتون
+کتابخانه قدرتمند و آشنا برای ساخت ربات های تخصصی روبیکا
 
 ## نصب
 ```bash
@@ -38,17 +38,8 @@ def start(message):
 bot.polling()
 ```
 
-## مثال پیشرفته تر
-```py
-@bot.message_handler(content_types=['file'])
-def handle(msg):
-    file_id = msg.file.id
-    file_url = bot.get_file(file_id)
-    file = bot.download_file(file_url)
-    with open('file.format', 'wb') as f
-        f.write(file)
-    # استفاده از فایل ارسالی
-```
+برای استفاده دقیقتر حتما مستندات رو مطالعه بفرمایید و یا برای دریافت سورس کد ها 
+و مثال ها به کانال روبیکای ما سر بزنید
 
 ## مستندات:
 

pyrubikabotapi-1.0.1/README.md

@@ -0,0 +1,31 @@
+# PyRubikaBotAPI
+
+کتابخانه قدرتمند و آشنا برای ساخت ربات های تخصصی روبیکا
+
+## نصب
+```bash
+pip install PyRubikaBotAPI
+
+```
+
+## مثال ساده
+
+```python
+from rubibot import RubiBot
+
+bot = RubiBot("YOUR_TOKEN")
+
+@bot.message_handler(commands=["start"])
+def start(message):
+    bot.send_message(message.chat_id, "سلام! خوش آمدید!")
+
+bot.polling()
+```
+
+برای استفاده دقیقتر حتما مستندات رو مطالعه بفرمایید و یا برای دریافت سورس کد ها 
+و مثال ها به کانال روبیکای ما سر بزنید
+
+## مستندات:
+
+Rubika: https://rubika.ir/pyrubikabotapi
+GitHub: https://github.com/alireza-sadeghian/PyRubikaBotAPI

{pyrubikabotapi-1.0.0 → pyrubikabotapi-1.0.1}/rubibot/__init__.py

@@ -47,8 +47,8 @@ class RubiBot:
             commands: Optional[List[str]]=None,
             content_types: Optional[List[str]]=None,
             func=None,
-            update_types: Optional[List[str]]=None
-    ):
+            update_types: Optional[List[str]]=None,
+        ):
         """
         It is responsible for managing messages received from the user. 
         It handles all types of messages such as text, video, Voice, Poll, etc.
@@ -134,7 +134,7 @@ class RubiBot:
                         "commands": commands,
                         "content_types": content_types,
                         "func": func,
-                        "update_types": update_types
+                        "update_types": update_types,
                     }
                 })
             return handler
@@ -151,12 +151,15 @@ class RubiBot:
         return decorator
     
     def register_message_handler(self, handler: Callable, **filters):
+        for filter in ['commands', 'content_types', 'func', 'update_types']:
+            filters.setdefault(filter, None)
+
         self._message_handlers.append({
             'handler': handler,
             'filters': filters
         })
 
-    def register_next_step_message_handler_by_chat_id(self, chat_id: str, handler: callable):
+    def register_next_step_message_handler_by_chat_id(self, chat_id: str, handler: Callable):
         """ To register a handler for the next message in a specific chat """
 
         if chat_id in self._next_step_message_handlers_by_chat_id:
@@ -214,8 +217,16 @@ class RubiBot:
             res = requests.post(f"{self.BASE_URL}/getUpdates", json=params, timeout=15)
         except Exception as e:
             raise Exception("Error: {}".format(e))
-        data = res.json()
-        print(data)
+        data: dict = res.json()
+        if data.get('status') != 'OK':
+            if data["status"] == "INVALID_INPUT":
+                raise exceptions.RubiBotInputError(
+                    "invalid inputs {}".format(data.get('dev_message', ''))
+                    )
+            if data["status"] == "INVALID_ACCESS":
+                raise exceptions.RubiBotAccessError("not Access")
+            raise exceptions.RubiBotError(data["status"])
+
         if not res or res.status_code !=200:
             raise Exception("Error in receiving updates: {}".format(data.get("status")))
         
@@ -228,13 +239,13 @@ class RubiBot:
     def __load_offset(self) -> dict:
         if not os.path.exists(self.OFFSET_FILE):
             with open(self.OFFSET_FILE, 'w', encoding="utf-8") as f:
-                json.dump({}, f, ensure_ascii=False, indent=4)
+                json.dump({self.token: None}, f, ensure_ascii=False, indent=4)
 
         with open(self.OFFSET_FILE, "r", encoding="utf-8") as f:
             return json.load(f)
     
-    def __get_offset(self) -> str:
-        return self.__load_offset()[self.token]
+    def __get_offset(self) -> Optional[str]:
+        return self.__load_offset().get(self.token)
 
     def __save_offset(self, offset_id):
         next_offset_ids = self.__load_offset()
@@ -286,10 +297,10 @@ class RubiBot:
                 self.polling(*args, **kwargs)
             except requests.exceptions.JSONDecodeError:
                 print('Json Decode Error')
-                continue
+                time.sleep(1)
             except Exception as e:
                 print(f"{e.__class__.__name__}: {e}")
-                continue
+                time.sleep(1)
 
 
     def send_message(
@@ -350,6 +361,10 @@ class RubiBot:
         if parse_mode:
             parser = parse_mode()
             text, metadata_list = parser(text)
+
+        if not metadata_list:
+            metadata_list = []    
+
         text = self._process_metadata(text, *metadata_list)
 
         return rubika_api.send_message(self.token, chat_id, text, chat_keypad, inline_keypad,
@@ -807,6 +822,7 @@ class RubiBot:
         if filters["content_types"]:
             if message.get_content_type() not in filters["content_types"]:
                 return False
+    
         
         if filters["func"]:
             return filters["func"](message)
@@ -850,22 +866,25 @@ class RubiBot:
 
             if isinstance(upd, rubibot.updates.Update):
                 message = upd.to_message()
-                message.token = self.token
-
-                if message.type == "NewMessage":
-                    if message.chat_id in self._next_step_message_handlers_by_chat_id:
-                        self._next_step_message_handlers_by_chat_id.pop(message.chat_id)(message)
-                        return
-                    elif message.sender_id in self._next_step_message_handlers_by_sender_id:
-                        self._next_step_message_handlers_by_sender_id.pop(message.sender_id)(message)
-                        return
-
-                for handler in self._message_handlers:
-                    if self._test_message_handler(handler, message):
-                        handler["handler"](message)
-                        break
+                if isinstance(message, rubibot.updates.InlineMessage):
+                    upd = rubibot.updates.InlineUpdate(upd.dict)
+                else:   
+                    message.token = self.token
+    
+                    if message.type == "NewMessage":
+                        if message.chat_id in self._next_step_message_handlers_by_chat_id:
+                            self._next_step_message_handlers_by_chat_id.pop(message.chat_id)(message)
+                            return
+                        elif message.sender_id in self._next_step_message_handlers_by_sender_id:
+                            self._next_step_message_handlers_by_sender_id.pop(message.sender_id)(message)
+                            return
+    
+                    for handler in self._message_handlers:
+                        if self._test_message_handler(handler, message):
+                            handler["handler"](message)
+                            break
 
-            elif isinstance(upd, rubibot.updates.InlineUpdate):
+            if isinstance(upd, rubibot.updates.InlineUpdate):
                 message = upd.to_inline_message()
                 message.token = self.token
                 for handler in self._inline_message_handlers:
@@ -875,5 +894,52 @@ class RubiBot:
             else: raise exceptions.RubiBotValueError("Invalid type for update")
 
 
+
+class GroupBot(RubiBot):
+    def __init__(self, token, set_token_env=True):
+        super().__init__(token, set_token_env)
+    
+    def command_handler(self, command: str):
+        def decorator(handler):
+            self.register_message_handler(handler, commands=[command])
+            return handler
+        return decorator
+    
+    def in_text_handler(self, text: str):
+        def decorator(handler):
+            self.register_message_handler(
+                handler,
+                func= lambda m: text in m.text
+            )
+            return handler
+        return decorator
+    
+    def text_equal_handler(self, text: str):
+        def decorator(handler):
+            self.register_message_handler(
+                handler,
+                func= lambda m: m.text==text
+            )
+            return handler
+        return decorator
+    
+    def text_startswith_handler(self, text: str):
+        def decorator(handler):
+            self.register_message_handler(
+                handler,
+                func= lambda m: m.text.startswith(text)
+            )
+            return handler
+        return decorator
+    
+    def text_endswith_handler(self, text: str):
+        def decorator(handler):
+            self.register_message_handler(
+                handler,
+                func= lambda m: m.text.endswith(text)
+            )
+            return handler
+        return decorator
+
 # soon...               
 # This is not the end of our work... 😎

pyrubikabotapi-1.0.1/rubibot/exceptions.py

@@ -0,0 +1,14 @@
+class RubiBotError(Exception):
+    pass
+
+class RubiBotSyntaxError(RubiBotError):
+    pass
+
+class RubiBotValueError(RubiBotError):
+    pass
+
+class RubiBotInputError(RubiBotError):
+    pass
+
+class RubiBotAccessError(RubiBotError):
+    pass

{pyrubikabotapi-1.0.0 → pyrubikabotapi-1.0.1}/rubibot/rubika_api.py

@@ -1,4 +1,3 @@
-import time
 import requests
 from rubibot import exceptions, types, updates
 

{pyrubikabotapi-1.0.0 → pyrubikabotapi-1.0.1}/rubibot/types.py

@@ -281,7 +281,7 @@ class KeypadTextboxButton(BaseKeypadButton):
             dic['button_textbox']['default_value'] = self.default_value
         if self.title:
             dic['button_textbox']['title'] = self.title
-        print(dic)
+
         return dic
 
 class KeypadRow:
@@ -293,16 +293,12 @@ class KeypadRow:
             self.btns.append(btn.to_dict())
         return self
     
-    def remove(self, btn_or_btn_id):
-        if isinstance(btn_or_btn_id, str):
-            for btn in self.btns:
-                if btn.id == btn_or_btn_id:
-                    buttton = self.btns.pop(btn)
-                    break
-            return buttton
-        if isinstance(btn_or_btn_id, KeypadSimpleButton):
-            return self.btns.pop(btn_or_btn_id)
-        
+    def remove(self, btn_id):
+        if isinstance(btn_id, str):
+            for i, btn in enumerate(self.btns):
+                if btn.get('id') == btn_id:
+                    return self.btns.pop(i)
+        return None
 
     def to_dict(self):
         return {"buttons": self.btns}
@@ -319,9 +315,6 @@ class BaseKeypad:
         for row in rows:
             self.rows.append(row.to_dict())
         return self
-        
-    def remove(self, row):
-        return self.rows.pop(row)
     
     def clear(self):
         self.rows = []

{pyrubikabotapi-1.0.0 → pyrubikabotapi-1.0.1}/rubibot/updates.py

@@ -1,10 +1,11 @@
+from typing import Optional
 from rubibot import types
 from rubibot import rubika_api
 import json, os
 
 
 class BaseUpdate:
-    def __init__(self, type: str, chat_id: str, update_time: str):
+    def __init__(self, type: str, chat_id: str, update_time: Optional[str]):
         self.type = type
         self.chat_id = chat_id
         self.update_time = update_time
@@ -18,7 +19,15 @@ class BaseUpdate:
             token = os.getenv('RUBIKA_BOT_API_TOKEN')
         return rubika_api.get_chat(token, self.chat_id)
 
-
+    @property
+    def chat_type(self):
+        if self.chat_id.startswith('b'):
+            return 'Private'
+        if self.chat_id.startswith('g'):
+            return 'Group'
+        if self.chat_id.startswith('c'):
+            return 'Channel'
+        return 'NotFound'
 
 class Message(BaseUpdate):
     def __init__(
@@ -78,17 +87,18 @@ class Message(BaseUpdate):
         return f"Message: from {self.chat.get_full_name()}"
 
 
-class InlineMessage:
+class InlineMessage(BaseUpdate):
     def __init__(self, chat_id: str, sender_id: str, message_id: str, text: str, aux_data: types.AuxData,
                  file: types.File, location: types.Location):
-        self.chat_id = chat_id
+        super().__init__('InlineMessage', chat_id, None)
         self.sender_id = sender_id
         self.message_id = message_id
         self.text = text
         self.aux = aux_data
         self.file = file
         self.location = location
-    
+        self.token = None
+
     def has_file(self):
         return self.file is not None
 
@@ -107,6 +117,7 @@ class InlineMessage:
         if self.has_location(): return "location"
 
 
+
 class RemovedMessage(BaseUpdate):
     def __init__(self, type, chat_id, update_time, removed_message_id):
         super().__init__(type, chat_id, update_time)
@@ -221,7 +232,7 @@ class Update:
                 update_time=update_time,
                 removed_message_id=update.get('removed_message_id')
             )
-        elif type_ == "NewMessage":
+        elif type_ == "NewMessage" or type_ == "UpdatedMessage":
 
             new_message: dict = update.get("new_message")
             message_id = new_message.get("message_id")

{pyrubikabotapi-1.0.0 → pyrubikabotapi-1.0.1}/setup.py

@@ -2,10 +2,10 @@ from setuptools import setup, find_packages
 
 setup(
     name="PyRubikaBotAPI",
-    version="1.0.0",
+    version="1.0.1",
     packages=find_packages(),
     install_requires=["requests"],
-    python_requires=">=3.8",
+    python_requires=">=3.10",
     description="A Python library with a simple and familiar interface for working with the official Rubika bot API",
     long_description=open("README.md", encoding="utf-8").read(),
     long_description_content_type="text/markdown",

pyrubikabotapi-1.0.0/README.md

@@ -1,40 +0,0 @@
-# PyRubikaBotAPI
-
-یک کتابخانه برای ساخت ربات‌های روبیکا با پایتون
-
-## نصب
-```bash
-pip install PyRubikaBotAPI
-
-```
-
-## مثال ساده
-
-```python
-from rubibot import RubiBot
-
-bot = RubiBot("YOUR_TOKEN")
-
-@bot.message_handler(commands=["start"])
-def start(message):
-    bot.send_message(message.chat_id, "سلام! خوش آمدید!")
-
-bot.polling()
-```
-
-## مثال پیشرفته تر
-```py
-@bot.message_handler(content_types=['file'])
-def handle(msg):
-    file_id = msg.file.id
-    file_url = bot.get_file(file_id)
-    file = bot.download_file(file_url)
-    with open('file.format', 'wb') as f
-        f.write(file)
-    # استفاده از فایل ارسالی
-```
-
-## مستندات:
-
-Rubika: https://rubika.ir/pyrubikabotapi
-GitHub: https://github.com/alireza-sadeghian/PyRubikaBotAPI

pyrubikabotapi-1.0.0/rubibot/exceptions.py

@@ -1,14 +0,0 @@
-class RubiBotError(Exception):
-    pass
-
-class RubiBotSyntaxError(Exception):
-    pass
-
-class RubiBotValueError(Exception):
-    pass
-
-class RubiBotInputError(Exception):
-    pass
-
-class RubiBotAccessError(Exception):
-    pass