From ad63877f04081e9c3d244873a3a890f59cf2a8b4 Mon Sep 17 00:00:00 2001
From: Wang Qi <wangq8@outlook.com>
Date: Wed, 10 Jun 2026 17:08:15 +0800
Subject: [PATCH] Fix cannot add bedrock (#15904)

Fix cannot add bedrock
---
 .../user-setting/setting-model/hooks.tsx      | 36 +++++++------------
 .../user-setting/setting-model/index.tsx      |  2 +-
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/web/src/pages/user-setting/setting-model/hooks.tsx b/web/src/pages/user-setting/setting-model/hooks.tsx
index c0d5713ca7..6d9d95bf2e 100644
--- a/web/src/pages/user-setting/setting-model/hooks.tsx
+++ b/web/src/pages/user-setting/setting-model/hooks.tsx
@@ -145,34 +145,24 @@ export const useSubmitBedrock = () => {
       if (!isVerify) {
         setSaveLoading(true);
       }
+      const { instancePayload, modelPayload } = splitProviderPayload(payload);
       if (isVerify) {
-        const legacyPayload = payload as any;
-        const modelType = Array.isArray(legacyPayload.model_type)
-          ? (legacyPayload.model_type as string[])
-          : legacyPayload.model_type
-            ? [legacyPayload.model_type as string]
-            : [];
-        const apiKey = JSON.stringify({
-          auth_mode: legacyPayload.auth_mode,
-          bedrock_ak: legacyPayload.bedrock_ak,
-          bedrock_sk: legacyPayload.bedrock_sk,
-          aws_role_arn: legacyPayload.aws_role_arn,
-        });
         return verifyConnection(
           payload.llm_factory as string,
-          apiKey,
-          legacyPayload.bedrock_region,
-          undefined,
-          [
-            {
-              model_type: modelType,
-              model_name: (legacyPayload.model_name as string) ?? '',
-              max_tokens: (legacyPayload.max_tokens as number) ?? 0,
-            },
-          ],
+          JSON.stringify(instancePayload.api_key),
+          instancePayload.base_url,
+          instancePayload.region,
+          [modelPayload],
         );
       }
-      const ret = await submitProviderInstance(payload, false);
+      const ret = await submitProviderInstance(
+        {
+          ...instancePayload,
+          max_tokens: modelPayload.max_tokens,
+          model_info: [modelPayload],
+        },
+        false,
+      );
       setSaveLoading(false);
       if (ret.code === 0) {
         hideBedrockAddingModal();
diff --git a/web/src/pages/user-setting/setting-model/index.tsx b/web/src/pages/user-setting/setting-model/index.tsx
index 581fcd6d78..b15fda93e1 100644
--- a/web/src/pages/user-setting/setting-model/index.tsx
+++ b/web/src/pages/user-setting/setting-model/index.tsx
@@ -375,7 +375,7 @@ const ModelProviders = () => {
         onOk={onBedrockAddingOk}
         loading={bedrockAddingLoading}
         llmFactory={LLMFactory.Bedrock}
-        onVerify={async () => ({ isValid: null, logs: '' })}
+        onVerify={(payload) => onBedrockAddingOk(payload, true)}
       ></BedrockModal>
     </div>
   );