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

fix: claude cache control (#2279)

Browse Source
This commit is contained in:
yetone
2025-06-21 01:22:52 +08:00
committed by GitHub
parent 30fab46ca1
commit 17d14cbbd5
2 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lua/avante/providers/claude.lua
View File

@@ -50,6 +50,7 @@ end
function M:is_disable_stream() return false end
---@return AvanteClaudeMessage[]
function M:parse_messages(opts)
---@type AvanteClaudeMessage[]
local messages = {}
@@ -64,16 +65,8 @@ function M:parse_messages(opts)
table.sort(messages_with_length, function(a, b) return a.length > b.length end)
---@type table<integer, boolean>
local top_two = {}
if self.support_prompt_caching then
for i = 1, math.min(2, #messages_with_length) do
top_two[messages_with_length[i].idx] = true
end
end
local has_tool_use = false
for idx, message in ipairs(opts.messages) do
for _, message in ipairs(opts.messages) do
local content_items = message.content
local message_content = {}
if type(content_items) == "string" then
@@ -82,7 +75,6 @@ function M:parse_messages(opts)
table.insert(message_content, {
type = "text",
text = content_items,
cache_control = top_two[idx] and { type = "ephemeral" } or nil,
})
end
elseif type(content_items) == "table" then
@@ -90,15 +82,9 @@ function M:parse_messages(opts)
for _, item in ipairs(content_items) do
if type(item) == "string" then
if message.role == "assistant" then item = item:gsub("%s+$", "") end
table.insert(
message_content,
{ type = "text", text = item, cache_control = top_two[idx] and { type = "ephemeral" } or nil }
)
table.insert(message_content, { type = "text", text = item })
elseif type(item) == "table" and item.type == "text" then
table.insert(
message_content,
{ type = "text", text = item.text, cache_control = top_two[idx] and { type = "ephemeral" } or nil }
)
table.insert(message_content, { type = "text", text = item.text })
elseif type(item) == "table" and item.type == "image" then
table.insert(message_content, { type = "image", source = item.source })
elseif not provider_conf.disable_tools and type(item) == "table" and item.type == "tool_use" then
@@ -386,10 +372,34 @@ function M:parse_curl_args(prompt_opts)
end
end
if self.support_prompt_caching and #tools > 0 then
local last_tool = vim.deepcopy(tools[#tools])
last_tool.cache_control = { type = "ephemeral" }
tools[#tools] = last_tool
if self.support_prompt_caching then
if #messages > 0 then
local found = false
for i = #messages, 1, -1 do
local message = messages[i]
message = vim.deepcopy(message)
---@cast message AvanteClaudeMessage
local content = message.content
---@cast content AvanteClaudeMessageContentTextItem[]
for j = #content, 1, -1 do
local item = content[j]
if item.type == "text" then
item.cache_control = { type = "ephemeral" }
found = true
break
end
end
if found then
messages[i] = message
break
end
end
end
if #tools > 0 then
local last_tool = vim.deepcopy(tools[#tools])
last_tool.cache_control = { type = "ephemeral" }
tools[#tools] = last_tool
end
end
return {
@@ -403,7 +413,7 @@ function M:parse_curl_args(prompt_opts)
{
type = "text",
text = prompt_opts.system_prompt,
cache_control = { type = "ephemeral" },
cache_control = self.support_prompt_caching and { type = "ephemeral" } or nil,
},
},
messages = messages,