mirror of
https://github.com/agentscope-ai/ReMe.git
synced 2026-08-28 05:25:04 +00:00
Some checks are pending
Pre-commit / run (ubuntu-latest) (push) Waiting to run
Tests ReMe / Unit Tests - py3.11 (push) Waiting to run
Tests ReMe / Unit Tests - py3.12 (push) Waiting to run
Tests ReMe / Unit Tests - py3.13 (push) Waiting to run
Windows Smoke / CLI smoke - py3.11 (push) Waiting to run
* feat(core): add shell command execution and memory status reporting - Introduce ShellStep for executing shell commands with timeout support - Add StatusStep to report memory estimates for stateful data components - Register shell and status commands in default configuration - Update documentation with new reme status and shell command capabilities - Implement comprehensive unit tests for both new step types - Add support for asynchronous command execution with proper error handling * feat(config): add log_config option to suppress config loading logs - Add log_config parameter to resolve_app_config function with default True - Conditionally log config loading messages based on log_config flag - Update reme.py and service_utils.py to use log_config=False for client calls - Suppress config logging in user-facing contexts to avoid output pollution refactor(shell): rename command parameter to cmd for clarity - Change 'command' to 'cmd' in default.yaml configuration schema - Rename 'timeout' to 'shell_timeout' to avoid parameter name collisions - Update ShellStep to accept both legacy and new parameter names - Maintain backward compatibility with existing command/timeout usage test(shell): add comprehensive tests for shell step parameter handling - Add test cases for new cmd and shell_timeout parameter names - Verify legacy command and timeout parameters still work - Test blank command rejection message updated to use cmd - Create integration test for shell parameter payload passing * fix(shell): ensure proper environment loading and process timeout handling - Move load_env() call to execute before parse_args() in main function - Add proper process group killing for timeout scenarios on POSIX systems - Implement recursive child process termination on Windows for proper cleanup - Change parameter name from 'timeout' to 'shell_timeout' in shell execution - Remove support for legacy 'command' and 'timeout' parameter names - Update test cases to verify new timeout behavior and parameter requirements - Add comments explaining component size tracking implementation details
119 lines
4 KiB
Python
119 lines
4 KiB
Python
"""Execute a shell command and return its stdout."""
|
|
|
|
import asyncio
|
|
import os
|
|
import signal
|
|
from dataclasses import dataclass
|
|
from typing import Any
|
|
|
|
from ..base_step import BaseStep
|
|
from ...components import R
|
|
|
|
DEFAULT_TIMEOUT = 60.0 * 60 * 24
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class _ShellResult:
|
|
stdout: str
|
|
stderr: str
|
|
returncode: int | None
|
|
timed_out: bool = False
|
|
|
|
|
|
@R.register("shell_step")
|
|
class ShellStep(BaseStep):
|
|
"""Run a command in a shell and return stdout as the response answer."""
|
|
|
|
async def execute(self):
|
|
assert self.context is not None
|
|
|
|
command = self.context.get("cmd", "")
|
|
timeout, timeout_error = self._parse_timeout(self.context.get("shell_timeout", DEFAULT_TIMEOUT))
|
|
if not isinstance(command, str) or not command.strip():
|
|
self.context.response.success = False
|
|
self.context.response.answer = "cmd is required"
|
|
return self.context.response
|
|
if timeout_error:
|
|
self.context.response.success = False
|
|
self.context.response.answer = timeout_error
|
|
return self.context.response
|
|
|
|
result = await self._run_shell(command, timeout)
|
|
if result.timed_out:
|
|
self.context.response.success = False
|
|
self.context.response.answer = f"Shell command timed out after {timeout:g}s"
|
|
else:
|
|
self.context.response.success = result.returncode == 0
|
|
self.context.response.answer = result.stdout if result.stdout or result.returncode == 0 else result.stderr
|
|
|
|
self.context.response.metadata.update(
|
|
{
|
|
"returncode": result.returncode,
|
|
"stderr": result.stderr,
|
|
"shell_timeout": timeout,
|
|
},
|
|
)
|
|
return self.context.response
|
|
|
|
async def _run_shell(self, command: str, timeout: float) -> _ShellResult:
|
|
process_kwargs = {"start_new_session": True} if os.name == "posix" else {}
|
|
process = await asyncio.create_subprocess_shell(
|
|
command,
|
|
stdout=asyncio.subprocess.PIPE,
|
|
stderr=asyncio.subprocess.PIPE,
|
|
cwd=self.workspace_path,
|
|
**process_kwargs,
|
|
)
|
|
try:
|
|
stdout, stderr = await asyncio.wait_for(process.communicate(), timeout=timeout)
|
|
return _ShellResult(
|
|
stdout=stdout.decode(errors="replace"),
|
|
stderr=stderr.decode(errors="replace"),
|
|
returncode=process.returncode,
|
|
)
|
|
except TimeoutError:
|
|
self._kill_process_tree(process)
|
|
stdout, stderr = await process.communicate()
|
|
return _ShellResult(
|
|
stdout=stdout.decode(errors="replace"),
|
|
stderr=stderr.decode(errors="replace"),
|
|
returncode=process.returncode,
|
|
timed_out=True,
|
|
)
|
|
|
|
@staticmethod
|
|
def _kill_process_tree(process: asyncio.subprocess.Process) -> None:
|
|
if os.name == "posix":
|
|
try:
|
|
os.killpg(process.pid, signal.SIGKILL)
|
|
except ProcessLookupError:
|
|
pass
|
|
return
|
|
|
|
# Windows has no process groups with POSIX kill semantics. Walk the
|
|
# descendants explicitly so commands do not survive their shell.
|
|
import psutil # pylint: disable=import-outside-toplevel
|
|
|
|
try:
|
|
descendants = psutil.Process(process.pid).children(recursive=True)
|
|
except psutil.Error:
|
|
descendants = []
|
|
for child in reversed(descendants):
|
|
try:
|
|
child.kill()
|
|
except psutil.Error:
|
|
pass
|
|
try:
|
|
process.kill()
|
|
except ProcessLookupError:
|
|
pass
|
|
|
|
@staticmethod
|
|
def _parse_timeout(raw: Any) -> tuple[float, str]:
|
|
try:
|
|
timeout = float(raw)
|
|
except (TypeError, ValueError):
|
|
return DEFAULT_TIMEOUT, "shell_timeout must be a positive number"
|
|
if timeout <= 0:
|
|
return DEFAULT_TIMEOUT, "shell_timeout must be a positive number"
|
|
return timeout, ""
|