mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-07 09:47:23 +00:00
688dce88d1
产品名早已是 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/免费池的既有改动，另批提交）。
63 lines
2.3 KiB
Go
63 lines
2.3 KiB
Go
package gateway
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"modelrouter/internal/types"
|
|
)
|
|
|
|
// TestMergeUsageKeepsZeroCacheDetails locks the streaming counterpart of the
|
|
// "distinguish missed from not reported" contract: a usage chunk that reports
|
|
// prompt_tokens_details with 0 cached tokens must survive the merge, otherwise
|
|
// streaming rows lose cache_reported and the UI shows "—" instead of 0%.
|
|
func TestMergeUsageKeepsZeroCacheDetails(t *testing.T) {
|
|
t.Run("zero-hit details survive merge", func(t *testing.T) {
|
|
prev := &types.TokenUsage{Prompt: 10, Completion: 1, Total: 11}
|
|
cur := &types.TokenUsage{
|
|
Prompt: 10, Completion: 5, Total: 15,
|
|
PromptTokensDetails: &types.PromptTokensDetails{CachedTokens: 0},
|
|
}
|
|
got := mergeUsage(prev, cur)
|
|
if got.PromptTokensDetails == nil {
|
|
t.Fatal("zero-hit prompt_tokens_details was dropped by mergeUsage")
|
|
}
|
|
if got.PromptTokensDetails.CachedTokens != 0 {
|
|
t.Fatalf("cached_tokens = %d, want 0", got.PromptTokensDetails.CachedTokens)
|
|
}
|
|
})
|
|
|
|
t.Run("non-zero hit still wins", func(t *testing.T) {
|
|
prev := &types.TokenUsage{Prompt: 10, Completion: 1, Total: 11}
|
|
cur := &types.TokenUsage{
|
|
Prompt: 10, Completion: 5, Total: 15,
|
|
PromptTokensDetails: &types.PromptTokensDetails{CachedTokens: 64},
|
|
}
|
|
got := mergeUsage(prev, cur)
|
|
if got.PromptTokensDetails == nil || got.PromptTokensDetails.CachedTokens != 64 {
|
|
t.Fatalf("cached_tokens lost: %+v", got.PromptTokensDetails)
|
|
}
|
|
})
|
|
|
|
t.Run("absent details do not overwrite an earlier report", func(t *testing.T) {
|
|
prev := &types.TokenUsage{
|
|
Prompt: 10, Completion: 1, Total: 11,
|
|
PromptTokensDetails: &types.PromptTokensDetails{CachedTokens: 32},
|
|
}
|
|
cur := &types.TokenUsage{Prompt: 10, Completion: 5, Total: 15}
|
|
got := mergeUsage(prev, cur)
|
|
if got.PromptTokensDetails == nil || got.PromptTokensDetails.CachedTokens != 32 {
|
|
t.Fatalf("earlier cache report clobbered by a later chunk without details: %+v",
|
|
got.PromptTokensDetails)
|
|
}
|
|
})
|
|
|
|
t.Run("no cache data anywhere stays nil", func(t *testing.T) {
|
|
prev := &types.TokenUsage{Prompt: 10, Completion: 1, Total: 11}
|
|
cur := &types.TokenUsage{Prompt: 10, Completion: 5, Total: 15}
|
|
got := mergeUsage(prev, cur)
|
|
if got.PromptTokensDetails != nil {
|
|
t.Fatalf("fabricated cache details: %+v", got.PromptTokensDetails)
|
|
}
|
|
})
|
|
}
|