Skip to content

Commit

Permalink
update delete_line skill
Browse files Browse the repository at this point in the history
  • Loading branch information
@SmartManoj
SmartManoj committed Sep 15, 2024
1 parent 178fc56 commit 5dbc1ef
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 39 deletions.
29 changes: 11 additions & 18 deletions openhands/runtime/plugins/agent_skills/file_ops/file_ops.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ def _edit_impl(lines, start, end, content):
f'Invalid line range: {start}-{end}. Start must be less than or equal to end.'
)

if not content.endswith('\n'):
if content and not content.endswith('\n'):
content += '\n'
content_lines = content.splitlines(True)
n_added_lines = len(content_lines)
Expand Down Expand Up @@ -762,23 +762,16 @@ def delete_line(file_name: str, line_number: int) -> None:
"""Delete the line at the given line number in a file.
This will NOT modify the content of the lines before OR after the given line number.
"""
# ret_str = _edit_file_impl(
# file_name,
# start=line_number,
# end=line_number,
# content='',
# is_insert=False,
# is_append=False,
# )
# the above replaces it with empty string
with open(file_name, 'r') as file:
lines = file.readlines()
if line_number < 1 or line_number > len(lines):
_output_error(f'Invalid line number: {line_number}')
return
lines.pop(line_number - 1)
with open(file_name, 'w') as file:
file.writelines(lines)
ret_str = _edit_file_impl(
file_name,
start=line_number,
end=line_number,
content='',
is_insert=False,
is_append=False,
)
if ret_str is not None:
print(ret_str)


def replace_full_file_content(file_name: str, new_content: str) -> None:
Expand Down
42 changes: 21 additions & 21 deletions tests/unit/test_agent_skill.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# edit_file_by_replace,
find_file,
goto_line,
insert_content_at_line,
insert_content_before_line,
open_file,
scroll_down,
scroll_up,
Expand Down Expand Up @@ -776,15 +776,15 @@ def test_edit_file_by_replace_unknown_file():
)


def test_insert_content_at_line(tmp_path):
def test_insert_content_before_line(tmp_path):
temp_file_path = tmp_path / 'b.txt'
content = 'Line 1\nLine 2\nLine 3'
temp_file_path.write_text(content)
open_file(str(temp_file_path))

