dshellInterpreter 0.2.17.1__tar.gz → 0.2.17.2__tar.gz

{dshellinterpreter-0.2.17.1 → dshellinterpreter-0.2.17.2}/Dshell/DISCORD_COMMANDS/utils/utils_global.py

@@ -1,5 +1,6 @@
 __all__ = [
     "utils_len",
+    "utils_random",
     "utils_get_name",
     "utils_get_id",
     "utils_get_roles",
@@ -7,8 +8,9 @@ __all__ = [
 
 from discord import Message, Role, TextChannel, VoiceChannel, CategoryChannel, ForumChannel, Thread, Member, Guild
 from discord.utils import get
-from typing import Union
+from typing import Union, Optional
 from enum import StrEnum
+from random import random, choice
 
 
 class DiscordType(StrEnum):
@@ -65,6 +67,20 @@ async def utils_len(ctx: Message, value):
 
     return len(value)
 
+async def utils_random(ctx: Message, value: Optional["ListNode"] = None):
+    """
+    Return a random element from a list, or a random integer between 0 and value
+    :param value:
+    :return:
+    """
+    from ..._DshellParser.ast_nodes import ListNode
+    if value is not None and not isinstance(value, ListNode):
+        raise TypeError(f"value must be a list in random command, not {type(value)}")
+
+    if value is None:
+        return random()
+    return choice(value)
+
 async def utils_get_name(ctx : Message, value: int) -> Union[str, None]:
     """
     Return the name of a role, member, or channel.

{dshellinterpreter-0.2.17.1 → dshellinterpreter-0.2.17.2}/Dshell/_DshellInterpreteur/__init__.py

@@ -1 +1,2 @@
 from .dshell_interpreter import *
+from .errors import *

{dshellinterpreter-0.2.17.1 → dshellinterpreter-0.2.17.2}/Dshell/_DshellInterpreteur/dshell_interpreter.py

@@ -9,6 +9,7 @@ from discord import AutoShardedBot, Embed, Colour, PermissionOverwrite, Permissi
 from discord.ui import Button
 from discord.abc import PrivateChannel
 
+from .errors import *
 from .._DshellParser.ast_nodes import *
 from ..DISCORD_COMMANDS.utils.utils_permissions import DshellPermissions
 from .._DshellParser.dshell_parser import parse
@@ -194,7 +195,10 @@ class DshellInterpreteur:
 
 
             elif isinstance(node, EndNode):
-                raise RuntimeError("Execution stopped - EndNode encountered")
+                if node.error_message:
+                    raise RuntimeError("Execution stopped - EndNode encountered")
+                else:
+                    raise DshellInterpreterStopExecution()
 
     def eval_data_token(self, token: Token):
         """

dshellinterpreter-0.2.17.2/Dshell/_DshellInterpreteur/errors.py

@@ -0,0 +1,8 @@
+
+class DshellInterpreterError(Exception):
+    """Base class for exceptions in this module."""
+    pass
+
+class DshellInterpreterStopExecution(DshellInterpreterError):
+    """Exception raised to stop the execution of the interpreter."""
+    pass

{dshellinterpreter-0.2.17.1 → dshellinterpreter-0.2.17.2}/Dshell/_DshellParser/ast_nodes.py

@@ -1,5 +1,5 @@
 from random import randint
-from typing import Optional, Any
+from typing import Optional, Any, Union
 
 from .._DshellTokenizer.dshell_token_type import Token
 
@@ -286,8 +286,8 @@ class EndNode(ASTNode):
     Node representing the end of the AST.
     """
 
-    def __init__(self):
-        pass
+    def __init__(self, error_message: Union[Token, bool] = True):
+        self.error_message: bool = error_message
 
     def __repr__(self):
         return f"<END>"
@@ -298,7 +298,8 @@ class EndNode(ASTNode):
         :return: Dictionary representation of the EndNode.
         """
         return {
-            "type": "EndNode"
+            "type": "EndNode",
+            "error_message": self.error_message
         }
 
 

{dshellinterpreter-0.2.17.1 → dshellinterpreter-0.2.17.2}/Dshell/_DshellParser/dshell_parser.py

@@ -158,7 +158,13 @@ def parse(token_lines: list[list[Token]], start_node: ASTNode) -> tuple[list[AST
                 return blocks, pointeur  # on renvoie les informations parsé à la dernière paramètre ouverte
 
             elif first_token_line.value == '#end':  # node pour arrêter le programme si elle est rencontré
-                end_node = EndNode()
+                error_message = True
+                if len(tokens_by_line) > 1:
+                    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)
                 last_block.body.append(end_node)
 
         ############################## DISCORD KEYWORDS ##############################

{dshellinterpreter-0.2.17.1 → dshellinterpreter-0.2.17.2}/Dshell/_DshellTokenizer/dshell_keywords.py

@@ -29,6 +29,9 @@ dshell_discord_keyword: set[str] = {
 }
 dshell_commands: dict[str, Callable] = {
 
+    ## global utils
+    'random': utils_random,
+
     ## List utils
     'length': utils_len,
     'len': utils_len,

{dshellinterpreter-0.2.17.1 → dshellinterpreter-0.2.17.2}/Dshell/__init__.py

@@ -1,2 +1,3 @@
 from ._DshellInterpreteur.dshell_interpreter import DshellInterpreteur
+from ._DshellInterpreteur.errors import *
 from ._utils import *

{dshellinterpreter-0.2.17.1/dshellInterpreter.egg-info → dshellinterpreter-0.2.17.2}/PKG-INFO

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

{dshellinterpreter-0.2.17.1 → dshellinterpreter-0.2.17.2/dshellInterpreter.egg-info}/PKG-INFO

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

{dshellinterpreter-0.2.17.1 → dshellinterpreter-0.2.17.2}/dshellInterpreter.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ Dshell/DISCORD_COMMANDS/utils/utils_permissions.py
 Dshell/DISCORD_COMMANDS/utils/utils_thread.py
 Dshell/_DshellInterpreteur/__init__.py
 Dshell/_DshellInterpreteur/dshell_interpreter.py
+Dshell/_DshellInterpreteur/errors.py
 Dshell/_DshellParser/__init__.py
 Dshell/_DshellParser/ast_nodes.py
 Dshell/_DshellParser/dshell_parser.py

{dshellinterpreter-0.2.17.1 → dshellinterpreter-0.2.17.2}/setup.py

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