🌟 The Multi-Agent Framework: First AI Software Company, Towards Natural Language Programming
[terminal.py] Add Windows Terminal support to terminal.py
Ruyuande17c62ae81a
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yamlindex 09a3b19ab..25d8b5fae 100644--- a/.pre-commit-config.yaml+++ b/.pre-commit-config.yaml@@ -5,7 +5,7 @@ default_stages: [ commit ]# 2. pre-commit install# 3. pre-commit run --all-files # make sure all files are cleanrepos:- - repo: https://github.com/pycqa/isort+ - repo: [email protected]:pycqa/isort.gitrev: 5.11.5hooks:- id: isort@@ -15,14 +15,14 @@ repos:.*__init__\.py$)- - repo: https://github.com/astral-sh/ruff-pre-commit+ - repo: [email protected]:astral-sh/ruff-pre-commit.git# Ruff version.rev: v0.0.284hooks:- id: ruffargs: [ --fix ]- - repo: https://github.com/psf/black+ - repo: [email protected]:psf/black.gitrev: 23.3.0hooks:- id: blackdiff --git a/metagpt/tools/libs/terminal.py b/metagpt/tools/libs/terminal.pyindex 9f3545052..6f869d53f 100644--- a/metagpt/tools/libs/terminal.py+++ b/metagpt/tools/libs/terminal.py@@ -1,6 +1,7 @@import asyncioimport osimport re+import sysfrom asyncio import Queuefrom asyncio.subprocess import PIPE, STDOUTfrom typing import Optional@@ -22,8 +23,17 @@ class Terminal:"""def __init__(self):- self.shell_command = ["bash"] # FIXME: should consider windows support later- self.command_terminator = "\n"+ if sys.platform.startswith("win"):+ self.shell_command = ["cmd.exe"] # Windows+ self.executable = None+ self.command_terminator = "\r\n"+ self.pwd_command = "cd"+ else:+ self.shell_command = ["bash"] # Linux / macOS+ self.executable = "bash"+ self.command_terminator = "\n"+ self.pwd_command = "pwd"+self.stdout_queue = Queue(maxsize=1000)self.observer = TerminalReporter()self.process: Optional[asyncio.subprocess.Process] = None@@ -41,17 +51,17 @@ class Terminal:stdin=PIPE,stdout=PIPE,stderr=STDOUT,- executable="bash",+ executable=self.executable,env=os.environ.copy(),- cwd=DEFAULT_WORKSPACE_ROOT.absolute(),+ cwd=str(DEFAULT_WORKSPACE_ROOT) if sys.platform.startswith("win") else DEFAULT_WORKSPACE_ROOT, # Windows)await self._check_state()async def _check_state(self):"""- Check the state of the terminal, e.g. the current directory of the terminal process. Useful for agent to understand.+ Check the state of the terminal, e.g. the current directory."""- output = await self.run_command("pwd")+ output = await self.run_command(self.pwd_command)logger.info("The terminal is at:", output)async def run_command(self, cmd: str, daemon=False) -> str:@@ -74,20 +84,21 @@ class Terminal:output = ""# Remove forbidden commandscommands = re.split(r"\s*&&\s*", cmd)+ skip_cmd = "echo Skipped" if sys.platform.startswith("win") else "true"for cmd_name, reason in self.forbidden_commands.items():# "true" is a pass command in linux terminal.for index, command in enumerate(commands):if cmd_name in command:- output += f"Failed to execut {command}. {reason}\n"- commands[index] = "true"+ output += f"Failed to execute {command}. {reason}\n"+ commands[index] = skip_cmdcmd = " && ".join(commands)-# Send the commandself.process.stdin.write((cmd + self.command_terminator).encode())- self.process.stdin.write(- f'echo "{END_MARKER_VALUE}"{self.command_terminator}'.encode() # write EOF- ) # Unique marker to signal command end++ marker_cmd = f"echo {END_MARKER_VALUE}"+ self.process.stdin.write((marker_cmd + self.command_terminator).encode()) # Unique marker to signal command endawait self.process.stdin.drain()+if daemon:asyncio.create_task(self._read_and_process_output(cmd))else:@@ -116,7 +127,8 @@ class Terminal:This function wraps `run_command`, prepending the necessary Conda activation commandsto ensure the specified environment is active for the command's execution."""- cmd = f"conda run -n {env} {cmd}"+ # windows & linux conda run+ cmd = f"conda activate {env} && {cmd}" if sys.platform.startswith("win") else f"conda run -n {env} {cmd}"return await self.run_command(cmd, daemon=daemon)async def get_stdout_output(self) -> str:@@ -147,10 +159,10 @@ class Terminal:continue*lines, tmp = output.splitlines(True)for line in lines:- line = line.decode()+ line = line.decode(errors="ignore")ix = line.rfind(END_MARKER_VALUE)if ix >= 0:- line = line[0:ix]+ line = line[:ix]if line:await observer.async_report(line, "output")# report stdout in real-time@@ -164,8 +176,9 @@ class Terminal:async def close(self):"""Close the persistent shell process."""- self.process.stdin.close()- await self.process.wait()+ if self.process:+ self.process.stdin.close()+ await self.process.wait()@register_tool(include_functions=["run"])diff --git a/metagpt/utils/token_counter.py b/metagpt/utils/token_counter.pyindex e8bf9d811..481200501 100644--- a/metagpt/utils/token_counter.py+++ b/metagpt/utils/token_counter.py@@ -113,10 +113,10 @@ TOKEN_COSTS = {"doubao-pro-128k-240515": {"prompt": 0.0007, "completion": 0.0013},"llama3-70b-llama3-70b-instruct": {"prompt": 0.0, "completion": 0.0},"llama3-8b-llama3-8b-instruct": {"prompt": 0.0, "completion": 0.0},- "llama-4-Scout-17B-16E-Instruct-FP8" : {"prompt": 0.0, "completion": 0.0}, # start, for Llama API+ "llama-4-Scout-17B-16E-Instruct-FP8": {"prompt": 0.0, "completion": 0.0}, # start, for Llama API"llama-4-Maverick-17B-128E-Instruct-FP8": {"prompt": 0.0, "completion": 0.0},"llama-3.3-8B-Instruct": {"prompt": 0.0, "completion": 0.0},- "llama-3.3-70B-Instruct": {"prompt": 0.0, "completion": 0.0}, # end, for Llama API+ "llama-3.3-70B-Instruct": {"prompt": 0.0, "completion": 0.0}, # end, for Llama API}