From f7da6b8ad11e0b0188e34e3274777ab55ca7fe2c Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Sat, 12 Oct 2024 15:40:02 +0800 Subject: [PATCH] [improvement][headless-fe] Introduced a revamped configuration for the large model in the assistant module. (#1790) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [improvement][semantic-fe] Fixing the abnormal state of the popup when creating a model. * [improvement][semantic-fe] Adding permission logic for bulk operations in the indicator market. * [improvement][semantic-fe] Adding the ability to download and transpose data. * [improvement][semantic-fe] Fixing the initialization issue with the date selection component in the indicator details page when switching time granularity. * [improvement][semantic-fe] Fixing the logic error in the dimension value setting. * [improvement][semantic-fe] Fixing the synchronization issue with the question and answer settings information. * [improvement][semantic-fe] Optimizing the canvas functionality for better performance and user experience. * [improvement][semantic-fe] Optimizing the update process for drawing model relationship edges in the canvas. * [improvement][semantic-fe] Changing the line type for canvas connections. * [improvement][semantic-fe] Replacing the initialization variable from "semantic" to "headless". * [improvement][semantic-fe] Fixing the missing migration issue for default drill-down dimension configuration in model editing. Additionally, optimizing the data retrieval method for initializing fields in the model. * [improvement][semantic-fe] Updating the logic for the fieldName. * [improvement][semantic-fe] Adjusting the position of the metrics tab. * [improvement][semantic-fe] Changing the 字段名称 to 英文名称. * [improvement][semantic-fe] Fix metric measurement deletion. * [improvement][semantic-fe] UI optimization for metric details page. * [improvement][semantic-fe] UI optimization for metric details page. * [improvement][semantic-fe] UI adjustment for metric details page. * [improvement][semantic-fe] The granularity field in the time type of model editing now supports setting it as empty. * [improvement][semantic-fe] Added field type and metric type to the metric creation options. * [improvement][semantic-fe] The organization structure selection feature has been added to the permission management. * [improvement][semantic-fe] Improved user experience for the metric list. * [improvement][semantic-fe] fix update the metric list. * [improvement][headless-fe] Added view management functionality. * [improvement][headless-fe] The view management functionality has been added. This feature allows users to create, edit, and manage different views within the system. * [improvement][headless-fe] Added model editing side effect detection. * [improvement][headless-fe] Fixed the logic error in view editing. * [improvement][headless-fe] Fixed the issue with initializing dimension associations in metric settings. * [improvement][headless-fe] Added the ability to hide the Q&A settings entry point. * [improvement][headless-fe] Fixed the issue with selecting search results in metric field creation. * [improvement][headless-fe] Added search functionality to the field list in model editing. * [improvement][headless-fe] fix the field list in model editing * [improvement][headless-fe] Restructured the data for the dimension value settings interface. * [improvement][headless-fe] Added dynamic variable functionality to model creation based on SQL scripts. * [improvement][headless-fe] Added support for passing dynamic variables as parameters in the executeSql function. * [improvement][headless-fe] Resolved the issue where users were unable to select all options for dimensions, metrics, and fields in the metric generation process. * [improvement][headless-fe] Replaced the term "view" with "dataset" * [improvement][headless-fe] Added the ability to export metrics and dimensions to a specific target. * [improvement][headless-fe] Enhanced dataset creation to support the tag mode. * [improvement][headless-fe] Added tag value setting. * [improvement][headless-fe] Optimized the tag setting system. * [improvement][headless-fe] Optimized the tag setting system. * [improvement][headless-fe] Updated the data initialization for model editing to use API requests instead. * [improvement][headless-fe] Added search functionality to model management. * [improvement][headless-fe] Removed field null validation during model editing. * [improvement][headless-fe] Updated the batch operation button component. * [improvement][headless-fe] Optimized the logic for initializing indicators in dimension value settings. * [improvement][headless-fe] Adjusted the length of the input field for model editing names. * [improvement][headless-fe] Lock the version of the @ant-design/pro-table component and replace it with @ant-design/pro-components. * [improvement][headless-fe] Optimized the style of the metrics market and tags market. * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling. * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling * [improvement][headless-fe] The quick creation of model fields now defaults to using the "comment" field for filling. * [improvement][headless-fe] Fixed the issue where the conditions for metric measurement creation were not being saved correctly. * [improvement][headless-fe] Default value setting for hiding dimensions. * [improvement][headless-fe] Updated the file imports in the project. * [improvement][headless-fe] Adjusted the logic for displaying the tab in the theme domain. * [improvement][headless-fe] Added term management functionality. * [improvement][headless-fe] When creating a model, the current metric operator now allows for clearance. * [improvement][headless-fe] Term management interface transformation * [improvement][headless-fe] Migrating scaffold version to @umi/max * [improvement][headless-fe] remove modle column * [improvement][headless-fe] 1.Added configuration for the large language model in the agent; 2.upgraded React version from 17 to 18; 3.modified some UI effects. * [improvement][headless-fe] Added a simplified mode to the question-answering system. * [improvement][headless-fe] remove pnpm-lock * [improvement][headless-fe] add pnpm-lock * [improvement][headless-fe] Fixed the issue with passing the modelId during initialization. * [improvement][headless-fe] Fixed the issue with abnormal comments during model creation. * [improvement][headless-fe] fix build bugs * [improvement][headless-fe] change build config * [improvement][headless-fe] route config change * [improvement][headless-fe] Optimized data updating when switching domains. * [improvement][headless-fe] css change * [improvement][semantic-fe] logo css change * [improvement][semantic-fe] system config add defaultValue support * [improvement][semantic-fe] tag mode wording change * [improvement][semantic-fe] fix metric edit page init error * [improvement][supersonic-fe] Updated the way chat projects are imported in supersonic-fe. * [improvement][chat-engine] Added a background silent mode for watching chat projects. * [improvement][supersonic-fe] fix proxy url * [improvement][headless-fe] agent setting update * [improvement][headless-fe] Agent configuration: Added connectivity testing for large models. * [improvement][headless-fe] Chat: Enabled integration with agent configuration. * [improvement][headless-fe] SQL formatter: Updated the import method. * [improvement][headless-fe] login fixed * [improvement][headless-fe] Agent: Optimized the logic for saving. * [improvement][headless-fe] Model management: Integrated into the main theme domain. * [improvement][headless-fe] Sensitivity: Added bulk modification functionality. * [improvement][headless-fe] wording change * [improvement][headless-fe] Prompt configuration: Added the ability to configure prompts. * [improvement][headless-fe] Added the ability to configure embedding models. * [improvement][headless-fe] hidden configure embedding models. * [improvement][headless-fe] Connection test prompt update for large language model settings. * [improvement][headless-fe] add memory review config * [improvement][headless-fe] Rollback of data structure for large language model configuration. * [improvement][headless-fe] Added dependency relationships between various items in system configuration. * [improvement][headless-fe] Added password parsing to the generation rules of system settings. * [improvement][headless-fe] Added slider parsing to the generation rules of system settings. * [improvement][headless-fe] Optimized the logic for initializing values in system settings. * [improvement][headless-fe] Optimized the time format * [improvement][headless-fe] Unified the SQL generation method for data sets to ensure consistency and improve efficiency. * [improvement][headless-fe] Added support for data sets with non-partitioned time fields * [improvement][headless-fe] Added support for editing time formats in dimension settings * [improvement][headless-fe] Rolled back the time parameter in the metric details page to its previous state * [improvement][headless-fe] Fixed the issue with hidden field validation when editing dimensions * [improvement][headless-fe] Added a connectivity test for large models in the system settings * [improvement][headless-fe] Changed the METRIC type in ChatContextType queryType to AGGREGATE * [improvement][headless-fe] Added query and batch delete operations to the terminology management feature * [improvement][headless-fe] Enhanced the memory management feature by adding sorting functionality and other optimization features. * [improvement][headless-fe] Resolved the compatibility issue with the backend service where the updatedAt and other time fields were not being properly converted to the updated_at format for sorting purposes. * [improvement][headless-fe] Added a configuration interface for large language models * [improvement][headless-fe] Introduced a new configuration option in the assistant module specifically for large model applications. * [improvement][headless-fe] Replaced the agentConfig with toolConfig * [improvement][headless-fe] Resolved the issue with the test connection parameters for the large model configuration. * [improvement][headless-fe] Implemented a new feature where the tool configuration types can be fetched from the backend API * [improvement][headless-fe] Updated the dimension value settings to retrieve and display values from a dictionary. * [improvement][headless-fe] Adjusted the pageSize of the dimension value settings list to 20. * [improvement][headless-fe] Introduced a revamped configuration for the large model in the assistant module. --------- Co-authored-by: tristanliu --- .../src/pages/Agent/AgentForm.tsx | 229 +++++++++++++----- .../supersonic-fe/src/pages/Agent/style.less | 12 + .../supersonic-fe/src/pages/Agent/type.ts | 14 +- .../supersonic-fe/src/services/system.ts | 6 + 4 files changed, 198 insertions(+), 63 deletions(-) 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',