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 字节级未漂移。
116 lines
3.3 KiB
Go
116 lines
3.3 KiB
Go
package lua
|
|
|
|
import (
|
|
"encoding/json"
|
|
"os"
|
|
"sort"
|
|
)
|
|
|
|
// Access overrides are OPERATOR policy, not plugin data. They live in their own
|
|
// file rather than in each plugin's state because:
|
|
//
|
|
// - they describe the deployment, not the plugin, so a plugin upgrade that
|
|
// replaces its .state.json must not silently widen access again;
|
|
// - they must survive a restart. An in-memory map made "restrict billing to
|
|
// admin" look like it worked right up to the next deploy, at which point the
|
|
// restriction evaporated with nothing in the logs to say why;
|
|
// - the plugin_dir is the one place an operator already looks when asking
|
|
// "what does this plugin actually get to see", so the answer lives beside it.
|
|
//
|
|
// The file is a flat map of "name" (whole plugin) or "name#path" (one endpoint)
|
|
// to an access spec, which is the same shape the in-memory store uses, so load
|
|
// and save cannot disagree about what a key means.
|
|
|
|
const accessFileName = ".access.json"
|
|
|
|
func (ps *Plugins) accessFile() string {
|
|
if ps.dir == "" {
|
|
return ""
|
|
}
|
|
return ps.dir + string(os.PathSeparator) + accessFileName
|
|
}
|
|
|
|
// LoadAccessOverrides reads the persisted overrides into memory. A missing file
|
|
// is not an error: no operator has restricted anything yet, which is the
|
|
// default state of a fresh install.
|
|
//
|
|
// A corrupt file is also not fatal. Losing a restriction is bad, but refusing to
|
|
// start the gateway is worse, and an empty map plus a logged error leaves the
|
|
// operator with something to fix.
|
|
func (ps *Plugins) LoadAccessOverrides() error {
|
|
path := ps.accessFile()
|
|
if path == "" {
|
|
return nil
|
|
}
|
|
b, err := os.ReadFile(path)
|
|
if os.IsNotExist(err) {
|
|
return nil
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
m := map[string]string{}
|
|
if err := json.Unmarshal(b, &m); err != nil {
|
|
return err
|
|
}
|
|
ps.mu.Lock()
|
|
defer ps.mu.Unlock()
|
|
if ps.visibility == nil {
|
|
ps.visibility = visibilityOverrides{}
|
|
}
|
|
for k, v := range m {
|
|
ps.visibility[k] = v
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// saveAccessOverridesLocked flushes the whole override map. It is called on
|
|
// every change, and unlike plugin state the map is tiny and changes only when an
|
|
// operator clicks Save — so a synchronous write costs nothing that matters, and
|
|
// it means the change is durable the moment the API returns 200.
|
|
func (ps *Plugins) saveAccessOverridesLocked() {
|
|
path := ps.accessFile()
|
|
if path == "" {
|
|
return
|
|
}
|
|
out := make(map[string]string, len(ps.visibility))
|
|
for k, v := range ps.visibility {
|
|
if v != "" {
|
|
out[k] = v
|
|
}
|
|
}
|
|
if len(out) == 0 {
|
|
// Leave no empty file behind: its absence is the honest encoding of
|
|
// "nothing is overridden".
|
|
_ = os.Remove(path)
|
|
return
|
|
}
|
|
writeJSONAtomic(path, out)
|
|
}
|
|
|
|
// AccessOverrides returns a copy of every override in force, for the UI.
|
|
func (ps *Plugins) accessOverridesSnapshot() map[string]string {
|
|
ps.mu.RLock()
|
|
defer ps.mu.RUnlock()
|
|
if len(ps.visibility) == 0 {
|
|
return nil
|
|
}
|
|
out := make(map[string]string, len(ps.visibility))
|
|
for k, v := range ps.visibility {
|
|
out[k] = v
|
|
}
|
|
return out
|
|
}
|
|
|
|
// sortedOverrideKeys exists only so a debug dump is stable; map iteration order
|
|
// would otherwise make two identical states look different.
|
|
func (ps *Plugins) sortedOverrideKeys() []string {
|
|
m := ps.accessOverridesSnapshot()
|
|
keys := make([]string, 0, len(m))
|
|
for k := range m {
|
|
keys = append(keys, k)
|
|
}
|
|
sort.Strings(keys)
|
|
return keys
|
|
}
|