Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const LLMContainer = (props) => {
return;
}
const modelData = (config.from === 'graph' ? graphOperator.getConfig(config.defaultValue) : config.defaultValue);
form.setFieldsValue(pick(modelData, ['model', 'temperature', 'systemPrompt']));
form.setFieldsValue(pick(modelData, ['accessInfo', 'model', 'temperature', 'systemPrompt']));
llmRef.current.setPromptValue(modelData.systemPrompt);
}, [config, appConfig]);

Expand Down
18 changes: 7 additions & 11 deletions frontend/src/pages/configForm/configUi/components/llm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,7 @@ const LLM = (props) => {
const handleGetModels = (open) => {
if (!open) return;
getModels().then((res) => {
const models = res.models.map((model) => {
return {
...model,
id: model.serviceName + '***' + model.tag
}
})
setModels(models);
setModels(res.models);
})
}

Expand Down Expand Up @@ -105,8 +99,9 @@ const LLM = (props) => {
};

// 校验模型是否存在
const checkExist = (rules, value) => {
if (!models.find(item => item.id === value)) {
const checkExist = () => {
const accessInfo = form.getFieldValue('accessInfo');
if (!models.find(item => item.serviceName === accessInfo.serviceName && item.tag === accessInfo.tag)) {
return Promise.reject(new Error(`${t('LLM')}${value}${t('modelNotExistTip')}`));
}
return Promise.resolve();
Expand All @@ -118,7 +113,8 @@ const LLM = (props) => {
dispatch(setValidateInfo(appValidateInfo.filter(item => (item.configCheckId !== validateItem.configCheckId) && item.configName !== 'accessInfo')));
})
}
const updateModelInfo = models.find(item => item.id === value);
const updateModelInfo = models.find(item => item.serviceName === value);
form.setFieldValue('accessInfo', { serviceName: updateModelInfo.serviceName, tag: updateModelInfo.tag });
updateData({ model: value, accessInfo: { serviceName: updateModelInfo.serviceName, tag: updateModelInfo.tag } });
};

Expand Down Expand Up @@ -160,7 +156,7 @@ const LLM = (props) => {
onChange={(value) => handleUpdateModel(models, value)}
fieldNames={{
label: 'serviceName',
value: 'id'
value: 'serviceName'
}}
>
</Select>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const RecommendContainer = (props) => {
dispatch(setConfigItem({ key: config.name, value }));
}
updateData();
setRecommendValues(value);
};

// 新增猜你想问
Expand Down
Loading