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 ./...` 通过。
128 lines
4.4 KiB
Go
128 lines
4.4 KiB
Go
package scheduler
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"llmsproxy/internal/types"
|
|
)
|
|
|
|
// TestResultIsEmptyMatchesTheReasoningOnlyResponse guards the production bug
|
|
// behind "model AUTO returned a completed response with no content".
|
|
//
|
|
// Production measurement: 2 of 20 AUTO requests returned zero content, both
|
|
// served by claude-opus-4-8. Direct upstream capture showed 28 chunks of
|
|
// `reasoning_content` and NO `content`, finish_reason=length — the token budget
|
|
// was consumed by thinking before any text was emitted. runTier accepted it
|
|
// because err == nil.
|
|
func TestResultIsEmptyMatchesTheReasoningOnlyResponse(t *testing.T) {
|
|
// Exactly what the upstream returned, as a decoded response.
|
|
onlyReasoning := &types.UnifiedResponse{
|
|
Model: "claude-opus-4-8",
|
|
ReasoningContent: "Alright, the user just said \"hi\". Simple greeting…",
|
|
FinishReason: "length",
|
|
TokenUsage: types.TokenUsage{Prompt: 14, Completion: 30, Total: 44},
|
|
}
|
|
if !resultIsEmpty(onlyReasoning) {
|
|
t.Error("a reasoning-only response with usage must count as empty; " +
|
|
"it is what the client sees as \"completed with no content\"")
|
|
}
|
|
|
|
// The same response WITH text is a normal answer.
|
|
if resultIsEmpty(&types.UnifiedResponse{Content: "Hi! ", ReasoningContent: "hmm"}) {
|
|
t.Error("a response with content is not empty")
|
|
}
|
|
// A tool-calling agent turn has no text and is perfectly valid.
|
|
if resultIsEmpty(&types.UnifiedResponse{
|
|
ToolCalls: []types.ToolCall{{Name: "read_file", Arguments: map[string]interface{}{"path": "x"}}},
|
|
}) {
|
|
t.Error("a tool-call-only response must NOT count as empty — agents " +
|
|
"legitimately produce tool calls with no text")
|
|
}
|
|
// An image slot returns no text by design.
|
|
if resultIsEmpty(&types.UnifiedResponse{
|
|
ImageData: []types.ImageData{{URL: "http://x/y.png"}},
|
|
}) {
|
|
t.Error("an image response must NOT count as empty")
|
|
}
|
|
// Whitespace-only content is as useless to a client as none at all.
|
|
if !resultIsEmpty(&types.UnifiedResponse{Content: " \n\t"}) {
|
|
t.Error("whitespace-only content must count as empty")
|
|
}
|
|
if resultIsEmpty(nil) {
|
|
t.Error("nil is not an empty response; it is an absent one")
|
|
}
|
|
}
|
|
|
|
// TestPeekStreamHoldsReasoningAndReportsEmpty is the streaming half: a channel
|
|
// of reasoning-only chunks must be reported as empty so chainDrive degrades.
|
|
func TestPeekStreamHoldsReasoningAndReportsEmpty(t *testing.T) {
|
|
in := make(chan types.UnifiedChunk, 8)
|
|
for i := 0; i < 5; i++ {
|
|
in <- types.UnifiedChunk{ReasoningContent: "thinking…"}
|
|
}
|
|
in <- types.UnifiedChunk{Done: true, FinishReason: "length"}
|
|
close(in)
|
|
|
|
_, peek := peekStream(in)
|
|
if peek() {
|
|
t.Error("a reasoning-only stream must be reported empty")
|
|
}
|
|
}
|
|
|
|
// TestPeekStreamForwardsContentAfterReasoning: the common case still works,
|
|
// and the reasoning preamble is not forwarded ahead of the content (holding it
|
|
// back is what keeps the degrade path available).
|
|
func TestPeekStreamForwardsContentAfterReasoning(t *testing.T) {
|
|
in := make(chan types.UnifiedChunk, 8)
|
|
in <- types.UnifiedChunk{ReasoningContent: "let me think"}
|
|
in <- types.UnifiedChunk{Content: "Hi"}
|
|
in <- types.UnifiedChunk{Content: "!"}
|
|
in <- types.UnifiedChunk{Done: true, FinishReason: "stop"}
|
|
close(in)
|
|
|
|
out, peek := peekStream(in)
|
|
if !peek() {
|
|
t.Fatal("a stream with content must be reported as having content")
|
|
}
|
|
var got []string
|
|
for ck := range out {
|
|
if ck.Content != "" {
|
|
got = append(got, ck.Content)
|
|
}
|
|
if strings.TrimSpace(ck.ReasoningContent) != "" {
|
|
t.Error("reasoning preamble must not be forwarded before content; " +
|
|
"that is what pins the client to a stream it cannot escape")
|
|
}
|
|
}
|
|
if strings.Join(got, "") != "Hi!" {
|
|
t.Errorf("forwarded content = %q, want %q", got, "Hi!")
|
|
}
|
|
}
|
|
|
|
// TestPeekStreamDoesNotDeadlockOnToolCalls: a tool-call delta is content for
|
|
// this purpose and must unblock peek immediately.
|
|
func TestPeekStreamDoesNotDeadlockOnToolCalls(t *testing.T) {
|
|
raw, _ := json.Marshal([]types.ToolCall{{Name: "ls"}})
|
|
in := make(chan types.UnifiedChunk, 4)
|
|
in <- types.UnifiedChunk{ToolCalls: raw}
|
|
in <- types.UnifiedChunk{Done: true, FinishReason: "tool_calls"}
|
|
close(in)
|
|
|
|
_, peek := peekStream(in)
|
|
done := make(chan bool, 1)
|
|
go func() { done <- peek() }()
|
|
select {
|
|
case ok := <-done:
|
|
if !ok {
|
|
t.Error("a tool-call delta must count as content")
|
|
}
|
|
case <-time.After(2 * time.Second):
|
|
t.Fatal("peek blocked on a tool-call-only stream")
|
|
}
|
|
_ = context.Background()
|
|
}
|