fix shell tool bug

promptulate/client/chat.py

@@ -28,7 +28,13 @@
 from promptulate.agents import ToolAgent
 from promptulate.llms import ErnieBot, ChatOpenAI, BaseLLM
 from promptulate.schema import LLMType
-from promptulate.tools import Calculator, DuckDuckGoTool, PythonREPLTool, ArxivQueryTool, SleepTool
+from promptulate.tools import (
+    Calculator,
+    DuckDuckGoTool,
+    PythonREPLTool,
+    ArxivQueryTool,
+    SleepTool,
+)
 from promptulate.tools.shell import ShellTool
 from promptulate.utils import set_proxy_mode, print_text
 
@@ -39,7 +45,7 @@
     "Python Script Executor": PythonREPLTool,
     "Arxiv Query": ArxivQueryTool,
     "Sleep": SleepTool,
-    "Shell Executor": ShellTool
+    "Shell Executor": ShellTool,
 }
 
 

promptulate/tools/shell/api_wrapper.py

@@ -1,4 +1,5 @@
 import os
+import subprocess
 import sys
 from io import StringIO
 
@@ -8,10 +9,21 @@ class ShellAPIWrapper:
 
     @staticmethod
     def run(command: str) -> str:
+        """
+        Runs a command in a subprocess and returns
+        the output.
+
+        Args:
+            command: The command to run
+        """
         try:
-            result = os.popen(command)
-            output = result.read()
-            result.close()
-        except Exception as e:
+            output = subprocess.run(
+                command,
+                shell=True,
+                check=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+            ).stdout.decode()
+        except subprocess.CalledProcessError as e:
             output = repr(e)
         return output

tests/tools/test_shell_tools.py

@@ -10,7 +10,7 @@ def test_run(self):
         command = """echo hello"""
         result = api_wrapper.run(command)
         print(result)
-        self.assertEqual("hello\n", result)
+        self.assertEqual("hello\r\n", result)
 
 
 class TestShellReplTool(TestCase):