From b132a64de60d2a0fb8a1fb47b8826971c3e37553 Mon Sep 17 00:00:00 2001
From: DrSmoothl <1787882683@qq.com>
Date: Sat, 2 May 2026 00:08:12 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E6=A8=A1=E5=9E=8B=E6=95=B0=E7=BB=84?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E9=89=B4=E6=9D=83=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dashboard/src/lib/config-api.ts                          | 9 ++++++++-
 .../src/routes/config/modelProvider/ProviderForm.tsx     | 6 +++++-
 src/webui/routers/model.py                               | 5 +++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/dashboard/src/lib/config-api.ts b/dashboard/src/lib/config-api.ts
index cfb51108..fa4ac5da 100644
--- a/dashboard/src/lib/config-api.ts
+++ b/dashboard/src/lib/config-api.ts
@@ -158,7 +158,14 @@ export async function fetchProviderModels(
     endpoint,
   })
   const response = await fetchWithAuth(`/api/webui/models/list?${params}`)
-  return parseResponse<ModelListItem[]>(response)
+  // 后端返回 { success, models, provider, count }，需要展开取出 models 数组
+  const parsed = await parseResponse<{ models?: ModelListItem[] } | ModelListItem[]>(response)
+  if (!parsed.success) {
+    return parsed
+  }
+  const body = parsed.data
+  const models = Array.isArray(body) ? body : Array.isArray(body?.models) ? body.models : []
+  return { success: true, data: models }
 }
 
 /**
diff --git a/dashboard/src/routes/config/modelProvider/ProviderForm.tsx b/dashboard/src/routes/config/modelProvider/ProviderForm.tsx
index 8095caa3..d7094ffa 100644
--- a/dashboard/src/routes/config/modelProvider/ProviderForm.tsx
+++ b/dashboard/src/routes/config/modelProvider/ProviderForm.tsx
@@ -138,7 +138,11 @@ export function ProviderForm({
           </DialogDescription>
         </DialogHeader>
 
-        <form onSubmit={(e) => { e.preventDefault(); handleSaveEdit(); }} autoComplete="off">
+        <form
+          onSubmit={(e) => { e.preventDefault(); handleSaveEdit(); }}
+          autoComplete="off"
+          className="contents"
+        >
           <DialogBody>
           <div className="grid gap-4 py-4">
             <div className="grid gap-2" data-tour="provider-template-select">
diff --git a/src/webui/routers/model.py b/src/webui/routers/model.py
index fad701ba..27323835 100644
--- a/src/webui/routers/model.py
+++ b/src/webui/routers/model.py
@@ -146,6 +146,11 @@ async def _fetch_models_from_provider(
         client_config = build_openai_compatible_client_config(provider)
         headers.update(client_config.default_headers)
         params.update(client_config.default_query)
+        # build_openai_compatible_client_config 在“默认 Bearer”场景下，
+        # 会把 api_key 留在 client_config.api_key 中交给 OpenAI SDK 自行注入 Authorization 头，
+        # 而不会写入 default_headers。这里我们用 httpx 直接发请求，需要手动补上鉴权头/参数。
+        if client_config.api_key and "Authorization" not in headers:
+            headers["Authorization"] = f"Bearer {client_config.api_key}"
 
     try:
         async with httpx.AsyncClient(timeout=30.0) as client: