PycordViews 1.2.25__py3-none-any.whl → 1.3.1__py3-none-any.whl

pycordViews/multibot/bot.py

@@ -46,7 +46,13 @@ class DiscordBot:
         else:
             raise BotNotStartedError(self.__bot.user.name)
 
-    def add_pyFile_commands(self, file: str, setup_function: str, reload_command: bool):
+    async def __stop_bot_in_thread(self):
+        """
+        Clear le cache du bot de manière asynchrone
+        """
+        await self.__bot.close()
+
+    def add_pyFile_commands(self, file: str, reload_command: bool, setup_function: str):
         """
         Ajoute et charge un fichier de commande bot et ses dépendances.
         Les fichiers doivent avoir une fonction appelée « setup » ou un équivalent passé en paramètre.
@@ -75,17 +81,13 @@ class DiscordBot:
         Ne recharge que le fichier et non les commandes du bot !
         :param file: Le chemin d'accès relatif ou absolue du fichier
         """
-        print('ok')
         module_name = path.splitext(path.basename(file))[0]
         module_found = False
 
         # Mise à jour du module et de son setup
-        print(self.__imported_module)
         for imported in self.__imported_module:
-            print(imported['module'].__name__, module_name)
+
             if imported['module'].__name__ == module_name:
-                print('reload module :', module_name)
-                reload(imported['module'])
                 imported['setup_function'] = setup_function
                 module_found = True
                 break
@@ -95,7 +97,6 @@ class DiscordBot:
 
         # Supprimer toutes les commandes du bot
         for command in self.__bot.application_commands:
-            print('del commande', command.name)
             self.__bot.remove_application_command(command)
 
         # Réattacher toutes les commandes en réexécutant tous les setup
@@ -107,6 +108,42 @@ class DiscordBot:
                 reload_command=False
             )
 
+    def reload_pyFile_commands(self):
+        """
+        Recharge tous les fichiers de commandes du bot
+        """
+        for imported in self.__imported_module:
+            self.modify_pyFile_commands(imported['file'], imported['setup_function'])
+
+
+
+    def __call_setup_function_in_command_file(self, file: str, module, setup_function: str, reload_command: bool):
+        """
+        Appel la fonction de setup du module pour charger toutes les commandes du bot
+        :param file: Le chemin d'accès du fichier de commandes
+        :param module: Le module préchargé
+        :param setup_function: Le nom de la fonction de setup
+        :param reload_command: Si les commandes doivent être recharger sur le bot (envoie une requête à Discord) automatiquement
+        """
+        if hasattr(module, setup_function):  # si la fonction setup (ou autre) est dans le package
+            getattr(module, setup_function)(self.__bot)
+
+            ########## permet de modifier le dictionnaire des modules importés si celui-ci existe déjà, sinon il l'ajoute à la liste des dictionaires des modules importés. Utile car on reload tout si un des modules est modifié
+            find = False
+            for mod in self.__imported_module:
+                if mod['module'].__name__ == module.__name__:
+                    mod['setup_function'] = setup_function
+                    find = True
+                    break
+
+            if not find:
+                self.__imported_module.append({'setup_function': setup_function, 'module': module, 'file': file})
+            ##########
+
+            if reload_command:
+                self.reload_commands()
+        else:
+            raise SetupCommandFunctionNotFound(setup_function, file)
 
     def reload_commands(self, commands: Optional[list[ApplicationCommand]] = None):
         """
@@ -114,6 +151,17 @@ class DiscordBot:
         """
         run_coroutine_threadsafe(self.__reload_commands(commands=commands), self.__loop).result(timeout=30)
 
+    async def __reload_commands(self, commands: Optional[list[ApplicationCommand]] = None):
+        """
+        Recharge les commandes quand le bot est ready
+        """
+        if self.__running_bot is not None:
+            while not self.is_ready:
+                await sleep(0.3)
+            await self.__bot.register_commands(commands=commands, method='individual', force=False)
+        else:
+            raise BotNotStartedError(self.__token)
+
 
     @property
     def is_running(self) -> bool:
@@ -135,12 +183,6 @@ class DiscordBot:
         return self.__bot.is_ws_ratelimited()
 
 
