dshellInterpreter 1.2.1.0__tar.gz → 1.2.1.1__tar.gz

{dshellinterpreter-1.2.1.0 → dshellinterpreter-1.2.1.1}/Dshell/DISCORD_COMMANDS/dshell_ui.py

@@ -47,18 +47,24 @@ async def build_ui_button_parameters(ui_button_node: UiButtonNode, interpreter:
 
     code = args_button.pop('code', None)
     style = args_button.pop('style', 'primary').lower()
-    custom_id = args_button.pop('custom_id', 'ui_button_'+str(random()))
-    row = args_button.pop('row', 0)
+    custom_id = args_button.pop('custom_id', StrNode('ui_button_'+str(random())))
+    row = args_button.pop('row', IntNode(0))
     emoji = utils_refactor_emoji(args_button.pop('emoji', None))
 
     _validate_optional_code_node(code, "Button code", "build_ui_button")
 
-    if not isinstance(custom_id, str):
+    if not isinstance(custom_id, StrNode):
         raise TypeError(f"Button custom_id must be a string, not {type(custom_id)} !")
 
     if style not in ButtonStyleValues:
         raise ValueError(f"Button style must be one of {', '.join(ButtonStyleValues)}, not '{style}' !")
 
+    if not isinstance(row, IntNode):
+        raise TypeError(f"Buttton row must be a int, not {type(row)} !")
+
+    if not isinstance(emoji, StrNode):
+        raise TypeError(f"Button emoji must be a str, not {type(emoji)} !")
+
     args_button['custom_id'] = custom_id
     args_button['row'] = row
     args_button['style'] = ButtonStyle[style]
@@ -78,7 +84,7 @@ async def build_ui_select_parameters(ui_select_node: UiSelectNode, interpreter:
     args_select: dict[str, list[Any]] = regrouped_parameters.get_dict_parameters()
 
     code = args_select.pop('code', None)
-    custom_id = args_select.pop('custom_id', 'ui_select_'+str(random()))
+    custom_id = args_select.pop('custom_id', StrNode('ui_select_'+str(random())))
     select_type = args_select.pop('type', 'string').lower()
 
     disabled = args_select.get('disabled', False)
@@ -89,22 +95,22 @@ async def build_ui_select_parameters(ui_select_node: UiSelectNode, interpreter:
 
     _validate_optional_code_node(code, "Select code", "build_ui_select")
 
-    if not isinstance(custom_id, str):
+    if not isinstance(custom_id, StrNode):
         raise TypeError(f"Select custom_id must be a string, not {type(custom_id)} !")
 
-    if select_type is None or not isinstance(select_type, str) or select_type not in SelectSyleValues:
+    if select_type is None or not isinstance(select_type, StrNode) or select_type not in SelectSyleValues:
         raise TypeError(f"Select type must be a string, not {type(select_type)} !")
 
-    if not isinstance(disabled, bool):
+    if not isinstance(disabled, BoolNode):
         raise TypeError(f"Select disabled must be a bool, not {type(disabled)} !")
 
-    if not isinstance(max_values, int):
+    if not isinstance(max_values, IntNode):
         raise TypeError(f"Select max_values must be an int, not {type(max_values)} !")
 
-    if not isinstance(min_values, int):
+    if not isinstance(min_values, IntNode):
         raise TypeError(f"Select min_values must be an int, not {type(min_values)} !")
 
-    if not isinstance(placeholder, str):
+    if not isinstance(placeholder, StrNode):
         raise TypeError(f"Select placeholder must be a string, not {type(placeholder)} !")
 
     _validate_optional_int(row, "Select row", "build_ui_select")
@@ -186,7 +192,6 @@ async def build_ui(ui_node: Union[UiButtonNode, UiSelectNode], interpreter: "Dsh
 
     if isinstance(ui_node, UiButtonNode):
         async for _, args_button, code in build_ui_button_parameters(ui_node, interpreter):
-            print(args_button)
             b = ui.Button(**args_button)
             view.add_items(b)
             view.set_callable(b.custom_id, _callable=ui_button_callback, data={'code': code, 'interpreter': interpreter})
@@ -288,8 +293,8 @@ async def ui_button_callback(button: ui.Button, interaction: Interaction, data:
     :param data:
     :return:
     """
-    code = data.pop('code', None)
-    interpreter: "DshellInterpreteur" = data.pop('interpreter', None)
+    code = data.get('code', None)
+    interpreter: "DshellInterpreteur" = data.get('interpreter', None)
     if code is not None:
         message = interaction
         local_env = {
@@ -377,14 +382,16 @@ async def ui_button_callback(button: ui.Button, interaction: Interaction, data:
                 }
             )
 
-        local_env.update(data)
+        #local_env.update(data)
         from ..DshellInterpreteur.dshell_interpreter import DshellInterpreteur
-        with new_scope(interpreter, local_env):
-            await DshellInterpreteur(code, ctx=interaction, debug=False, vars_env=interpreter.env).execute()
+
+        new_interpreter = DshellInterpreteur(code, ctx=interaction, debug=False, vars_env=interpreter.env)
+        with new_scope(new_interpreter, local_env):
+            await new_interpreter.execute()
+
     else:
         await interaction.response.defer(invisible=True)
 
-    data.update({'code': code, 'interpreter': interpreter})
 
 async def ui_select_callback(select: ui.Select, interaction: Interaction, data: dict[str, Any]):
     """
@@ -395,8 +402,8 @@ async def ui_select_callback(select: ui.Select, interaction: Interaction, data:
     :param data:
     :return:
     """
-    code = data.pop('code', None)
-    interpreter: "DshellInterpreteur" = data.pop('interpreter', None)
+    code = data.get('code', None)
+    interpreter: "DshellInterpreteur" = data.get('interpreter', None)
 
     message = interaction
     if code is not None:
@@ -515,5 +522,3 @@ async def ui_select_callback(select: ui.Select, interaction: Interaction, data:
             await DshellInterpreteur(code, ctx=interaction, debug=False, vars_env=interpreter.env).execute()
     else:
         await interaction.response.defer(invisible=True)
-
-    data.update({'code': code, 'interpreter': interpreter})

{dshellinterpreter-1.2.1.0/dshellInterpreter.egg-info → dshellinterpreter-1.2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 1.2.1.0
+Version: 1.2.1.1
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos

{dshellinterpreter-1.2.1.0 → dshellinterpreter-1.2.1.1/dshellInterpreter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 1.2.1.0
+Version: 1.2.1.1
 Summary: A Discord bot interpreter for creating custom commands and automations.
 Home-page: https://github.com/BOXERRMD/Dshell_Interpreter
 Author: Chronos

{dshellinterpreter-1.2.1.0 → dshellinterpreter-1.2.1.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="dshellInterpreter",
-    version="1.2.1.0",
+    version="1.2.1.1",
     author="Chronos",
     author_email="vagabonwalybi@gmail.com",
     description="A Discord bot interpreter for creating custom commands and automations.",