dshellInterpreter 0.2.13.3__py3-none-any.whl → 0.2.13.5__py3-none-any.whl

Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -311,7 +311,7 @@ async def call_function(function: Callable, args: ArgsCommandNode, interpreter:
     return await function(*absolute_args, **keyword_args)
 
 
-def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> list[dict[str, list[Any]]]:
+def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur, normalise: bool = False) -> list[dict[str, list[Any]]]:
     """
     Groups the command arguments in the form of a python dictionary.
     Note that you can specify the parameter you wish to pass via -- followed by the parameter name. But this is not mandatory!
@@ -322,6 +322,7 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> li
 
     :param body: The list of tokens to group.
     :param interpreter: The Dshell interpreter instance.
+    :param normalise: If True, normalises the arguments (make value lowercase).
     """
     tokens = {'*': [],
               '--*': {}}  # tokens to return
@@ -332,6 +333,9 @@ def regroupe_commandes(body: list[Token], interpreter: DshellInterpreteur) -> li
     i = 0
     while i < n:
 
+        if normalise and body[i].type == DTT.STR:
+            body[i].value = body[i].value.lower()
+
         if body[i].type == DTT.SEPARATOR and body[
             i + 1].type == DTT.IDENT:  # Check if it's a separator and if the next token is an IDENT
             current_arg = body[i + 1].value  # change the current argument. It will be impossible to return to '*'
@@ -419,12 +423,11 @@ def build_ui(ui_node: UiNode, interpreter: DshellInterpreteur) -> EasyModifiedVi
     view = EasyModifiedViews()
 
     for component in ui_node.buttons:
-        b = Button
-        args_button: dict[str, list[Any]] = regroupe_commandes(component.body, interpreter)[0]
+        args_button: dict[str, list[Any]] = regroupe_commandes(component.body, interpreter, normalise=True)[0]
         args_button.pop('--*', ())
         code = args_button.pop('code', None)
         args = args_button.pop('*', ())
-        b(*args, **args_button)
+        b = Button(*args, **args_button)
 
         custom_id = ''.join(choice(ascii_letters + digits) for _ in range(20))
         b.custom_id = custom_id
@@ -435,6 +438,14 @@ def build_ui(ui_node: UiNode, interpreter: DshellInterpreteur) -> EasyModifiedVi
     return view
 
 async def ui_button_callback(button, interaction, data):
+    """
+    Callback for UI buttons.
+    Executes the code associated with the button.
+    :param button:
+    :param interaction:
+    :param data:
+    :return:
+    """
     code = data.pop('code', None)
     local_env = {}
     if code is not None:
@@ -457,7 +468,7 @@ async def ui_button_callback(button, interaction, data):
             '__private_channel__': isinstance(interaction.channel, PrivateChannel),
         }
         local_env.update(data)
-    x = DshellInterpreteur(code, interaction, debug=False)
+    x = DshellInterpreteur(code, interaction.message, debug=False)
     x.env.update(local_env)
     await x.execute()
 

Dshell/_DshellParser/ast_nodes.py

