zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-07-31 04:59:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: model selection format compat and provider api_key wrapping (#17112)

Browse Source
This commit is contained in:
chanx
2026-07-20 19:12:59 +08:00
committed by GitHub
parent 9a2a3c0459
commit b3f731d4de
7 changed files with 76 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/pages/user-setting/setting-model/layout/system-setting.tsx
View File

@@ -26,6 +26,7 @@ import {
useFetchDefaultModelDictionary,
useSetDefaultModel,
} from '@/hooks/use-llm-request';
import { parseModelValue } from '@/utils/llm-util';
import { CircleQuestionMark } from 'lucide-react';
import { useCallback, useMemo } from 'react';
@@ -88,8 +89,13 @@ function SystemSetting() {
async (field: string, value: string) => {
const modelType = FieldToModelType[field];
if (!modelType) return;
await setDefaultModel({ model_id: value, model_type: modelType });
if (!value) return;
const parsed = parseModelValue(value);
if (parsed) {
await setDefaultModel({ ...parsed, model_type: modelType });
} else {
await setDefaultModel({ model_id: value, model_type: modelType });
}
},
[setDefaultModel],
);

17
web/src/pages/user-setting/setting-model/provider-schema/field-config/generic-api-key-config.ts
View File

@@ -77,13 +77,16 @@ export const GenericApiKeyConfig: ProviderConfig = {
apiKey: values.api_key,
baseUrl: values.base_url,
}),
submitTransform: (values) => ({
instance_name: values.instance_name,
api_key: values.api_key,
api_base: values.base_url || '',
group_id: values.group_id,
max_tokens: 0,
}),
submitTransform: (values) => {
const apiKey = values.group_id
? { api_key: values.api_key ?? '', group_id: values.group_id }
: (values.api_key ?? '');
return {
instance_name: values.instance_name,
api_key: apiKey,
api_base: values.base_url || '',
};
},
};
/**

25
web/src/pages/user-setting/setting-model/provider-schema/field-config/local-llm-configs.ts
View File

@@ -295,15 +295,20 @@ function buildLocalConfig(
baseUrl: values.base_url,
modelInfo: buildModelInfoFromValues(values),
}),
submitTransform: (values) => ({
instance_name: values.instance_name,
llm_factory: llmFactory,
model_info: buildModelInfoFromValues(values),
api_base: values.base_url,
api_key: values.api_key,
...(values.provider_order
? { provider_order: values.provider_order }
: {}),
}),
submitTransform: (values) => {
const apiKey = values.provider_order
? {
api_key: values.api_key ?? '',
provider_order: values.provider_order,
}
: (values.api_key ?? '');
return {
instance_name: values.instance_name,
llm_factory: llmFactory,
model_info: buildModelInfoFromValues(values),
api_base: values.base_url,
api_key: apiKey,
};
},
};
}

20
web/src/pages/user-setting/setting-model/provider-schema/field-config/provider-config-map.ts
View File

@@ -70,14 +70,18 @@ export const ProviderConfigMap: Record<string, ProviderConfig> = {
baseUrl: values.api_base,
modelInfo: [],
}),
submitTransform: (values) => ({
instance_name: values.instance_name,
llm_factory: LLMFactory.AzureOpenAI,
api_base: values.api_base,
api_key: values.api_key,
api_version: values.api_version,
model_info: [],
}),
submitTransform: (values) => {
const apiKey = values.api_version
? { api_key: values.api_key ?? '', api_version: values.api_version }
: (values.api_key ?? '');
return {
instance_name: values.instance_name,
llm_factory: LLMFactory.AzureOpenAI,
api_base: values.api_base,
api_key: apiKey,
model_info: [],
};
},
},
// ============ VolcEngine ============