with io.StringIO() as buf:
with contextlib.redirect_stdout(buf):
insert_content_at_line(
insert_content_before_line(
file_name=str(temp_file_path),
line_number=2,
content='Inserted Line',
Expand Down Expand Up @@ -829,14 +829,14 @@ def test_delete_line(tmp_path):
assert lines[1].rstrip() == 'Line 3'


def test_insert_content_at_line_from_scratch(tmp_path):
def test_insert_content_before_line_from_scratch(tmp_path):
temp_file_path = tmp_path / 'a.txt'
create_file(str(temp_file_path))
open_file(str(temp_file_path))

with io.StringIO() as buf:
with contextlib.redirect_stdout(buf):
insert_content_at_line(
insert_content_before_line(
file_name=str(temp_file_path),
line_number=1,
content='REPLACE TEXT',
Expand All @@ -858,15 +858,15 @@ def test_insert_content_at_line_from_scratch(tmp_path):
assert lines[0].rstrip() == 'REPLACE TEXT'


def test_insert_content_at_line_from_scratch_emptyfile(tmp_path):
def test_insert_content_before_line_from_scratch_emptyfile(tmp_path):
temp_file_path = tmp_path / 'a.txt'
with open(temp_file_path, 'w') as file:
file.write('')
open_file(str(temp_file_path))

with io.StringIO() as buf:
with contextlib.redirect_stdout(buf):
insert_content_at_line(
insert_content_before_line(
file_name=str(temp_file_path),
line_number=1,
content='REPLACE TEXT',
Expand All @@ -888,15 +888,15 @@ def test_insert_content_at_line_from_scratch_emptyfile(tmp_path):
assert lines[0].rstrip() == 'REPLACE TEXT'


def test_insert_content_at_line_emptyline(tmp_path):
def test_insert_content_before_line_emptyline(tmp_path):
temp_file_path = tmp_path / 'b.txt'
content = 'Line 1\n\n'
temp_file_path.write_text(content)
open_file(str(temp_file_path))

with io.StringIO() as buf:
with contextlib.redirect_stdout(buf):
insert_content_at_line(
insert_content_before_line(
file_name=str(temp_file_path),
line_number=2,
content='Inserted Line',
Expand All @@ -921,7 +921,7 @@ def test_insert_content_at_line_emptyline(tmp_path):
assert lines[1].rstrip() == 'Inserted Line'


def test_insert_content_at_line_from_scratch_multiline_with_backticks_and_second_edit(
def test_insert_content_before_line_from_scratch_multiline_with_backticks_and_second_edit(
tmp_path,
):
temp_file_path = tmp_path / 'a.txt'
Expand All @@ -930,7 +930,7 @@ def test_insert_content_at_line_from_scratch_multiline_with_backticks_and_second

with io.StringIO() as buf:
with contextlib.redirect_stdout(buf):
insert_content_at_line(
insert_content_before_line(
str(temp_file_path),
1,
'`REPLACE TEXT1`\n`REPLACE TEXT2`\n`REPLACE TEXT3`',
Expand Down Expand Up @@ -990,14 +990,14 @@ def test_insert_content_at_line_from_scratch_multiline_with_backticks_and_second
assert '\\`' not in second_result


def test_insert_content_at_line_from_scratch_multiline(tmp_path):
def test_insert_content_before_line_from_scratch_multiline(tmp_path):
temp_file_path = tmp_path / 'a.txt'
create_file(str(temp_file_path))
open_file(temp_file_path)

with io.StringIO() as buf:
with contextlib.redirect_stdout(buf):
insert_content_at_line(
insert_content_before_line(
str(temp_file_path),
1,
content='REPLACE TEXT1\nREPLACE TEXT2\nREPLACE TEXT3',
Expand All @@ -1023,9 +1023,9 @@ def test_insert_content_at_line_from_scratch_multiline(tmp_path):
assert lines[2].rstrip() == 'REPLACE TEXT3'


def test_insert_content_at_line_not_opened():
def test_insert_content_before_line_not_opened():
_capture_file_operation_error(
lambda: insert_content_at_line(
lambda: insert_content_before_line(
str('unknown file'),
1,
'REPLACE TEXT',
Expand Down Expand Up @@ -1312,7 +1312,7 @@ def test_edit_lint_file_pass(tmp_path):
with io.StringIO() as buf:
with contextlib.redirect_stdout(buf):
open_file(str(file_path))
insert_content_at_line(str(file_path), 1, "print('hello')\n")
insert_content_before_line(str(file_path), 1, "print('hello')\n")
result = buf.getvalue()
assert result is not None
expected = (
Expand Down Expand Up @@ -1355,7 +1355,7 @@ def test_lint_file_fail_undefined_name(tmp_path, capsys):
file_path = _generate_test_file_with_lines(tmp_path, 1)

open_file(str(file_path), current_line)
insert_content_at_line(str(file_path), 1, 'undefined_name()\n')
insert_content_before_line(str(file_path), 1, 'undefined_name()\n')

result = capsys.readouterr().out
assert result is not None
Expand Down Expand Up @@ -1399,7 +1399,7 @@ def test_lint_file_fail_undefined_name_long(tmp_path, capsys):
)

open_file(str(file_path))
insert_content_at_line(str(file_path), error_line, 'undefined_name()\n')
insert_content_before_line(str(file_path), error_line, 'undefined_name()\n')

result = capsys.readouterr().out
assert result is not None
Expand Down Expand Up @@ -1439,7 +1439,7 @@ def test_lint_file_disabled_undefined_name(tmp_path, capsys):
file_path = _generate_test_file_with_lines(tmp_path, 1)

open_file(str(file_path))
insert_content_at_line(str(file_path), 1, 'undefined_name()\n')
insert_content_before_line(str(file_path), 1, 'undefined_name()\n')

result = capsys.readouterr().out
assert result is not None
Expand Down Expand Up @@ -1583,7 +1583,7 @@ def test_lint_file_fail_non_python(tmp_path, capsys):
file_path = _generate_ruby_test_file_with_lines(tmp_path, 1)

open_file(str(file_path), current_line)
insert_content_at_line(
insert_content_before_line(
str(file_path), 1, "def print_hello_world()\n puts 'Hello World'"
)
result = capsys.readouterr().out
Expand Down Expand Up @@ -1624,7 +1624,7 @@ def test_lint_file_fail_typescript(tmp_path, capsys):
file_path.write_text('')

open_file(str(file_path), current_line)
insert_content_at_line(
insert_content_before_line(
str(file_path),
1,
"function greet(name: string) {\n console.log('Hello, ' + name)",
Expand Down

0 comments on commit 5dbc1ef

Please sign in to comment.