diff --git a/deploy/fba/README.md b/deploy/fba/README.md index 2e92e00..bfea716 100644 --- a/deploy/fba/README.md +++ b/deploy/fba/README.md @@ -138,9 +138,15 @@ docker exec -it fba_postgres psql -U postgres -d fba # 进数据库 │ · 6 模块 → views/iaop/*(cockpit/chat/studio/admin) │ · 推理通道 /v1/ → 127.0.0.1:30800(推理服务,独立于 /fba) ├── /fba/ → 127.0.0.1:8001 fba_server(认证/RBAC/系统管理) - └── /v1/ → 127.0.0.1:30800 推理服务(iAOP LLM 网关) + └── /v1/ → 127.0.0.1:30800 推理服务(iAOP LLM 网关,**不去前缀直接透传**) ``` +### 推理通道路径约定(issue #188) +- 推理服务真实路径即 `:30800/v1/*`(`/v1/models`、`/v1/chat/completions`、`/v1/health`)。 +- nginx 反代 `/v1/` 用 `proxy_pass http://127.0.0.1:30800/`(带末尾 `/`,**不去前缀**,直接透传到后端的 `/v1/...`)。 +- 前端 `api/iaop/infer.ts` 的 `BASE_URL` 为空串,调用方统一写 `/v1/models`、`/v1/chat/completions`、`/v1/health`,**不再出现 `/v1/v1` 双前缀**,也不依赖 nginx rewrite 去前缀的巧合耦合。 +- nginx location 片段见 `deploy/fba/nginx-fba.conf`。 + ### 组件落点 - 受控源码:`fba-ui-src/`(fastapi-best-architecture-ui 工程,apps/web-antdv-next) - 构建流水线:`build-ui.sh`(pnpm install → build → artifacts/fba-ui-dist.tar.gz) diff --git a/deploy/fba/fba-ui-src/apps/web-antdv-next/src/api/iaop/infer.ts b/deploy/fba/fba-ui-src/apps/web-antdv-next/src/api/iaop/infer.ts index 3314809..a5e88f5 100644 --- a/deploy/fba/fba-ui-src/apps/web-antdv-next/src/api/iaop/infer.ts +++ b/deploy/fba/fba-ui-src/apps/web-antdv-next/src/api/iaop/infer.ts @@ -8,8 +8,12 @@ * * 推理服务为 iAOP 独立通道(不要求 FBA JWT),故用原生 fetch 封装, * 统一超时 / 错误信息 / 结果结构;FBA requestClient 仅用于 /fba/* 接口。 + * + * issue #188:推理服务真实路径即 :30800/v1/*,nginx 反代 /v1/ 不去前缀直接透传, + * 故 BASE_URL 为空串,调用方统一写 /v1/models、/v1/chat/completions, + * 避免出现 /v1/v1 双前缀对 nginx rewrite 的隐式耦合。 */ -const BASE_URL = '/v1'; +const BASE_URL = ''; const TIMEOUT_MS = 15000; export interface InferResult { @@ -61,7 +65,7 @@ async function fetchJson(path: string, init?: RequestInit): Promise { /** 健康巡检(前端徽标展示;失败不抛出,由调用方降级) */ export async function fetchHealth(): Promise | null> { try { - return await fetchJson>('/health'); + return await fetchJson>('/v1/health'); } catch { return null; } @@ -92,12 +96,14 @@ export async function chatCompletion( /** 便捷:返回纯文本(B 系列页面统一使用) */ export async function ask(prompt: string, opts?: Parameters[1]): Promise { + // issue #188:用 performance.now() 实测耗时,替代原先 latencyMs: 0 硬编码 + const startedAt = performance.now(); const resp = await chatCompletion(prompt, opts); const msg = resp.choices?.[0]?.message?.content || ''; return { text: msg, meta: (resp.meta as Record) || {}, backend: String((resp.meta as Record)?.backend || 'gpu'), - latencyMs: 0, + latencyMs: Math.round(performance.now() - startedAt), }; } diff --git a/deploy/fba/fba-ui-src/apps/web-antdv-next/src/views/iaop/cockpit/index.vue b/deploy/fba/fba-ui-src/apps/web-antdv-next/src/views/iaop/cockpit/index.vue index 5cf6f1d..5b90569 100644 --- a/deploy/fba/fba-ui-src/apps/web-antdv-next/src/views/iaop/cockpit/index.vue +++ b/deploy/fba/fba-ui-src/apps/web-antdv-next/src/views/iaop/cockpit/index.vue @@ -8,6 +8,7 @@ import { onMounted, onUnmounted, ref } from 'vue'; import { Page } from '@vben/common-ui'; +import { fetchHealth } from '#/api/iaop/infer'; import { loadCockpitPlan } from '#/api/iaop/templates'; import AlarmPanel from './components/AlarmPanel.vue'; @@ -53,13 +54,10 @@ onUnmounted(() => window.clearInterval(timer)); const inferOnline = ref(false); async function refreshHealth() { - try { - const resp = await fetch('/v1/health', { signal: AbortSignal.timeout(3000) }); - const d = await resp.json(); - inferOnline.value = d.status === 'ok' || d.status === 'dry-run'; - } catch { - inferOnline.value = false; - } + // issue #188:健康检查改走 infer.ts 的 fetchHealth 封装,路径口径统一(/v1/health) + const d = await fetchHealth(); + const status = d?.status; + inferOnline.value = status === 'ok' || status === 'dry-run'; } diff --git a/deploy/fba/nginx-fba.conf b/deploy/fba/nginx-fba.conf index 89a3a69..e61655b 100644 --- a/deploy/fba/nginx-fba.conf +++ b/deploy/fba/nginx-fba.conf @@ -64,3 +64,23 @@ location /fba-admin/ { add_header Cache-Control "no-cache"; } } + +# ============================================================================= +# 推理通道(iAOP LLM 网关) +# +# issue #188:推理服务真实路径即 :30800/v1/*(/v1/models、/v1/chat/completions、 +# /v1/health),故 nginx 反代 /v1/ 时 proxy_pass 带 / —— 不去前缀,直接透传, +# 消除前端「拼出 /v1/v1 靠 rewrite 巧合耦合」的隐式依赖。 +# 前端 infer.ts BASE_URL 为空串,统一写 /v1/models、/v1/chat/completions、/v1/health。 +# ============================================================================= +location /v1/ { + proxy_pass http://127.0.0.1:30800/; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + client_max_body_size 20m; + proxy_read_timeout 120s; +}