dshellInterpreter 1.2.0.22__tar.gz → 1.2.1.1__tar.gz

{dshellinterpreter-1.2.0.22 → dshellinterpreter-1.2.1.1}/Dshell/DISCORD_COMMANDS/dshell_channel.py

@@ -158,7 +158,7 @@ async def dshell_create_text_channel(ctx: Message,
 
     channel_category = ctx.channel.category if category is None else ctx.channel.guild.get_channel(category)
 
-    final_permissions = permissions.value if not MISSING else permissions
+    final_permissions = permissions.value if not isinstance(permissions, _MissingSentinel) else permissions
 
     created_channel = await ctx.guild.create_text_channel(str(name),
                                                           category=channel_category,
@@ -198,7 +198,7 @@ async def dshell_create_voice_channel(ctx: Message,
 
     channel_category = ctx.channel.category if category is None else ctx.channel.guild.get_channel(category)
 
-    final_permissions = permissions.value if not MISSING else permissions
+    final_permissions = permissions.value if not isinstance(permissions, _MissingSentinel) else permissions
 
     created_channel = await ctx.guild.create_voice_channel(StrNode(name),
                                                            category=channel_category,

{dshellinterpreter-1.2.0.22 → 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.0.22 → dshellinterpreter-1.2.1.1}/Dshell/DshellInterpreteur/dshell_interpreter.py

@@ -1,6 +1,6 @@
 from ..DshellTokenizer.dshell_token_type import Token
 from ..DshellTokenizer.dshell_token_type import DshellTokenType as DTT
-from ..DshellInterpreteur.errors import DshellInterpreterStopExecution
+from ..DshellInterpreteur.errors import DshellInterpreterStopExecution, DshellInterpreterError
 from Dshell.full_import import TypeVar, Union, Optional, Any, Callable, sleep, findall
 from ..DshellParser.ast_nodes import *
 from Dshell.full_import import AutoShardedBot, Interaction, Message, PrivateChannel
@@ -120,6 +120,7 @@ class DshellInterpreteur:
             print_ast(self.ast)
 
         self.raise_error = False
+        self.end_program: bool = False
 
     async def _execute_command_node(self, node: CommandNode):
         """Execute a command node."""
@@ -155,6 +156,9 @@ class DshellInterpreteur:
                 self.env.set('__break__', BoolNode(0))
                 break
 
+            if self.end_program:
+                break
+
     async def _execute_break_node(self, node: BreakNode):
         """Execute a break node."""
         self.env.set('__break__', BoolNode(1))
@@ -223,9 +227,14 @@ class DshellInterpreteur:
 
         for node in ast:
 
+            # cut the current program if an EndNode is encountred with the parameter "error_message" to False
+            if self.end_program:
+                return
+
             try:
                 if isinstance(node, StartNode):
                     await self.execute(node.body)
+                    return
 
                 if isinstance(node, CommandNode):
                     await self._execute_command_node(node)
@@ -260,7 +269,7 @@ class DshellInterpreteur:
                     if await self.eval_data_token(node.error_message):
                         raise RuntimeError("Execution stopped - EndNode encountered")
                     else:
-                        raise DshellInterpreterStopExecution("Execution stopped without error")
+                        self.end_program = True
 
             except Exception as e:
                 if not self.raise_error:

{dshellinterpreter-1.2.0.22 → dshellinterpreter-1.2.1.1}/Dshell/DshellParser/ast_nodes.py

@@ -35,7 +35,6 @@ __all__ = [
     'UiButtonNode',
     'UiSelectNode',
     'OptionUiSelectNode',
-    'ScanNode',
     'FileNode',
     'FileStreamNode'
 ]
@@ -337,26 +336,6 @@ class ArgsCommandNode(ASTNode):
             "body": [token.to_dict() for token in self.body]
         }
 
-class ScanNode(ASTNode):
-    """
-    Node representing a scan message in the AST
-    """
-    def __init__(self, body: ArgsCommandNode, line: int):
-        super().__init__(line)
-        self.body = body
-
-    def __repr__(self):
-        return StrNode(f"<SCAN> - {self.body}")
-
-    def to_dict(self):
-        """
-        Convert the ScanNode to a dictionary representation.
-        :return: Dictionary representation of the ScanNode.
-        """
-        return {
-            "type": "ScanNode",
-            "body": self.body.to_dict()
-        }
 
 class CommandNode(ASTNode):
     """

{dshellinterpreter-1.2.0.22 → dshellinterpreter-1.2.1.1}/Dshell/DshellParser/dshell_parser.py

@@ -221,18 +221,14 @@ def parse(token_lines: list[list[Token]], start_node: ASTNode) -> tuple[list[AST
                 return_node = ReturnNode(body=tokens_by_line[1:], line=line)
                 last_block.body.append(return_node)
 
-            elif first_token_line.value == 'scan':
-                scan_node = ScanNode(ArgsCommandNode(body=tokens_by_line[1:], line=line), line=line)
-                last_block.body.append(scan_node)
-
             elif first_token_line.value == '#end':  # node pour arrêter le programme si elle est rencontré
-                error_message = True
+                error_message = BoolNode(1)
                 if len_tokens_by_line_since_command_name > 0:
                     if tokens_by_line[1].type != DTT.BOOL:
                         raise TypeError(f'[#END] the variable given must be a boolean, not {tokens_by_line[1].type}')
                     else:
                         error_message = tokens_by_line[1]
-                end_node = EndNode(error_message)
+                end_node = EndNode(line=line, error_message=error_message)
                 last_block.body.append(end_node)
 
         ############################## DISCORD KEYWORDS ##############################

{dshellinterpreter-1.2.0.22 → dshellinterpreter-1.2.1.1}/Dshell/DshellTokenizer/dshell_keywords.py

@@ -11,7 +11,6 @@ __all__ = [
 from ..DISCORD_COMMANDS import *
 
 from Dshell.full_import import Callable
-from ..DISCORD_COMMANDS.dshell_file import dshell_read_file, dshell_write_file, dshell_get_message_files
 
 dshell_keyword: set[str] = {
     'if', 'else', 'elif', 'loop', '#end', 'var', '#loop', '#if', 'sleep', 'param', '#param', 'code', '#code', 'eval', 'return', 'break'
@@ -184,6 +183,8 @@ dshell_mathematical_operators: dict[str, tuple[Callable, int, int, int]] = {
     r"%": (lambda a, b: a % b, 7, 2, 2),
     r"-": (lambda a, b=None: a-b if b is not None else -a, 6, 1, 2),
     r"+": (lambda a, b: a + b, 6, 2, 2),
+    r"..": (lambda a, b: ListNode([IntNode(i) for i in range(IntNode(a), IntNode(b))])
+                if a <= b else ListNode([IntNode(i) for i in range(IntNode(a), IntNode(b), -1)]), 5, 2, 2)
     # warning: ambiguity between unary and binary to be handled in your parser
 
 }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 1.2.0.22
+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.0.22 → dshellinterpreter-1.2.1.1/dshellInterpreter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dshellInterpreter
-Version: 1.2.0.22
+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.0.22 → dshellinterpreter-1.2.1.1}/setup.py

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