diff --git a/webapp/packages/chat-sdk/src/Chat/index.tsx b/webapp/packages/chat-sdk/src/Chat/index.tsx index 64dc71da2..562406961 100644 --- a/webapp/packages/chat-sdk/src/Chat/index.tsx +++ b/webapp/packages/chat-sdk/src/Chat/index.tsx @@ -95,7 +95,7 @@ const Chat: ForwardRefRenderFunction = ( }; const updateAgentConfigMode = (agent: AgentType) => { - const agentConfig = jsonParse(agent?.agentConfig, {}); + const agentConfig = jsonParse(agent?.toolConfig, {}); const { simpleMode, debugMode } = agentConfig; if (isBoolean(simpleMode)) { setIsSimpleMode(simpleMode); diff --git a/webapp/packages/supersonic-fe/src/locales/zh-CN/menu.ts b/webapp/packages/supersonic-fe/src/locales/zh-CN/menu.ts index 05335e1ad..acc957460 100644 --- a/webapp/packages/supersonic-fe/src/locales/zh-CN/menu.ts +++ b/webapp/packages/supersonic-fe/src/locales/zh-CN/menu.ts @@ -16,7 +16,7 @@ export default { 'menu.database': '数据库管理', 'menu.llm': '大模型管理', 'menu.chatSetting': '问答设置', - 'menu.plugin': '插件管理', + 'menu.plugin': '工具管理', 'menu.login': '登录', 'menu.system': '系统设置', 'menu.chat': '问答对话', diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx index 05ec97d33..5ab3bd3e4 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx @@ -1,28 +1,14 @@ -import { - Form, - Modal, - Input, - Button, - Switch, - Tabs, - Slider, - InputNumber, - Select, - Row, - message, - Space, - Tooltip, -} from 'antd'; +import { Form, Input, Button, Switch, Tabs, Select, message, Space, Tooltip } from 'antd'; import MainTitleMark from '@/components/MainTitleMark'; import { AgentType } from './type'; import { useEffect, useState } from 'react'; import styles from './style.less'; import { DeleteOutlined, PlusOutlined } from '@ant-design/icons'; -import { uuid, jsonParse, encryptPassword, decryptPassword } from '@/utils/utils'; +import { uuid, jsonParse } from '@/utils/utils'; import ToolsSection from './ToolsSection'; import globalStyles from '@/global.less'; import { QuestionCircleOutlined } from '@ant-design/icons'; -import { testLLMConn } from '../../services/system'; +import { getLlmModelTypeList, getLlmList } from '../../services/system'; import MemorySection from './MemorySection'; const FormItem = Form.Item; @@ -43,7 +29,8 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli const [saveLoading, setSaveLoading] = useState(false); const [examples, setExamples] = useState<{ id: string; question?: string }[]>([]); const [activeKey, setActiveKey] = useState('basic'); - const [llmTestLoading, setLlmTestLoading] = useState(false); + const [modelTypeOptions, setModelTypeOptions] = useState([]); + const [llmConfigListOptions, setLlmConfigListOptions] = useState([]); const [formData, setFormData] = useState({ enableSearch: true, modelConfig: { @@ -51,10 +38,6 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli provider: 'OPEN_AI', temperature: 0, }, - // embeddingStore: { - // provider: 'MILVUS', - // timeOut: 60, - // }, agentConfig: { ...defaultAgentConfig, }, @@ -68,7 +51,7 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli delete sourceData.modelConfig; } - const config = jsonParse(editAgent.agentConfig, {}); + const config = jsonParse(editAgent.toolConfig, {}); const initData = { ...sourceData, enableSearch: editAgent.enableSearch !== 0, @@ -82,26 +65,57 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli } else { form.resetFields(); } + queryModelTypeList(); + queryLlmList(); }, [editAgent]); + const queryLlmList = async () => { + const { code, data } = await getLlmList(); + if (code === 200 && data) { + const options = data.map((item) => { + return { + label: item.name, + value: item.id, + }; + }); + setLlmConfigListOptions(options); + } else { + message.error('获取模型场景类型失败'); + } + }; + const queryModelTypeList = async () => { + const { code, data } = await getLlmModelTypeList(); + if (code === 200 && data) { + const options = data.map((item) => { + return { + label: item.name, + value: item.type, + description: item.description, + }; + }); + setModelTypeOptions(options); + } else { + message.error('获取模型场景类型失败'); + } + }; + const layout = { labelCol: { span: 4 }, wrapperCol: { span: 16 }, - // layout: 'vertical', }; const onOk = async () => { const values = await form.validateFields(); setSaveLoading(true); - const config = jsonParse(editAgent?.agentConfig, {}); + const config = jsonParse(editAgent?.toolConfig, {}); await onSaveAgent?.({ id: editAgent?.id, ...(editAgent || {}), ...values, agentConfig: JSON.stringify({ ...config, - ...values.agentConfig, - debugMode: values.agentConfig?.simpleMode === true ? false : values.agentConfig?.debugMode, + ...values.toolConfig, + debugMode: values.toolConfig?.simpleMode === true ? false : values.toolConfig?.debugMode, }) as any, examples: examples.map((example) => example.question), enableSearch: values.enableSearch ? 1 : 0, @@ -110,16 +124,6 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli setSaveLoading(false); }; - const testLLMConnect = async (params: any) => { - setLlmTestLoading(true); - const { code, data } = await testLLMConn(params); - setLlmTestLoading(false); - if (code === 200 && data) { - message.success('连接成功'); - } else { - message.error('模型连接失败'); - } - }; const tips = [ '自定义提示词模板可嵌入以下变量，将由系统自动进行替换：', '-{{exemplar}} :替换成few-shot示例，示例个数由系统配置', @@ -140,25 +144,6 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli > - {/* - - {['OPEN_AI', 'OLLAMA'].map((item) => ( - - {item} - - ))} - - - - - - - - - - - - - - - - - - {/*
- - 向量模型 - -
- - - - - - - - {formData?.modelConfig?.embeddingModel?.provider === 'IN_MEMORY' ? ( - <> - - + {modelTypeOptions.map((item) => { + return ( + + - - - ) : ( - <> - - - - { - const value = event.target.value; - return encryptPassword(value); - }} - getValueProps={(value) => { - return { - value: value ? decryptPassword(value) : '', - }; - }} - > - - - - )} */} + ); + })} ), }, - // { - // label: '向量库配置', - // key: 'embeddingStore', - // children: ( - //
- // - // - // - // {formData?.embeddingStore?.provider === 'IN_MEMORY' ? ( - // <> - // - // - // - // - // ) : ( - // <> - // - // - // - // { - // const value = event.target.value; - // return encryptPassword(value); - // }} - // getValueProps={(value) => { - // return { - // value: value ? decryptPassword(value) : '', - // }; - // }} - // > - // - // - // - // - // - // - // )} - //
- // ), - // }, { label: '提示词配置', key: 'promptConfig', @@ -433,7 +269,7 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli ), }, { - label: '工具管理', + label: '工具配置', key: 'tools', children: , }, @@ -478,17 +314,6 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli 新增工具 )} - {activeKey === 'modelConfig' && ( - - )} } defaultActiveKey="basic" diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx index 7d382cd24..f348a784e 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx @@ -15,7 +15,7 @@ const ToolsSection: React.FC = ({ currentAgent, onSaveAgent }) => { const [modalVisible, setModalVisible] = useState(false); const [editTool, setEditTool] = useState(); - const agentConfig = currentAgent?.agentConfig ? JSON.parse(currentAgent.agentConfig as any) : {}; + const agentConfig = currentAgent?.toolConfig ? JSON.parse(currentAgent.toolConfig as any) : {}; const saveAgent = async (agent: AgentType) => { await onSaveAgent(agent); diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/index.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/index.tsx index a4b8087d1..3d754ac62 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/index.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/index.tsx @@ -17,7 +17,7 @@ const Agent = () => { const [agentConfig, setAgentConfig] = useState({}); useEffect(() => { - const config = jsonParse(currentAgent?.agentConfig, {}); + const config = jsonParse(currentAgent?.toolConfig, {}); setAgentConfig(config); }, [currentAgent]); diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/LLM/LlmCreateForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/LLM/LlmCreateForm.tsx index 52bc75ee2..8da857bc8 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/LLM/LlmCreateForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/LLM/LlmCreateForm.tsx @@ -1,10 +1,12 @@ -import { useEffect, forwardRef, useImperativeHandle, useState } from 'react'; +import { useEffect, forwardRef, useImperativeHandle, useState, useRef } from 'react'; import type { ForwardRefRenderFunction } from 'react'; import { message, Form, Input, Select, Button, Space, Slider, InputNumber } from 'antd'; import { saveLlmConfig } from '../../service'; -import { testLLMConn } from '@/services/system'; +import { ConfigParametersItem, SystemConfig, dependenciesItem } from '@/pages/System/types'; +import { testLLMConn, getLlmConfig } from '@/services/system'; import { formLayout } from '@/components/FormHelper/utils'; -import { encryptPassword, decryptPassword } from '@/utils/utils'; + +import { genneratorFormItemList } from '../../utils'; import styles from '../style.less'; type Props = { llmItem?: any; @@ -14,9 +16,9 @@ type Props = { const FormItem = Form.Item; const TextArea = Input.TextArea; -const DatabaseCreateForm: ForwardRefRenderFunction = ({ llmItem, onSubmit }, ref) => { +const LlmCreateForm: ForwardRefRenderFunction = ({ llmItem, onSubmit }, ref) => { const [form] = Form.useForm(); - + const [config, setConfig] = useState([]); const [formData, setFormData] = useState({ config: { timeOut: 60, @@ -24,7 +26,6 @@ const DatabaseCreateForm: ForwardRefRenderFunction = ({ llmItem, onS temperature: 0, }, }); - const [testLoading, setTestLoading] = useState(false); useEffect(() => { @@ -32,6 +33,7 @@ const DatabaseCreateForm: ForwardRefRenderFunction = ({ llmItem, onS if (llmItem) { form.setFieldsValue({ ...llmItem }); } + queryConfig(); }, [llmItem]); const getFormValidateFields = async () => { @@ -40,15 +42,18 @@ const DatabaseCreateForm: ForwardRefRenderFunction = ({ llmItem, onS useImperativeHandle(ref, () => ({ getFormValidateFields, - saveDatabaseConfig, - testDatabaseConnection, + saveLlmConfig: save, + testLlmConnection, })); - const saveDatabaseConfig = async () => { + const save = async () => { const values = await form.validateFields(); + console.log(values, 22222); + const { code, msg } = await saveLlmConfig({ ...(llmItem || {}), ...values, + config: values, }); if (code === 200) { @@ -58,7 +63,43 @@ const DatabaseCreateForm: ForwardRefRenderFunction = ({ llmItem, onS } message.error(msg); }; - const testDatabaseConnection = async () => { + const queryConfig = async () => { + setTestLoading(true); + const { code, data } = await getLlmConfig(); + setTestLoading(false); + if (code === 200 && data) { + let parameters = data; + if (llmItem?.config) { + parameters = data.map((item) => { + const target = llmItem.config[item.name]; + if (target) { + return { + ...item, + value: target, + }; + } + return item; + }); + } + const parametersMap = parameters.reduce( + (configReduceMap: Record, item: ConfigParametersItem) => { + return { + ...configReduceMap, + [item.name]: item, + }; + }, + {}, + ); + + configMap.current = parametersMap; + initDepConfig(parameters); + setConfig(parameters); + return; + } + message.error('获取大模型配置信息失败'); + }; + + const testLlmConnection = async () => { const values = await form.validateFields(); setTestLoading(true); const { code, data } = await testLLMConn({ @@ -71,6 +112,107 @@ const DatabaseCreateForm: ForwardRefRenderFunction = ({ llmItem, onS } message.error('连接测试失败'); }; + const configIocDepMap = useRef>(); + const configMap = useRef>(); + + const getDepIoc = (parameters: ConfigParametersItem[]) => { + const iocMap: Record> = {}; + parameters.forEach((item) => { + const { name: itemName, dependencies } = item; + if (Array.isArray(dependencies)) { + dependencies.forEach((depItem) => { + const { name } = depItem; + + if (iocMap[name]) { + iocMap[name] = { + ...iocMap[name], + [itemName]: item, + }; + } else { + iocMap[name] = { + [itemName]: item, + }; + } + }); + } + }); + return iocMap; + }; + const setInitData = (systemConfigParameters: ConfigParametersItem[]) => { + const fieldsValue = systemConfigParameters.reduce((fields, item) => { + const { name, value } = item; + return { + ...fields, + [name]: value, + }; + }, {}); + form.setFieldsValue(fieldsValue); + return fieldsValue; + }; + + const initDepConfig = (parameters: ConfigParametersItem[]) => { + const iocMap = getDepIoc(parameters); + configIocDepMap.current = iocMap; + const initFormValues = setInitData(parameters); + Object.keys(initFormValues).forEach((itemName) => { + const targetDep = iocMap[itemName] || {}; + const excuteStack = Object.values(targetDep); + if (Array.isArray(excuteStack)) { + excuteDepConfig(itemName, initFormValues, true); + } + }); + }; + + const excuteDepConfig = ( + itemName: string, + formValues: Record, + isInit: boolean = false, + ) => { + const targetDep = configIocDepMap?.current?.[itemName]; + if (!targetDep) { + return; + } + const excuteStack = Object.values(targetDep); + if (!Array.isArray(excuteStack)) { + return; + } + const tempConfigMap: any = { ...configMap.current }; + const currentFormValues = formValues; + excuteStack.forEach((configItem: any) => { + const showStateList: boolean[] = []; + const hasValueFieldsSetDefaultValueList: any[] = []; + const { dependencies, name: configItemName } = configItem; + dependencies.forEach((item: dependenciesItem) => { + const { name, setDefaultValue } = item; + const currentDepValue = currentFormValues[name]; + const showIncludesValue = item.show?.includesValue; + if (Array.isArray(showIncludesValue)) { + showStateList.push(showIncludesValue.includes(currentDepValue)); + } + if (setDefaultValue && currentDepValue) { + hasValueFieldsSetDefaultValueList.push({ + excuteItem: configItemName, + ...item, + }); + } + }); + + const visible = showStateList.every((item) => item); + tempConfigMap[configItemName].visible = visible; + const lastSetDefaultValueItem = + hasValueFieldsSetDefaultValueList[hasValueFieldsSetDefaultValueList.length - 1]; + const lastSetDefaultValue = lastSetDefaultValueItem?.setDefaultValue; + + if (lastSetDefaultValue) { + const targetValue = lastSetDefaultValue[currentFormValues[lastSetDefaultValueItem.name]]; + if (targetValue && !isInit) { + form.setFieldValue(lastSetDefaultValueItem.excuteItem, targetValue); + } + } + }); + setConfig(Object.values(tempConfigMap)); + }; + return ( <>
= ({ llmItem, onS layout="vertical" className={styles.form} initialValues={formData} + onValuesChange={(value, values) => { + const valueKey = Object.keys(value)[0]; + excuteDepConfig(valueKey, values); + }} > = ({ llmItem, onS > - + {genneratorFormItemList(config)} + {/*