PycordViews 1.3.6__tar.gz → 1.3.6.2__tar.gz

{pycordviews-1.3.6 → pycordviews-1.3.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PycordViews
-Version: 1.3.6
+Version: 1.3.6.2
 Summary: Views and multibot for py-cord library
 Home-page: https://github.com/BOXERRMD/Py-cord_Views
 Author: Chronos (alias BOXERRMD)
@@ -19,6 +19,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: immutable-Python-type
+Requires-Dist: psutil
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -35,6 +36,10 @@ Dynamic: summary
 # Py-cord_Views
  Views for py-cord library
 
+DO NOT USE **MULTIBOT** CLASS FOR COMMERCIAL PURPOSES! 
+BOTS ARE NOT SEPARATED FROM EACH OTHER WHEN THEY ARE IN THE SAME PROCESS. 
+EACH BOT CAN ACCESS INFORMATION FROM OTHER BOTS CONTAINED IN THE SAME PROCESS.
+
 # Paginator
 The paginator instance is used to create a view acting as a “book”, with pages that can be turned using buttons.
 ## `Paginator`
@@ -226,6 +231,8 @@ Each instance of this class creates a process where bots can be added. These bot
 > > ```
 > 
 > > **Method** `modify_pyFile_commands(bot_name: str, file: str, setup_function: str = 'setup') -> dict[str, str]` : Modify python discord command file and setup function. This method doesn't reload automatically commands on the bot. Use `reload_commands` after. `file` parameter require a file path, absolute or not.
+>
+> > **Method** `allow_subprocess(allow: bool) -> dict[str, str]` : Allow or disallow the use of subprocess to all bots in the current process. By default, it's allowed.
 > 
 > > **@property** `bot_count -> int` : Return the total number of bots
 > 

{pycordviews-1.3.6 → pycordviews-1.3.6.2}/PycordViews.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PycordViews
-Version: 1.3.6
+Version: 1.3.6.2
 Summary: Views and multibot for py-cord library
 Home-page: https://github.com/BOXERRMD/Py-cord_Views
 Author: Chronos (alias BOXERRMD)
@@ -19,6 +19,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: immutable-Python-type
+Requires-Dist: psutil
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -35,6 +36,10 @@ Dynamic: summary
 # Py-cord_Views
  Views for py-cord library
 
+DO NOT USE **MULTIBOT** CLASS FOR COMMERCIAL PURPOSES! 
+BOTS ARE NOT SEPARATED FROM EACH OTHER WHEN THEY ARE IN THE SAME PROCESS. 
+EACH BOT CAN ACCESS INFORMATION FROM OTHER BOTS CONTAINED IN THE SAME PROCESS.
+
 # Paginator
 The paginator instance is used to create a view acting as a “book”, with pages that can be turned using buttons.
 ## `Paginator`
@@ -226,6 +231,8 @@ Each instance of this class creates a process where bots can be added. These bot
 > > ```
 > 
 > > **Method** `modify_pyFile_commands(bot_name: str, file: str, setup_function: str = 'setup') -> dict[str, str]` : Modify python discord command file and setup function. This method doesn't reload automatically commands on the bot. Use `reload_commands` after. `file` parameter require a file path, absolute or not.
+>
+> > **Method** `allow_subprocess(allow: bool) -> dict[str, str]` : Allow or disallow the use of subprocess to all bots in the current process. By default, it's allowed.
 > 
 > > **@property** `bot_count -> int` : Return the total number of bots
 > 

{pycordviews-1.3.6 → pycordviews-1.3.6.2}/PycordViews.egg-info/requires.txt

@@ -1 +1,2 @@
 immutable-Python-type
+psutil

{pycordviews-1.3.6 → pycordviews-1.3.6.2}/README.md

@@ -1,6 +1,10 @@
 # Py-cord_Views
  Views for py-cord library
 
+DO NOT USE **MULTIBOT** CLASS FOR COMMERCIAL PURPOSES! 
+BOTS ARE NOT SEPARATED FROM EACH OTHER WHEN THEY ARE IN THE SAME PROCESS. 
+EACH BOT CAN ACCESS INFORMATION FROM OTHER BOTS CONTAINED IN THE SAME PROCESS.
+
 # Paginator
 The paginator instance is used to create a view acting as a “book”, with pages that can be turned using buttons.
 ## `Paginator`
@@ -192,6 +196,8 @@ Each instance of this class creates a process where bots can be added. These bot
 > > ```
 > 
 > > **Method** `modify_pyFile_commands(bot_name: str, file: str, setup_function: str = 'setup') -> dict[str, str]` : Modify python discord command file and setup function. This method doesn't reload automatically commands on the bot. Use `reload_commands` after. `file` parameter require a file path, absolute or not.
+>
+> > **Method** `allow_subprocess(allow: bool) -> dict[str, str]` : Allow or disallow the use of subprocess to all bots in the current process. By default, it's allowed.
 > 
 > > **@property** `bot_count -> int` : Return the total number of bots
 > 

{pycordviews-1.3.6 → pycordviews-1.3.6.2}/pycordViews/multibot/bot.py

@@ -77,7 +77,7 @@ class DiscordBot:
 
     def modify_pyFile_commands(self, file: str, setup_function: str):
         """
-        Modifie un fichier de comandes et le recharge.
+        Modifie un fichier de commandes et le recharge.
         Ne recharge que le fichier et non les commandes du bot !
         :param file: Le chemin d'accès relatif ou absolue du fichier
         """
@@ -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=None)
+        run_coroutine_threadsafe(self.__reload_commands(commands=commands), self.__loop).result(timeout=60)
 
     async def __reload_commands(self, commands: Optional[list[ApplicationCommand]] = None):
         """

{pycordviews-1.3.6 → pycordviews-1.3.6.2}/pycordViews/multibot/multibot.py

@@ -199,7 +199,7 @@ class Multibot:
         request_type = "RELOAD_COMMANDS"
         result = []
         for name in bot_names:
-            self.__main_queue.put({'type': request_type, 'name': name})
+            self.__main_queue.put({'type': request_type, 'bot_name': name})
             result.append(self.__get_data_queue(request_type))
         return result
 
@@ -231,6 +231,7 @@ class Multibot:
         Reloads only the file, not the bot commands!
         :param bot_name: The bot's name
         :param file: The file's relative or absolute path
+        :param setup_function: Function name called by the process to give the Bot instance. Set to 'setup' by default.
         """
         request_type = "MODIFY_COMMAND_FILE"
         self.__main_queue.put({'type': request_type,

{pycordviews-1.3.6 → pycordviews-1.3.6.2}/pycordViews/multibot/process.py

@@ -5,6 +5,7 @@ from discord import Intents
 from immutableType import Str_
 from sys import modules
 from os import system
+from psutil import Process
 
 class ManageProcess:
 
@@ -16,6 +17,8 @@ class ManageProcess:
         self.main_queue: Queue = main_queue
         self.process_queue: Queue = process_queue
         self.removed_modules: dict[str, "ModuleType"] = {}
+        self.allow_create_subprocess: bool = True
+        self.process: Process = Process()
 
         self.commandes = {
             "ADD": self.add_bot_to_process,
@@ -37,7 +40,8 @@ class ManageProcess:
             "ADD_COMMAND_FILE": self.add_pyFile_commands,
             "MODIFY_COMMAND_FILE": self.modify_pyFile_commands,
             "REMOVE_MODULES": self.remove_modules,
-            "ADD_MODULES": self.add_modules
+            "ADD_MODULES": self.add_modules,
+            "ALLOW_SUBPROCESS": self.allow_subprocess
         }
 
     def run(self):
@@ -45,6 +49,7 @@ class ManageProcess:
         Boucle principale du processus, écoute la queue principale.
         Doit comporter aubligatoirement un dictionnaire avec la clé 'type'
         """
+        wait_for = 0  # secondes avant de forcer la fermeture des subprocess
         while True:
             if not self.main_queue.empty():
                 command: dict = self.main_queue.get()
@@ -59,6 +64,16 @@ class ManageProcess:
                     except MultibotError as e:
                         self.process_queue.put({'status': 'error', 'message': e, 'type': type_request})
 
+            if not self.allow_create_subprocess and wait_for > 50000 and (childrens_process := self.process.children()):
+                for i in childrens_process:
+                    try:
+                        i.kill()
+                    except Exception:
+                        pass
+                    finally:
+                        wait_for = 0
+            wait_for += 1
+
     def start_bot_to_process(self, bot_name: str) -> str:
         """
         Lance un unique bot
@@ -156,6 +171,15 @@ class ManageProcess:
         file = Str_(file).str_
         self.__bots[bot_name].modify_pyFile_commands(file=file, setup_function=setup_function)
 
+    def remove_pyFile_commands(self, bot_name: str, file: str):
+        """
+        Enlève un fichier de commandes et toutes ses commandes du bot.
+        :param bot_name: Le nom du bot
+        :param file: Le chemin d'accès relatif ou absolue du fichier
+        """
+        self.if_bot_no_exist(bot_name)
+        file = Str_(file).str_
+        self.__bots[bot_name].remove_pyFile_commands(file=file)
 
     def reload_all_commands(self, bot_name: str):
         """
@@ -271,3 +295,13 @@ class ManageProcess:
         Renvoie tous les noms des bots entrée par l'utilisateur
         """
         return list(self.__bots.keys())
+
+    def allow_subprocess(self, allow: bool) -> str:
+        """
+        Permet ou non l'utilisation de subprocess dans les bots.
+        ATTENTION : Peut poser des problèmes de sécurité si un utilisateur malveillant à accès au code.
+        Par défaut, False.
+        :param allow: True pour autoriser, False pour interdire
+        """
+        self.allow_create_subprocess = allow
+        return f'Subprocess allowed: {allow}'

{pycordviews-1.3.6 → pycordviews-1.3.6.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", encoding='utf-8') as file:
 
 setup(
     name="PycordViews",
-    version="1.3.6",
+    version="1.3.6.2",
     url="https://github.com/BOXERRMD/Py-cord_Views",
     author="Chronos (alias BOXERRMD)",
     author_email="vagabonwalybi@gmail.com",
@@ -25,7 +25,8 @@ setup(
         "Programming Language :: Python :: 3.9"
     ],
     install_requires=[
-        "immutable-Python-type"
+        "immutable-Python-type",
+        "psutil"
     ],
     packages=['pycordViews', 'pycordViews/pagination', 'pycordViews/views', 'pycordViews/menu', 'pycordViews/multibot', 'pycordViews/kit', 'pycordViews/modal'],
     python_requires='>=3.9'