mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-07 09:47:23 +00:00
用户判据:「priority 直接移除」「即使带 key 也没有 /v1/responses」
「channel 插件的问题还没完全解决」「生图和聊天合并到一个导航项」
## 一、删除 priority(它从未参与跨源调度)
`config.Model.Priority` 号称"高者优先参与 AUTO 选源",**那是错的**:
AUTO 链由 `config.ModelScope.Tier` 驱动(scheduler.Chain),priority 只被
`bestChatModel/bestImageModel` 用于"本源内部该发哪个模型",与跨源调度无关。
把它当调度依据会让人以为拖个数字就能改顺序,改完毫无效果。
- 删 `config.Model.Priority` 字段与 `bestChatModel/bestImageModel` 的优先级比较
- 删 `seedAuto()`:**AUTO 链为空时网关应直接 503**,不能凭空播种用户没配过的档位
- 删 UI `buildLanes` 的 discovery 回退(按源 priority 自动铺开)与 sourceRows
- 清掉 config.yaml 里 140 行 priority
## 二、一通道 = 一个适配器 = 一个源(channels 插件)
旧设计「一账号一源」(`channels-<平台>-<12位hex>`) 有三个结构性后果:
1. 三个账号 ⇒ 三个源、三份同名模型,用户看到三行无法区分的东西
2. 谁先谁后**取决于注册顺序,不是余额**(rankAccounts 只用于展示,从未接进同步路径)
3. 换号要改源名 ⇒ 用户书签里的 `源:模型` 全部失效
新设计:
- 源名只跟通道绑定:`channels-<平台>`,换号 = 同名 add_source 覆盖 api_key
(内核 AddSource 是 UpsertSourceInYAML + 内存替换),对客户端完全透明
- `pickAccountForSource()`:凭据可用 → 余额分档(先快作废后永久)→
跳过已标记失效的号。没有 balance 声明的平台不据此排除(不因"不会查"判死)
- `request_end` 钩子:真实请求失败且是**终态**错误(需充值/封禁/凭据永久失效)
时给当前账号打 termErr,下次选号跳过;成功则清标记。
⚠️ 只认终态 —— 429/超时/抖动都**不**标记(那会把好号一个个废掉)
- `refresh_creds` 每 30 分钟巡检后重新选号(兜底心跳,纯本地判定)
- 迁移:同步时自动清掉旧版按账号拆的源(按已知平台前缀匹配,不用贪婪 match)
- 顺带修:`refresh_creds` 漏认 `refresh_fn` ⇒ codearts 的 DPoP 续期永不触发
## 三、discover 支持用已存凭据(真实缺口)
刷新已有源的模型目录,此前必须让运维**再粘一次明文 key** —— 而库里是
`enc:v1:` 密文,WebUI 也不回显明文。结果就是"想刷新 → 得重新申请 key",
很多人干脆不刷,源的目录越放越旧(实例:某源 3 个生图模型从未登记)。
- `{"name":"oin"}` ⇒ 从已存源取 base_url + 解密凭据 + adapter
- 安全边界:已要求 admin;只能探测**本网关已配置的**源(不能拿任意 URL+key
做探测,那就成了 SSRF/密钥外带);响应不回显 key
## 四、image_models 显式声明(补元数据缺失)
`discoveredModelKind` 只看上游 modality 字段,并刻意**不从模型名推断**
(错误的 kind 会毒死 AUTO 链)。但有些网关的 /v1/models 只返回
`{id,object,created,owned_by}` —— 零 modality,于是生图模型全落成 chat,
生图端点永远 `no image source configured`。
不解这个两难:默认仍完全按元数据(不猜),但允许 `image_models` **显式声明**。
写错的 id 明确报 400,不静默造一个不存在的模型。
## 五、UI:对话与生图合并为一个导航项
两者本是同一件事的两种输入(都选模型、都发请求、都读结果),只是 kind 与端点
不同。合并只发生在**导航层**:模型下拉仍按 kind 分组/禁选(把图片模型选进 chat
会请求到错误端点)。两个面板同时存在于 DOM,切换只改 display —— 来回切不会丢
已输入的文字、对话历史或已生成的图。
## 测试
- `TestUI_ImageModeIsReachableFromChatTab`:改为钉"合并后仍可达"(分段控件、
切换函数、面板容器、端点),并断言**旧 tab 三件套必须消失**(否则 goTab 会找
一个不存在的面板)
- 测试夹具显式建 AUTO 链(内核不再 seedAuto):默认一源一 tier 倒序
(TestChatAUTO 验优先级);TestChatAutoChainTierFailover 自己覆盖成同 tier
(验 tier 内轮转)—— 两者验不同机制,不能共用一个默认
- core 的一批断言从"按账号 id 找源"改为"按平台名找源"
gateway/config/provider 全绿;core 的 channels 用例全绿。
TestRealMutants 需工作树干净后才跑(其自带的变异残留防护)。
BREAKING CHANGE: config.Model.Priority 已删除。旧的 priority 字段会被 YAML
解码静默忽略(内核不校验未知字段),因此既有 config.yaml 仍可加载,但该字段
不再有任何作用 —— 调度顺序请通过 AUTO 链的 tier 表达。
213 lines
6.3 KiB
Go
213 lines
6.3 KiB
Go
package config
|
|
|
|
// Built-in preset source templates. Seeded into the runtime store on first
|
|
// startup so the WebUI can present "从模板创建" for popular providers — the
|
|
// user only needs to supply a name and API key.
|
|
//
|
|
// Model IDs verified against provider docs 2026-08-28. Providers ship new IDs
|
|
// frequently; treat these as a starting point and edit in the WebUI as needed.
|
|
var PresetTemplates = []SourceTemplate{
|
|
// ── 国内热门 ────────────────────────────────────────────────────────────
|
|
{
|
|
Name: "DeepSeek",
|
|
BaseURL: "https://api.deepseek.com",
|
|
Adapter: "deepseek",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "deepseek-v4-flash", Kind: "chat"},
|
|
{ID: "deepseek-v4-pro", Kind: "chat"},
|
|
{ID: "deepseek-v4-flash-vision-exp", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "智谱 GLM",
|
|
BaseURL: "https://open.bigmodel.cn/api/paas/v4",
|
|
Adapter: "openai",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "glm-5.3", Kind: "chat"},
|
|
{ID: "glm-5.3-flash", Kind: "chat"},
|
|
{ID: "glm-5.2", Kind: "chat"},
|
|
{ID: "glm-5.1", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "Kimi / Moonshot",
|
|
BaseURL: "https://api.moonshot.cn/v1",
|
|
Adapter: "openai",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "kimi-k3", Kind: "chat"},
|
|
{ID: "kimi-k2.7-code", Kind: "chat"},
|
|
{ID: "kimi-k2.7-code-highspeed", Kind: "chat"},
|
|
{ID: "kimi-k2.6", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "SiliconFlow",
|
|
BaseURL: "https://api.siliconflow.cn/v1",
|
|
Adapter: "openai",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "deepseek-ai/DeepSeek-V4-Pro", Kind: "chat"},
|
|
{ID: "deepseek-ai/DeepSeek-V4-Flash", Kind: "chat"},
|
|
{ID: "moonshotai/Kimi-K2.6", Kind: "chat"},
|
|
{ID: "zai-org/GLM-5.1", Kind: "chat"},
|
|
{ID: "Kwai-Kolors/Kolors", Kind: "image"},
|
|
},
|
|
},
|
|
{
|
|
Name: "讯飞星火 (Spark)",
|
|
BaseURL: "https://spark-api-open.xf-yun.com/v1",
|
|
Adapter: "openai",
|
|
MaxConcurrent: 4,
|
|
Models: []Model{
|
|
{ID: "4.0Ultra", Kind: "chat"},
|
|
{ID: "generalv3.5", Kind: "chat"},
|
|
{ID: "max-32k", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "阿里云 通义千问",
|
|
BaseURL: "https://dashscope.aliyuncs.com/compatible-mode/v1",
|
|
Adapter: "openai",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "qwen3.8-max", Kind: "chat"},
|
|
{ID: "qwen3.8-flash", Kind: "chat"},
|
|
{ID: "qwen3.7-plus", Kind: "chat"},
|
|
{ID: "deepseek-v4-pro", Kind: "chat"},
|
|
{ID: "kimi-k3", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "百度 千帆",
|
|
BaseURL: "https://qianfan.baidubce.com/v2",
|
|
Adapter: "openai",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "ernie-5.0-turbo", Kind: "chat"},
|
|
{ID: "ernie-5.0", Kind: "chat"},
|
|
{ID: "deepseek-v4-pro", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "豆包 (火山方舟)",
|
|
BaseURL: "https://ark.cn-beijing.volces.com/api/v3",
|
|
Adapter: "openai",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "doubao-seed-2.0-pro", Kind: "chat"},
|
|
{ID: "doubao-seed-2.0", Kind: "chat"},
|
|
{ID: "doubao-seed-2.0-flash", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "MiniMax",
|
|
BaseURL: "https://api.minimax.chat/v1",
|
|
Adapter: "openai",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "MiniMax-M3", Kind: "chat"},
|
|
{ID: "MiniMax-M2.5", Kind: "chat"},
|
|
},
|
|
},
|
|
// ── 国际主流 ────────────────────────────────────────────────────────────
|
|
{
|
|
Name: "OpenAI",
|
|
BaseURL: "https://api.openai.com/v1",
|
|
Adapter: "openai",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "gpt-5.6-sol", Kind: "chat"},
|
|
{ID: "gpt-5.6-terra", Kind: "chat"},
|
|
{ID: "gpt-5.6-luna", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "Anthropic Claude",
|
|
BaseURL: "https://api.anthropic.com",
|
|
Adapter: "anthropic",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "claude-opus-5", Kind: "chat"},
|
|
{ID: "claude-fable-5", Kind: "chat"},
|
|
{ID: "claude-sonnet-5", Kind: "chat"},
|
|
{ID: "claude-haiku-4-5", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "Google Gemini",
|
|
BaseURL: "https://generativelanguage.googleapis.com/v1beta",
|
|
Adapter: "gemini",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "gemini-3.6-flash", Kind: "chat"},
|
|
{ID: "gemini-3.5-flash", Kind: "chat"},
|
|
{ID: "gemini-3.5-flash-lite", Kind: "chat"},
|
|
{ID: "gemini-3.1-pro", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "Groq",
|
|
BaseURL: "https://api.groq.com/openai/v1",
|
|
Adapter: "groq",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "openai/gpt-oss-120b", Kind: "chat"},
|
|
{ID: "openai/gpt-oss-20b", Kind: "chat"},
|
|
{ID: "groq/compound", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "Mistral",
|
|
BaseURL: "https://api.mistral.ai/v1",
|
|
Adapter: "mistral",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "mistral-medium-latest", Kind: "chat"},
|
|
{ID: "mistral-large-latest", Kind: "chat"},
|
|
{ID: "codestral-latest", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "OpenRouter",
|
|
BaseURL: "https://openrouter.ai/api/v1",
|
|
Adapter: "openai",
|
|
MaxConcurrent: 8,
|
|
Headers: map[string]string{
|
|
"HTTP-Referer": "http://localhost:8080",
|
|
"X-Title": "ModelRouter",
|
|
},
|
|
Models: []Model{
|
|
{ID: "openrouter/auto", Kind: "chat"},
|
|
{ID: "deepseek/deepseek-v4-flash", Kind: "chat"},
|
|
{ID: "anthropic/claude-opus-5", Kind: "chat"},
|
|
{ID: "openai/gpt-5.6-sol", Kind: "chat"},
|
|
},
|
|
},
|
|
{
|
|
Name: "GitHub Models",
|
|
BaseURL: "https://models.inference.ai.azure.com",
|
|
Adapter: "github",
|
|
MaxConcurrent: 8,
|
|
Models: []Model{
|
|
{ID: "gpt-5.6-sol", Kind: "chat"},
|
|
{ID: "gpt-5.6-luna", Kind: "chat"},
|
|
},
|
|
},
|
|
// ── 本地模型 ────────────────────────────────────────────────────────────
|
|
{
|
|
Name: "Ollama (localhost)",
|
|
BaseURL: "http://127.0.0.1:11434",
|
|
Adapter: "ollama",
|
|
Endpoint: "/api/chat",
|
|
MaxConcurrent: 4,
|
|
Models: []Model{
|
|
{ID: "qwen3", Kind: "chat"},
|
|
{ID: "deepseek-r1", Kind: "chat"},
|
|
{ID: "llama3.3", Kind: "chat"},
|
|
},
|
|
},
|
|
}
|