PycordViews 1.3.4__py3-none-any.whl → 1.3.6__py3-none-any.whl

pycordViews/multibot/bot.py

@@ -149,7 +149,7 @@ class DiscordBot:
         """
         Charge toutes les commandes du bot sur Discord
         """
-        run_coroutine_threadsafe(self.__reload_commands(commands=commands), self.__loop).result(timeout=30)
+        run_coroutine_threadsafe(self.__reload_commands(commands=commands), self.__loop).result(timeout=None)
 
     async def __reload_commands(self, commands: Optional[list[ApplicationCommand]] = None):
         """

pycordViews/multibot/multibot.py

@@ -25,17 +25,22 @@ class Multibot:
         
         self.global_timeout = global_timeout
         
-    def __get_data_queue(self) -> Union[list[dict], dict]:
+    def __get_data_queue(self, type: str) -> Union[list[dict], dict]:
         """
         Récupère les données dans la queue processus
+        :param type: Type de la requête. Si elle ne correspond pas à la requête écoutée, elle refera un cicle d'écoute
         """
         try:
             result = self.__process_queue.get(timeout=self.global_timeout)
-            return result
+            if result['type'] == type:
+                return result
+            else:
+                # Si le type ne correspond pas, on relance la récupération
+                return self.__get_data_queue(type)
         except Empty:
             return {'status': 'error', 'message': 'timeout request exceeded'}
         except ValueError:
-            return {'status': 'critical error', 'message': 'queue was closed !'}
+            return {'status': 'critical error', 'message': 'queue was closed ! Process was killed ?'}
 
     def _start_process(self):
         """
@@ -51,17 +56,24 @@ class Multibot:
         :param token: Token bot
         :param intents: Intents bot to Intents discord class
         """
-        self.__main_queue.put({"type": "ADD", "bot_name": bot_name, "token": token, 'intents': intents})
-        response = self.__get_data_queue()
+        request_type = "ADD"
+        self.__main_queue.put({"type": request_type,
+                               "bot_name": bot_name,
+                               "token": token,
+                               "intents": intents})
+        response = self.__get_data_queue(request_type)
         return response  # Retourne le statut de l'ajout
 
-    def remove_bot(self, bot_name: str) -> dict[str, str]:
+    def remove_bots(self, *bot_names: str) -> list[dict[str, str]]:
         """
-        Shutdown and remove à bot
-        :param bot_name: Bot name to remove
+        Shutdown and remove bots
+        :param bot_names: Bot name to remove
         """
-        self.__main_queue.put({"type": "REMOVE", "bot_name": bot_name})
-        response = self.__get_data_queue()
+        request_type = "REMOVE"
+        response = []
+        for bot_name in bot_names:
+            self.__main_queue.put({"type": request_type, "bot_name": bot_name})
+            response.append(self.__get_data_queue(request_type))
         return response  # Retourne le statut de la suppression
 
     def start(self, *bot_names: str) -> list[dict[str, str]]:
@@ -70,10 +82,11 @@ class Multibot:
         :param bot_names: Bots name to start
         :return: List of data bot status
         """
+        request_type = "START"
         results = []
         for bot_name in bot_names:
-            self.__main_queue.put({'type': "START", 'bot_name': bot_name})
-            results.append(self.__get_data_queue())
+            self.__main_queue.put({'type': request_type, 'bot_name': bot_name})
+            results.append(self.__get_data_queue(request_type))
         return results
 
     def stop(self, *bot_names: str) -> list[dict[str, str]]:
@@ -82,10 +95,11 @@ class Multibot:
         :param bot_names: Bots name to start
         :return: Data status dict
         """
+        request_type = "STOP"
         results = []
         for bot_name in bot_names:
-            self.__main_queue.put({'type': "STOP", 'bot_name': bot_name})
-            results.append(self.__get_data_queue())
+            self.__main_queue.put({'type': request_type, 'bot_name': bot_name})
+            results.append(self.__get_data_queue(request_type))
         return results
 
     def restart(self, *bot_names: str) -> list[dict[str, str]]:
@@ -93,10 +107,11 @@ class Multibot:
         Stop and start bots.
         This function is slow ! It's shutdown all bots properly.
         """