-    async def __stop_bot_in_thread(self):
-        """
-        Clear le cache du bot de manière asynchrone
-        """
-        await self.__bot.close()
-
     def close_ascyncio_loop(self):
         """
         Ferme la boucle asyncio
@@ -153,42 +195,4 @@ class DiscordBot:
 
         self.__loop.close()
 
-    async def __reload_commands(self, commands: Optional[list[ApplicationCommand]]):
-        """
-        Recharge les commandes quand le bot est ready
-        """
-        if self.__running_bot is not None:
-            while not self.is_ready:
-                await sleep(0.3)
-            await self.__bot.register_commands(commands=commands, method='individual', force=False)
-        else:
-            raise BotNotStartedError(self.__token)
-
-    def __call_setup_function_in_command_file(self, file: str, module, setup_function: str, reload_command: bool):
-        """
-        Appel la fonction de setup du module pour charger toutes les commandes du bot
-        :param file: Le chemin d'accès du fichier de commandes
-        :param module: Le module préchargé
-        :param setup_function: Le nom de la fonction de setup
-        :param reload_command: Si les commandes doivent être recharger sur le bot (envoie une requête à Discord) automatiquement
-        """
-        if hasattr(module, setup_function):  # si la fonction setup (ou autre) est dans le package
-            getattr(module, setup_function)(self.__bot)
-
-            ########## permet de modifier le dictionnaire des modules importés si celui-ci existe déjà, sinon il l'ajoute à la liste des dictionaires des modules importés. Utile car on reload tout si un des modules est modifié
-            find = False
-            for mod in self.__imported_module:
-                if mod['module'].__name__ == module.__name__:
-                    mod['setup_function'] = setup_function
-                    find = True
-                    break
-
-            if not find:
-                self.__imported_module.append({'setup_function': setup_function, 'module': module})
-            ##########
-
-            if reload_command:
-                self.reload_commands()
-        else:
-            raise SetupCommandFunctionNotFound(setup_function, file)
 

pycordViews/multibot/errors.py

@@ -27,4 +27,8 @@ class SetupCommandFunctionNotFound(MultibotError):
 
 class CommandFileNotFoundError(MultibotError):
     def __init__(self, file_name: str):
-        super().__init__(f"'{file_name}' file not found ! Init commands impossible.")
+        super().__init__(f"'{file_name}' file not found ! Init commands impossible !")
+
+class ModuleNotFoundError(MultibotError):
+    def __init__(self, module_name: str):
+        super().__init__(f"{module_name} module not found !")

pycordViews/multibot/multibot.py

@@ -3,7 +3,7 @@ from multiprocessing.queues import Queue
 from .process import ManageProcess
 from discord import Intents
 from sys import platform
-from typing import Union
+from typing import Union, Optional
 
 
 class Multibot:
@@ -84,7 +84,26 @@ class Multibot:
             self.__main_queue.put({'type': "STOP", 'bot_name': bot_name})
             results.append(self.__get_data_queue())
         return results
-    
+
+    def restart(self, *bot_names: str) -> list[dict[str, str]]:
+        """
+        Stop and start bots.
+        This function is slow ! It's shutdown all bots properly.
+        """
+        results = []
+        for bot_name in bot_names:
+            self.__main_queue.put({'type': "RESTART", 'bot_name': bot_name})
+            results.append(self.__get_data_queue())
+        return results
+
+    def restart_all(self):
+        """
+        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()
+
     def start_all(self) -> list[dict[str, list[str]]]:
         """
         Start all bots in the process.
@@ -100,6 +119,25 @@ class Multibot:
         self.__main_queue.put({'type': "STOPALL"})
         return self.__get_data_queue()
 
+    def add_modules(self, *modules_name):
+        """
+        Adds modules (library) to the process (thus affecting bots).
+        Only previously removed modules can be added again!
+        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()
+
+    def remove_modules(self, *modules_name):
+        """
+        Removes modules (library) to the process (thus affecting bots).
+        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()
+
     def is_started(self, bot_name: str) -> bool:
         """
         Return the current Websocket connexion status
@@ -148,7 +186,7 @@ class Multibot:
 
         :param bot_name: The bot's name to add commands file
         :param file: Relative or absolute commands file's path
-        :param setup_function: Function name called by the process to give the Bot instance.
+        :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",

pycordViews/multibot/process.py

@@ -1,8 +1,9 @@
 from multiprocessing import Queue
