mirror of
https://gitcode.com/JianFeeeee/HomeAgent.git
synced 2026-09-22 09:58:06 +00:00
llm: 统一源接入层修复（对照 llmsproxy）
- provider: 新增 OpenAI-compatible 响应/流兜底解析，Lua adapter 异常时也能解析 choices/message/tool_calls/usage（含 function.arguments 缺失、对象/字符串参数） - 过滤无效 LLM 源（<nil>/空/缺 http(s) scheme），main 与 ReloadFromConfig 均跳过， 避免 mocktest 等坏源污染 fallback 与 healthcheck - adapter(openai/deepseek/groq/mistral/github/kimicode): 修 tool_calls 对 nil function 的崩溃，兼容扁平/嵌套结构；openai 流透传 reasoning/tool_calls - config: ToConfig 探活端点过滤无效 base_url，修复 supervisor 误报 LLM unreachable
This commit is contained in:
root
@ -45,14 +45,34 @@ function adapter.transform_response(raw_body)
|
||||
if type(ch.message.tool_calls) == "table" then
|
||||
local tcs = {}
|
||||
for _, tc in ipairs(ch.message.tool_calls) do
|
||||
local args_ok, args = pcall(json.decode, tc["function"].arguments)
|
||||
if not args_ok then args = {} end
|
||||
table.insert(tcs, {
|
||||
id = tc.id,
|
||||
type = tc.type or "function",
|
||||
name = tc["function"].name,
|
||||
arguments = args
|
||||
})
|
||||
local fn = tc["function"]
|
||||
local name = tc.name
|
||||
local raw_args = tc.arguments
|
||||
if type(fn) == "table" then
|
||||
name = fn.name or name
|
||||
raw_args = fn.arguments or raw_args
|
||||
end
|
||||
local args = {}
|
||||
if type(raw_args) == "table" then
|
||||
args = raw_args
|
||||
elseif type(raw_args) == "string" and raw_args ~= "" then
|
||||
local args_ok, decoded = pcall(json.decode, raw_args)
|
||||
if args_ok and type(decoded) == "table" then
|
||||
args = decoded
|
||||
elseif args_ok then
|
||||
args = { value = decoded }
|
||||
else
|
||||
args = { raw = raw_args }
|
||||
end
|
||||
end
|
||||
if name ~= nil and name ~= "" then
|
||||
table.insert(tcs, {
|
||||
id = tc.id,
|
||||
type = tc.type or "function",
|
||||
name = name,
|
||||
arguments = args
|
||||
})
|
||||
end
|
||||
end
|
||||
unified.tool_calls = tcs
|
||||
end
|
||||
|
||||
@ -42,14 +42,34 @@ function adapter.transform_response(raw_body)
|
||||
if type(ch.message.tool_calls) == "table" then
|
||||
local tcs = {}
|
||||
for _, tc in ipairs(ch.message.tool_calls) do
|
||||
local args_ok, args = pcall(json.decode, tc["function"].arguments)
|
||||
if not args_ok then args = {} end
|
||||
table.insert(tcs, {
|
||||
id = tc.id,
|
||||
type = tc.type or "function",
|
||||
name = tc["function"].name,
|
||||
arguments = args
|
||||
})
|
||||
local fn = tc["function"]
|
||||
local name = tc.name
|
||||
local raw_args = tc.arguments
|
||||
if type(fn) == "table" then
|
||||
name = fn.name or name
|
||||
raw_args = fn.arguments or raw_args
|
||||
end
|
||||
local args = {}
|
||||
if type(raw_args) == "table" then
|
||||
args = raw_args
|
||||
elseif type(raw_args) == "string" and raw_args ~= "" then
|
||||
local args_ok, decoded = pcall(json.decode, raw_args)
|
||||
if args_ok and type(decoded) == "table" then
|
||||
args = decoded
|
||||
elseif args_ok then
|
||||
args = { value = decoded }
|
||||
else
|
||||
args = { raw = raw_args }
|
||||
end
|
||||
end
|
||||
if name ~= nil and name ~= "" then
|
||||
table.insert(tcs, {
|
||||
id = tc.id,
|
||||
type = tc.type or "function",
|
||||
name = name,
|
||||
arguments = args
|
||||
})
|
||||
end
|
||||
end
|
||||
unified.tool_calls = tcs
|
||||
end
|
||||
|
||||
@ -41,14 +41,34 @@ function adapter.transform_response(raw_body)
|
||||
if type(ch.message.tool_calls) == "table" then
|
||||
local tcs = {}
|
||||
for _, tc in ipairs(ch.message.tool_calls) do
|
||||
local args_ok, args = pcall(json.decode, tc["function"].arguments)
|
||||
if not args_ok then args = {} end
|
||||
table.insert(tcs, {
|
||||
id = tc.id,
|
||||
type = tc.type or "function",
|
||||
name = tc["function"].name,
|
||||
arguments = args
|
||||
})
|
||||
local fn = tc["function"]
|
||||
local name = tc.name
|
||||
local raw_args = tc.arguments
|
||||
if type(fn) == "table" then
|
||||
name = fn.name or name
|
||||
raw_args = fn.arguments or raw_args
|
||||
end
|
||||
local args = {}
|
||||
if type(raw_args) == "table" then
|
||||
args = raw_args
|
||||
elseif type(raw_args) == "string" and raw_args ~= "" then
|
||||
local args_ok, decoded = pcall(json.decode, raw_args)
|
||||
if args_ok and type(decoded) == "table" then
|
||||
args = decoded
|
||||
elseif args_ok then
|
||||
args = { value = decoded }
|
||||
else
|
||||
args = { raw = raw_args }
|
||||
end
|
||||
end
|
||||
if name ~= nil and name ~= "" then
|
||||
table.insert(tcs, {
|
||||
id = tc.id,
|
||||
type = tc.type or "function",
|
||||
name = name,
|
||||
arguments = args
|
||||
})
|
||||
end
|
||||
end
|
||||
unified.tool_calls = tcs
|
||||
end
|
||||
|
||||
103
internal/lua/adapters/kimicode.lua
Normal file
103
internal/lua/adapters/kimicode.lua
Normal file
@ -0,0 +1,103 @@
|
||||
local adapter = {}
|
||||
|
||||
adapter.name = "kimicode"
|
||||
adapter.version = "1.0.0"
|
||||
adapter.endpoint = "/v1/chat/completions"
|
||||
adapter.headers = {}
|
||||
|
||||
function adapter.transform_request(raw_body)
|
||||
local ok, req = pcall(json.decode, raw_body)
|
||||
if not ok then return raw_body end
|
||||
req.model = req.model or "kimi-k2"
|
||||
req.disable_thinking = nil
|
||||
req.extra_body = nil
|
||||
if req.messages then
|
||||
for _, msg in ipairs(req.messages) do
|
||||
msg.reasoning_content = nil
|
||||
end
|
||||
end
|
||||
return json.encode(req)
|
||||
end
|
||||
|
||||
function adapter.transform_response(raw_body)
|
||||
local ok, resp = pcall(json.decode, raw_body)
|
||||
if not ok or resp == nil then return raw_body end
|
||||
|
||||
local unified = {
|
||||
content = "",
|
||||
finish_reason = "",
|
||||
token_usage = { prompt = 0, completion = 0, total = 0 }
|
||||
}
|
||||
if type(resp.usage) == "table" then
|
||||
unified.token_usage.prompt = resp.usage.prompt_tokens or 0
|
||||
unified.token_usage.completion = resp.usage.completion_tokens or 0
|
||||
unified.token_usage.total = resp.usage.total_tokens or 0
|
||||
end
|
||||
if type(resp.choices) == "table" and #resp.choices > 0 then
|
||||
local ch = resp.choices[1]
|
||||
if type(ch.message) == "table" then
|
||||
unified.content = ch.message.content or ""
|
||||
if ch.message.reasoning_content then
|
||||
unified.reasoning_content = ch.message.reasoning_content
|
||||
end
|
||||
if type(ch.message.tool_calls) == "table" then
|
||||
local tcs = {}
|
||||
for _, tc in ipairs(ch.message.tool_calls) do
|
||||
local fn = tc["function"]
|
||||
local name = tc.name
|
||||
local raw_args = tc.arguments
|
||||
if type(fn) == "table" then
|
||||
name = fn.name or name
|
||||
raw_args = fn.arguments or raw_args
|
||||
end
|
||||
local args = {}
|
||||
if type(raw_args) == "table" then
|
||||
args = raw_args
|
||||
elseif type(raw_args) == "string" and raw_args ~= "" then
|
||||
local args_ok, decoded = pcall(json.decode, raw_args)
|
||||
if args_ok and type(decoded) == "table" then
|
||||
args = decoded
|
||||
elseif args_ok then
|
||||
args = { value = decoded }
|
||||
else
|
||||
args = { raw = raw_args }
|
||||
end
|
||||
end
|
||||
if name ~= nil and name ~= "" then
|
||||
table.insert(tcs, {
|
||||
id = tc.id,
|
||||
type = tc.type or "function",
|
||||
name = name,
|
||||
arguments = args
|
||||
})
|
||||
end
|
||||
end
|
||||
unified.tool_calls = tcs
|
||||
end
|
||||
end
|
||||
unified.finish_reason = ch.finish_reason or ""
|
||||
end
|
||||
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 not chunk.choices or #chunk.choices == 0 then return "" end
|
||||
local delta = chunk.choices[1].delta or {}
|
||||
local fr = chunk.choices[1].finish_reason
|
||||
|
||||
local unified = {
|
||||
content = delta.content or "",
|
||||
done = (fr ~= nil)
|
||||
}
|
||||
if delta.reasoning_content then
|
||||
unified.reasoning_content = delta.reasoning_content
|
||||
end
|
||||
if delta.tool_calls then
|
||||
unified.tool_calls = delta.tool_calls
|
||||
end
|
||||
return json.encode(unified)
|
||||
end
|
||||
|
||||
return adapter
|
||||
@ -41,14 +41,34 @@ function adapter.transform_response(raw_body)
|
||||
if type(ch.message.tool_calls) == "table" then
|
||||
local tcs = {}
|
||||
for _, tc in ipairs(ch.message.tool_calls) do
|
||||
local args_ok, args = pcall(json.decode, tc["function"].arguments)
|
||||
if not args_ok then args = {} end
|
||||
table.insert(tcs, {
|
||||
id = tc.id,
|
||||
type = tc.type or "function",
|
||||
name = tc["function"].name,
|
||||
arguments = args
|
||||
})
|
||||
local fn = tc["function"]
|
||||
local name = tc.name
|
||||
local raw_args = tc.arguments
|
||||
if type(fn) == "table" then
|
||||
name = fn.name or name
|
||||
raw_args = fn.arguments or raw_args
|
||||
end
|
||||
local args = {}
|
||||
if type(raw_args) == "table" then
|
||||
args = raw_args
|
||||
elseif type(raw_args) == "string" and raw_args ~= "" then
|
||||
local args_ok, decoded = pcall(json.decode, raw_args)
|
||||
if args_ok and type(decoded) == "table" then
|
||||
args = decoded
|
||||
elseif args_ok then
|
||||
args = { value = decoded }
|
||||
else
|
||||
args = { raw = raw_args }
|
||||
end
|
||||
end
|
||||
if name ~= nil and name ~= "" then
|
||||
table.insert(tcs, {
|
||||
id = tc.id,
|
||||
type = tc.type or "function",
|
||||
name = name,
|
||||
arguments = args
|
||||
})
|
||||
end
|
||||
end
|
||||
unified.tool_calls = tcs
|
||||
end
|
||||
|
||||
@ -45,14 +45,34 @@ function adapter.transform_response(raw_body)
|
||||
if type(ch.message.tool_calls) == "table" then
|
||||
local tcs = {}
|
||||
for _, tc in ipairs(ch.message.tool_calls) do
|
||||
local args_ok, args = pcall(json.decode, tc["function"].arguments)
|
||||
if not args_ok then args = {} end
|
||||
table.insert(tcs, {
|
||||
id = tc.id,
|
||||
type = tc.type or "function",
|
||||
name = tc["function"].name,
|
||||
arguments = args
|
||||
})
|
||||
local fn = tc["function"]
|
||||
local name = tc.name
|
||||
local raw_args = tc.arguments
|
||||
if type(fn) == "table" then
|
||||
name = fn.name or name
|
||||
raw_args = fn.arguments or raw_args
|
||||
end
|
||||
local args = {}
|
||||
if type(raw_args) == "table" then
|
||||
args = raw_args
|
||||
elseif type(raw_args) == "string" and raw_args ~= "" then
|
||||
local args_ok, decoded = pcall(json.decode, raw_args)
|
||||
if args_ok and type(decoded) == "table" then
|
||||
args = decoded
|
||||
elseif args_ok then
|
||||
args = { value = decoded }
|
||||
else
|
||||
args = { raw = raw_args }
|
||||
end
|
||||
end
|
||||
if name ~= nil and name ~= "" then
|
||||
table.insert(tcs, {
|
||||
id = tc.id,
|
||||
type = tc.type or "function",
|
||||
name = name,
|
||||
arguments = args
|
||||
})
|
||||
end
|
||||
end
|
||||
unified.tool_calls = tcs
|
||||
end
|
||||
@ -71,10 +91,17 @@ function adapter.transform_stream_chunk(raw_chunk)
|
||||
local delta = chunk.choices[1].delta or {}
|
||||
local fr = chunk.choices[1].finish_reason
|
||||
|
||||
return json.encode({
|
||||
local unified = {
|
||||
content = delta.content or "",
|
||||
done = (fr ~= nil)
|
||||
})
|
||||
}
|
||||
if delta.reasoning_content then
|
||||
unified.reasoning_content = delta.reasoning_content
|
||||
end
|
||||
if delta.tool_calls then
|
||||
unified.tool_calls = delta.tool_calls
|
||||
end
|
||||
return json.encode(unified)
|
||||
end
|
||||
|
||||
return adapter
|
||||
|
||||
Reference in New Issue
Block a user