mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-07 09:47:23 +00:00
Phase 2 收尾(入向)。ChatRequest 从"客户端发什么就是什么"改为
UnifiedRequest(最大集合)的别名,内核真正用上了那个超集类型。
改掉的具体缺陷:
1. 私有字段泄漏归零(v1 的核心问题)
v1 的 disable_thinking 是内核私有开关,却被序列化进交给适配器的 body,
迫使 10 个适配器各自写 req.disable_thinking = nil 来清理。
现在它是中立的 thinking 字段({enabled, budget_tokens}),客户端与
适配器都认这个词:
- gateway/chat.go:thinkingFromClient() 把 disable_thinking 翻译成
thinking.enabled=false;冲突时中立字段优先(它能带预算,布尔不能)
- deepseek.lua:thinking.enabled=false → extra_body.thinking.type=disabled
- anthropic.lua:thinking.enabled=true + budget → 原生 {type,budget_tokens}
(enabled=false 时不传该字段——Anthropic 没有 type=disabled 这个写法)
- 其余 7 个适配器:把"清理内核私有字段"改成"清理中立字段"
2. Tools/ToolChoice 改 json.RawMessage
原为 []interface{}(OpenAI 原始形状 = 内核在假设某个协议)。
内核从不解释工具 schema——它原样交给适配器,所以原始形状不损失任何
内核侧统一性。ToolDef 结构化类型保留在包内供新适配器选用。
3. 删除 MarshalJSON 后门
v1 手工 splice ExtraBody 进 OpenAI 形状的 body;现在 ExtraBody 是
UnifiedRequest 上一个正正经经声明的字段。
渐进迁移:ChatRequest 保留为别名(不是新类型),49 处引用零改动编译,
语义变更不被机械改名淹没。
测试:新增 thinking_test.go(翻译链 4 例 + 泄漏回归 + tools 透传);
vm_test.go 两处迁移到中立语义。golden 字节级未漂移。
123 lines
3.2 KiB
Go
123 lines
3.2 KiB
Go
package lua
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
golua "github.com/aarzilli/golua/lua"
|
|
)
|
|
|
|
// httpArgIdx is the stack slot holding the caller's table. Verified against
|
|
// golua: a PushGoClosure function is invoked with its arguments already on top
|
|
// and nothing of itself below them.
|
|
const httpArgIdx = 1
|
|
|
|
// readHTTPRequestSpec decodes the Lua argument table:
|
|
//
|
|
// __llmsproxy_http({
|
|
// url = "https://host/path",
|
|
// method = "GET", -- optional, default GET
|
|
// headers = { ["X-A"] = "1" }, -- optional
|
|
// body = "...", -- optional
|
|
// timeout_ms = 8000, -- optional, clamped to 60s
|
|
// })
|
|
//
|
|
// The table is at index 1: measured, not assumed. A Go closure registered with
|
|
// PushGoClosure is NOT on the stack when it runs — GetTop() is 1 and slot 1 is
|
|
// the caller's table (type LUA_TTABLE). An earlier version assumed the closure
|
|
// occupied slot 1 and read from slot 2, which then reported "expected a table
|
|
// argument" for a perfectly good call.
|
|
//
|
|
// luaTableToGoValue already turns the table into a map/slice, so the whole
|
|
// argument is decoded in one pass instead of walking the table field by field.
|
|
func readHTTPRequestSpec(L *golua.State) (httpRequestSpec, error) {
|
|
var spec httpRequestSpec
|
|
if L.GetTop() < httpArgIdx {
|
|
return spec, fmt.Errorf("__llmsproxy_http: expected a table argument")
|
|
}
|
|
if L.Type(httpArgIdx) != golua.LUA_TTABLE {
|
|
return spec, fmt.Errorf("__llmsproxy_http: expected a table, got %s",
|
|
normalizeString(L, httpArgIdx))
|
|
}
|
|
arg, ok := luaTableToGoValue(L, httpArgIdx).(map[string]interface{})
|
|
if !ok {
|
|
return spec, fmt.Errorf("__llmsproxy_http: argument must be a keyed table")
|
|
}
|
|
for k, v := range arg {
|
|
switch strings.ToLower(k) {
|
|
case "url", "uri", "endpoint":
|
|
spec.URL = asString(v)
|
|
case "method", "verb":
|
|
spec.Method = asString(v)
|
|
case "body", "data", "payload":
|
|
spec.Body = asString(v)
|
|
case "headers", "header":
|
|
if m, ok := v.(map[string]interface{}); ok {
|
|
spec.Headers = make(map[string]string, len(m))
|
|
for hk, hv := range m {
|
|
spec.Headers[hk] = asString(hv)
|
|
}
|
|
}
|
|
case "timeout_ms", "timeoutms":
|
|
if n, ok := asFloat(v); ok {
|
|
spec.Timeout = time.Duration(n) * time.Millisecond
|
|
}
|
|
}
|
|
}
|
|
if spec.URL == "" {
|
|
return spec, fmt.Errorf("__llmsproxy_http: missing url")
|
|
}
|
|
return spec, nil
|
|
}
|
|
|
|
// pushHTTPResponse converts the result into two Lua values: a table
|
|
// {status, headers, body} and nil. The caller pushes the error slot itself.
|
|
func pushHTTPResponse(L *golua.State, r *httpResult) {
|
|
L.NewTable()
|
|
|
|
L.PushString("status")
|
|
L.PushNumber(float64(r.Status))
|
|
L.SetTable(-3)
|
|
|
|
L.PushString("headers")
|
|
pushStringMap(L, r.Headers)
|
|
L.SetTable(-3)
|
|
|
|
L.PushString("body")
|
|
L.PushString(r.Body)
|
|
L.SetTable(-3)
|
|
}
|
|
|
|
func pushStringMap(L *golua.State, m map[string]string) {
|
|
L.NewTable()
|
|
for k, v := range m {
|
|
L.PushString(v)
|
|
L.SetField(-2, k)
|
|
}
|
|
}
|
|
|
|
func asString(v interface{}) string {
|
|
switch t := v.(type) {
|
|
case string:
|
|
return t
|
|
case nil:
|
|
return ""
|
|
default:
|
|
return fmt.Sprintf("%v", t)
|
|
}
|
|
}
|
|
|
|
func asFloat(v interface{}) (float64, bool) {
|
|
switch t := v.(type) {
|
|
case float64:
|
|
return t, true
|
|
case int:
|
|
return float64(t), true
|
|
case int64:
|
|
return float64(t), true
|
|
default:
|
|
return 0, false
|
|
}
|
|
}
|