-from .errors import BotAlreadyExistError, BotNotFoundError, MultibotError, BotNotStartedError
+from .errors import BotAlreadyExistError, BotNotFoundError, MultibotError, BotNotStartedError, ModuleNotFoundError
 from .bot import DiscordBot
 from discord import Intents
 from immutableType import Str_
+from sys import modules
 
 class ManageProcess:
 
@@ -13,24 +14,29 @@ class ManageProcess:
         self.__bots: dict[str, DiscordBot] = {}
         self.main_queue: Queue = main_queue
         self.process_queue: Queue = process_queue
+        self.removed_modules: dict[str, "ModuleType"] = {}
 
         self.commandes = {
             "ADD": self.add_bot_to_process,
             "REMOVE": self.remove_bot_to_process,
             "START": self.start_bot_to_process,
             "STOP": self.stop_bot_to_process,
+            "RESTART": self.restart_bot_to_process,
             "IS_STARTED": self.is_started,
             "IS_READY": self.is_ready,
             "IS_WS_RATELIMITED": self.is_ws_ratelimited,
             "STOPALL": self.stop_all_bot_to_process,
             "STARTALL": self.start_all_bot_to_process,
+            "RESTARTALL": self.restart_all_bot_to_process,
             "BOT_COUNT": self.bot_count,
             "STARTED_BOT_COUNT": self.started_bot_count,
             "SHUTDOWN_BOT_COUNT": self.shutdown_bot_count,
             "BOTS_bot_name": self.get_bots_bot_name,
             "RELOAD_COMMANDS": self.reload_all_commands,
             "ADD_COMMAND_FILE": self.add_pyFile_commands,
-            "MODIFY_COMMAND_FILE": self.modify_pyFile_commands
+            "MODIFY_COMMAND_FILE": self.modify_pyFile_commands,
+            "REMOVE_MODULES": self.remove_modules,
+            "ADD_MODULES": self.add_modules
         }
 
     def run(self):
@@ -69,6 +75,26 @@ class ManageProcess:
         self.__bots[bot_name].stop()
         return f'{bot_name} bot stopped'
 
+    def restart_bot_to_process(self, bot_name: str) -> str:
+        """
+        Redémarre un bot du processus
+        :param bot_name: Le nom du bot à redémarrer
+        """
+        self.if_bot_no_exist(bot_name)
+        self.__bots[bot_name].stop()
+        self.__bots[bot_name].start()
+        self.__bots[bot_name].reload_pyFile_commands()
+        return f'{bot_name} bot restarted'
+
+    def restart_all_bot_to_process(self) -> list[str]:
+        """
+        Redémarre tous les bots du processus
+        """
+        result = []
+        for bot in self.__bots.keys():
+            result.append(self.restart_bot_to_process(bot))
+        return result
+
     def start_all_bot_to_process(self) -> list[str]:
         """
         Start tous les bots du processus
@@ -114,8 +140,8 @@ class ManageProcess:
         :param reload_command : Recharge toutes les commandes dans le fichier et les dépendances. Défaut : True
         """
         self.if_bot_no_exist(bot_name)
-        setup_function = Str_(setup_function).str_
         file = Str_(file).str_
+        setup_function = Str_(setup_function).str_
         self.__bots[bot_name].add_pyFile_commands(file=file, setup_function=setup_function, reload_command=reload_command)
 
     def modify_pyFile_commands(self, bot_name: str, file: str, setup_function: str):
@@ -153,6 +179,33 @@ class ManageProcess:
         del self.__bots[bot_name]
         return f'Bot {bot_name} removed'
 
+    def remove_modules(self, modules_name: tuple[str]):
+        """
+        Enlève les modules (bibliothèque) de tous le processus (affecte donc les bots).
+        A éxécuter avant de lancer un bot !
+        :param modules_name: Tuple contenant les noms des modules à enlever
+        """
+        for module in modules_name:
+            if module in modules_name:
+                self.removed_modules[module] = modules.pop(module)
+            else:
+                raise ModuleNotFoundError(module)
+        return f"[{', '.join(modules_name)}] modules removed"
+
+    def add_modules(self, modules_name: tuple[str]):
+        """
+        Ajoute les modules (bibliothèque) de tous le processus (affecte donc les bots).
+        Uniquement les modules enlever au préalable peuvent-être de nouveau ajouter !
+        A éxécuter avant de lancer un bot !
+        :param modules_name: Tuple contenant les noms des modules à ajouter
+        """
+        for module in modules_name:
+            if module in self.removed_modules.keys():
+                modules[module] = self.removed_modules.pop(module)
+            else:
+                raise ModuleNotFoundError(module)
+        return f"[{', '.join(modules_name)}] modules added"
+
     def is_started(self, bot_name: str) -> bool:
         """
         Regarde si la connexion au Websocket est effectué

pycordViews/pagination/pagination_view.py

@@ -67,7 +67,7 @@ class Pagination:
         page_count = len(self.__pages)
 
         if page_count <= 1:
-            await self.__view.disable_items(*self.__view.items)
+            await self.__view.shutdown()
             await interaction.response.defer(invisible=True)
             return
 
@@ -134,3 +134,7 @@ class Pagination:
         (start to 0)
         """
         return self.__current_page
