From 5151f26b9ee71ae6929ab5df278c7f8699d774d1 Mon Sep 17 00:00:00 2001 From: jialin Date: Tue, 24 Feb 2026 15:25:23 +0800 Subject: [PATCH] fix: miss openaiCustomUrl in get-models payload --- src/pages/maas-provider/config/form-context.ts | 1 + src/pages/maas-provider/forms/index.tsx | 12 +++++++++++- src/pages/maas-provider/forms/model-item.tsx | 2 +- src/pages/maas-provider/forms/supported-models.tsx | 13 ++++++++++--- .../hooks/use-query-provider-models.tsx | 6 +++++- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/pages/maas-provider/config/form-context.ts b/src/pages/maas-provider/config/form-context.ts index 09909478..1f9dc9d4 100644 --- a/src/pages/maas-provider/config/form-context.ts +++ b/src/pages/maas-provider/config/form-context.ts @@ -7,6 +7,7 @@ interface FormContextProps { action: PageActionType; currentData?: any; id?: number; + getCustomConfig?: () => Record; } const FormContext = createContext({} as FormContextProps); diff --git a/src/pages/maas-provider/forms/index.tsx b/src/pages/maas-provider/forms/index.tsx index a757a8d3..800ea80c 100644 --- a/src/pages/maas-provider/forms/index.tsx +++ b/src/pages/maas-provider/forms/index.tsx @@ -97,6 +97,11 @@ const ProviderForm: React.FC = forwardRef((props, ref) => { ); }; + const getCustomConfig = () => { + const customConfig = yaml2Json(advanceRef.current?.getYamlValue() || ''); + return customConfig; + }; + const handleOnFinish = (values: FormData) => { const data = { ..._.omit(values, ['api_key']), @@ -171,7 +176,12 @@ const ProviderForm: React.FC = forwardRef((props, ref) => { getScrollElementScrollableHeight={getScrollElementScrollableHeight} >
= ({ form.getFieldValue('api_key') ) as string, proxy_url: proxyConfigEnabled - ? form.getFieldValue('proxy_url') || undefined + ? form.getFieldValue('proxy_url') || null : null, config: { type: form.getFieldValue(['config', 'type']) || '' diff --git a/src/pages/maas-provider/forms/supported-models.tsx b/src/pages/maas-provider/forms/supported-models.tsx index 0a3077d1..d8eb97c7 100644 --- a/src/pages/maas-provider/forms/supported-models.tsx +++ b/src/pages/maas-provider/forms/supported-models.tsx @@ -18,7 +18,7 @@ const SupportedModels = () => { type: string; api_key: string; }>({ type: '', api_key: '' }); - const { id, action, currentData } = useFormContext(); + const { id, action, currentData, getCustomConfig } = useFormContext(); const generateCurrentAPIKey = (currentAPIKey: string) => { if ( @@ -50,6 +50,7 @@ const SupportedModels = () => { try { await form.validateFields(['api_key', ['config', 'type']]); + const proxyConfigEnabled = form.getFieldValue('proxy_enabled'); const currentAPIKey = form.getFieldValue('api_key') || ''; const configType = form.getFieldValue(['config', 'type']); @@ -66,9 +67,15 @@ const SupportedModels = () => { id: generateID(), data: { api_token: generateCurrentAPIKey(currentAPIKey) as string, - proxy_url: form.getFieldValue('proxy_url') || undefined, + proxy_url: proxyConfigEnabled + ? form.getFieldValue('proxy_url') || null + : null, config: { - type: form.getFieldValue(['config', 'type']) || '' + type: form.getFieldValue(['config', 'type']) || '', + openaiCustomUrl: + form.getFieldValue(['config', 'openaiCustomUrl']) || + getCustomConfig?.()?.openaiCustomUrl || + null } } }); diff --git a/src/pages/maas-provider/hooks/use-query-provider-models.tsx b/src/pages/maas-provider/hooks/use-query-provider-models.tsx index 39d7c0a4..02acd468 100644 --- a/src/pages/maas-provider/hooks/use-query-provider-models.tsx +++ b/src/pages/maas-provider/hooks/use-query-provider-models.tsx @@ -26,7 +26,11 @@ export const useQueryProviderModels = () => { } = useRequest( async (params: { id: number; - data: { api_token: string; config: { type: string }; proxy_url: string }; + data: { + api_token: string; + config: { type: string; [key: string]: any }; + proxy_url: string; + }; }) => { axiosTokenRef.current?.cancel(); axiosTokenRef.current = createAxiosToken();