apunkt/MetaGPT
1
0
Fork 0
mirror of https://github.com/FoundationAgents/MetaGPT.git synced 2026-05-01 20:03:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

terminal stream opt

Browse source
This commit is contained in:
shenchucheng 2024-05-08 15:12:40 +08:00
parent d6fdb21207
commit caa42ff7c1
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,8 +26,6 @@ class Terminal:
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
text=True,
bufsize=1, # Line buffered
executable="/bin/bash",
)
self.stdout_queue = Queue()
@ -58,9 +56,9 @@ class Terminal:
"""
# Send the command
self.process.stdin.write(cmd + self.command_terminator)
self.process.stdin.write((cmd + self.command_terminator).encode())
self.process.stdin.write(
f'echo "{END_MARKER_VALUE}"' + self.command_terminator # write EOF
(f'echo "{END_MARKER_VALUE}"{self.command_terminator}').encode() # write EOF
) # Unique marker to signal command end
self.process.stdin.flush()
if daemon:
@ -100,22 +98,24 @@ class Terminal:
# report the command
# Read the output until the unique marker is found
tmp = b""
while True:
line = self.process.stdout.readline()
ix = line.rfind(END_MARKER_VALUE)
if ix >= 0:
line = line[0:ix]
if line:
observer.report(line, "output")
# report stdout in real-time
cmd_output.append(line)
break
# log stdout in real-time
observer.report(line, "output")
cmd_output.append(line)
self.stdout_queue.put(line)
return "".join(cmd_output)
output = tmp + self.process.stdout.read(1)
*lines, tmp = output.splitlines(True)
for line in lines:
line = line.decode()
ix = line.rfind(END_MARKER_VALUE)
if ix >= 0:
line = line[0:ix]
if line:
observer.report(line, "output")
# report stdout in real-time
cmd_output.append(line)
return "".join(cmd_output)
# log stdout in real-time
observer.report(line, "output")
cmd_output.append(line)
self.stdout_queue.put(line)
def close(self):
"""Close the persistent shell process."""