+
+    @property
+    def get_view(self) -> EasyModifiedViews:
+        return self.__view

pycordViews/views/easy_modified_view.py

@@ -290,14 +290,14 @@ class EasyModifiedViews(View):
 
         await self._update()
 
-    def on_timeout(self) -> None:
+    async def on_timeout(self) -> None:
         """
         Called if timeout view is finished
         """
         if self.__disabled_on_timeout:
-            create_task(self.shutdown())
+            await self.shutdown()
         if self.__call_on_timeout is not None:
-            create_task(self.__call_on_timeout(self.__ctx))
+            await self.__call_on_timeout(self.__ctx)
 
     def call_on_timeout(self, _callable: Callable) -> None:
         """

{pycordviews-1.2.25.dist-info → pycordviews-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PycordViews
-Version: 1.2.25
+Version: 1.3.1
 Summary: Views and multibot for py-cord library
 Home-page: https://github.com/BOXERRMD/Py-cord_Views
 Author: Chronos (alias BOXERRMD)
@@ -47,7 +47,7 @@ The paginator instance is used to create a view acting as a “book”, with pag
 > 
 > > **Method** `send(target: Union[Member, TextChannel]) -> Any` : Send the pagination in dm member or channels
 > 
-> > **Method** `respond(ctx: ApplicationContext) -> Any` : Respond at slash command call
+> > **Method** `respond(ctx: Union[ApplicationContext, Interaction]) -> Any` : Respond at slash command call
 > 
 > > **@property** `get_view -> EasyModifiedViews` : Return the pagination view. Can be used in `view` parameter to setup a view
 > 
@@ -75,7 +75,7 @@ async def pagination_command(ctx):
     pages.add_page(content="My last page !", embed=None)# reset embed else he show the embed of the page before
 
     await pages.respond(ctx=ctx) # respond to the command
-    await pages.send(send_to=ctx.author) # send the message to the command author
+    await pages.send(target=ctx.author) # send the message to the command author
 
 bot.run("Your token")
 ```
@@ -95,11 +95,12 @@ The SelectMenu instance is used to create drop-down menus that can be easily mod
 > 
 > > **Method** `add_mentionnable_select_menu(custom_id: str = None, placeholder: str = None, min_values: int = 1, max_values: int = 1, disabled=False, row=None) -> Menu` : Add a mentionable select menu in the ui. Return Menu instance to set options
 > 
-> > **Method** `set_callable(*custom_ids: str, _callable: Union[Callable, None], data: Optional[dict[str, Any]]) -> SelectMenu` : Set a callable for menus associated with custom_ids. This callable _(async function)_ will be set to respond at selected menus interactions. _data_ parameter is a dict fill with any values to pass in _(async function)_ parameters
+> > **Method** `set_callable(*custom_ids: str, _callable: Union[Callable, None], data: Optional[dict[str, Any]], autorised_roles : Optional[list[Union[int, Role]]] = None,
+                     autorised_key: Optional[Callable] = None) -> SelectMenu` : Set a callable for menus associated with custom_ids. This callable _(async function)_ will be set to respond at selected menus interactions. _data_ parameter is a dict fill with any values to pass in _(async function)_ parameters
 > 
 > > **Method** `send(target: Union[Member, TextChannel]) -> Any` : Send the selectmenu in dm member or channels
 > 
-> > **Method** `respond(ctx: ApplicationContext) -> Any` : Respond at slash command call
+> > **Method** `respond(ctx: Union[ApplicationContext, Interaction]) -> Any` : Respond at slash command call and Interaction
 > 
 > > **Method** `update() -> None` : Update the view dynamically if there was sent before. 
 > 
@@ -113,7 +114,10 @@ The SelectMenu instance is used to create drop-down menus that can be easily mod
 > ```python
 > Menu(...)` # Not to be initialized by the user
 > ```
-> > **Method** `set_callable(_callable: Union[Callable, None]) -> Menu` : Set a callable for menus associated. This callable _(async function)_ will be set to respond at selected menus interactions
+> > **Method** `set_callable(_callable: Union[Callable, None],
+                     data: Optional[dict[str, Any]] = None,
+                     autorised_roles : Optional[list[Union[int, Role]]] = None,
+                     autorised_key: Optional[Callable] = None) -> Menu` : Set a callable for menus associated. This callable _(async function)_ will be set to respond at selected menus interactions
 > 
 > > **Method** `add_option(label: str, value: str = MISSING, description: Union[str, None] = None, emoji: Union[str, Emoji, PartialEmoji, None] = None, default: bool = False) -> Menu` : Add a string select option. Only for string select menu !
 > 
@@ -171,6 +175,8 @@ Each instance of this class creates a process where bots can be added. These bot
 > 
 > > **Method** `stop(*bot_names: str) -> list[dict[str, str]]` : Stop bots properly
 > 
+> > **Method** `restart(*bot_names: str) -> list[dict[str, str]]` : Restarts bots
+> 
 > > **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

{pycordviews-1.2.25.dist-info → pycordviews-1.3.1.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=UrRqSSmtFpkQKAqeunHxIy_O5DgO1gcW-nMEQ9yNdAo,8267
-pycordViews/multibot/errors.py,sha256=_xawL8jQZTajx253F4JKywFGVPdYf8vTALOMiNqJ9hs,1176
-pycordViews/multibot/multibot.py,sha256=WNpU9jzZcul-jlKD3XR0Z9fLvPxIY9glES87fV4LNTk,7615
-pycordViews/multibot/process.py,sha256=wp5jS4Y69pyhm-gM3iq6epobpUHf1Pb-CtZt8I05J2Q,7864
+pycordViews/multibot/bot.py,sha256=pD-BPXNo7JeJPguTn7qLii0UzBSS4ITvmOPv8htKJG8,8284
+pycordViews/multibot/errors.py,sha256=sPl_mM6b72Q8uuz4JkocO0TKBQ_9R3f0yT5eGhH_-PY,1328
+pycordViews/multibot/multibot.py,sha256=625UTZ1FcgjR_BzXv2LZfkXonq9qosB_C1-zazr1pYs,9112
+pycordViews/multibot/process.py,sha256=efSWVeHxrN88RdikUb3oOm8pAKgnQn2Q20CZqXGATfo,10114
 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=1vOSjJ4xuA3zuhBtYAsXu7-wnfQCWmyAXxwKvPzkKxQ,5725
+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=HJfq_zSZaxzt84DLmFd-T2I7G79x4lgakI_dzX7jHh4,14000
+pycordViews/views/easy_modified_view.py,sha256=dOiSZ59zthRUV6s-mzdnql0o-z6hQM2ppKShJjmipu0,13992
 pycordViews/views/errors.py,sha256=AkhGskuBjbFs0ZQdTDlVyfvAJ1WRMMQx2sAXUnYjmog,360
-pycordviews-1.2.25.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-pycordviews-1.2.25.dist-info/METADATA,sha256=mtCif2XKY9sXcPb33GWRkDY5-gktLDDAjiesGtVpEdI,11947
-pycordviews-1.2.25.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-pycordviews-1.2.25.dist-info/top_level.txt,sha256=3NvgH6MjESe7Q6jb6aqHgdYrYb5NhxwxnoDyE6PkThY,125
-pycordviews-1.2.25.dist-info/RECORD,,
+pycordviews-1.3.1.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+pycordviews-1.3.1.dist-info/METADATA,sha256=Qf2sc2nqKIu9X02j7OEjSs4vVjHA5EC14fXgglLjVyI,12417
+pycordviews-1.3.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+pycordviews-1.3.1.dist-info/top_level.txt,sha256=3NvgH6MjESe7Q6jb6aqHgdYrYb5NhxwxnoDyE6PkThY,125
+pycordviews-1.3.1.dist-info/RECORD,,

{pycordviews-1.2.25.dist-info → pycordviews-1.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any