+        request_type = "RESTART"
         results = []
         for bot_name in bot_names:
-            self.__main_queue.put({'type': "RESTART", 'bot_name': bot_name})
-            results.append(self.__get_data_queue())
+            self.__main_queue.put({'type': request_type, 'bot_name': bot_name})
+            results.append(self.__get_data_queue(request_type))
         return results
 
     def restart_all(self):
@@ -104,23 +119,26 @@ class Multibot:
         Stop and restart all bots
         This function is slow ! It's shutdown all bots properly.
         """
-        self.__main_queue.put({'type': "RESTARTALL"})
-        return self.__get_data_queue()
+        request_type = "RESTARTALL"
+        self.__main_queue.put({'type': request_type})
+        return self.__get_data_queue(request_type)
 
     def start_all(self) -> list[dict[str, list[str]]]:
         """
         Start all bots in the process.
         """
-        self.__main_queue.put({'type': "STARTALL"})
-        return self.__get_data_queue()
+        request_type = "STARTALL"
+        self.__main_queue.put({'type': request_type})
+        return self.__get_data_queue(request_type)
     
     def stop_all(self) -> list[dict[str, list[str]]]:
         """
         Stop all bots in the process.
         This function is slow ! It's shutdown all bots properly.
         """
-        self.__main_queue.put({'type': "STOPALL"})
-        return self.__get_data_queue()
+        request_type = "STOPALL"
+        self.__main_queue.put({'type': request_type})
+        return self.__get_data_queue(request_type)
 
     def add_modules(self, *modules_name):
         """
@@ -129,8 +147,9 @@ class Multibot:
         To be run before launching a bot!
         :param modules_name: names of modules to be added
         """
-        self.__main_queue.put({'type': "ADD_MODULES", 'modules_name': modules_name})
-        return self.__get_data_queue()
+        request_type = "ADD_MODULES"
+        self.__main_queue.put({'type': request_type, 'modules_name': modules_name})
+        return self.__get_data_queue(request_type)
 
     def remove_modules(self, *modules_name):
         """
@@ -138,8 +157,9 @@ class Multibot:
         To be run before launching a bot!
         :param modules_name: names of modules to be removed
         """
-        self.__main_queue.put({'type': "REMOVE_MODULES", 'modules_name': modules_name})
-        return self.__get_data_queue()
+        request_type = "REMOVE_MODULES"
+        self.__main_queue.put({'type': request_type, 'modules_name': modules_name})
+        return self.__get_data_queue(request_type)
 
     def is_started(self, bot_name: str) -> bool:
         """
@@ -147,8 +167,9 @@ class Multibot:
         :param bot_name: Bot name
         :return: True if the Websocket is online, else False
         """
-        self.__main_queue.put({'type': "IS_STARTED", 'bot_name': bot_name})
-        return self.__get_data_queue()['message']
+        request_type = "IS_STARTED"
+        self.__main_queue.put({'type': request_type, 'bot_name': bot_name})
+        return self.__get_data_queue(request_type)['message']
 
     def is_ready(self, bot_name: str) -> bool:
         """
@@ -156,8 +177,9 @@ class Multibot:
         :param bot_name: Bot name
         :return: True if the bot if ready, else False
         """
-        self.__main_queue.put({'type': "IS_READY", 'bot_name': bot_name})
-        return self.__get_data_queue()['message']
+        request_type = "IS_READY"
+        self.__main_queue.put({'type': request_type, 'bot_name': bot_name})
+        return self.__get_data_queue(request_type)['message']
 
     def is_ws_ratelimited(self, bot_name: str) -> bool:
         """
