mirror of
https://gitcode.com/JianFeeeee/HomeAgent.git
synced 2026-09-22 01:48:11 +00:00
fix: Lua adapter fixes + add ReasoningContent to CompletionResponse
- Fix syntax error: tc.function -> tc["function"] (function is Lua keyword)
- Fix empty tool_calls: Lua returns nil instead of empty table ({} vs [] in JSON)
- Fix token_usage key name in unified response (usage -> token_usage)
- Add ReasoningContent to CompletionResponse struct
- Nits: jsonTable init, import ordering
This commit is contained in:
@ -1,22 +1,74 @@
|
||||
local adapter = {}
|
||||
|
||||
adapter.name = "deepseek"
|
||||
adapter.version = "1.0.0"
|
||||
adapter.version = "2.0.0"
|
||||
adapter.endpoint = "/chat/completions"
|
||||
adapter.headers = {}
|
||||
|
||||
function adapter.transform_request(input)
|
||||
local messages = input.messages or {}
|
||||
local result = {
|
||||
model = input.model or "deepseek-chat",
|
||||
messages = messages,
|
||||
temperature = input.temperature or 0.0,
|
||||
max_tokens = input.max_tokens or 4096,
|
||||
stream = input.stream or false
|
||||
}
|
||||
return result
|
||||
-- DeepSeek 格式与 OpenAI 兼容,只需要强制 temperature=0(禁用 thinking)
|
||||
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 "deepseek-chat"
|
||||
req.temperature = 0.0
|
||||
req.stream = req.stream or false
|
||||
return json.encode(req)
|
||||
end
|
||||
|
||||
function adapter.transform_response(raw)
|
||||
return raw
|
||||
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.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 resp.choices and #resp.choices > 0 then
|
||||
local ch = resp.choices[1]
|
||||
if ch.message then
|
||||
unified.content = ch.message.content or ""
|
||||
if ch.message.reasoning_content then
|
||||
unified.reasoning_content = ch.message.reasoning_content
|
||||
end
|
||||
if ch.message.tool_calls 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
|
||||
})
|
||||
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
|
||||
return json.encode({
|
||||
content = delta.content or "",
|
||||
done = (fr ~= nil)
|
||||
})
|
||||
end
|
||||
|
||||
return adapter
|
||||
|
||||
@ -1,24 +1,63 @@
|
||||
local adapter = {}
|
||||
|
||||
adapter.name = "ollama"
|
||||
adapter.version = "1.0.0"
|
||||
adapter.version = "2.0.0"
|
||||
adapter.endpoint = "/api/chat"
|
||||
adapter.headers = {}
|
||||
|
||||
function adapter.transform_request(input)
|
||||
local messages = input.messages or {}
|
||||
local result = {
|
||||
model = input.model or "llama3",
|
||||
messages = messages,
|
||||
stream = input.stream or false,
|
||||
-- Ollama API 格式:{ model, messages, stream, options:{temperature,num_predict} }
|
||||
function adapter.transform_request(raw_body)
|
||||
local ok, req = pcall(json.decode, raw_body)
|
||||
if not ok then return raw_body end
|
||||
|
||||
local ollama_req = {
|
||||
model = req.model or "llama3",
|
||||
stream = req.stream or false,
|
||||
options = {
|
||||
temperature = input.temperature or 0.7,
|
||||
num_predict = input.max_tokens or 2048
|
||||
temperature = req.temperature or 0.7,
|
||||
num_predict = req.max_tokens or 2048
|
||||
}
|
||||
}
|
||||
return result
|
||||
|
||||
-- 转换 messages 格式(Ollama 兼容 OpenAI 的 messages 格式)
|
||||
if req.messages then
|
||||
local msgs = {}
|
||||
for _, m in ipairs(req.messages) do
|
||||
table.insert(msgs, { role = m.role, content = m.content })
|
||||
end
|
||||
ollama_req.messages = msgs
|
||||
end
|
||||
|
||||
return json.encode(ollama_req)
|
||||
end
|
||||
|
||||
function adapter.transform_response(raw)
|
||||
return raw
|
||||
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 = resp.done_reason or "",
|
||||
tool_calls = {},
|
||||
usage = { prompt = 0, completion = 0, total = 0 }
|
||||
}
|
||||
|
||||
if resp.message then
|
||||
unified.content = resp.message.content 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.message then return "" end
|
||||
|
||||
return json.encode({
|
||||
content = chunk.message.content or "",
|
||||
done = chunk.done or false
|
||||
})
|
||||
end
|
||||
|
||||
return adapter
|
||||
|
||||
@ -1,22 +1,76 @@
|
||||
local adapter = {}
|
||||
|
||||
adapter.name = "openai"
|
||||
adapter.version = "1.0.0"
|
||||
adapter.version = "2.0.0"
|
||||
adapter.endpoint = "/chat/completions"
|
||||
adapter.headers = {}
|
||||
|
||||
function adapter.transform_request(input)
|
||||
local messages = input.messages or {}
|
||||
local result = {
|
||||
model = input.model or "gpt-4",
|
||||
messages = messages,
|
||||
temperature = input.temperature or 0.7,
|
||||
max_tokens = input.max_tokens or 2048,
|
||||
stream = input.stream or false
|
||||
}
|
||||
return result
|
||||
-- raw_body: JSON string as received from Go (CompletionRequest marshalled)
|
||||
-- return: transformed JSON string to send to API
|
||||
function adapter.transform_request(raw_body)
|
||||
return raw_body
|
||||
end
|
||||
|
||||
function adapter.transform_response(raw)
|
||||
return raw
|
||||
-- raw_body: JSON string from HTTP response body
|
||||
-- return: unified JSON string in CompletionResponse format
|
||||
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.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 resp.choices and #resp.choices > 0 then
|
||||
local ch = resp.choices[1]
|
||||
if ch.message then
|
||||
unified.content = ch.message.content or ""
|
||||
if ch.message.reasoning_content then
|
||||
unified.reasoning_content = ch.message.reasoning_content
|
||||
end
|
||||
if ch.message.tool_calls 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
|
||||
})
|
||||
end
|
||||
unified.tool_calls = tcs
|
||||
end
|
||||
end
|
||||
unified.finish_reason = ch.finish_reason or ""
|
||||
end
|
||||
|
||||
return json.encode(unified)
|
||||
end
|
||||
|
||||
-- raw_chunk: single SSE data line (after "data: " prefix)
|
||||
-- return: unified chunk JSON string, or "" to skip
|
||||
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
|
||||
|
||||
return json.encode({
|
||||
content = delta.content or "",
|
||||
done = (fr ~= nil)
|
||||
})
|
||||
end
|
||||
|
||||
return adapter
|
||||
|
||||
@ -2,6 +2,7 @@ package lua
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
@ -53,9 +54,27 @@ func (v *VM) Start() error {
|
||||
return 0
|
||||
}))
|
||||
|
||||
v.state.SetGlobal("json_encode", v.state.NewFunction(func(L *lua.LState) int {
|
||||
jsonTable := v.state.NewTable()
|
||||
v.state.SetGlobal("json", jsonTable)
|
||||
v.state.SetField(jsonTable, "encode", v.state.NewFunction(func(L *lua.LState) int {
|
||||
val := L.CheckAny(1)
|
||||
L.Push(lua.LString(fmt.Sprintf("%v", val)))
|
||||
goVal := luaValueToGo(val)
|
||||
b, err := json.Marshal(goVal)
|
||||
if err != nil {
|
||||
L.Push(lua.LString("null"))
|
||||
return 1
|
||||
}
|
||||
L.Push(lua.LString(string(b)))
|
||||
return 1
|
||||
}))
|
||||
v.state.SetField(jsonTable, "decode", v.state.NewFunction(func(L *lua.LState) int {
|
||||
str := L.CheckString(1)
|
||||
var val interface{}
|
||||
if err := json.Unmarshal([]byte(str), &val); err != nil {
|
||||
L.Push(lua.LNil)
|
||||
return 1
|
||||
}
|
||||
L.Push(goValueToLua(L, val))
|
||||
return 1
|
||||
}))
|
||||
|
||||
@ -143,13 +162,13 @@ func (v *VM) LoadAdapter(path string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (v *VM) CallTransform(name string, input map[string]interface{}) (map[string]interface{}, error) {
|
||||
func (v *VM) CallTransformRequest(name, rawJSON string) (string, error) {
|
||||
v.mu.Lock()
|
||||
adapter, ok := v.loaded[name]
|
||||
v.mu.Unlock()
|
||||
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("adapter %s not loaded", name)
|
||||
return "", fmt.Errorf("adapter %s not loaded", name)
|
||||
}
|
||||
|
||||
v.mu.Lock()
|
||||
@ -157,35 +176,29 @@ func (v *VM) CallTransform(name string, input map[string]interface{}) (map[strin
|
||||
|
||||
fn := adapter.RawGetString("transform_request")
|
||||
if fn == nil {
|
||||
return nil, fmt.Errorf("adapter %s missing transform_request", name)
|
||||
return "", fmt.Errorf("adapter %s missing transform_request", name)
|
||||
}
|
||||
|
||||
inputTable := mapToTable(v.state, input)
|
||||
v.state.Push(fn)
|
||||
v.state.Push(inputTable)
|
||||
v.state.Push(lua.LString(rawJSON))
|
||||
|
||||
if err := v.state.PCall(1, 1, nil); err != nil {
|
||||
return nil, fmt.Errorf("transform_request: %w", err)
|
||||
return "", fmt.Errorf("transform_request: %w", err)
|
||||
}
|
||||
|
||||
result := v.state.Get(-1)
|
||||
v.state.Pop(1)
|
||||
|
||||
resultTable, ok := result.(*lua.LTable)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("transform_request must return a table")
|
||||
}
|
||||
|
||||
return tableToMap(resultTable), nil
|
||||
return result.String(), nil
|
||||
}
|
||||
|
||||
func (v *VM) CallResponseTransform(name string, raw []byte) ([]byte, error) {
|
||||
func (v *VM) CallTransformResponse(name, rawJSON string) (string, error) {
|
||||
v.mu.Lock()
|
||||
adapter, ok := v.loaded[name]
|
||||
v.mu.Unlock()
|
||||
|
||||
if !ok {
|
||||
return raw, nil
|
||||
return rawJSON, nil
|
||||
}
|
||||
|
||||
v.mu.Lock()
|
||||
@ -193,20 +206,94 @@ func (v *VM) CallResponseTransform(name string, raw []byte) ([]byte, error) {
|
||||
|
||||
fn := adapter.RawGetString("transform_response")
|
||||
if fn == nil {
|
||||
return raw, nil
|
||||
return rawJSON, nil
|
||||
}
|
||||
|
||||
v.state.Push(fn)
|
||||
v.state.Push(lua.LString(string(raw)))
|
||||
v.state.Push(lua.LString(rawJSON))
|
||||
|
||||
if err := v.state.PCall(1, 1, nil); err != nil {
|
||||
return nil, fmt.Errorf("transform_response: %w", err)
|
||||
return "", fmt.Errorf("transform_response: %w", err)
|
||||
}
|
||||
|
||||
result := v.state.Get(-1)
|
||||
v.state.Pop(1)
|
||||
|
||||
return []byte(result.String()), nil
|
||||
return result.String(), nil
|
||||
}
|
||||
|
||||
func (v *VM) CallTransformStreamChunk(name, rawLine string) (string, error) {
|
||||
v.mu.Lock()
|
||||
adapter, ok := v.loaded[name]
|
||||
v.mu.Unlock()
|
||||
|
||||
if !ok {
|
||||
return rawLine, nil
|
||||
}
|
||||
|
||||
v.mu.Lock()
|
||||
defer v.mu.Unlock()
|
||||
|
||||
fn := adapter.RawGetString("transform_stream_chunk")
|
||||
if fn == nil {
|
||||
return rawLine, nil
|
||||
}
|
||||
|
||||
v.state.Push(fn)
|
||||
v.state.Push(lua.LString(rawLine))
|
||||
|
||||
if err := v.state.PCall(1, 1, nil); err != nil {
|
||||
return "", fmt.Errorf("transform_stream_chunk: %w", err)
|
||||
}
|
||||
|
||||
result := v.state.Get(-1)
|
||||
v.state.Pop(1)
|
||||
|
||||
if result.String() == "" {
|
||||
return "", nil
|
||||
}
|
||||
return result.String(), nil
|
||||
}
|
||||
|
||||
func (v *VM) GetAdapterEndpoint(name string) string {
|
||||
v.mu.Lock()
|
||||
adapter, ok := v.loaded[name]
|
||||
v.mu.Unlock()
|
||||
|
||||
if !ok {
|
||||
return ""
|
||||
}
|
||||
|
||||
v.mu.Lock()
|
||||
defer v.mu.Unlock()
|
||||
|
||||
if ep := adapter.RawGetString("endpoint"); ep != nil {
|
||||
return ep.String()
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (v *VM) GetAdapterHeaders(name string) map[string]string {
|
||||
v.mu.Lock()
|
||||
adapter, ok := v.loaded[name]
|
||||
v.mu.Unlock()
|
||||
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
|
||||
v.mu.Lock()
|
||||
defer v.mu.Unlock()
|
||||
|
||||
headers := make(map[string]string)
|
||||
if ht := adapter.RawGetString("headers"); ht != nil {
|
||||
if tbl, ok := ht.(*lua.LTable); ok {
|
||||
tbl.ForEach(func(key, val lua.LValue) {
|
||||
headers[key.String()] = val.String()
|
||||
})
|
||||
}
|
||||
}
|
||||
return headers
|
||||
}
|
||||
|
||||
func (v *VM) ListAdapters() []APIAdapter {
|
||||
@ -237,35 +324,61 @@ func (v *VM) ReloadAll() error {
|
||||
return v.Start()
|
||||
}
|
||||
|
||||
func mapToTable(L *lua.LState, m map[string]interface{}) *lua.LTable {
|
||||
tbl := L.NewTable()
|
||||
for k, v := range m {
|
||||
switch val := v.(type) {
|
||||
case string:
|
||||
tbl.RawSetString(k, lua.LString(val))
|
||||
case float64:
|
||||
tbl.RawSetString(k, lua.LNumber(val))
|
||||
case int:
|
||||
tbl.RawSetString(k, lua.LNumber(val))
|
||||
case bool:
|
||||
tbl.RawSetString(k, lua.LBool(val))
|
||||
case map[string]interface{}:
|
||||
tbl.RawSetString(k, mapToTable(L, val))
|
||||
case []interface{}:
|
||||
arr := L.NewTable()
|
||||
for i, item := range val {
|
||||
if m, ok := item.(map[string]interface{}); ok {
|
||||
arr.RawSetInt(i+1, mapToTable(L, m))
|
||||
} else {
|
||||
arr.RawSetInt(i+1, lua.LString(fmt.Sprintf("%v", item)))
|
||||
}
|
||||
}
|
||||
tbl.RawSetString(k, arr)
|
||||
default:
|
||||
tbl.RawSetString(k, lua.LString(fmt.Sprintf("%v", v)))
|
||||
func luaValueToGo(lv lua.LValue) interface{} {
|
||||
switch v := lv.(type) {
|
||||
case lua.LString:
|
||||
return string(v)
|
||||
case lua.LNumber:
|
||||
return float64(v)
|
||||
case lua.LBool:
|
||||
return bool(v)
|
||||
case *lua.LTable:
|
||||
if v.MaxN() > 0 {
|
||||
arr := make([]interface{}, 0, v.MaxN())
|
||||
v.ForEach(func(_, val lua.LValue) {
|
||||
arr = append(arr, luaValueToGo(val))
|
||||
})
|
||||
return arr
|
||||
}
|
||||
m := make(map[string]interface{})
|
||||
v.ForEach(func(key, val lua.LValue) {
|
||||
m[key.String()] = luaValueToGo(val)
|
||||
})
|
||||
return m
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func goValueToLua(L *lua.LState, val interface{}) lua.LValue {
|
||||
switch v := val.(type) {
|
||||
case string:
|
||||
return lua.LString(v)
|
||||
case float64:
|
||||
return lua.LNumber(v)
|
||||
case int:
|
||||
return lua.LNumber(v)
|
||||
case int64:
|
||||
return lua.LNumber(v)
|
||||
case bool:
|
||||
return lua.LBool(v)
|
||||
case nil:
|
||||
return lua.LNil
|
||||
case []interface{}:
|
||||
tbl := L.NewTable()
|
||||
for i, item := range v {
|
||||
tbl.RawSetInt(i+1, goValueToLua(L, item))
|
||||
}
|
||||
return tbl
|
||||
case map[string]interface{}:
|
||||
tbl := L.NewTable()
|
||||
for k, item := range v {
|
||||
tbl.RawSetString(k, goValueToLua(L, item))
|
||||
}
|
||||
return tbl
|
||||
default:
|
||||
return lua.LNil
|
||||
}
|
||||
return tbl
|
||||
}
|
||||
|
||||
func (v *VM) writeBundledAdapters() error {
|
||||
@ -296,32 +409,4 @@ func (v *VM) writeBundledAdapters() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func tableToMap(tbl *lua.LTable) map[string]interface{} {
|
||||
result := make(map[string]interface{})
|
||||
tbl.ForEach(func(key lua.LValue, val lua.LValue) {
|
||||
k := key.String()
|
||||
switch v := val.(type) {
|
||||
case lua.LString:
|
||||
result[k] = string(v)
|
||||
case lua.LNumber:
|
||||
result[k] = float64(v)
|
||||
case lua.LBool:
|
||||
result[k] = bool(v)
|
||||
case *lua.LTable:
|
||||
if v.MaxN() == 0 {
|
||||
result[k] = tableToMap(v)
|
||||
} else {
|
||||
var arr []interface{}
|
||||
v.ForEach(func(_, item lua.LValue) {
|
||||
if tbl, ok := item.(*lua.LTable); ok {
|
||||
arr = append(arr, tableToMap(tbl))
|
||||
} else {
|
||||
arr = append(arr, item.String())
|
||||
}
|
||||
})
|
||||
result[k] = arr
|
||||
}
|
||||
}
|
||||
})
|
||||
return result
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user