From b926e6e48a756ac16d1179aea2f9597c82516797 Mon Sep 17 00:00:00 2001 From: kicer Date: Mon, 31 Aug 2026 16:29:45 +0800 Subject: [PATCH] =?UTF-8?q?models=20=E9=85=8D=E7=BD=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=AF=8F=E6=A8=A1=E5=9E=8B=E7=8B=AC=E7=AB=8B=20url/api=5Fkey?= =?UTF-8?q?=EF=BC=9A=E7=A7=BB=E9=99=A4=E5=85=A8=E5=B1=80=20upstream=5Furl/?= =?UTF-8?q?api=5Fkey=EF=BC=8Cconfig.js=20=E6=A0=A1=E9=AA=8C=E6=AF=8F?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=BF=85=E5=A1=AB=20url=EF=BC=88=E9=80=89?= =?UTF-8?q?=E5=A1=AB=20api=5Fkey=EF=BC=8C=E5=8E=BB=E5=B0=BE=E6=96=9C?= =?UTF-8?q?=E6=9D=A0=EF=BC=89=EF=BC=8Cllm.callModel=20=E6=8C=89=20model=5F?= =?UTF-8?q?id=20=E8=A7=A3=E6=9E=90=E5=90=84=E8=87=AA=E4=B8=8A=E6=B8=B8?= =?UTF-8?q?=E4=B8=8E=E9=89=B4=E6=9D=83=E5=A4=B4=EF=BC=8Cserver=20=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=BF=97=E9=80=90=E6=A8=A1=E5=9E=8B=E6=89=93?= =?UTF-8?q?=E5=8D=B0=20url=EF=BC=9Bexample/test=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=8E=20README/DEPLOY=20=E5=90=8C=E6=AD=A5=EF=BC=88?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=20config.yml=20=E5=B7=B2=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=90=8C=E5=80=BC=E7=8B=AC=E7=AB=8B=E7=BB=93=E6=9E=84=EF=BC=8C?= =?UTF-8?q?gitignore=20=E4=B8=8D=E5=85=A5=E5=BA=93=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++++-- app/README.md | 2 +- app/config.example.yml | 13 +++++++------ app/server/config.js | 12 ++++++------ app/server/llm.js | 7 +++++-- app/server/server.js | 2 +- app/test/config.test.yml | 4 ++-- docs/DEPLOY.md | 2 +- 8 files changed, 29 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index f637142..5c89319 100644 --- a/README.md +++ b/README.md @@ -995,12 +995,16 @@ networks: models: - id: ds1 display_name: "AMD DeepSeek 1" + url: "https://proxy-a.example.com/v1" + api_key: "sk-..." - id: ds2 display_name: "AMD DeepSeek 2" + url: "https://proxy-b.example.com/v1" + api_key: "sk-..." - id: ds3 display_name: "AMD DeepSeek 3" - -upstream_url: "https://your-cli-proxy-api.example.com/v1" + url: "https://proxy-c.example.com/v1" + api_key: "sk-..." workspace_root: "/workspace/tasks" diff --git a/app/README.md b/app/README.md index a520b97..b571a27 100644 --- a/app/README.md +++ b/app/README.md @@ -33,7 +33,7 @@ app/ ```bash cd app npm install -cp config.example.yml config.yml # 修改 upstream_url / models +cp config.example.yml config.yml # 修改 models(每个模型独立 url/api_key) npm start # http://localhost:8080 ``` diff --git a/app/config.example.yml b/app/config.example.yml index 422d63d..f5a8319 100644 --- a/app/config.example.yml +++ b/app/config.example.yml @@ -1,20 +1,21 @@ # 自用通用 Agent 系统配置示例 # 复制为 config.yml 后按需修改;容器内通过 AGENT_CONFIG 指定路径。 -# 模型池:多个 ID 共用同一个上游 URL(cli-proxy-api 按 ID 路由到不同账号)。 +# 模型池:每个模型独立配置上游 url 与 api_key(互不共用,可指向不同代理/账号)。 # 同时活跃会话数上限 = 模型数量。 models: - id: ds1 display_name: "AMD DeepSeek 1" + url: "https://proxy-a.example.com/v1" # 独立的 OpenAI 兼容 /v1 地址 + api_key: "sk-..." # 各模型可不同,留空则不带鉴权头 - id: ds2 display_name: "AMD DeepSeek 2" + url: "https://proxy-b.example.com/v1" + api_key: "sk-..." - id: ds3 display_name: "AMD DeepSeek 3" - -# OpenAI 兼容上游(cli-proxy-api),会请求 {upstream_url}/chat/completions -upstream_url: "https://your-cli-proxy-api.example.com/v1" -# 若上游需要鉴权(可选) -api_key: "" + url: "https://proxy-c.example.com/v1" + api_key: "" workspace_root: "./data/tasks" # db_path: "/data/.agent.db" diff --git a/app/server/config.js b/app/server/config.js index 9dbce3f..79afa4c 100644 --- a/app/server/config.js +++ b/app/server/config.js @@ -5,8 +5,6 @@ const YAML = require('yaml'); const DEFAULTS = { port: 8080, - upstream_url: '', - api_key: '', workspace_root: './data/tasks', db_path: '', // 默认为 workspace_root/.agent.db terminal: { default_timeout_ms: 30000, max_output_chars: 10000 }, @@ -45,14 +43,16 @@ function loadConfig(configPath) { const cfg = deepMerge(DEFAULTS, raw); if (!Array.isArray(cfg.models) || cfg.models.length === 0) { - throw new Error('配置缺少 models:至少需要一个模型 {id, display_name}'); + throw new Error('配置缺少 models:至少需要一个模型 {id, url, display_name}') } + // 每个模型独立配置上游:url 必填(OpenAI 兼容 /v1 地址),api_key 选填(留空则不带鉴权头) for (const m of cfg.models) { - if (!m.id) throw new Error('models 中每项必须有 id'); + if (!m || !m.id) throw new Error('models 中每项必须有 id'); + if (!m.url) throw new Error('models.' + m.id + ' 缺少 url(每个模型独立配置上游 /v1 地址)'); if (!m.display_name) m.display_name = m.id; + m.url = String(m.url).replace(/\/+$/, ''); + m.api_key = m.api_key || ''; } - if (!cfg.upstream_url) throw new Error('配置缺少 upstream_url(cli-proxy-api 的 /v1 地址)'); - cfg.upstream_url = cfg.upstream_url.replace(/\/+$/, ''); cfg.workspace_root = path.resolve(cfg.workspace_root); if (!cfg.db_path) cfg.db_path = path.join(cfg.workspace_root, '.agent.db'); diff --git a/app/server/llm.js b/app/server/llm.js index 75dfa8b..f935fde 100644 --- a/app/server/llm.js +++ b/app/server/llm.js @@ -66,6 +66,9 @@ async function callModel(cfg, modelId, messages, tools, options) { if (opts.signal.aborted) controller.abort(); else opts.signal.addEventListener('abort', () => controller.abort()); } + const modelCfg = (cfg.models || []).find(m => m.id === modelId); + if (!modelCfg || !modelCfg.url) throw new Error('模型未在配置中定义或缺少独立 url: ' + modelId); + const body = { model: modelId, messages, @@ -76,9 +79,9 @@ async function callModel(cfg, modelId, messages, tools, options) { if (tools && tools.length) body.tools = tools; const headers = { 'Content-Type': 'application/json' }; - if (cfg.api_key) headers.Authorization = 'Bearer ' + cfg.api_key; + if (modelCfg.api_key) headers.Authorization = 'Bearer ' + modelCfg.api_key; - const res = await fetch(cfg.upstream_url + '/chat/completions', { + const res = await fetch(modelCfg.url + '/chat/completions', { method: 'POST', headers, body: JSON.stringify(body), diff --git a/app/server/server.js b/app/server/server.js index bde54b9..067f694 100644 --- a/app/server/server.js +++ b/app/server/server.js @@ -48,5 +48,5 @@ const PORT = process.env.PORT || cfg.port; server.listen(PORT, () => { console.log('Agent server listening on ' + PORT); console.log(' workspace_root=' + cfg.workspace_root); - console.log(' models=' + cfg.models.map(m => m.id).join(',') + ' upstream=' + cfg.upstream_url); + console.log(' models=' + cfg.models.map(m => m.id + '@' + m.url).join(', ')); }); diff --git a/app/test/config.test.yml b/app/test/config.test.yml index 116587a..ff26a6a 100644 --- a/app/test/config.test.yml +++ b/app/test/config.test.yml @@ -2,10 +2,10 @@ models: - id: ds1 display_name: "Mock Model 1" + url: "http://127.0.0.1:9999/v1" - id: ds2 display_name: "Mock Model 2" - -upstream_url: "http://127.0.0.1:9999/v1" + url: "http://127.0.0.1:9999/v1" workspace_root: "./test/tmp/tasks" diff --git a/docs/DEPLOY.md b/docs/DEPLOY.md index a3b9c78..e86d700 100644 --- a/docs/DEPLOY.md +++ b/docs/DEPLOY.md @@ -12,7 +12,7 @@ ```bash cp app/config.example.yml config.yml -vi config.yml # 至少改 upstream_url 与 models +vi config.yml # 至少改 models(每个模型独立 url/api_key) ``` > 容器内运行时 `workspace_root` 写 `/workspace/tasks`(docker-compose.yml 已把 `./data` 挂到这里)。