mirror of
https://gitcode.com/JianFeeeee/HomeAgent.git
synced 2026-09-27 21:03:16 +00:00
体检判据(TestAllBundledAdaptersStreamToolCallStatus)报出的三类问题,
本提交解决其中两类;第三类(gemini)未动,原因见下。
## ① OpenAI 兼容族:github / groq / mistral(3 个)
它们的 transform_stream_chunk 与修复前的 deepseek **逐字相同** ——
只透 content/done,tool_calls 处理只存在于 transform_response(非流式)。
后果与 deepseek 相同:流式模式下工具调用全部丢失,模型调不动任何工具,
且**没有任何报错**。生产当前未启用这三个源,但按预设配置的用户会踩到。
照 deepseek 的修法补上(含 reasoning_content 透传)。
## ② 嵌套形态 + 键名错:server / kimicode / anthropic / ollama(4 个)
这四个**有** tool_calls 处理,但发的是:
{ index = N, id = ..., ["function"] = { name = ..., arguments = ... } }
而 homed 的 `agentAPI.ToolCall` 是**扁平**结构,json tag 为:
id / type / name / arguments / raw_arguments / stream_index
两处都是**静默**失效(Go 侧按 json tag 反序列化,取不到就是零值,无报错):
- **嵌套** `["function"]` ⇒ `name` / `raw_arguments` 取零值
⇒ flush 时判「无 name」丢弃,或参数为空
- **键名 `index`** ⇒ `StreamIndex` 取零值
⇒ 多个分片并到同一个桶,argsRaw 混拼 ⇒ 每个工具报「参数不是合法 JSON」
而**一个都没真跑**
已逐项对齐为扁平 + `stream_index`。协议差异都保留:
- anthropic:`content_block_start` / `input_json_delta`,续传片 name 留空
(内核按 stream_index 累积,补齐 name 后才 flush)
- ollama:tool_calls **整条一次发完**(不分片),故 stream_index 取数组下标
## ③ gemini 未动
它的流式函数处理 `candidates[].content.parts`,**全文件没有任何
tool_calls / functionCall 处理** —— 连非流式路径也没有。补它不是"对齐"
而是新实现,且 gemini 的 functionCall 形态(`functionCall: {name, args}`,
args 是对象而非 JSON 字符串)与 OpenAI 族不同,需要单独判据。
生产三个源(llmsproxy / visionllm / justworker)全部用 `openai.lua`,
不阻塞。留作独立项。
## 判据
- TestOpenAICompatibleFamilyHandlesStreamToolCalls 5 个 OpenAI 族适配器,
逐个验证 tool_calls 未丢 + stream_index 正确
- TestAnthropicAdapterEmitsFlatToolCallsWithStreamIndex 用 **Anthropic 协议**
的 fixture(不用 OpenAI 的,否则会因"不适用该 chunk"跳过 —— 看着绿,
实则没测)
- TestOllamaAdapterEmitsFlatToolCallsWithStreamIndex 用 Ollama 协议形态
- TestDeepSeekAdapterHandlesStreamToolCalls 单列,因它有源预设指向
★ 三个判据按**协议**分文件而非逐适配器:这几个文件的流式函数逐字相同,
共用一个 fixture 会因协议不适用而静默跳过 —— 那等于没测。
## 体检分类
修前: ✓ [openai] ⚠ [kimicode server] ✗ [anthropic deepseek gemini github groq mistral ollama]
修后: ✓ [openai deepseek github groq mistral] ⚠ [] ✗ [gemini]
155 lines
5.8 KiB
Lua
155 lines
5.8 KiB
Lua
local adapter = {}
|
||
|
||
adapter.name = "anthropic"
|
||
adapter.version = "2.0.0"
|
||
adapter.endpoint = "/v1/messages"
|
||
adapter.headers = {
|
||
["anthropic-version"] = "2023-06-01"
|
||
}
|
||
|
||
function adapter.transform_request(raw_body)
|
||
local ok, req = pcall(json.decode, raw_body)
|
||
if not ok then return raw_body end
|
||
|
||
-- 将 OpenAI 风格 content(字符串或 [{type:*}] 数组)拆成文本/图片块
|
||
local function collect_blocks(content)
|
||
if type(content) == "string" then
|
||
return { { type = "text", text = content } }
|
||
end
|
||
local blocks = {}
|
||
for _, p in ipairs(content or {}) do
|
||
if p.type == "text" then
|
||
table.insert(blocks, { type = "text", text = p.text })
|
||
elseif p.type == "image_url" and type(p.image_url) == "table" and p.image_url.url then
|
||
local mt, b64 = string.match(p.image_url.url, "^data:([^,]+);base64,(.+)$")
|
||
if b64 then
|
||
table.insert(blocks, { type = "image", source = { type = "base64", media_type = mt or "image/png", data = b64 } })
|
||
else
|
||
table.insert(blocks, { type = "image", source = { type = "url", url = p.image_url.url } })
|
||
end
|
||
end
|
||
end
|
||
return blocks
|
||
end
|
||
local function text_of(content)
|
||
if type(content) == "string" then return content end
|
||
local t = ""
|
||
for _, p in ipairs(content or {}) do
|
||
if p.type == "text" and p.text then t = t .. p.text end
|
||
end
|
||
return t
|
||
end
|
||
|
||
local msgs = {}
|
||
local system = ""
|
||
for _, m in ipairs(req.messages or {}) do
|
||
if m.role == "system" then
|
||
system = system .. text_of(m.content) .. "\n"
|
||
else
|
||
table.insert(msgs, { role = m.role, content = collect_blocks(m.content) })
|
||
end
|
||
end
|
||
|
||
local anthropic_req = {
|
||
model = req.model or "claude-sonnet-4-20250514",
|
||
max_tokens = req.max_tokens or 4096,
|
||
messages = msgs,
|
||
stream = req.stream or false,
|
||
}
|
||
|
||
if not req.disable_thinking then
|
||
anthropic_req.thinking = { type = "enabled", budget_tokens = 4096 }
|
||
end
|
||
|
||
if system ~= "" then
|
||
anthropic_req.system = system
|
||
end
|
||
|
||
return json.encode(anthropic_req)
|
||
end
|
||
|
||
function adapter.transform_response(raw_body)
|
||
local ok, resp = pcall(json.decode, raw_body)
|
||
if not ok then return raw_body end
|
||
|
||
local unified = {
|
||
content = "",
|
||
finish_reason = "",
|
||
token_usage = { prompt = 0, completion = 0, total = 0 }
|
||
}
|
||
|
||
if resp.usage then
|
||
unified.token_usage.prompt = resp.usage.input_tokens or 0
|
||
unified.token_usage.completion = resp.usage.output_tokens or 0
|
||
unified.token_usage.total = (resp.usage.input_tokens or 0) + (resp.usage.output_tokens or 0)
|
||
end
|
||
|
||
if resp.content and #resp.content > 0 then
|
||
for _, block in ipairs(resp.content) do
|
||
if block.type == "text" then
|
||
unified.content = unified.content .. (block.text or "")
|
||
end
|
||
end
|
||
end
|
||
unified.finish_reason = resp.stop_reason or ""
|
||
|
||
return json.encode(unified)
|
||
end
|
||
|
||
function adapter.transform_stream_chunk(raw_chunk)
|
||
local ok, chunk = pcall(json.decode, raw_chunk)
|
||
if not ok then return "" end
|
||
if chunk.type == "message_start" then return "" end
|
||
if chunk.type == "message_delta" then
|
||
return json.encode({ content = "", done = (chunk.delta and chunk.delta.stop_reason ~= nil) })
|
||
end
|
||
if chunk.type == "content_block_start" and chunk.content_block
|
||
and chunk.content_block.type == "tool_use" then
|
||
-- first fragment of a tool call: emit index + id + name, empty args
|
||
return json.encode({
|
||
content = "", done = false,
|
||
-- ★ 必须是**扁平**结构(name / raw_arguments 在顶层)且键名是
|
||
-- stream_index —— homed 的 agentAPI.ToolCall 按 json tag 反序列化:
|
||
-- · 嵌套 ["function"]={...} ⇒ Go 侧取不到 name/raw_arguments(取零值)
|
||
-- · 键名写 index ⇒ StreamIndex 取零值 ⇒ 多个分片并到同一个桶,
|
||
-- argsRaw 混拼 ⇒ 每个工具报"参数不是合法 JSON"而一个都没真跑
|
||
-- 两种形态都是**静默**失效,所以这里逐项对齐。
|
||
tool_calls = { {
|
||
id = chunk.content_block.id or "",
|
||
type = "function",
|
||
name = chunk.content_block.name or "",
|
||
raw_arguments = "",
|
||
stream_index = chunk.index or 0
|
||
} }
|
||
})
|
||
end
|
||
if chunk.type == "content_block_delta" and chunk.delta then
|
||
if chunk.delta.type == "input_json_delta" then
|
||
-- incremental JSON fragment; clients accumulate across chunks
|
||
-- 同上:扁平 + stream_index。续传片 name 为空是正常的 ——
|
||
-- 内核按 stream_index 累积,补齐 name 后才 flush。
|
||
local unified = { content = "", done = false, tool_calls = { {
|
||
id = "",
|
||
type = "function",
|
||
name = "",
|
||
raw_arguments = chunk.delta.partial_json or "",
|
||
stream_index = chunk.index or 0
|
||
} } }
|
||
return json.encode(unified)
|
||
end
|
||
if chunk.delta.type == "thinking_delta" and chunk.delta.thinking then
|
||
return json.encode({ content = "", done = false, reasoning_content = chunk.delta.thinking })
|
||
end
|
||
return json.encode({ content = chunk.delta.text or "", done = false })
|
||
end
|
||
if chunk.type == "message_stop" then
|
||
return json.encode({ content = "", done = true })
|
||
end
|
||
if chunk.type == "content_block_stop" then
|
||
return json.encode({ content = "", done = false })
|
||
end
|
||
return ""
|
||
end
|
||
|
||
return adapter
|