mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-07 09:47:23 +00:00
按发布纪律回流。**注意这是内容对齐而非 merge**,理由与依据:
1. 纪律禁止 merge 回主干,因为 merge 会把发布分支的**版本号变更**带进 main。
本项目版本号**只由 `git describe --tags` 推导**(Makefile VERSION),
仓库里没有任何文件存放版本号 ⇒ 回流不存在版本污染风险。
2. 逐项核对确认 **main 是 release 的内容严格子集**:
- `main` 独有的**文件**:0 个;
- `internal/lua/plugins.go` / `internal/core/kernel_actions.go` 等内核文件
main 独有行数:0;
- `deploy.sh` 那 14 行只是 emoji 清理(release 刻意去掉了 emoji);
- `channels.lua` 那 333 行是**旧版内容**(旧 exports 表、旧模型名单)。
- main 独有的 9 个提交按 patch-id **全部已在 release 中等效存在**
(`git cherry` 逐条列出均为 `-`,即已合入)。
3. 故回流 = 把 release 的内容带到 main,等价于"只捡拾修复、不带版本号",
且不会丢任何 main 独有的修复。
本次带回 v2.0.12 的全部内容(37 个提交):
- 源串行 + 按模型节流(照 model-gate)
- 已失效模型存储 + 远端目录闸门
- 余额分档选号
- 模型能力元数据(models.dev,isFree 权威判定)
- **凭据续期修复**(此前恒报 ok:true 却一个请求都不发)
- 通用件 TTL 缓存 + 串行锁;account_test/account_adopt/account_delete 修正
- 内核级:出站授权持久化重启后不生效、`__llmsproxy_plugin_dir` ground truth
校验:`git diff release/v2.0.x` = 0 行;`go build -tags luajit ./...` 通过。
146 lines
6.2 KiB
Lua
146 lines
6.2 KiB
Lua
local adapter = {}
|
||
|
||
adapter.name = "openai"
|
||
adapter.version = "2.0.0"
|
||
adapter.endpoint = "/chat/completions"
|
||
adapter.headers = {}
|
||
|
||
-- Claude-behind-OpenAI upstreams (tabitoken, 扇贝, …) convert /chat/completions
|
||
-- to the Anthropic Messages API internally, so they inherit Anthropic's
|
||
-- tool id rule: ^[a-zA-Z0-9_-]{1,64}$, enforced by rejecting the WHOLE request
|
||
-- with "Invalid tool use format" / "tool_use.id: String should match pattern".
|
||
-- Plain OpenAI has no such rule, so an OpenAI-compatible model can mint an id
|
||
-- like "bash:0" (observed from moonshotai/kimi-k3). In a fan-out router that id
|
||
-- is replayed to every other source, so one such id kills every Claude slot at
|
||
-- once and an AUTO request falls through all tiers.
|
||
--
|
||
-- safe_tool_id is pure and deterministic, so a tool_calls entry and its
|
||
-- matching tool_call_id are rewritten identically within one request. A
|
||
-- rewritten id keeps an 8-hex digest of the ORIGINAL id, without which two
|
||
-- distinct ids could collapse into one ("a:b" and "a_b") and become an
|
||
-- unpaired/duplicate tool call. Already-legal ids are returned untouched, so
|
||
-- well-behaved traffic is byte-identical to before.
|
||
-- (anthropic.lua carries the same helper; Lua adapters have no shared prelude.)
|
||
local TOOL_ID_MAX = 64
|
||
|
||
local function safe_tool_id(id)
|
||
if type(id) ~= "string" or id == "" then return id end
|
||
local clean = string.gsub(id, "[^A-Za-z0-9_-]", "_")
|
||
if clean == id and #clean <= TOOL_ID_MAX then
|
||
return clean
|
||
end
|
||
local digest = string.sub(sha256_hex(id), 1, 8)
|
||
local keep = TOOL_ID_MAX - #digest - 1
|
||
if #clean > keep then clean = string.sub(clean, 1, keep) end
|
||
return clean .. "_" .. digest
|
||
end
|
||
|
||
-- OpenAI /chat/completions format (pass-through, strip provider-specific fields)
|
||
function adapter.transform_request(raw_body)
|
||
local ok, req = pcall(json.decode, raw_body)
|
||
if not ok then return raw_body end
|
||
-- The gateway's private control fields are GONE from the body (v2): the
|
||
-- neutral `thinking` field carries that intent and each adapter maps it in
|
||
-- its own protocol terms. These upstreams have no thinking switch at all,
|
||
-- so the field is simply dropped here — which is what the nil-ing below
|
||
-- used to do, except the field being dropped is no longer the kernel's
|
||
-- private one.
|
||
req.thinking = nil
|
||
req.extra_body = nil
|
||
if req.messages then
|
||
for _, msg in ipairs(req.messages) do
|
||
msg.reasoning_content = nil
|
||
if msg.tool_call_id ~= nil then
|
||
msg.tool_call_id = safe_tool_id(msg.tool_call_id)
|
||
end
|
||
if type(msg.tool_calls) == "table" then
|
||
for _, tc in ipairs(msg.tool_calls) do
|
||
if type(tc) == "table" and tc.id ~= nil then
|
||
tc.id = safe_tool_id(tc.id)
|
||
end
|
||
end
|
||
end
|
||
end
|
||
end
|
||
return json.encode(req)
|
||
end
|
||
|
||
function adapter.transform_response(raw_body)
|
||
-- 非流式 OpenAI 响应 → 统一信封。此前在 openai/groq/kimicode/mistral/github
|
||
-- 五个适配器里**逐字节相同**(各 2206B,diff 为空),已抽到共享前导。
|
||
return __prelude.openai_response(raw_body)
|
||
end
|
||
|
||
function adapter.transform_stream_chunk(raw_chunk)
|
||
local ok, chunk = pcall(json.decode, raw_chunk)
|
||
if not ok then return "" end
|
||
|
||
-- OpenAI-style streams may attach usage to a chunk with empty choices
|
||
-- (the final usage chunk). Keys must match Go's TokenUsage json tags
|
||
-- (prompt/completion/total); the gateway re-emits standard *_tokens.
|
||
local uses = nil
|
||
if type(chunk.usage) == "table" then
|
||
uses = {
|
||
prompt = chunk.usage.prompt_tokens or chunk.usage.prompt or 0,
|
||
completion = chunk.usage.completion_tokens or chunk.usage.completion or 0,
|
||
total = chunk.usage.total_tokens or chunk.usage.total or 0,
|
||
}
|
||
if type(chunk.usage.prompt_tokens_details) == "table" and chunk.usage.prompt_tokens_details.cached_tokens ~= nil then
|
||
uses.prompt_tokens_details = { cached_tokens = chunk.usage.prompt_tokens_details.cached_tokens }
|
||
elseif (chunk.usage.prompt_cache_hit_tokens or 0) > 0 then
|
||
uses.prompt_cache_hit_tokens = chunk.usage.prompt_cache_hit_tokens
|
||
uses.prompt_cache_miss_tokens = chunk.usage.prompt_cache_miss_tokens or 0
|
||
uses.prompt_tokens_details = { cached_tokens = chunk.usage.prompt_cache_hit_tokens }
|
||
end
|
||
end
|
||
|
||
if not chunk.choices or #chunk.choices == 0 then
|
||
if uses ~= nil then
|
||
-- usage-only chunk is not a content/finish signal; the gateway
|
||
-- emits its own terminal stop chunk and merges this usage.
|
||
return json.encode({ usage = uses, done = false })
|
||
end
|
||
return ""
|
||
end
|
||
local delta = chunk.choices[1].delta or {}
|
||
local fr = chunk.choices[1].finish_reason
|
||
|
||
local finish = (type(fr) == "string" and fr ~= "") and fr or nil
|
||
|
||
local unified = {
|
||
content = delta.content or "",
|
||
done = (finish ~= nil)
|
||
}
|
||
if finish then
|
||
unified.finish_reason = finish
|
||
end
|
||
if uses ~= nil then
|
||
unified.usage = uses
|
||
end
|
||
if delta.reasoning_content then
|
||
unified.reasoning_content = delta.reasoning_content
|
||
end
|
||
if delta.tool_calls then
|
||
-- Sanitize on the way OUT too: an id this upstream happily minted (it
|
||
-- does not validate them) becomes a landmine once the client replays
|
||
-- it to a Claude upstream. Only the first fragment of a streamed call
|
||
-- carries an id; later argument fragments have none and are untouched.
|
||
for _, tc in ipairs(delta.tool_calls) do
|
||
if type(tc) == "table" and tc.id ~= nil then
|
||
tc.id = safe_tool_id(tc.id)
|
||
end
|
||
end
|
||
unified.tool_calls = delta.tool_calls
|
||
end
|
||
return json.encode(unified)
|
||
end
|
||
|
||
-- 错误收敛:标准 OpenAI 信封 {error:{message,...}}
|
||
function adapter.transform_error(status, body)
|
||
-- OpenAI 风格错误体抽消息。此前在 deepseek/github/groq/kimicode/
|
||
-- openai/sensenova 六个适配器里逐字节相同(各 293B),已抽到共享前导。
|
||
return __prelude.openai_error(status, body)
|
||
end
|
||
|
||
return adapter
|