@@ -165,18 +187,20 @@ class Multibot:
         :param bot_name: Bot name
         :return: True if the bot was ratelimited, else False
         """
-        self.__main_queue.put({'type': "IS_WS_RATELIMITED", 'bot_name': bot_name})
-        return self.__get_data_queue()['message']
+        request_type = "IS_WS_RATELIMITED"
+        self.__main_queue.put({'type': request_type, 'bot_name': bot_name})
+        return self.__get_data_queue(request_type)['message']
 
     def reload_commands(self, *bot_names: str) -> list[dict[str, str]]:
         """
         Reload all commands for each bot when bots are ready
         :param bot_names: Bots name to reload commands
         """
+        request_type = "RELOAD_COMMANDS"
         result = []
         for name in bot_names:
-            self.__main_queue.put({'type': "RELOAD_COMMANDS", 'name': name})
-            result.append(self.__get_data_queue())
+            self.__main_queue.put({'type': request_type, 'name': name})
+            result.append(self.__get_data_queue(request_type))
         return result
 
     def add_pyFile_commands(self, bot_name: str, file: str, setup_function: str = 'setup', reload_command: bool = True) -> dict[str, str]:
@@ -192,12 +216,13 @@ class Multibot:
         :param setup_function: Function name called by the process to give the Bot instance. Set to 'setup' by default.
         :param reload_command: Reload all command in the fil and dependencies. Default : True
         """
