From a9119b0038982ba5a7d302387acf28b2a932cb8a Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Thu, 10 Oct 2024 15:38:05 +0800 Subject: [PATCH] [improvement][headless-fe] Implemented a new feature where the tool configuration types can be fetched from the backend API (#1771) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [improvement][semantic-fe] Adding the ability to edit relationships between models in the canvas. * [improvement][semantic-fe] Updating the datePicker component to use dayjs instead. * [improvement][semantic-fe] Fixing the issue with passing the model ID for dimensions in the indicator market. * [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 --------- Co-authored-by: tristanliu --- .../src/pages/Agent/ToolModal.tsx | 34 ++++++++++++------- .../src/pages/Agent/ToolsSection.tsx | 30 +++++++++++++--- .../supersonic-fe/src/pages/Agent/service.ts | 6 ++++ .../supersonic-fe/src/pages/Agent/type.ts | 18 ++-------- .../supersonic-fe/src/pages/System/index.tsx | 25 +++++++------- 5 files changed, 67 insertions(+), 46 deletions(-) diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx index cae1133d4..f124c46c7 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx @@ -1,17 +1,12 @@ -import { Form, Modal, Input, Select, Button, TreeSelect } from 'antd'; -import { - AgentToolType, - AgentToolTypeEnum, - AGENT_TOOL_TYPE_LIST, - MetricOptionType, - QUERY_MODE_LIST, -} from './type'; +import { Form, Modal, Input, Select, Button, TreeSelect, message } from 'antd'; +import { AgentToolType, AgentToolTypeEnum, MetricOptionType, QUERY_MODE_LIST } from './type'; import { useEffect, useState } from 'react'; import { DeleteOutlined, PlusOutlined } from '@ant-design/icons'; import styles from './style.less'; import { traverseTree, uuid } from '@/utils/utils'; import { getModelList } from './service'; import { PluginType } from '../ChatPlugin/type'; +import { getToolTypes } from './service'; import { getPluginList } from '../ChatPlugin/service'; const FormItem = Form.Item; @@ -29,6 +24,7 @@ const ToolModal: React.FC = ({ editTool, onSaveTool, onCancel }) => { const [examples, setExamples] = useState<{ id: string; question?: string }[]>([]); const [metricOptions, setMetricOptions] = useState([]); const [plugins, setPlugins] = useState([]); + const [toolTypesOptions, setToolTypesOptions] = useState([]); const [form] = Form.useForm(); const initModelList = async () => { @@ -50,6 +46,7 @@ const ToolModal: React.FC = ({ editTool, onSaveTool, onCancel }) => { useEffect(() => { initModelList(); initPluginList(); + queryToolTypes(); }, []); useEffect(() => { @@ -65,6 +62,21 @@ const ToolModal: React.FC = ({ editTool, onSaveTool, onCancel }) => { } }, [editTool]); + const queryToolTypes = async () => { + const { code, data } = await getToolTypes(); + if (code === 200 && data) { + const options = Object.keys(data).map((key: string) => { + return { + label: data[key], + value: key, + }; + }); + setToolTypesOptions(options); + } else { + message.error('获取工具类型失败'); + } + }; + const layout = { labelCol: { span: 6 }, wrapperCol: { span: 14 }, @@ -95,11 +107,7 @@ const ToolModal: React.FC = ({ editTool, onSaveTool, onCancel }) => { >
- diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx index 8fc7824e5..78b220180 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx @@ -1,10 +1,11 @@ import { uuid } from '@/utils/utils'; import { DeleteOutlined, EditOutlined, ToolOutlined } from '@ant-design/icons'; -import { Empty, Popconfirm } from 'antd'; -import { useState } from 'react'; +import { Empty, Popconfirm, message } from 'antd'; +import { useState, useEffect } from 'react'; import styles from './style.less'; import ToolModal from './ToolModal'; -import { AgentToolType, AgentType, AGENT_TOOL_TYPE_LIST } from './type'; +import { getToolTypes } from './service'; +import { AgentToolType, AgentType } from './type'; type Props = { currentAgent?: AgentType; @@ -15,6 +16,12 @@ const ToolsSection: React.FC = ({ currentAgent, onSaveAgent }) => { const [modalVisible, setModalVisible] = useState(false); const [editTool, setEditTool] = useState(); + const [toolTypesOptions, setToolTypesOptions] = useState([]); + + useEffect(() => { + queryToolTypes(); + }, []); + const toolConfig = currentAgent?.toolConfig ? JSON.parse(currentAgent.toolConfig as any) : {}; const saveAgent = async (agent: AgentType) => { @@ -22,6 +29,21 @@ const ToolsSection: React.FC = ({ currentAgent, onSaveAgent }) => { setModalVisible(false); }; + const queryToolTypes = async () => { + const { code, data } = await getToolTypes(); + if (code === 200 && data) { + const options = Object.keys(data).map((key: string) => { + return { + label: data[key], + value: key, + }; + }); + setToolTypesOptions(options); + } else { + message.error('获取工具类型失败'); + } + }; + const onSaveTool = async (tool: AgentToolType) => { const newAgentConfig = toolConfig || ({} as any); if (!newAgentConfig.tools) { @@ -60,7 +82,7 @@ const ToolsSection: React.FC = ({ currentAgent, onSaveAgent }) => { {toolConfig?.tools && toolConfig?.tools?.length > 0 ? (
{toolConfig.tools.map((tool: AgentToolType) => { - const toolType = AGENT_TOOL_TYPE_LIST.find((item) => item.value === tool.type)?.label; + const toolType = toolTypesOptions.find((item) => item.value === tool.type)?.label; return (
{ + return request(`${process.env.CHAT_API_BASE_URL}agent/getToolTypes`, { + method: 'GET', + }); +} diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/type.ts b/webapp/packages/supersonic-fe/src/pages/Agent/type.ts index ed38b937c..45eea5727 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/type.ts +++ b/webapp/packages/supersonic-fe/src/pages/Agent/type.ts @@ -8,23 +8,9 @@ export enum AgentToolTypeEnum { NL2SQL_RULE = 'NL2SQL_RULE', NL2SQL_LLM = 'NL2SQL_LLM', PLUGIN = 'PLUGIN', + DATASET = 'DATASET', } -export const AGENT_TOOL_TYPE_LIST = [ - { - label: '规则语义解析', - value: AgentToolTypeEnum.NL2SQL_RULE, - }, - { - label: '大模型语义解析', - value: AgentToolTypeEnum.NL2SQL_LLM, - }, - { - label: '第三方插件', - value: AgentToolTypeEnum.PLUGIN, - }, -]; - export enum QueryModeEnum { METRIC = 'METRIC', DETAIL = 'DETAIL', @@ -97,7 +83,7 @@ export type AgentType = { status?: 0 | 1; enableSearch?: 0 | 1; toolConfig?: string; - modelConfig: LlmConfigType; + modelConfig?: LlmConfigType; multiTurnConfig?: MultiTurnConfig; visualConfig?: VisualConfig; }; diff --git a/webapp/packages/supersonic-fe/src/pages/System/index.tsx b/webapp/packages/supersonic-fe/src/pages/System/index.tsx index 634a93b7d..533008ed2 100644 --- a/webapp/packages/supersonic-fe/src/pages/System/index.tsx +++ b/webapp/packages/supersonic-fe/src/pages/System/index.tsx @@ -5,7 +5,7 @@ import { getSystemConfig, saveSystemConfig } from '@/services/user'; import { ProCard } from '@ant-design/pro-components'; import SelectTMEPerson from '@/components/SelectTMEPerson'; import { ConfigParametersItem, SystemConfig, dependenciesItem } from './types'; -import { testLLMConn } from '../../services/system'; +// import { testLLMConn } from '../../services/system'; import { groupBy } from 'lodash'; import { genneratorFormItemList } from '../SemanticModel/utils'; @@ -23,7 +23,7 @@ const System: React.FC = () => { const configMap = useRef>(); const configIocDepMap = useRef>(); - const [llmTestLoading, setLlmTestLoading] = useState(false); + // const [llmTestLoading, setLlmTestLoading] = useState(false); useEffect(() => { querySystemConfig(); @@ -48,7 +48,6 @@ const System: React.FC = () => { configMap.current = parametersMap; groupConfigAndSet(parameters); - console.log(parameters, admins, 232323); initDepConfig(parameters, admins); setConfigSource(data); @@ -197,16 +196,16 @@ const System: React.FC = () => { groupConfigAndSet(Object.values(tempConfigMap)); }; - 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 testLLMConnect = async (params: any) => { + // setLlmTestLoading(true); + // const { code, data } = await testLLMConn(params); + // setLlmTestLoading(false); + // if (code === 200 && data) { + // message.success('连接成功'); + // } else { + // message.error('模型连接失败'); + // } + // }; return ( <>