From d7ec32a007b254ab72cad121b7a5c95a66a51c11 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Thu, 31 Oct 2024 19:44:18 +0800 Subject: [PATCH] [improvement][headless-fe] Enhanced the display of errMsg and textSummary in the question-answering dialogue of the assistant module (#1868) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [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. * [improvement][headless-fe] Added new functionality to the assistant's memory management system * [improvement][headless-fe] Optimized the management of CSS styles in the assistant module. * [improvement][headless] fixed build config * [improvement][headless-fe] Revamped the dimension value settings in the assistant module. * [improvement][headless-fe] Optimized the initialization process of dimension value settings in the assistant module. * [improvement][headless-fe] Added support for user confirmation mode in the question-answering dialogue of the assistant module. * [improvement][headless-be] As part of the ongoing improvements to the question-answering dialogue, the datasetId will now be included as a parameter in the API endpoint /api/chat/query/search for querying the question-answering dataset. * [improvement][headless-be] Optimized the logic for intent confirmation and streamlined mode in the question-answering dialogue of the assistant module. * [improvement][headless-be] rollback proxy config * [improvement][headless-fe] Enhanced the display of errMsg and textSummary in the question-answering dialogue of the assistant module --- webapp/packages/chat-sdk/src/common/type.ts | 1 + .../src/components/ChatItem/ExecuteItem.tsx | 23 ++++++++++-- .../components/ChatItem/ExpandParseTip.tsx | 35 +++---------------- .../src/components/ChatItem/index.tsx | 4 +-- .../src/components/ChatMsg/Table/index.tsx | 10 ++++-- .../chat-sdk/src/components/ChatMsg/index.tsx | 3 +- 6 files changed, 36 insertions(+), 40 deletions(-) diff --git a/webapp/packages/chat-sdk/src/common/type.ts b/webapp/packages/chat-sdk/src/common/type.ts index 3e25d4066..19c1d0955 100644 --- a/webapp/packages/chat-sdk/src/common/type.ts +++ b/webapp/packages/chat-sdk/src/common/type.ts @@ -149,6 +149,7 @@ export type MsgDataType = { recommendedDimensions: DrillDownDimensionType[]; textResult: string; errorMsg: string; + textSummary: string; }; export enum ParseStateEnum { diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/ExecuteItem.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/ExecuteItem.tsx index 6c609a231..5968da3de 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/ExecuteItem.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatItem/ExecuteItem.tsx @@ -1,5 +1,5 @@ -import { Spin, Switch } from 'antd'; -import { CheckCircleFilled } from '@ant-design/icons'; +import { Spin, Switch, Tooltip } from 'antd'; +import { CheckCircleFilled, InfoCircleOutlined } from '@ant-design/icons'; import { PREFIX_CLS, MsgContentTypeEnum } from '../../common/constants'; import { MsgDataType } from '../../common/type'; import ChatMsg from '../ChatMsg'; @@ -15,6 +15,7 @@ type Props = { entitySwitchLoading?: boolean; chartIndex: number; executeTip?: string; + executeErrorMsg?: string; executeItemNode?: ReactNode; renderCustomExecuteNode?: boolean; data?: MsgDataType; @@ -31,6 +32,7 @@ const ExecuteItem: React.FC = ({ entitySwitchLoading = false, chartIndex, executeTip, + executeErrorMsg, executeItemNode, renderCustomExecuteNode, data, @@ -66,7 +68,13 @@ const ExecuteItem: React.FC = ({ if (executeTip) { return getNodeTip( <> - {titlePrefix}查询失败 + {titlePrefix}查询失败 + {executeErrorMsg && ( + + + + )} + {!!data?.queryTimeCost && isDeveloper && ( (耗时: {data.queryTimeCost}ms) )} @@ -121,6 +129,15 @@ const ExecuteItem: React.FC = ({ {data.queryAuthorization?.message && (
提示：{data.queryAuthorization.message}
)} + {data.textSummary && ( +

+ + 总结: + + {data.textSummary} +

+ )} + {renderCustomExecuteNode && executeItemNode ? ( executeItemNode ) : data?.queryMode === 'PLAIN_TEXT' || data?.queryMode === 'WEB_SERVICE' ? ( diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/ExpandParseTip.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/ExpandParseTip.tsx index 38475f724..8e4a4c49f 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/ExpandParseTip.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatItem/ExpandParseTip.tsx @@ -1,4 +1,4 @@ -import React, { ReactNode } from 'react'; +import React, { ReactNode, useState } from 'react'; import { ChatContextType, DateInfoType, EntityInfoType, FilterItemType } from '../../common/type'; import { Button, DatePicker, Row, Col } from 'antd'; import { CheckCircleFilled, CloseCircleFilled } from '@ant-design/icons'; @@ -21,7 +21,6 @@ const { RangePicker } = DatePicker; type Props = { isSimpleMode?: boolean; parseInfoOptions: ChatContextType[]; - currentParseInfo?: ChatContextType; agentId?: number; integrateSystem?: string; parseTimeCost?: number; @@ -40,7 +39,6 @@ type RangeKeys = '近7日' | '近14日' | '近30日' | '本周' | '本月' | ' const ExpandParseTip: React.FC = ({ isSimpleMode = false, parseInfoOptions, - currentParseInfo, agentId, integrateSystem, parseTimeCost, @@ -52,6 +50,8 @@ const ExpandParseTip: React.FC = ({ onRefresh, handlePresetClick, }) => { + const [currentParseInfo, setCurrentParseInfo] = useState(); + const ranges: Record = { 近7日: [dayjs().subtract(7, 'day'), dayjs()], 近14日: [dayjs().subtract(14, 'day'), dayjs()], @@ -227,33 +227,7 @@ const ExpandParseTip: React.FC = ({ ); })} - {/* {parseInfoOptions.map((parseInfo, index) => { - const { queryMode, properties, textInfo, id, dimensionFilters, entityInfo } = - parseInfo || {}; - const { type: agentType } = properties || {}; - return ( -
-
- - 解析{index + 1}: - -
-
- {isSimpleMode ? ( - - ) : ( - <> - {getTipNode({ parseInfo, dimensionFilters, entityInfo })} - {!(!!agentType && queryMode !== 'LLM_S2SQL') && getFiltersNode(parseInfo)} - - )} -
-
- ); - })} */} + {parseInfoOptions?.length > 1 && (
@@ -274,6 +248,7 @@ const ExpandParseTip: React.FC = ({ if (currentParseInfo) { return; } + setCurrentParseInfo(parseInfo); onSelectParseInfo(parseInfo); }} key={parseInfo.id} diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx index 1dc4643e3..72b77fb0c 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx @@ -434,7 +434,7 @@ const ChatItem: React.FC = ({ const { llmReq, llmResp } = parseInfo?.properties?.CONTEXT || {}; return ( -
+
{!isMobile && }
@@ -450,7 +450,6 @@ const ChatItem: React.FC = ({ = ({ queryMode={parseInfo?.queryMode} executeLoading={executeLoading} executeTip={executeTip} + executeErrorMsg={executeErrorMsg} chartIndex={0} data={data} triggerResize={triggerResize} diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx index 63523832f..30907aea1 100644 --- a/webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx @@ -1,4 +1,8 @@ -import { formatByDecimalPlaces, getFormattedValue } from '../../../utils/utils'; +import { + formatByDecimalPlaces, + getFormattedValue, + formatByThousandSeperator, +} from '../../../utils/utils'; import { Table as AntTable } from 'antd'; import { MsgDataType } from '../../../common/type'; import { CLS_PREFIX } from '../../../common/constants'; @@ -17,7 +21,6 @@ const Table: React.FC = ({ data, size, loading, onApplyAuth }) => { const { entityInfo, queryColumns, queryResults } = data; const prefixCls = `${CLS_PREFIX}-table`; - const tableColumns: any[] = queryColumns.map( ({ name, nameEn, showType, dataFormatType, dataFormat, authorized }) => { return { @@ -47,7 +50,8 @@ const Table: React.FC = ({ data, size, loading, onApplyAuth }) => { if (showType === 'NUMBER') { return (
- {getFormattedValue(value as number)} + {/* {getFormattedValue(value as number)} */} + {formatByThousandSeperator(value)}
); } diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx index de6704c61..cd166408e 100644 --- a/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx @@ -214,8 +214,7 @@ const ChatMsg: React.FC = ({ ); case MsgContentTypeEnum.MARKDOWN: return ( -
- {/* {data.textResult} */} +
);