diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx index 734db9d50..9115727c5 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx @@ -1,6 +1,6 @@ -import { Form, Input, Button, Switch, Tabs, Select, message, Space, Tooltip } from 'antd'; +import { Form, Input, Button, Switch, Tabs, Select, message, Space, Tooltip, Row, Col } from 'antd'; import MainTitleMark from '@/components/MainTitleMark'; -import { AgentType } from './type'; +import { AgentType, ChatAppConfig, ChatAppConfigItem } from './type'; import { useEffect, useState } from 'react'; import styles from './style.less'; import { DeleteOutlined, PlusOutlined } from '@ant-design/icons'; @@ -8,7 +8,7 @@ import { uuid, jsonParse } from '@/utils/utils'; import ToolsSection from './ToolsSection'; import globalStyles from '@/global.less'; import { QuestionCircleOutlined } from '@ant-design/icons'; -import { getLlmModelTypeList, getLlmList } from '../../services/system'; +import { getLlmModelTypeList, getLlmModelAppList, getLlmList } from '../../services/system'; import MemorySection from './MemorySection'; const FormItem = Form.Item; @@ -29,8 +29,12 @@ 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 [modelTypeOptions, setModelTypeOptions] = useState([]); - const [llmConfigListOptions, setLlmConfigListOptions] = useState([]); + const [modelTypeOptions, setModelTypeOptions] = useState< + (OptionsItem & { enable: boolean; prompt: string; description: string })[] + >([]); + const [llmConfigListOptions, setLlmConfigListOptions] = useState([]); + const [currentChatModel, setCurrentChatModel] = useState(''); + const [defaultChatAppConfig, setDefaultChatAppConfig] = useState({}); const [formData, setFormData] = useState({ enableSearch: true, modelConfig: { @@ -46,17 +50,13 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli useEffect(() => { if (editAgent) { - const sourceData = { ...editAgent }; - if (!sourceData.modelConfig) { - delete sourceData.modelConfig; - } - const config = jsonParse(editAgent.toolConfig, {}); const initData = { - ...sourceData, + ...editAgent, enableSearch: editAgent.enableSearch !== 0, toolConfig: { ...defaultAgentConfig, ...config }, }; + form.setFieldsValue(initData); setFormData(initData); if (editAgent.examples) { @@ -65,7 +65,7 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli } else { form.resetFields(); } - queryModelTypeList(); + queryModelTypeList(editAgent?.chatAppConfig); queryLlmList(); }, [editAgent]); @@ -83,16 +83,49 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli message.error('获取模型场景类型失败'); } }; - const queryModelTypeList = async () => { - const { code, data } = await getLlmModelTypeList(); + const queryModelTypeList = async (currentAgentChatConfig: any = {}) => { + const { code, data } = await getLlmModelAppList(); if (code === 200 && data) { - const options = data.map((item) => { + let options = Object.keys(data).map((key: string) => { + let config = data[key]; + if (currentAgentChatConfig[key]) { + config = currentAgentChatConfig[key]; + } return { - label: item.name, - value: item.type, - description: item.description, + label: config.name, + value: key, + enable: config.enable, + description: config.description, + prompt: config.prompt, }; }); + const sqlParserIndex = options.findIndex((item) => item.value === 'S2SQL_PARSER'); + if (sqlParserIndex >= 0) { + options.splice(0, 0, options.splice(sqlParserIndex, 1)[0]); + } + const firstOption = options[0]; + if (firstOption) { + setCurrentChatModel(firstOption.value); + } + const initChatModelConfig = Object.keys(data).reduce( + (modelConfig: ChatAppConfig, key: string) => { + let config = data[key]; + if (currentAgentChatConfig[key]) { + config = currentAgentChatConfig[key]; + } + return { + ...modelConfig, + [key]: config, + }; + }, + {}, + ); + setDefaultChatAppConfig(initChatModelConfig); + const formData = form.getFieldsValue(); + form.setFieldsValue({ + ...formData, + chatAppConfig: initChatModelConfig, + }); setModelTypeOptions(options); } else { message.error('获取模型场景类型失败'); @@ -100,8 +133,8 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli }; const layout = { - labelCol: { span: 4 }, - wrapperCol: { span: 16 }, + labelCol: { span: 8 }, + wrapperCol: { span: 12 }, }; const onOk = async () => { @@ -119,7 +152,15 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli }) as any, examples: examples.map((example) => example.question), enableSearch: values.enableSearch ? 1 : 0, - enableMemoryReview: values.enableMemoryReview ? 1 : 0, + chatAppConfig: Object.keys(defaultChatAppConfig).reduce((mergeConfig, key) => { + return { + ...mergeConfig, + [key]: { + ...defaultChatAppConfig[key], + ...(values.chatAppConfig[key] ? values.chatAppConfig[key] : {}), + }, + }; + }, {}), }); setSaveLoading(false); }; @@ -147,7 +188,7 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli - = ({ editAgent, onSaveAgent, onCreateToolBtnCli - + */} = ({ editAgent, onSaveAgent, onCreateToolBtnCli label: '大模型配置', key: 'modelConfig', children: ( -
+
应用场景
- {modelTypeOptions.map((item) => { - return ( - - + + + + 提示词模板 + + {tips.map((tip) => ( +
{tip}
+ ))} + + } + > + + + + + } + > + + +
+ ); + })} +
+ + ), }, + // { + // label: '提示词配置', + // key: 'promptConfig', + // children: ( + //
+ // + // + // 提示词模板 + // + // {tips.map((tip) => ( + //
{tip}
+ // ))} + // + // } + // > + // + // + // + // + // } + // > + // + // + //
+ // ), + // }, { label: '工具配置', key: 'tools', diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/style.less b/webapp/packages/supersonic-fe/src/pages/Agent/style.less index 9eeed757d..94b2b32ff 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/style.less +++ b/webapp/packages/supersonic-fe/src/pages/Agent/style.less @@ -380,3 +380,15 @@ gap: 10px; margin-bottom: 20px; } + + +.agentChatModelCell { + cursor: pointer; + &:hover { + background-color: #f0f5ff; + } +} + +.agentChatModelCellActive { + background-color: #f0f5ff; +} \ No newline at end of file diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/type.ts b/webapp/packages/supersonic-fe/src/pages/Agent/type.ts index 45eea5727..1acd94b4b 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/type.ts +++ b/webapp/packages/supersonic-fe/src/pages/Agent/type.ts @@ -71,6 +71,17 @@ export type VisualConfig = { defaultShowType: string; }; +export type ChatAppConfigItem = { + key: string; + name: string; + description: string; + prompt: string; + enable: boolean; + chatModelId: number; +}; + +export type ChatAppConfig = Record; + export type AgentType = { id?: number; name?: string; @@ -83,7 +94,8 @@ export type AgentType = { status?: 0 | 1; enableSearch?: 0 | 1; toolConfig?: string; - modelConfig?: LlmConfigType; + // modelConfig?: LlmConfigType; + chatAppConfig: ChatAppConfig; multiTurnConfig?: MultiTurnConfig; visualConfig?: VisualConfig; }; diff --git a/webapp/packages/supersonic-fe/src/services/system.ts b/webapp/packages/supersonic-fe/src/services/system.ts index 6cbc80d04..d5cd694a8 100644 --- a/webapp/packages/supersonic-fe/src/services/system.ts +++ b/webapp/packages/supersonic-fe/src/services/system.ts @@ -13,6 +13,12 @@ export function getLlmModelTypeList(): Promise { }); } +export function getLlmModelAppList(): Promise { + return request(`${process.env.CHAT_API_BASE_URL}model/getModelAppList`, { + method: 'GET', + }); +} + export function getLlmList(): Promise { return request(`${process.env.CHAT_API_BASE_URL}model/getModelList`, { method: 'GET',