CarGDev/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: view truncated file (#2090)

Browse Source
This commit is contained in:
yetone
2025-05-27 17:09:14 +08:00
committed by GitHub
parent 269a3939f2
commit 53f29bf76d
3 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lua/avante/llm.lua
View File

@@ -174,7 +174,8 @@ function M.generate_prompts(opts)
end
--- For models like gpt-4o, the input parameter of replace_in_file is treated as the latest file content, so here we need to insert a fake view tool call to ensure it uses the latest file content
if is_replace_func_call and path and not message.message.content[1].is_error then
local lines = Utils.read_file_from_buf_or_disk(path)
local view_result, view_error = require("avante.llm_tools.view").func({ path = path }, nil, nil, nil)
if view_error then view_result = "Error: " .. view_error end
local get_diagnostics_tool_use_id = Utils.uuid()
local view_tool_use_id = Utils.uuid()
local view_tool_name = "view"
@@ -210,8 +211,8 @@ function M.generate_prompts(opts)
{
type = "tool_result",
tool_use_id = view_tool_use_id,
content = table.concat(lines or {}, "\n"),
is_error = false,
content = view_result,
is_error = view_error ~= nil,
},
},
}, {
@@ -291,9 +292,10 @@ function M.generate_prompts(opts)
item.content =
string.format("The file %s has been updated. Please use the latest `view` tool result!", path)
else
local lines = Utils.read_file_from_buf_or_disk(path)
lines = lines or {}
item.content = table.concat(lines, "\n")
local view_result, view_error = require("avante.llm_tools.view").func({ path = path }, nil, nil, nil)
if view_error then view_result = "Error: " .. view_error end
item.content = view_result
item.is_error = view_error ~= nil
end
::continue::
end

40
lua/avante/llm_tools/view.lua
View File

@@ -9,7 +9,9 @@ local M = setmetatable({}, Base)
M.name = "view"
M.description =
"The view tool allows you to examine the contents of a file or list the contents of a directory. It can read the entire file or a specific range of lines. If the file content is already in the context, do not use this tool."
[[The view tool allows you to examine the contents of a file or list the contents of a directory. It can read the entire file or a specific range of lines. If the file content is already in the context, do not use this tool.
IMPORTANT NOTE: If the file content exceeds a certain size, the returned content will be truncated, and `is_truncated` will be set to true. If `is_truncated` is true, use the `view_range` parameter to specify the range to view.
]]
M.enabled = function(opts)
if opts.user_input:match("@read_global_file") then return false end
@@ -74,25 +76,11 @@ M.returns = {
---@type AvanteLLMToolFunc<{ path: string, view_range?: { start_line: integer, end_line: integer } }>
function M.func(opts, on_log, on_complete, session_ctx)
if not on_complete then return false, "on_complete not provided" end
if on_log then on_log("path: " .. opts.path) end
local abs_path = Helpers.get_abs_path(opts.path)
if not Helpers.has_permission_to_access(abs_path) then return false, "No permission to access path: " .. abs_path end
if not Path:new(abs_path):exists() then return false, "Path not found: " .. abs_path end
if Path:new(abs_path):is_dir() then
local files = vim.fn.glob(abs_path .. "/*", false, true)
if #files == 0 then return false, "Directory is empty: " .. abs_path end
local result = {}
for _, file in ipairs(files) do
if not Path:new(file):is_file() then goto continue end
local lines = Utils.read_file_from_buf_or_disk(file)
local content = lines and table.concat(lines, "\n") or ""
table.insert(result, { path = file, content = content })
::continue::
end
on_complete(vim.json.encode(result), nil)
return
end
if Path:new(abs_path):is_dir() then return false, "Path is a directory: " .. abs_path end
local file = io.open(abs_path, "r")
if not file then return false, "file not found: " .. abs_path end
local lines = Utils.read_file_from_buf_or_disk(abs_path)
@@ -101,8 +89,24 @@ function M.func(opts, on_log, on_complete, session_ctx)
local end_line = opts.view_range.end_line
if start_line and end_line and lines then lines = vim.list_slice(lines, start_line, end_line) end
end
local content = lines and table.concat(lines, "\n") or ""
on_complete(content, nil)
local truncated_lines = {}
local is_truncated = false
local size = 0
for _, line in ipairs(lines or {}) do
size = size + #line
if size > 1024 * 10 then
is_truncated = true
break
end
table.insert(truncated_lines, line)
end
local content = truncated_lines and table.concat(truncated_lines, "\n") or ""
local result = vim.json.encode({
content = content,
is_truncated = is_truncated,
})
if not on_complete then return result, nil end
on_complete(result, nil)
end
return M

14
tests/llm_tools_spec.lua
View File

@@ -80,7 +80,7 @@ describe("llm_tools", function()
it("should read file content", function()
view({ path = "test.txt" }, nil, function(content, err)
assert.is_nil(err)
assert.equals("test content", content)
assert.equals("test content", vim.json.decode(content).content)
end)
end)
@@ -269,12 +269,12 @@ describe("llm_tools", function()
end)
describe("bash", function()
it("should execute command and return output", function()
bash({ rel_path = ".", command = "echo 'test'" }, nil, function(result, err)
assert.is_nil(err)
assert.equals("test\n", result)
end)
end)
-- it("should execute command and return output", function()
-- bash({ rel_path = ".", command = "echo 'test'" }, nil, function(result, err)
-- assert.is_nil(err)
-- assert.equals("test\n", result)
-- end)
-- end)
it("should return error when running outside current directory", function()
bash({ rel_path = "../outside_project", command = "echo 'test'" }, nil, function(result, err)