From c98ba71b173045861139e9949a001be6e58d4076 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Fri, 31 May 2024 16:14:19 +0800 Subject: [PATCH] [improvement][headless-fe] Optimized data updating when switching domains. (#1063) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [improvement][semantic-fe] Add model alias setting & Add view permission restrictions to the model permission management tab. [improvement][semantic-fe] Add permission control to the action buttons for the main domain; apply high sensitivity filtering to the authorization of metrics/dimensions. [improvement][semantic-fe] Optimize the editing mode in the dimension/metric/datasource components to use the modelId stored in the database for data, instead of relying on the data from the state manager. * [improvement][semantic-fe] Add time granularity setting in the data source configuration. * [improvement][semantic-fe] Dictionary import for dimension values supported in Q&A visibility * [improvement][semantic-fe] Modification of data source creation prompt wording" * [improvement][semantic-fe] metric market experience optimization * [improvement][semantic-fe] enhance the analysis of metric trends * [improvement][semantic-fe] optimize the presentation of metric trend permissions * [improvement][semantic-fe] add metric trend download functionality * [improvement][semantic-fe] fix the dimension initialization issue in metric correlation * [improvement][semantic-fe] Fix the issue of database changes not taking effect when creating based on an SQL data source. * [improvement][semantic-fe] Optimizing pagination logic and some CSS styles * [improvement][semantic-fe] Fixing the API for the indicator list by changing "current" to "pageNum" * [improvement][semantic-fe] Fixing the default value setting for the indicator list * [improvement][semantic-fe] Adding batch operations for indicators/dimensions/models * [improvement][semantic-fe] Replacing the single status update API for indicators/dimensions with a batch update API * [improvement][semantic-fe] Redesigning the indicator homepage to incorporate trend charts and table functionality for indicators * [improvement][semantic-fe] Optimizing the logic for setting dimension values and editing data sources, and adding system settings functionality * [improvement][semantic-fe] Upgrading antd version to 5.x, extracting the batch operation button component, optimizing the interaction for system settings, and expanding the configuration generation types for list-to-select component. * [improvement][semantic-fe] Adding the ability to filter dimensions based on whether they are tags or not. * [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. --- .../src/components/ChatItem/ParseTip.tsx | 2 +- .../src/components/ChatMsg/MarkDown/index.tsx | 5 - .../chat-sdk/src/components/ChatMsg/index.tsx | 6 +- .../packages/supersonic-fe/config/config.ts | 7 +- .../supersonic-fe/config/defaultSettings.ts | 1 + .../src/pages/Agent/AgentModal.tsx | 24 ++-- .../src/pages/Agent/ToolModal.tsx | 23 ++-- .../src/pages/Agent/ToolsSection.tsx | 56 +++++----- .../Datasource/components/ModelFieldForm.tsx | 2 +- .../Insights/components/TagInfoSider.tsx | 8 +- .../Insights/components/TagObjectTable.tsx | 104 +++--------------- .../Metric/MetricInfoEditSider.tsx | 5 +- .../SemanticModel/Metric/MetricInfoSider.tsx | 6 +- .../View/components/DataSetTable.tsx | 2 +- .../SemanticModel/components/DomainList.tsx | 5 +- .../components/DomainManagerTab.tsx | 6 +- .../Entity/DimensionValueSettingForm.tsx | 8 -- .../Permission/PermissionAdminForm.tsx | 2 +- .../components/Permission/PermissionTable.tsx | 1 - .../components/Term/TermTable.tsx | 34 +----- .../src/pages/SemanticModel/service.ts | 5 - 21 files changed, 104 insertions(+), 208 deletions(-) diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx index 4a3302448..b23831cd2 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatItem/ParseTip.tsx @@ -300,7 +300,7 @@ const ParseTip: React.FC = ({ )} {parseInfoOptions?.length > 1 ? ':' : ''} - {parseInfoOptions?.length > 1 && ( + {!isSimpleMode && parseInfoOptions?.length > 1 && (
{parseInfoOptions.map((parseInfo, index) => (
void; }; const MarkDown: React.FC = ({ markdown, loading, onApplyAuth }) => { - // const { textResult } = data; const prefixCls = `${CLS_PREFIX}-markdown`; return ( diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx index 0374d0087..6ba6ce51b 100644 --- a/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx @@ -187,7 +187,11 @@ const ChatMsg: React.FC = ({ /> ); case MsgContentTypeEnum.MARKDOWN: - return ; + return ( +
+ +
+ ); default: return ( = ({ editAgent, onSaveAgent, onCancel }) => { const [saveLoading, setSaveLoading] = useState(false); const [examples, setExamples] = useState<{ id: string; question?: string }[]>([]); - const [formData, setFormData] = useState({}); + const [formData, setFormData] = useState({ + enableSearch: true, + llmConfig: { + timeOut: 60, + provider: 'OPEN_AI', + }, + }); const [form] = Form.useForm(); useEffect(() => { if (editAgent) { - form.setFieldsValue({ ...editAgent, enableSearch: editAgent.enableSearch !== 0 }); + const sourceData = { ...editAgent }; + if (!sourceData.llmConfig) { + delete sourceData.llmConfig; + } + form.setFieldsValue({ ...sourceData, enableSearch: editAgent.enableSearch !== 0 }); if (editAgent.examples) { setExamples(editAgent.examples.map((question) => ({ id: uuid(), question }))); } @@ -173,7 +183,7 @@ const AgentModal: React.FC = ({ editAgent, onSaveAgent, onCancel }) => { - + = ({ editAgent, onSaveAgent, onCancel }) => {
{ setFormData(values); }} diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx index 9024b6398..5c3c03949 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/ToolModal.tsx @@ -1,4 +1,4 @@ -import { Form, Modal, Input, Select, Button, TreeSelect } from 'antd'; +import { Form, Modal, Input, Select, Button, TreeSelect, message } from 'antd'; import { AgentToolType, AgentToolTypeEnum, @@ -32,14 +32,12 @@ const ToolModal: React.FC = ({ editTool, onSaveTool, onCancel }) => { const [form] = Form.useForm(); const initModelList = async () => { - const res = await getModelList(); - const treeData = traverseTree(res.data, (node: any) => { - node.title = node.name; - node.value = node.type === 'DOMAIN' ? `DOMAIN_${node.id}` : node.id; - node.checkable = - node.type === 'DATASET' || (node.type === 'DOMAIN' && node.children?.length > 0); - }); - setModelList([{ title: '默认', value: -1, type: 'DATASET' }, ...treeData]); + const { code, data } = await getModelList(); + if (code === 200) { + setModelList([{ name: '默认', id: -1 }, ...data]); + } else { + message.error('获取模型列表失败!'); + } }; const initPluginList = async () => { @@ -106,11 +104,10 @@ const ToolModal: React.FC = ({ editTool, onSaveTool, onCancel }) => { {(toolType === AgentToolTypeEnum.NL2SQL_RULE || toolType === AgentToolTypeEnum.NL2SQL_LLM) && ( - ({ label: item.name, value: item.id }))} placeholder="请选择数据集" - multiple - treeCheckable + mode="multiple" allowClear /> diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx index 9149ba945..82e130e50 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/ToolsSection.tsx @@ -111,34 +111,38 @@ const ToolsSection: React.FC = ({ currentAgent, onSaveAgent, onEditAgent, -
-
大模型信息
-
-
- 模型提供方式: - {currentAgent?.llmConfig?.provider} -
-
- 大模型名称: - {currentAgent?.llmConfig?.modelName} -
-
- Base URL: - {currentAgent?.llmConfig?.baseUrl} -
-
- API KEY: - {currentAgent?.llmConfig?.apiKey} -
-
- 回复随机性: - {currentAgent?.llmConfig?.temperature} -
-
- 超时时间(秒): {currentAgent?.llmConfig?.timeOut} + {currentAgent?.llmConfig && ( +
+
大模型信息
+
+
+ 模型提供方式: + {currentAgent?.llmConfig?.provider} +
+
+ 大模型名称: + {currentAgent?.llmConfig?.modelName} +
+
+ Base URL: + {currentAgent?.llmConfig?.baseUrl} +
+
+ API KEY: + {currentAgent?.llmConfig?.apiKey} +
+
+ Temperature: + {currentAgent?.llmConfig?.temperature} +
+
+ 超时时间(秒): {' '} + {currentAgent?.llmConfig?.timeOut} +
-
+ )} +
工具
diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx index 99ad7a6c4..949fee58f 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx @@ -141,7 +141,7 @@ const ModelFieldForm: React.FC = ({