apunkt/MetaGPT
1
0
Fork 0
mirror of https://github.com/FoundationAgents/MetaGPT.git synced 2026-04-27 09:46:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: merge gitlab mgx_ops

Browse source
This commit is contained in:
莘权 马 2024-04-03 11:05:13 +08:00
commit 4a395d44c2
4 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
metagpt/tools/libs/software_development.py
View file

@ -6,7 +6,7 @@ from pathlib import Path
from typing import Optional
from metagpt.const import BUGFIX_FILENAME, REQUIREMENT_FILENAME
from metagpt.logs import ToolOutputItem, log_tool_output
from metagpt.logs import log_tool_output
from metagpt.schema import BugFixContext, Message
from metagpt.tools.tool_registry import register_tool
from metagpt.utils.common import any_to_str

16
metagpt/tools/libs/terminal.py
View file

@ -1,6 +1,6 @@
import subprocess
from metagpt.logs import log_tool_output
from metagpt.logs import TOOL_LOG_END_MARKER, ToolLogItem, log_tool_output
from metagpt.tools.tool_registry import register_tool
@ -11,7 +11,6 @@ class Terminal:
def __init__(self):
self.shell_command = ["bash"] # FIXME: should consider windows support later
self.command_terminator = "\n"
self.end_marker = "#END_MARKER#"
# Start a persistent shell process
self.process = subprocess.Popen(
@ -40,17 +39,22 @@ class Terminal:
# Send the command
self.process.stdin.write(cmd + self.command_terminator)
self.process.stdin.write(
f'echo "{self.end_marker}"' + self.command_terminator
f'echo "{TOOL_LOG_END_MARKER.value}"' + self.command_terminator
) # Unique marker to signal command end
self.process.stdin.flush()
log_tool_output(output={"cmd": cmd + self.command_terminator}, tool_name="Terminal") # log the command
log_tool_output(
output=ToolLogItem(name="cmd", value=cmd + self.command_terminator), tool_name="Terminal"
) # log the command
# Read the output until the unique marker is found
while True:
line = self.process.stdout.readline()
if line.strip() == self.end_marker:
if line.strip() == TOOL_LOG_END_MARKER.value:
log_tool_output(TOOL_LOG_END_MARKER)
break
log_tool_output(output={"output": line}, tool_name="Terminal") # log stdout in real-time
log_tool_output(
output=ToolLogItem(name="output", value=line), tool_name="Terminal"
) # log stdout in real-time
cmd_output.append(line)
return "".join(cmd_output)