Feat: remove useSetLlmSetting from GenerateForm #3591 (#3592)

### What problem does this PR solve?

Feat: remove useSetLlmSetting from GenerateForm #3591

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
balibabu 2024-11-22 16:31:44 +08:00 committed by GitHub
parent cc219ff648
commit 06b9256972
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 22 additions and 30 deletions

View File

@ -594,8 +594,8 @@ The above is the content you need to summarize.`,
updateDate: 'Update Date', updateDate: 'Update Date',
role: 'Role', role: 'Role',
invite: 'Invite', invite: 'Invite',
agree: 'Agree', agree: 'Accept',
refuse: 'Refuse', refuse: 'Decline',
teamMembers: 'Team Members', teamMembers: 'Team Members',
joinedTeams: 'Joined Teams', joinedTeams: 'Joined Teams',
}, },

View File

@ -2,7 +2,6 @@ import LLMSelect from '@/components/llm-select';
import MessageHistoryWindowSizeItem from '@/components/message-history-window-size-item'; import MessageHistoryWindowSizeItem from '@/components/message-history-window-size-item';
import { useTranslate } from '@/hooks/common-hooks'; import { useTranslate } from '@/hooks/common-hooks';
import { Form } from 'antd'; import { Form } from 'antd';
import { useSetLlmSetting } from '../../hooks';
import { IOperatorForm } from '../../interface'; import { IOperatorForm } from '../../interface';
import DynamicInputVariable from '../components/dynamic-input-variable'; import DynamicInputVariable from '../components/dynamic-input-variable';
import DynamicCategorize from './dynamic-categorize'; import DynamicCategorize from './dynamic-categorize';
@ -15,7 +14,6 @@ const CategorizeForm = ({ form, onValuesChange, node }: IOperatorForm) => {
nodeId: node?.id, nodeId: node?.id,
onValuesChange, onValuesChange,
}); });
useSetLlmSetting(form);
return ( return (
<Form <Form

View File

@ -2,15 +2,12 @@ import LLMSelect from '@/components/llm-select';
import MessageHistoryWindowSizeItem from '@/components/message-history-window-size-item'; import MessageHistoryWindowSizeItem from '@/components/message-history-window-size-item';
import { useTranslate } from '@/hooks/common-hooks'; import { useTranslate } from '@/hooks/common-hooks';
import { Form, Input, Switch } from 'antd'; import { Form, Input, Switch } from 'antd';
import { useSetLlmSetting } from '../../hooks';
import { IOperatorForm } from '../../interface'; import { IOperatorForm } from '../../interface';
import DynamicParameters from './dynamic-parameters'; import DynamicParameters from './dynamic-parameters';
const GenerateForm = ({ onValuesChange, form, node }: IOperatorForm) => { const GenerateForm = ({ onValuesChange, form, node }: IOperatorForm) => {
const { t } = useTranslate('flow'); const { t } = useTranslate('flow');
useSetLlmSetting(form);
return ( return (
<Form <Form
name="basic" name="basic"

View File

@ -1,7 +1,6 @@
import Editor from '@monaco-editor/react'; import Editor from '@monaco-editor/react';
import { Form, Input, InputNumber, Select, Space, Switch } from 'antd'; import { Form, Input, InputNumber, Select, Space, Switch } from 'antd';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useSetLlmSetting } from '../../hooks';
import { IOperatorForm } from '../../interface'; import { IOperatorForm } from '../../interface';
import DynamicVariablesForm from './dynamic-variables'; import DynamicVariablesForm from './dynamic-variables';
@ -33,8 +32,6 @@ const TimeoutInput = ({ value, onChange }: TimeoutInputProps) => {
const InvokeForm = ({ onValuesChange, form, node }: IOperatorForm) => { const InvokeForm = ({ onValuesChange, form, node }: IOperatorForm) => {
const { t } = useTranslation(); const { t } = useTranslation();
useSetLlmSetting(form);
return ( return (
<> <>
<Form <Form

View File

@ -2,15 +2,12 @@ import LLMSelect from '@/components/llm-select';
import TopNItem from '@/components/top-n-item'; import TopNItem from '@/components/top-n-item';
import { useTranslate } from '@/hooks/common-hooks'; import { useTranslate } from '@/hooks/common-hooks';
import { Form } from 'antd'; import { Form } from 'antd';
import { useSetLlmSetting } from '../../hooks';
import { IOperatorForm } from '../../interface'; import { IOperatorForm } from '../../interface';
import DynamicInputVariable from '../components/dynamic-input-variable'; import DynamicInputVariable from '../components/dynamic-input-variable';
const KeywordExtractForm = ({ onValuesChange, form, node }: IOperatorForm) => { const KeywordExtractForm = ({ onValuesChange, form, node }: IOperatorForm) => {
const { t } = useTranslate('flow'); const { t } = useTranslate('flow');
useSetLlmSetting(form);
return ( return (
<Form <Form
name="basic" name="basic"

View File

@ -3,13 +3,11 @@ import { useTranslate } from '@/hooks/common-hooks';
import { Form, Select } from 'antd'; import { Form, Select } from 'antd';
import { Operator } from '../../constant'; import { Operator } from '../../constant';
import { useBuildFormSelectOptions } from '../../form-hooks'; import { useBuildFormSelectOptions } from '../../form-hooks';
import { useSetLlmSetting } from '../../hooks';
import { IOperatorForm } from '../../interface'; import { IOperatorForm } from '../../interface';
import { useWatchConnectionChanges } from './hooks'; import { useWatchConnectionChanges } from './hooks';
const RelevantForm = ({ onValuesChange, form, node }: IOperatorForm) => { const RelevantForm = ({ onValuesChange, form, node }: IOperatorForm) => {
const { t } = useTranslate('flow'); const { t } = useTranslate('flow');
useSetLlmSetting(form);
const buildRelevantOptions = useBuildFormSelectOptions( const buildRelevantOptions = useBuildFormSelectOptions(
Operator.Relevant, Operator.Relevant,
node?.id, node?.id,

View File

@ -1,12 +1,10 @@
import LLMSelect from '@/components/llm-select'; import LLMSelect from '@/components/llm-select';
import { useTranslate } from '@/hooks/common-hooks'; import { useTranslate } from '@/hooks/common-hooks';
import { Form, InputNumber } from 'antd'; import { Form, InputNumber } from 'antd';
import { useSetLlmSetting } from '../../hooks';
import { IOperatorForm } from '../../interface'; import { IOperatorForm } from '../../interface';
const RewriteQuestionForm = ({ onValuesChange, form }: IOperatorForm) => { const RewriteQuestionForm = ({ onValuesChange, form }: IOperatorForm) => {
const { t } = useTranslate('chat'); const { t } = useTranslate('chat');
useSetLlmSetting(form);
return ( return (
<Form <Form

View File

@ -23,7 +23,7 @@ import { FormInstance, message } from 'antd';
import { DefaultOptionType } from 'antd/es/select'; import { DefaultOptionType } from 'antd/es/select';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { humanId } from 'human-id'; import { humanId } from 'human-id';
import { get, lowerFirst } from 'lodash'; import { get, isEmpty, lowerFirst, pick } from 'lodash';
import trim from 'lodash/trim'; import trim from 'lodash/trim';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useParams } from 'umi'; import { useParams } from 'umi';
@ -349,24 +349,31 @@ export const useFlowIsFetching = () => {
return useIsFetching({ queryKey: ['flowDetail'] }) > 0; return useIsFetching({ queryKey: ['flowDetail'] }) > 0;
}; };
export const useSetLlmSetting = (form?: FormInstance) => { export const useSetLlmSetting = (
const initialLlmSetting = undefined; form?: FormInstance,
formData?: Record<string, any>,
) => {
const initialLlmSetting = pick(
formData,
Object.values(variableEnabledFieldMap),
);
useEffect(() => { useEffect(() => {
const switchBoxValues = Object.keys(variableEnabledFieldMap).reduce< const switchBoxValues = Object.keys(variableEnabledFieldMap).reduce<
Record<string, boolean> Record<string, boolean>
>((pre, field) => { >((pre, field) => {
pre[field] = pre[field] = isEmpty(initialLlmSetting)
initialLlmSetting === undefined ? true
? true : !!initialLlmSetting[
: !!initialLlmSetting[ variableEnabledFieldMap[
variableEnabledFieldMap[ field as keyof typeof variableEnabledFieldMap
field as keyof typeof variableEnabledFieldMap ] as keyof Variable
] as keyof Variable ];
];
return pre; return pre;
}, {}); }, {});
const otherValues = settledModelVariableMap[ModelVariableType.Precise]; let otherValues = settledModelVariableMap[ModelVariableType.Precise];
if (!isEmpty(initialLlmSetting)) {
otherValues = initialLlmSetting;
}
form?.setFieldsValue({ form?.setFieldsValue({
...switchBoxValues, ...switchBoxValues,
...otherValues, ...otherValues,