mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-07 09:47:23 +00:00
产品名早已是 ModelRouter,但仓库标识符仍沿用旧名。这次统一,读写两侧都做兼容, 已部署的机器不会因为顺序问题立刻失效。 - go module `llmsproxy` → `modelrouter`;全仓 import 与 `cmd/modelrouter` 同步。 - `Makefile BINARY=modelrouter`;发行包名、systemd unit、/usr/share 资源、 `/usr/local/bin` 目标全部改为 modelrouter。 - 默认配置目录 `/etc/llmsproxy` → `/etc/modelrouter`。**读取侧回退**:插件与 `storeDir` 仍会检查旧路径,所以"先换二进制、后改 unit"不会立即失效。 - 环境变量 `LLMSPROXY_*`(PLUGIN_DIR / XDISPLAY_BASE / ARCH / LIVE_ZEN / BUILD_DIR)改为 `MODELROUTER_*`;`LLMS_PROXY_MASTER_KEY` → `MODELROUTER_MASTER_KEY`。旧名在读取侧继续接受。 - 桌面端内嵌核心 `bin/llmsproxy` → `bin/modelrouter`,并保留旧文件名回退, 避免升级到一半的 profile 被判成"core binary missing"。 - 新增 `packaging/migrate-to-modelrouter.sh`:**默认 dry-run**,复制而非移动、 旧目录永不删除、支持 `--rollback`;随 release tar 分发并由 core-dist 校验。 - `deploy.sh` 增加改名保护:发现旧 `/etc/llmsproxy` 而新配置不存在时**中止**, 否则会部署出一个"能启动但没有 key、没有源"的空实例。 - 临时目录前缀 `/tmp/llmsproxy-*` → `/tmp/modelrouter-*`;清理逻辑同时回收两代。 兼容别名(`__llmsproxy_*` 全局、`llmsproxy` SDK 别名、旧路径/旧 env)刻意保留, 它们是升级路径而非遗留;docs/plugins.md 已标注为废弃。 本提交未包含:`adapters/opencodezen.lua`、`adapter_opencodezen_test.go`、 `adapter_opencodezen_live_test.go`(OpenCode UA/免费池的既有改动,另批提交)。
128 lines
4.4 KiB
Go
128 lines
4.4 KiB
Go
package scheduler
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"modelrouter/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()
|
|
}
|