fix: miss openaiCustomUrl in get-models payload
This commit is contained in:
@@ -7,6 +7,7 @@ interface FormContextProps {
|
||||
action: PageActionType;
|
||||
currentData?: any;
|
||||
id?: number;
|
||||
getCustomConfig?: () => Record<string, any>;
|
||||
}
|
||||
|
||||
const FormContext = createContext<FormContextProps>({} as FormContextProps);
|
||||
|
||||
@@ -97,6 +97,11 @@ const ProviderForm: React.FC<ProviderFormProps> = 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<ProviderFormProps> = forwardRef((props, ref) => {
|
||||
getScrollElementScrollableHeight={getScrollElementScrollableHeight}
|
||||
>
|
||||
<FormContext.Provider
|
||||
value={{ action, id: currentData?.id, currentData }}
|
||||
value={{
|
||||
action,
|
||||
id: currentData?.id,
|
||||
currentData,
|
||||
getCustomConfig: getCustomConfig
|
||||
}}
|
||||
>
|
||||
<Form
|
||||
form={form}
|
||||
|
||||
@@ -84,7 +84,7 @@ const ModelItem: React.FC<ModelItemProps> = ({
|
||||
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']) || ''
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user