Execute scripts externally by default

Author: Simatwa

src/pytgpt/console.py

@@ -332,7 +332,7 @@ def __init__(
         chat_completion=False,
         ignore_working=False,
         rawdog=False,
-        external_exec=False,
+        internal_exec=False,
         confirm_script=False,
         interpreter="python",
         *args,
@@ -352,7 +352,7 @@ def __init__(
 
                 self.RawDog = RawDog(
                     quiet=quiet,
-                    external_exec=external_exec,
+                    internal_exec=internal_exec,
                     confirm_script=confirm_script,
                     interpreter=interpreter,
                     prettify=True,
@@ -535,6 +535,9 @@ def __init__(
         self.disable_stream = False
         self.provider = provider
         self.disable_coloring = False
+        self.internal_exec = internal_exec
+        self.confirm_script = confirm_script
+        self.interpreter = interpreter
         self.rawdog = rawdog
         self.__init_time = time.time()
         self.__start_time = time.time()
@@ -842,6 +845,30 @@ def do_last_response(self, line):
             is_json=True,
         )
 
+    @busy_bar.run()
+    def do_exec(self, line):
+        """Exec python code in last response with RawDog"""
+        last_response = self.bot.get_message(self.bot.last_response)
+        assert last_response, "Last response is null"
+        assert "```python" in last_response, "Last response has no python code"
+        if self.rawdog:
+            self.RawDog.main(last_response)
+        else:
+            rawdog = RawDog(
+                quiet=self.quiet,
+                internal_exec=self.internal_exec,
+                confirm_script=self.confirm_script,
+                interpreter=self.interpreter,
+                prettify=self.prettify,
+            )
+            rawdog.main(last_response)
+
+    @busy_bar.run()
+    def do_rawdog(self, line):
+        """Repeat executing last rawdog's python code"""
+        assert self.rawdog, "Session not in rawdog mode. Restart with --rawdog"
+        self.default(self.bot.get_message(self.bot.last_response))
+
     @busy_bar.run()
     def default(self, line, exit_on_error: bool = False):
         """Chat with LLM"""
@@ -854,10 +881,11 @@ def default(self, line, exit_on_error: bool = False):
             self.__start_time = time.time()
             busy_bar.start_spinning()
             ai_response = self.bot.chat(line, stream=False)
+            busy_bar.stop_spinning()
             is_feedback = self.RawDog.main(ai_response)
             if is_feedback:
                 return self.default(self.bot.chat(is_feedback))
-            busy_bar.stop_spinning()
+            self.__end_time = time.time()
 
         else:
             self.__start_time = time.time()
@@ -1151,10 +1179,10 @@ class ChatInteractive:
         help="Generate and auto-execute Python scripts - (experimental)",
     )
     @click.option(
-        "-ex",
-        "--external-exec",
+        "-ix",
+        "--internal-exec",
         is_flag=True,
-        help="RawDog : Execute scripts with system's python interpreter",
+        help="RawDog : Execute scripts with exec function instead of out-of-script interpreter",
     )
     @click.option(
         "-cs",
@@ -1200,7 +1228,7 @@ def interactive(
         chat_completion,
         ignore_working,
         rawdog,
-        external_exec,
+        internal_exec,
         confirm_script,
         interpreter,
     ):
@@ -1226,7 +1254,7 @@ def interactive(
             chat_completion,
             ignore_working,
             rawdog=rawdog,
-            external_exec=external_exec,
+            internal_exec=internal_exec,
             confirm_script=confirm_script,
             interpreter=interpreter,
         )
@@ -1437,10 +1465,10 @@ class ChatGenerate:
         help="Generate and auto-execute Python scripts - (experimental)",
     )
     @click.option(
-        "-ex",
-        "--external-exec",
+        "-ix",
+        "--internal-exec",
         is_flag=True,
-        help="RawDog : Execute scripts with system's python interpreter",
+        help="RawDog : Execute scripts with exec function instead of out-of-script interpreter",
     )
     @click.option(
         "-cs",
@@ -1486,7 +1514,7 @@ def generate(
         with_copied,
         ignore_working,
         rawdog,
-        external_exec,
+        internal_exec,
         confirm_script,
         interpreter,
     ):
@@ -1511,7 +1539,7 @@ def generate(
             quiet,
             ignore_working=ignore_working,
             rawdog=rawdog,
-            external_exec=external_exec,
+            internal_exec=internal_exec,
             confirm_script=confirm_script,
             interpreter=interpreter,
         )

src/pytgpt/utils.py

@@ -430,7 +430,7 @@ class RawDog:
     def __init__(
         self,
         quiet: bool = False,
-        external_exec: bool = False,
+        internal_exec: bool = False,
         confirm_script: bool = False,
         interpreter: str = "python",
         prettify: bool = True,
@@ -439,7 +439,7 @@ def __init__(
 
         Args:
             quiet (bool, optional): Flag for control logging. Defaults to False.
-            external_exec (bool, optional): Execute scripts with system's python executable. Defaults to False.
+            internal_exec (bool, optional): Execute scripts with exec function. Defaults to False.
             confirm_script (bool, optional): Give consent to scripts prior to execution. Defaults to False.
             interpreter (str, optional): Python's interpreter name. Defaults to Python.
             prettify (bool, optional): Prettify the code on stdout. Defaults to True.
@@ -453,7 +453,7 @@ def __init__(
                 "Be alerted on the risk posed! (Experimental)\n"
                 "Use '--quiet' to suppress this message and code/logs stdout.\n"
             )
-        self.external_exec = external_exec
+        self.internal_exec = internal_exec
         self.confirm_script = confirm_script
         self.quiet = quiet
         self.interpreter = interpreter
@@ -565,7 +565,7 @@ def main(self, response: str) -> None:
 
             raw_code_plus = re.sub(r"(```)(python)?", "", raw_code)
 
-            if "CONTINUE" in response or self.external_exec:
+            if "CONTINUE" in response or not self.internal_exec:
                 self.log("Executing script externally")
                 path_to_script = os.path.join(default_path, "execute_this.py")
                 with open(path_to_script, "w") as fh:
@@ -593,7 +593,8 @@ def main(self, response: str) -> None:
                     exec(raw_code_plus)
                 except Exception as e:
                     self.log(
-                        "Exception occurred while executing script. Responding with error.",
+                        "Exception occurred while executing script. Responding with error: "
+                        f"{e.args[1] if len(e.args)>1 else str(e)}",
                         "error",
                     )
                     return f"PREVIOUS SCRIPT EXCEPTION:\n{str(e)}"