mirror/nanobot
1
0
Fork 0
mirror of https://github.com/HKUDS/nanobot.git synced 2026-04-08 20:23:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: extract _kill_process helper to DRY timeout/cancel cleanup

Browse Source 
Made-with: Cursor
This commit is contained in:
Xubin Ren 2026-04-06 05:45:46 +00:00 committed by Xubin Ren
parent 0e617c32cd
commit 424b9fc262
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nanobot/agent/tools/shell.py
View File

@ -116,30 +116,10 @@ class ExecTool(Tool):
timeout=effective_timeout, timeout=effective_timeout,
) )
except asyncio.TimeoutError: except asyncio.TimeoutError:
process.kill() await self._kill_process(process)
try:
await asyncio.wait_for(process.wait(), timeout=5.0)
except asyncio.TimeoutError:
pass
finally:
if sys.platform != "win32":
try:
os.waitpid(process.pid, os.WNOHANG)
except (ProcessLookupError, ChildProcessError) as e:
logger.debug("Process already reaped or not found: {}", e)
return f"Error: Command timed out after {effective_timeout} seconds" return f"Error: Command timed out after {effective_timeout} seconds"
except asyncio.CancelledError: except asyncio.CancelledError:
process.kill() await self._kill_process(process)
try:
await asyncio.wait_for(process.wait(), timeout=5.0)
except asyncio.TimeoutError:
pass
finally:
if sys.platform != "win32":
try:
os.waitpid(process.pid, os.WNOHANG)
except (ProcessLookupError, ChildProcessError) as e:
logger.debug("Process already reaped or not found: {}", e)
raise raise
output_parts = [] output_parts = []
@ -171,6 +151,21 @@ class ExecTool(Tool):
except Exception as e: except Exception as e:
return f"Error executing command: {str(e)}" return f"Error executing command: {str(e)}"
@staticmethod
async def _kill_process(process: asyncio.subprocess.Process) -> None:
"""Kill a subprocess and reap it to prevent zombies."""
process.kill()
try:
await asyncio.wait_for(process.wait(), timeout=5.0)
except asyncio.TimeoutError:
pass
finally:
if sys.platform != "win32":
try:
os.waitpid(process.pid, os.WNOHANG)
except (ProcessLookupError, ChildProcessError) as e:
logger.debug("Process already reaped or not found: {}", e)
def _build_env(self) -> dict[str, str]: def _build_env(self) -> dict[str, str]:
"""Build a minimal environment for subprocess execution. """Build a minimal environment for subprocess execution.