dshellInterpreter 1.2.1.3__tar.gz → 1.2.1.5__tar.gz

{dshellinterpreter-1.2.1.3 → dshellinterpreter-1.2.1.5}/Dshell/DISCORD_COMMANDS/dshell_ui.py

@@ -177,13 +177,18 @@ async def build_ui(ui_node: Union[UiButtonNode, UiSelectNode], interpreter: "Dsh
     :param interpreter:
     :return:
     """
-    view = EasyModifiedViews()
+
+    async def ui_timeout(ctx):
+        update_nbr_usage_scope(interpreter.scope_id, -1)
+
+    view = EasyModifiedViews(timeout=3600, call_on_timeout=ui_timeout, disabled_on_timeout=True)
 
     if isinstance(ui_node, UiButtonNode):
         async for _, args_button, code in build_ui_button_parameters(ui_node, interpreter):
             b = ui.Button(**args_button)
             view.add_items(b)
             view.set_callable(b.custom_id, _callable=ui_button_callback, data={'code': code, scope_id: interpreter.scope_id})
+        update_nbr_usage_scope(interpreter.scope_id, 1)
 
     elif isinstance(ui_node, UiSelectNode):
         s = SelectMenu()
@@ -217,6 +222,7 @@ async def build_ui(ui_node: Union[UiButtonNode, UiSelectNode], interpreter: "Dsh
                 s.set_callable(args_select["custom_id"], _callable=ui_select_callback, data={'code': code, scope_id: interpreter.scope_id})
 
         view.add_items(s)
+        update_nbr_usage_scope(interpreter.scope_id, 1)
 
     else:
         raise TypeError(f"UI node must be UiButtonNode or UiSelectNode, not {type(ui_node)} !")
@@ -224,7 +230,6 @@ async def build_ui(ui_node: Union[UiButtonNode, UiSelectNode], interpreter: "Dsh
     return view
 
 
-
 async def rebuild_ui(ui_node: Union[UiButtonNode, UiSelectNode], view: EasyModifiedViews, interpreter: "DshellInterpreteur") -> EasyModifiedViews:
     """
     Rebuilds a UI component from an existing EasyModifiedViews.
@@ -378,17 +383,11 @@ async def ui_button_callback(button: ui.Button, interaction: Interaction, data:
             code,
             ctx=interaction,
             debug=False,
-            vars_env=get_scope(scope))
-
-        if scope is not None:
-            update_nbr_usage_scope(scope, 1)
+            vars_env=scope)
 
         with new_scope(new_interpreter, local_env):
             await new_interpreter.execute()
 
-        if scope is not None:
-            update_nbr_usage_scope(scope, -1)
-
     else:
         await interaction.response.defer(invisible=True)
 
@@ -522,16 +521,10 @@ async def ui_select_callback(select: ui.Select, interaction: Interaction, data:
             code,
             ctx=interaction,
             debug=False,
-            vars_env=get_scope(scope))
-
-        if scope is not None:
-            update_nbr_usage_scope(scope, 1)
+            vars_env=scope)
 
         with new_scope(new_interpreter, local_env):
             await new_interpreter.execute()
 
-        if scope is not None:
-            update_nbr_usage_scope(scope, -1)
-
     else:
         await interaction.response.defer(invisible=True)

{dshellinterpreter-1.2.1.3 → dshellinterpreter-1.2.1.5}/Dshell/DshellInterpreteur/dshell_interpreter.py

@@ -27,7 +27,7 @@ class DshellInterpreteur:
     def __init__(self, code: Union[str, CodeNode], ctx: context,
                  debug: bool = False,
                  vars: Optional[str] = None,
-                 vars_env: Optional[dict[str, Any] | Scope] = None):
+                 vars_env: Optional[dict[str, Any] | str] = None):
         """
         Interpreter Dshell code
         :param code: The code to interpret. Each line must end with a newline character, except SEPARATOR and SUB_SEPARATOR tokens.
@@ -49,8 +49,13 @@ class DshellInterpreteur:
         message = ctx.message if isinstance(ctx, Interaction) else ctx
 
         # scope creation
-        self.scope_id: str = create_scope()
-        self.env: Optional[Scope] = get_scope(self.scope_id)
+        scope = get_scope(vars_env)
+        if scope:
+            self.env = scope
+            self.scope_id = vars_env
+        else:
+            self.scope_id: str = create_scope()
+            self.env: Optional[Scope] = get_scope(self.scope_id)
 
         if self.env is None:
             raise Exception(f"Scope {self.scope_id} not found in interpreter creation !")
@@ -112,9 +117,8 @@ class DshellInterpreteur:
 
         } if message is not None and not debug else {'__ret__': None, '__break__': BoolNode(0)}) # {} is used in debug mode, when ctx is None
 
-        if isinstance(vars_env, Scope):
-            self.env = vars_env
-        elif isinstance(vars_env, dict): # add the variables to the environment
+
+        if isinstance(vars_env, dict): # add the variables to the environment
             self.env.update(vars_env)
 
         self.vars = StrNode(vars) if vars is not None else StrNode('')

{dshellinterpreter-1.2.1.3/dshellInterpreter.egg-info → dshellinterpreter-1.2.1.5}/PKG-INFO

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

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

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