quantalogic 0.2.27__tar.gz → 0.28__tar.gz

{quantalogic-0.2.27 → quantalogic-0.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quantalogic
-Version: 0.2.27
+Version: 0.28
 Summary: QuantaLogic ReAct Agents
 Author: Raphaël MANSUY
 Author-email: raphael.mansuy@gmail.com

{quantalogic-0.2.27 → quantalogic-0.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "quantalogic"
-version = "0.2.27"
+version = "0.28"
 description = "QuantaLogic ReAct Agents"
 authors = ["Raphaël MANSUY <raphael.mansuy@gmail.com>"]
 readme = "README.md"

quantalogic-0.28/quantalogic/tools/execute_bash_command_tool.py

@@ -0,0 +1,133 @@
+"""Tool for executing bash commands with interactive input support."""
+
+import os
+import pty
+import select
+import signal
+import subprocess
+import sys
+from typing import Dict, Optional, Union
+
+from quantalogic.tools.tool import Tool, ToolArgument
+
+
+class ExecuteBashCommandTool(Tool):
+    """Tool for executing bash commands with real-time I/O handling."""
+
+    name: str = "execute_bash_tool"
+    description: str = "Executes a bash command and returns its output."
+    need_validation: bool = True
+    arguments: list = [
+        ToolArgument(
+            name="command",
+            arg_type="string",
+            description="The bash command to execute.",
+            required=True,
+            example="ls -la",
+        ),
+        ToolArgument(
+            name="working_dir",
+            arg_type="string",
+            description="The working directory where the command will be executed. Defaults to the current directory.",
+            required=False,
+            example="/path/to/directory",
+        ),
+        ToolArgument(
+            name="timeout",
+            arg_type="int",
+            description="Maximum time in seconds to wait for the command to complete. Defaults to 60 seconds.",
+            required=False,
+            example="60",
+        ),
+    ]
+
+    def execute(
+        self,
+        command: str,
+        working_dir: Optional[str] = None,
+        timeout: Union[int, str, None] = 60,
+        env: Optional[Dict[str, str]] = None,
+    ) -> str:
+        """Executes a bash command with interactive input handling."""
+        timeout_seconds = int(timeout) if timeout else 60
+        cwd = working_dir or os.getcwd()
+        env_vars = os.environ.copy()
+        if env:
+            env_vars.update(env)
+
+        try:
+            master, slave = pty.openpty()
+            proc = subprocess.Popen(
+                command,
+                shell=True,
+                stdin=slave,
+                stdout=slave,
+                stderr=subprocess.STDOUT,
+                cwd=cwd,
+                env=env_vars,
+                preexec_fn=os.setsid,
+                close_fds=True,
+            )
+            os.close(slave)
+
+            stdout_buffer = []
+            break_loop = False
+
+            try:
+                while True:
+                    rlist, _, _ = select.select([master, sys.stdin], [], [], timeout_seconds)
+                    if not rlist:
+                        if proc.poll() is not None:
+                            break  # Process completed but select timed out
+                        raise subprocess.TimeoutExpired(command, timeout_seconds)
+                    
+                    for fd in rlist:
+                        if fd == master:
+                            data = os.read(master, 1024).decode()
+                            if not data:
+                                break_loop = True
+                                break
+                            stdout_buffer.append(data)
+                            sys.stdout.write(data)
+                            sys.stdout.flush()
+                        elif fd == sys.stdin:
+                            user_input = os.read(sys.stdin.fileno(), 1024)
+                            os.write(master, user_input)
+                    
+                    # Check if process completed or EOF received
+                    if break_loop or proc.poll() is not None:
+                        # Read any remaining output
+                        while True:
+                            data = os.read(master, 1024).decode()
+                            if not data:
+                                break
+                            stdout_buffer.append(data)
+                            sys.stdout.write(data)
+                            sys.stdout.flush()
+                        break
+
+            except subprocess.TimeoutExpired:
+                os.killpg(os.getpgid(proc.pid), signal.SIGTERM)
+                return f"Command timed out after {timeout_seconds} seconds."
+            except EOFError:
+                pass  # Process exited normally
+            finally:
+                os.close(master)
+                proc.wait()
+
+            stdout_content = ''.join(stdout_buffer)
+            return_code = proc.returncode
+            formatted_result = (
+                "<command_output>"
+                f" <stdout>{stdout_content.strip()}</stdout>"
+                f" <returncode>{return_code}</returncode>"
+                f"</command_output>"
+            )
+            return formatted_result
+        except Exception as e:
+            return f"Unexpected error executing command: {str(e)}"
+
+
+if __name__ == "__main__":
+    tool = ExecuteBashCommandTool()
+    print(tool.to_markdown())

quantalogic-0.2.27/quantalogic/tools/execute_bash_command_tool.py

@@ -1,116 +0,0 @@
-"""Tool for executing bash commands and capturing their output."""
-
-import os
-import subprocess
-from typing import Dict, Optional, Union
-
-from quantalogic.tools.tool import Tool, ToolArgument
-
-
-class ExecuteBashCommandTool(Tool):
-    """Tool for executing bash commands and capturing their output."""
-
-    name: str = "execute_bash_tool"
-    description: str = "Executes a bash command and returns its output."
-    need_validation: bool = True
-    arguments: list = [
-        ToolArgument(
-            name="command",
-            arg_type="string",
-            description="The bash command to execute.",
-            required=True,
-            example="ls -la",
-        ),
-        ToolArgument(
-            name="working_dir",
-            arg_type="string",
-            description="The working directory where the command will be executed. Defaults to the current directory.",
-            required=False,
-            example="/path/to/directory",
-        ),
-        ToolArgument(
-            name="timeout",
-            arg_type="int",
-            description="Maximum time in seconds to wait for the command to complete. Defaults to 60 seconds.",
-            required=False,
-            example="60",
-        ),
-        # Removed the `env` argument from ToolArgument since it doesn't support `dict` type
-    ]
-
-    def execute(
-        self,
-        command: str,
-        working_dir: Optional[str] = None,
-        timeout: Union[int, str, None] = 60,
-        env: Optional[Dict[str, str]] = None,
-    ) -> str:
-        """Executes a bash command and returns its output.
-
-        Args:
-            command (str): The bash command to execute.
-            working_dir (str, optional): Working directory for command execution. Defaults to the current directory.
-            timeout (int or str, optional): Maximum execution time in seconds. Defaults to 60 seconds.
-            env (dict, optional): Environment variables to set for the command execution. Defaults to the current environment.
-
-        Returns:
-            str: The command output or error message.
-
-        Raises:
-            subprocess.TimeoutExpired: If the command execution exceeds the timeout.
-            subprocess.CalledProcessError: If the command returns a non-zero exit status.
-            ValueError: If the timeout cannot be converted to an integer.
-        """
-        # Convert timeout to integer, defaulting to 60 if None or invalid
-        try:
-            timeout_seconds = int(timeout) if timeout else 60
-        except (ValueError, TypeError):
-            timeout_seconds = 60
-
-        # Use the current working directory if no working directory is specified
-        cwd = working_dir if working_dir else os.getcwd()
-
-        # Use the current environment if no custom environment is specified
-        env_vars = os.environ.copy()
-        if env:
-            env_vars.update(env)
-
-        try:
-            # Execute the command with specified timeout, working directory, and environment
-            result = subprocess.run(
-                command,
-                shell=True,
-                cwd=cwd,
-                capture_output=True,
-                text=True,
-                timeout=timeout_seconds,
-                env=env_vars,
-            )
-
-            formated_result = (
-                "<command_output>"
-                f" <stdout>"
-                f"{result.stdout.strip()}"
-                f" </stdout>"
-                f" <stderr>"
-                f"{result.stderr.strip()}"
-                f" </stderr>"
-                f" <returncode>"
-                f" {result.returncode}"
-                f" </returncode>"
-                f"</command_output>"
-            )
-
-            return formated_result
-
-        except subprocess.TimeoutExpired:
-            return f"Command timed out after {timeout_seconds} seconds."
-        except subprocess.CalledProcessError as e:
-            return f"Command failed with error: {e.stderr.strip()}"
-        except Exception as e:
-            return f"Unexpected error executing command: {str(e)}"
-
-
-if __name__ == "__main__":
-    tool = ExecuteBashCommandTool()
-    print(tool.to_markdown())