-        self.__main_queue.put({'type': "ADD_COMMAND_FILE",
+        request_type = "ADD_COMMAND_FILE"
+        self.__main_queue.put({'type': request_type,
                                'bot_name': bot_name,
                                'file': file,
                                'setup_function': setup_function,
                                'reload_command': reload_command})
-        return self.__get_data_queue()
+        return self.__get_data_queue(request_type)
 
     def modify_pyFile_commands(self, bot_name: str, file: str, setup_function: str = 'setup') -> dict[str, str]:
 
@@ -207,41 +232,45 @@ class Multibot:
         :param bot_name: The bot's name
         :param file: The file's relative or absolute path
         """
-
-        self.__main_queue.put({'type': "MODIFY_COMMAND_FILE",
+        request_type = "MODIFY_COMMAND_FILE"
+        self.__main_queue.put({'type': request_type,
                                'bot_name': bot_name,
                                'file': file,
                                'setup_function': setup_function})
-        return self.__get_data_queue()
+        return self.__get_data_queue(request_type)
 
     @property
     def bot_count(self) -> int:
         """
         Return the total number of bots
         """
-        self.__main_queue.put({'type': "BOT_COUNT"})
-        return self.__get_data_queue()['message']
+        request_type = "BOT_COUNT"
+        self.__main_queue.put({'type': request_type})
+        return self.__get_data_queue(request_type)['message']
 
     @property
     def started_bot_count(self) -> int:
         """
         Return the total number of started bots
         """
-        self.__main_queue.put({'type': "STARTED_BOT_COUNT"})
-        return self.__get_data_queue()['message']
+        request_type = "STARTED_BOT_COUNT"
+        self.__main_queue.put({'type': request_type})
+        return self.__get_data_queue(request_type)['message']
 
     @property
     def shutdown_bot_count(self) -> int:
         """
         Return the total number of shutdown bots
         """
-        self.__main_queue.put({'type': "SHUTDOWN_BOT_COUNT"})
-        return self.__get_data_queue()['message']
+        request_type = "SHUTDOWN_BOT_COUNT"
+        self.__main_queue.put({'type': request_type})
+        return self.__get_data_queue(request_type)['message']
 
     @property
     def get_bots_name(self) -> list[str]:
         """
         Return all bots name (not real name of bots)
         """
-        self.__main_queue.put({'type': "BOTS_NAME"})
-        return self.__get_data_queue()['message']
+        request_type = "BOTS_NAME"
+        self.__main_queue.put({'type': request_type})
+        return self.__get_data_queue(request_type)['message']

pycordViews/multibot/process.py

@@ -50,14 +50,14 @@ class ManageProcess:
                 command: dict = self.main_queue.get()
                 #print(command)
 
-                c = command["type"]
-                if c in self.commandes.keys():
+                type_request = command["type"]
+                if type_request in self.commandes.keys():
                     del command['type']
                     try:
-                        result = self.commandes[c](**command)
-                        self.process_queue.put({'status': 'success', 'message': result})
+                        result = self.commandes[type_request](**command)
+                        self.process_queue.put({'status': 'success', 'message': result, 'type': type_request})
                     except MultibotError as e:
-                        self.process_queue.put({'status': 'error', 'message': e})
+                        self.process_queue.put({'status': 'error', 'message': e, 'type': type_request})
 
     def start_bot_to_process(self, bot_name: str) -> str:
         """

pycordViews/views/easy_modified_view.py

@@ -118,7 +118,7 @@ class EasyModifiedViews(View):
         :param custom_id: item ID of the view
         :param data: Add any data to pass in called function.
         :param autorised_roles: Any role ID allowed to interact with the view
-        :param autorised_key: Callable function to check anything. The function get the current interaction passed in parameter
+        :param autorised_key: Callable function to check anything. The function get the current interaction and data passed in parameter
         """
 
         def decorator(_callable: Callable):
@@ -142,7 +142,7 @@ class EasyModifiedViews(View):
         :param _callable: The asynchronous callable linked. Take UI (Button, Select...) and Interaction parameters.
         :param data: Add any data to pass in called function.
         :param autorised_roles: Any role ID allowed to interact with the view
-        :param autorised_key: Callable function to check anything. The function get the current interaction passed in parameter
+        :param autorised_key: Callable function to check anything. The function get the current interaction and data passed in parameter
 
         **UI, Interaction and data parameter is required in callable function !**
 

{pycordviews-1.3.4.dist-info → pycordviews-1.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PycordViews
-Version: 1.3.4
+Version: 1.3.6
 Summary: Views and multibot for py-cord library
 Home-page: https://github.com/BOXERRMD/Py-cord_Views
 Author: Chronos (alias BOXERRMD)
@@ -169,7 +169,7 @@ Each instance of this class creates a process where bots can be added. These bot
 > ```
 > > **Method** `add_bot(bot_name: str, token: str, intents: Intents) -> None` : Add a bot. The name given here is not the real bot name, it's juste an ID
 > 
-> > **Method** `remove_bot(bot_name: str) -> dict[str, str]` : Remove à bot. If the bot is online, it will turn off properly. It can take a long time !
+> > **Method** `remove_bots(bot_names: str) -> list[dict[str, str]]` : Remove bots. If bots are online, they will turn off properly. It can take a long time !
 > 
 > > **Method** `start(*bot_names: str) -> list[dict[str, str]]` : Start bots
 > 
@@ -177,10 +177,16 @@ Each instance of this class creates a process where bots can be added. These bot
 > 
 > > **Method** `restart(*bot_names: str) -> list[dict[str, str]]` : Restarts bots
 > 
+> > **Method** `restart_all() -> list[dict[str, str]]` : Restarts all bots in the process
+> 
 > > **Method** `start_all() -> list[dict[str, list[str]]]` : Start all bot in the process
 > 
 > > **Method** `stop_all() -> list[dict[str, list[str]]]` : Stop all bot in the process properly
 > 
+> > **Method** `add_modules(*modules_name: str) -> list[dict[str, str]]` : Add a module to the process. It can be only a package to download from pypi. Install the package for all bots in the process.
+> 
+> > **Method** `remove_modules(*modules_name: str) -> list[dict[str, str]]` : Remove a module from the process. It can be only a package to download from pypi. Uninstall the package for all bots in the process. If modules was used by a bot, an error was raised when the bot attempt to use it.
+> 
 > > **Method** `is_started(bot_name: str) -> bool` : Return if the bot is connected at the Discord WebSocket
 > 
 > > **Method** `is_ready(bot_name: str) -> bool` : Return if the bot is ready in Discord

{pycordviews-1.3.4.dist-info → pycordviews-1.3.6.dist-info}/RECORD

@@ -10,19 +10,19 @@ pycordViews/modal/__init__.py,sha256=TFUX3z25oInBhBzoOQhnLbKmwArXo4IVVqBfN6y11Bo
 pycordViews/modal/easy_modal_view.py,sha256=sNxfSg6sgoiKa3vc6eKa4RV7vNVNaSrI1XUJ9RMSD80,4281
 pycordViews/modal/errors.py,sha256=nIGYyOS_oWH49Dj8ZGW53nnzaPmbvFbAo7ydikD5xWE,307
 pycordViews/multibot/__init__.py,sha256=93Q_URiRUMsvwQJIqUnb75aq6SPM83yteSMrH0rmXMg,30
-pycordViews/multibot/bot.py,sha256=pD-BPXNo7JeJPguTn7qLii0UzBSS4ITvmOPv8htKJG8,8284
+pycordViews/multibot/bot.py,sha256=GuA7gw5YUfTyEwgJKF5hSEqGfmQL1nE3yr9eArEi0_8,8286
 pycordViews/multibot/errors.py,sha256=sPl_mM6b72Q8uuz4JkocO0TKBQ_9R3f0yT5eGhH_-PY,1328
-pycordViews/multibot/multibot.py,sha256=A_abouhHcellnBNbgN7uF9UheApQwptfUuDt2tZQZZc,9253
-pycordViews/multibot/process.py,sha256=-rJTw6ACfvMMinoAhQVGqPx76m0Nai5nymtDv1LrnxQ,10239
+pycordViews/multibot/multibot.py,sha256=ENzMU-FN2Xl-eu1At1f_1rRwUu1EKDaHnhP-mZcnJeE,10759
+pycordViews/multibot/process.py,sha256=3PIhciUuOdruYh88j-fM-XOVk_7-cIV9sFUQ-fWbs_Q,10316
 pycordViews/pagination/__init__.py,sha256=rvOp-nGXZ6EX_ojK1_1lcOHYUcrB0LG3DL7zwatkRPY,105
 pycordViews/pagination/errors.py,sha256=CYb5gBcXx0kYDUDkNpfUrqSxQAcJE_qfpomWtUFOsTk,316
 pycordViews/pagination/page.py,sha256=sKi_gCFt1euY7uJKWgMnxEqP1B4LMhUysxQ8oQbhNVQ,1147
 pycordViews/pagination/pagination_view.py,sha256=t6wvTLNTYg-w4eJQiyiX-LmEeR385SChifUzhiVSZBs,5793
 pycordViews/views/__init__.py,sha256=yligptZmw-np8tjKLr76SVmi0807Nk6jCyKkKYLhbCY,89
-pycordViews/views/easy_modified_view.py,sha256=BbEnIfv4mVm4Glj45sAuYLbXIA1KRN699XdVVtmiaUo,14024
+pycordViews/views/easy_modified_view.py,sha256=3WM3dFflPjIK6_8cXrSsLK27dAqnEZ0kKDq4-wQ8HMo,14042
 pycordViews/views/errors.py,sha256=AkhGskuBjbFs0ZQdTDlVyfvAJ1WRMMQx2sAXUnYjmog,360
-pycordviews-1.3.4.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-pycordviews-1.3.4.dist-info/METADATA,sha256=WOeLWZAkCLc57fIOBHhy-U_w_ALSrHvXTJpJPXhI5jk,12417
-pycordviews-1.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pycordviews-1.3.4.dist-info/top_level.txt,sha256=3NvgH6MjESe7Q6jb6aqHgdYrYb5NhxwxnoDyE6PkThY,125
-pycordviews-1.3.4.dist-info/RECORD,,
+pycordviews-1.3.6.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+pycordviews-1.3.6.dist-info/METADATA,sha256=yjtSJAbl3GI4er98xhtE-Xrqk__fT9tyVanIDOBwPYw,13022
+pycordviews-1.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pycordviews-1.3.6.dist-info/top_level.txt,sha256=3NvgH6MjESe7Q6jb6aqHgdYrYb5NhxwxnoDyE6PkThY,125
+pycordviews-1.3.6.dist-info/RECORD,,