Merge branch 'master' of https://github.com/BillSchumacher/Auto-GPT into plugin-support

autogpt/commands/execute_code.py

@@ -13,7 +13,7 @@ CFG = Config()
 
 
 @command("execute_python_file", "Execute Python File", '"file": "<file>"')
-def execute_python_file(file: str):
+def execute_python_file(file: str) -> str:
     """Execute a Python file in a Docker container and return the output
 
     Args:
@@ -45,7 +45,10 @@ def execute_python_file(file: str):
     try:
         client = docker.from_env()
 
-        image_name = "python:3.10"
+        # You can replace this with the desired Python image/version
+        # You can find available Python images on Docker Hub:
+        # https://hub.docker.com/_/python
+        image_name = "python:3-alpine"
         try:
             client.images.get(image_name)
             print(f"Image '{image_name}' found locally")
@@ -62,9 +65,6 @@ def execute_python_file(file: str):
                 elif status:
                     print(status)
 
-        # You can replace 'python:3.8' with the desired Python image/version
-        # You can find available Python images on Docker Hub:
-        # https://hub.docker.com/_/python
         container = client.containers.run(
             image_name,
             f"python {file}",
@@ -135,6 +135,35 @@ def execute_shell(command_line: str) -> str:
     return output
 
 
+def execute_shell_popen(command_line) -> str:
+    """Execute a shell command with Popen and returns an english description
+    of the event and the process id
+
+    Args:
+        command_line (str): The command line to execute
+
+    Returns:
+        str: Description of the fact that the process started and its id
+    """
+    current_dir = os.getcwd()
+    # Change dir into workspace if necessary
+    if str(WORKSPACE_PATH) not in current_dir:
+        os.chdir(WORKSPACE_PATH)
+
+    print(f"Executing command '{command_line}' in working directory '{os.getcwd()}'")
+
+    do_not_show_output = subprocess.DEVNULL
+    process = subprocess.Popen(
+        command_line, shell=True, stdout=do_not_show_output, stderr=do_not_show_output
+    )
+
+    # Change back to whatever the prior working dir was
+
+    os.chdir(current_dir)
+
+    return f"Subprocess started with PID:'{str(process.pid)}'"
+
+
 def we_are_running_in_a_docker_container() -> bool:
     """Check if we are running in a Docker container