From 1d871dae0d9dba0bef9a36b327438a36edb7da1d Mon Sep 17 00:00:00 2001
From: JzoNg <jzongcode@gmail.com>
Date: Fri, 1 Nov 2024 11:59:43 +0800
Subject: [PATCH] Revert "credentials of models"

This reverts commit 2ed73b763d34d4ea2f7911cf0c11b77bcbeccde1.
---
 .../model-provider-page/model-modal/index.tsx |  2 --
 .../model-provider-page/utils.ts              | 19 +++++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/index.tsx b/web/app/components/header/account-setting/model-provider-page/model-modal/index.tsx
index a1a56b19d1..0bb6942428 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-modal/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-modal/index.tsx
@@ -229,7 +229,6 @@ const ModelModal: FC<ModelModalProps> = ({
       setLoading(true)
       const res = await saveCredentials(
         providerFormSchemaPredefined,
-        provider.plugin_id,
         provider.provider,
         encodeSecretValues(value),
         {
@@ -256,7 +255,6 @@ const ModelModal: FC<ModelModalProps> = ({
 
       const res = await removeCredentials(
         providerFormSchemaPredefined,
-        provider.plugin_id,
         provider.provider,
         value,
       )
diff --git a/web/app/components/header/account-setting/model-provider-page/utils.ts b/web/app/components/header/account-setting/model-provider-page/utils.ts
index d3af826f61..cdc517581c 100644
--- a/web/app/components/header/account-setting/model-provider-page/utils.ts
+++ b/web/app/components/header/account-setting/model-provider-page/utils.ts
@@ -26,15 +26,14 @@ export const isNullOrUndefined = (value: any) => {
   return value === undefined || value === null
 }
 
-// deprecated ???
-export const validateCredentials = async (predefined: boolean, pluginID: string, provider: string, v: FormValue) => {
+export const validateCredentials = async (predefined: boolean, provider: string, v: FormValue) => {
   let body, url
 
   if (predefined) {
     body = {
       credentials: v,
     }
-    url = `/workspaces/current/model-providers/${pluginID}/${provider}/credentials/validate`
+    url = `/workspaces/current/model-providers/${provider}/credentials/validate`
   }
   else {
     const { __model_name, __model_type, ...credentials } = v
@@ -43,7 +42,7 @@ export const validateCredentials = async (predefined: boolean, pluginID: string,
       model_type: __model_type,
       credentials,
     }
-    url = `/workspaces/current/model-providers/${pluginID}/${provider}/models/credentials/validate`
+    url = `/workspaces/current/model-providers/${provider}/models/credentials/validate`
   }
   try {
     const res = await validateModelProvider({ url, body })
@@ -81,7 +80,7 @@ export const validateLoadBalancingCredentials = async (predefined: boolean, plug
   }
 }
 
-export const saveCredentials = async (predefined: boolean, pluginID: string, provider: string, v: FormValue, loadBalancing?: ModelLoadBalancingConfig) => {
+export const saveCredentials = async (predefined: boolean, provider: string, v: FormValue, loadBalancing?: ModelLoadBalancingConfig) => {
   let body, url
 
   if (predefined) {
@@ -90,7 +89,7 @@ export const saveCredentials = async (predefined: boolean, pluginID: string, pro
       credentials: v,
       load_balancing: loadBalancing,
     }
-    url = `/workspaces/current/model-providers/${pluginID}/${provider}`
+    url = `/workspaces/current/model-providers/${provider}`
   }
   else {
     const { __model_name, __model_type, ...credentials } = v
@@ -100,7 +99,7 @@ export const saveCredentials = async (predefined: boolean, pluginID: string, pro
       credentials,
       load_balancing: loadBalancing,
     }
-    url = `/workspaces/current/model-providers/${pluginID}/${provider}/models`
+    url = `/workspaces/current/model-providers/${provider}/models`
   }
 
   return setModelProvider({ url, body })
@@ -120,12 +119,12 @@ export const savePredefinedLoadBalancingConfig = async (provider: string, v: For
   return setModelProvider({ url, body })
 }
 
-export const removeCredentials = async (predefined: boolean, pluginID: string, provider: string, v: FormValue) => {
+export const removeCredentials = async (predefined: boolean, provider: string, v: FormValue) => {
   let url = ''
   let body
 
   if (predefined) {
-    url = `/workspaces/current/model-providers/${pluginID}/${provider}`
+    url = `/workspaces/current/model-providers/${provider}`
   }
   else {
     if (v) {
@@ -134,7 +133,7 @@ export const removeCredentials = async (predefined: boolean, pluginID: string, p
         model: __model_name,
         model_type: __model_type,
       }
-      url = `/workspaces/current/model-providers/${pluginID}/${provider}/models`
+      url = `/workspaces/current/model-providers/${provider}/models`
     }
   }