@@ -498,12 +498,11 @@ class UiNode(ASTNode):
     This is used to define UI elements for commands in Dshell.
     """
 
-    def __init__(self, body, buttons: Optional[list[UiButtonNode]] = None,
+    def __init__(self, buttons: Optional[list[UiButtonNode]] = None,
                  selects: Optional[list[UiSelectNode]] = None):
         """
         :param body: list of tokens representing the UI component
         """
-        self.body = body
         self.buttons = buttons or []
         self.selects = selects or []
 

Dshell/_DshellParser/dshell_parser.py

@@ -205,15 +205,13 @@ def parse(token_lines: list[list[Token]], start_node: ASTNode) -> tuple[list[AST
                 if not isinstance(last_block, UiNode):
                     raise SyntaxError(f'[BUTTON] No UI open on line {first_token_line.position} !')
                 button_node = UiButtonNode(tokens_by_line[1:])
-                last_block.body.append(button_node)
-                pointeur += 1
+                last_block.buttons.append(button_node)
 
             elif first_token_line.value == 'select':
                 if not isinstance(last_block, UiNode):
                     raise SyntaxError(f'[SELECT] No UI open on line {first_token_line.position} !')
                 select_node = UiSelectNode(tokens_by_line[1:])
-                last_block.body.append(select_node)
-                pointeur += 1
+                last_block.selects.append(select_node)
 
         ############################## AUTRE ##############################
 

{dshellinterpreter-0.2.13.3.dist-info → dshellinterpreter-0.2.13.5.dist-info}/METADATA

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

{dshellinterpreter-0.2.13.3.dist-info → dshellinterpreter-0.2.13.5.dist-info}/RECORD

@@ -10,16 +10,16 @@ Dshell/DISCORD_COMMANDS/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 Dshell/DISCORD_COMMANDS/utils/utils_message.py,sha256=Pn0ljyeCvRfY4tlWHrSbIsxSFZZ5J4lDaeVme3WHp9o,1239
 Dshell/DISCORD_COMMANDS/utils/utils_thread.py,sha256=tVl4msEwrWHY-0AytI6eY3JSs-eIFUigDSJfK9mT1ww,1457
 Dshell/_DshellInterpreteur/__init__.py,sha256=xy5-J-R3YmY99JF3NBHTRRLsComFxpjnCA5xacISctU,35
-Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=rHRCoLvT6J1mtyYm9jGH5XlbRAjU7pawAVxRv6a4B9k,25956
+Dshell/_DshellInterpreteur/dshell_interpreter.py,sha256=E2NA5SpnbdB-o1MOoP5xUX4rNULLQPIiHk41KCD8XpM,26355
 Dshell/_DshellParser/__init__.py,sha256=ONDfhZMvClqP_6tE8SLjp-cf3pXL-auQYnfYRrHZxC4,56
-Dshell/_DshellParser/ast_nodes.py,sha256=uKSbK32Ez2wRX9lnH4DA-Ne3yq2v73YJ-_6ObA8U14k,17749
-Dshell/_DshellParser/dshell_parser.py,sha256=hWatNRY6E3F6u-Y71dM45wnIeMLoInJh1vlXAD44rJ0,16969
+Dshell/_DshellParser/ast_nodes.py,sha256=CXUG0rIJNh4jzMCgCcRqmQwU0WQoESQ-5FkuVtZZndM,17717
+Dshell/_DshellParser/dshell_parser.py,sha256=73eKwY7iBzBtL6n2IxJcvtSz0xkfE5y1qEffZ2YfXXY,16913
 Dshell/_DshellTokenizer/__init__.py,sha256=LIQSRhDx2B9pmPx5ADMwwD0Xr9ybneVLhHH8qrJWw_s,172
 Dshell/_DshellTokenizer/dshell_keywords.py,sha256=HtrOQiND_TdM2pdNNAdjBZK2Lhzm2_9umY2dmKfFMTQ,5675
 Dshell/_DshellTokenizer/dshell_token_type.py,sha256=gYIb2XN2YcgeRgmar_rBDS5CGmwfmxihu8mOW_d6lbE,1533
 Dshell/_DshellTokenizer/dshell_tokenizer.py,sha256=LZGs4Ytuyx9Galazqtz32lS4Mmu9yZya1B7AzFQAQOk,7150
-dshellinterpreter-0.2.13.3.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
-dshellinterpreter-0.2.13.3.dist-info/METADATA,sha256=xqvU62szhgive2IfV7RtSsL8c051YxMd1m6D6ynp6_I,1151
-dshellinterpreter-0.2.13.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dshellinterpreter-0.2.13.3.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
-dshellinterpreter-0.2.13.3.dist-info/RECORD,,
+dshellinterpreter-0.2.13.5.dist-info/licenses/LICENSE,sha256=lNgcw1_xb7QENAQi3uHGymaFtbs0RV-ihiCd7AoLQjA,1082
+dshellinterpreter-0.2.13.5.dist-info/METADATA,sha256=5U40G2EGuFk9mnKAQ9Cd4bfT-MyP2JvX2UEu_g4cSsQ,1151
+dshellinterpreter-0.2.13.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dshellinterpreter-0.2.13.5.dist-info/top_level.txt,sha256=B4CMhtmchGwPQJLuqUy0GhRG-0cUGxKL4GqEbCiB_vE,7
+dshellinterpreter-0.2.13.5.dist-info/RECORD,,