apunkt/MetaGPT
1
0
Fork 0
mirror of https://github.com/FoundationAgents/MetaGPT.git synced 2026-06-08 15:05:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use start_line_number and end_line_number to guide editor.replace

Browse source
This commit is contained in:
黄伟韬 2024-09-13 17:54:38 +08:00
parent be2868dfcf
commit fa68d071a5
3 changed files with 107 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
metagpt/roles/di/role_zero.py
View file

@ -310,8 +310,10 @@ class RoleZero(Role):
if self.rc.max_react_loop >= 10 and actions_taken >= self.rc.max_react_loop:
# If max_react_loop is a small value (e.g. < 10), it is intended to be reached and make the agent stop
logger.warning(f"reached max_react_loop: {actions_taken}")
rsp = await self.ask_human("I have reached my max action rounds, do you want me to continue? Yes or no")
if "yes" in rsp.lower():
human_rsp = await self.ask_human(
"I have reached my max action rounds, do you want me to continue? Yes or no"
)
if "yes" in human_rsp.lower():
actions_taken = 0
return rsp # return output from the last action
@ -541,7 +543,7 @@ class RoleZero(Role):
from metagpt.environment.mgx.mgx_env import MGXEnv # avoid circular import
if not isinstance(self.rc.env, MGXEnv):
return "Not in MGXEnv, command will not be executed."
return "Not in MGXEnv, command will not be executed. If you no longer need to take action, use the command ‘end’ to stop."
return await self.rc.env.reply_to_human(content, sent_from=self)
async def _end(self, **kwarg):

10
metagpt/strategy/experience_retriever.py
View file

@ -957,6 +957,13 @@ I have opened the openai_api.py file. However, the range of lines shown is from
## example 9
I've found the bug and will start fixing it. I'll pay close attention to the indentation.
the previous file look like:
739| can_fold_brackets = self._settings['fold_func_brackets'] and \
740| len(args) == 1 and \
741| not self._needs_function_brackets(expr.args[0])
743| inv_trig_table = ["asin", "acos", "atan", "acsc", "asec", "acot"]
745| # If the function is an inverse trig function, handle the style
Since I only need to modify a few lines in this file, I will use Editor.edit_file_by_replace. The original content will be replaced by the new code.
Editor tool is exclusive. If I use this tool, I cannot use any other commands in the current response.
```json
@ -965,7 +972,8 @@ Editor tool is exclusive. If I use this tool, I cannot use any other commands in
"command_name": "Editor.edit_file_by_replace",
"args": {
"file_name":"/workspace/MetaGPT/provider/openai_api.py",
"to_replace": " inv_trig_table = ["asin", "acos", "atan", "acot"]"
"start_line": 741,
"end_line": 741,
"new_content": " inv_trig_table = ["asin", "acos", "atan", "acsc", "asec", "acot"]"
}
}

106
metagpt/tools/libs/editor.py
View file

@ -57,8 +57,9 @@ Your changes have NOT been applied. Please fix your edit command and try again
SUCCESS_EDIT_INFO = """
[File: {file_name} ({n_total_lines} lines total after edit)]
{window_after_applied}
[File updated (edited at line {line_number}). Please review the changes and make sure they are correct (correct indentation, no duplicate lines, etc). Edit the file again if necessary.]
[File updated (edited at line {line_number}).
"""
# Please review the changes and make sure they are correct (correct indentation, no duplicate lines, etc). Edit the file again if necessary.]
class FileBlock(BaseModel):
@ -207,7 +208,7 @@ class Editor(BaseModel):
else:
output += "(this is the beginning of the file)\n"
for i in range(start, end + 1):
_new_line = f"{i}|{lines[i - 1]}"
_new_line = f"{i:03d}|{lines[i - 1]}"
if not _new_line.endswith("\n"):
_new_line += "\n"
output += _new_line
@ -665,7 +666,86 @@ class Editor(BaseModel):
).strip()
return success_edit_info
def edit_file_by_replace(self, file_name: str, to_replace: str, new_content: str) -> str:
def edit_file_by_replace(
self, file_name: str, start_line: Optional[int], end_line: Optional[int], new_content: str
) -> str:
"""
Line numbers start from 1. Replaces lines start_line through end_line (inclusive) with the given text in the open file.
All of the new_content will be entered, so makesure your indentation is formatted properly.
Example 1:
Given a file "/workspace/example.txt" with the following content:
```
001|line 1
002|line 2
003|line 3
004|line 4
```
EDITING: If you want to replace line 2 and line 3
edit_file_by_replace(
'/workspace/example.txt',
start_line=2,
end_line=3,
new_content='new line',
)
This will replace only the second line 2 and line 3 with "new line".
The resulting file will be:
```
001|line 1
002|new line
003|line 4
```
Example 2:
Given a file "/workspace/example.txt" with the following content:
```
001|line 1
002|line 2
003|line 3
004|line 4
```
EDITING: If you want to remove the line 2 and line 3
edit_file_by_replace(
'/workspace/example.txt',
start_line=2,
end_line=3,
new_content='new line',
)
This will remove line 2 and line 3
The resulting file will be:
```
001|line 1
002|
003|line 4
```
Args:
file_name str:The name of the file to edit.
start_line int: The line number to start the edit at, starting from 1.
end_line int: The line number to end the edit at (inclusive), starting from 1.
new_content str: The text to replace the current selection with, must conform to PEP8 standards.
"""
# FIXME: support replacing *all* occurrences
# search for `to_replace` in the file
# if found, replace it with `new_content`
# if not found, perform a fuzzy search to find the closest match and replace it with `new_content`
file_name = self._try_fix_path(file_name)
ret_str = self._edit_file_impl(
file_name,
start=start_line,
end=end_line,
content=new_content,
)
# lint_error = bool(LINTER_ERROR_MSG in ret_str)
# TODO: automatically tries to fix linter error (maybe involve some static analysis tools on the location near the edit to figure out indentation)
self.resource.report(file_name, "path")
return ret_str
def _edit_file_by_replace(self, file_name: str, to_replace: str, new_content: str) -> str:
"""Edit a file. This will search for `to_replace` in the given file and replace it with `new_content`.
Every *to_replace* must *EXACTLY MATCH* the existing source code, character for character, including all comments, docstrings, etc.
@ -710,7 +790,6 @@ class Editor(BaseModel):
file_name: str: The name of the file to edit.
to_replace: str: The content to search for and replace.
new_content: str: The new content to replace the old content with.
NOTE:
This tool is exclusive. If you use this tool, you cannot use any other commands in the current response.
If you need to use it multiple times, wait for the next turn.
@ -736,7 +815,6 @@ class Editor(BaseModel):
raise ValueError(
"`to_replace` appears more than once, please include enough lines to make code in `to_replace` unique."
)
start = file_content.find(to_replace)
if start != -1:
# Convert start from index to line number
@ -772,21 +850,23 @@ class Editor(BaseModel):
return ret_str
def insert_content_at_line(self, file_name: str, line_number: int, content: str) -> str:
"""Insert content at the given line number in a file.
"""Insert content at the given line number in a file. That is, the new content will start at line_number after the insertion.
This will NOT modify the content of the lines before OR after the given line number.
For example, if the file has the following content:
```
line 1
line 2
line 3
001|line 1
002|line 2
003|line 3
004|line 4
```
and you call `insert_content_at_line('file.txt', 2, 'new line')`, the file will be updated to:
```
line 1
new line
line 2
line 3
001|line 1
002|new line
003|line 2
004|line 3
005|line 4
```
Args: