mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-10 19:51:00 +00:00
[improvement][headless-fe] Enhanced the display of errMsg and textSummary in the question-answering dialogue of the assistant module (#1868)
* [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
This commit is contained in:
@@ -149,6 +149,7 @@ export type MsgDataType = {
|
|||||||
recommendedDimensions: DrillDownDimensionType[];
|
recommendedDimensions: DrillDownDimensionType[];
|
||||||
textResult: string;
|
textResult: string;
|
||||||
errorMsg: string;
|
errorMsg: string;
|
||||||
|
textSummary: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export enum ParseStateEnum {
|
export enum ParseStateEnum {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Spin, Switch } from 'antd';
|
import { Spin, Switch, Tooltip } from 'antd';
|
||||||
import { CheckCircleFilled } from '@ant-design/icons';
|
import { CheckCircleFilled, InfoCircleOutlined } from '@ant-design/icons';
|
||||||
import { PREFIX_CLS, MsgContentTypeEnum } from '../../common/constants';
|
import { PREFIX_CLS, MsgContentTypeEnum } from '../../common/constants';
|
||||||
import { MsgDataType } from '../../common/type';
|
import { MsgDataType } from '../../common/type';
|
||||||
import ChatMsg from '../ChatMsg';
|
import ChatMsg from '../ChatMsg';
|
||||||
@@ -15,6 +15,7 @@ type Props = {
|
|||||||
entitySwitchLoading?: boolean;
|
entitySwitchLoading?: boolean;
|
||||||
chartIndex: number;
|
chartIndex: number;
|
||||||
executeTip?: string;
|
executeTip?: string;
|
||||||
|
executeErrorMsg?: string;
|
||||||
executeItemNode?: ReactNode;
|
executeItemNode?: ReactNode;
|
||||||
renderCustomExecuteNode?: boolean;
|
renderCustomExecuteNode?: boolean;
|
||||||
data?: MsgDataType;
|
data?: MsgDataType;
|
||||||
@@ -31,6 +32,7 @@ const ExecuteItem: React.FC<Props> = ({
|
|||||||
entitySwitchLoading = false,
|
entitySwitchLoading = false,
|
||||||
chartIndex,
|
chartIndex,
|
||||||
executeTip,
|
executeTip,
|
||||||
|
executeErrorMsg,
|
||||||
executeItemNode,
|
executeItemNode,
|
||||||
renderCustomExecuteNode,
|
renderCustomExecuteNode,
|
||||||
data,
|
data,
|
||||||
@@ -66,7 +68,13 @@ const ExecuteItem: React.FC<Props> = ({
|
|||||||
if (executeTip) {
|
if (executeTip) {
|
||||||
return getNodeTip(
|
return getNodeTip(
|
||||||
<>
|
<>
|
||||||
{titlePrefix}查询失败
|
<span>{titlePrefix}查询失败</span>
|
||||||
|
{executeErrorMsg && (
|
||||||
|
<Tooltip title={executeErrorMsg}>
|
||||||
|
<InfoCircleOutlined style={{ marginLeft: 5, color: 'red' }} />
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
|
||||||
{!!data?.queryTimeCost && isDeveloper && (
|
{!!data?.queryTimeCost && isDeveloper && (
|
||||||
<span className={`${prefixCls}-title-tip`}>(耗时: {data.queryTimeCost}ms)</span>
|
<span className={`${prefixCls}-title-tip`}>(耗时: {data.queryTimeCost}ms)</span>
|
||||||
)}
|
)}
|
||||||
@@ -121,6 +129,15 @@ const ExecuteItem: React.FC<Props> = ({
|
|||||||
{data.queryAuthorization?.message && (
|
{data.queryAuthorization?.message && (
|
||||||
<div className={`${prefixCls}-auth-tip`}>提示:{data.queryAuthorization.message}</div>
|
<div className={`${prefixCls}-auth-tip`}>提示:{data.queryAuthorization.message}</div>
|
||||||
)}
|
)}
|
||||||
|
{data.textSummary && (
|
||||||
|
<p>
|
||||||
|
<span className={`${prefixCls}-step-title`} style={{ marginRight: 5 }}>
|
||||||
|
总结:
|
||||||
|
</span>
|
||||||
|
{data.textSummary}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
|
||||||
{renderCustomExecuteNode && executeItemNode ? (
|
{renderCustomExecuteNode && executeItemNode ? (
|
||||||
executeItemNode
|
executeItemNode
|
||||||
) : data?.queryMode === 'PLAIN_TEXT' || data?.queryMode === 'WEB_SERVICE' ? (
|
) : data?.queryMode === 'PLAIN_TEXT' || data?.queryMode === 'WEB_SERVICE' ? (
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { ReactNode } from 'react';
|
import React, { ReactNode, useState } from 'react';
|
||||||
import { ChatContextType, DateInfoType, EntityInfoType, FilterItemType } from '../../common/type';
|
import { ChatContextType, DateInfoType, EntityInfoType, FilterItemType } from '../../common/type';
|
||||||
import { Button, DatePicker, Row, Col } from 'antd';
|
import { Button, DatePicker, Row, Col } from 'antd';
|
||||||
import { CheckCircleFilled, CloseCircleFilled } from '@ant-design/icons';
|
import { CheckCircleFilled, CloseCircleFilled } from '@ant-design/icons';
|
||||||
@@ -21,7 +21,6 @@ const { RangePicker } = DatePicker;
|
|||||||
type Props = {
|
type Props = {
|
||||||
isSimpleMode?: boolean;
|
isSimpleMode?: boolean;
|
||||||
parseInfoOptions: ChatContextType[];
|
parseInfoOptions: ChatContextType[];
|
||||||
currentParseInfo?: ChatContextType;
|
|
||||||
agentId?: number;
|
agentId?: number;
|
||||||
integrateSystem?: string;
|
integrateSystem?: string;
|
||||||
parseTimeCost?: number;
|
parseTimeCost?: number;
|
||||||
@@ -40,7 +39,6 @@ type RangeKeys = '近7日' | '近14日' | '近30日' | '本周' | '本月' | '
|
|||||||
const ExpandParseTip: React.FC<Props> = ({
|
const ExpandParseTip: React.FC<Props> = ({
|
||||||
isSimpleMode = false,
|
isSimpleMode = false,
|
||||||
parseInfoOptions,
|
parseInfoOptions,
|
||||||
currentParseInfo,
|
|
||||||
agentId,
|
agentId,
|
||||||
integrateSystem,
|
integrateSystem,
|
||||||
parseTimeCost,
|
parseTimeCost,
|
||||||
@@ -52,6 +50,8 @@ const ExpandParseTip: React.FC<Props> = ({
|
|||||||
onRefresh,
|
onRefresh,
|
||||||
handlePresetClick,
|
handlePresetClick,
|
||||||
}) => {
|
}) => {
|
||||||
|
const [currentParseInfo, setCurrentParseInfo] = useState<ChatContextType>();
|
||||||
|
|
||||||
const ranges: Record<RangeKeys, RangeValue> = {
|
const ranges: Record<RangeKeys, RangeValue> = {
|
||||||
近7日: [dayjs().subtract(7, 'day'), dayjs()],
|
近7日: [dayjs().subtract(7, 'day'), dayjs()],
|
||||||
近14日: [dayjs().subtract(14, 'day'), dayjs()],
|
近14日: [dayjs().subtract(14, 'day'), dayjs()],
|
||||||
@@ -227,33 +227,7 @@ const ExpandParseTip: React.FC<Props> = ({
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
{/* {parseInfoOptions.map((parseInfo, index) => {
|
|
||||||
const { queryMode, properties, textInfo, id, dimensionFilters, entityInfo } =
|
|
||||||
parseInfo || {};
|
|
||||||
const { type: agentType } = properties || {};
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
style={{ marginBottom: 10, paddingBottom: 10, borderBottom: '1px solid #eee' }}
|
|
||||||
key={`${id}-${textInfo}`}
|
|
||||||
>
|
|
||||||
<div style={{ marginBottom: 10, height: '30px', lineHeight: '30px' }}>
|
|
||||||
<span className={`${prefixCls}-content-parser-options-title`}>
|
|
||||||
解析{index + 1}:
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className={`${prefixCls}-tip`}>
|
|
||||||
{isSimpleMode ? (
|
|
||||||
<MarkDown markdown={textInfo} />
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
{getTipNode({ parseInfo, dimensionFilters, entityInfo })}
|
|
||||||
{!(!!agentType && queryMode !== 'LLM_S2SQL') && getFiltersNode(parseInfo)}
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
})} */}
|
|
||||||
{parseInfoOptions?.length > 1 && (
|
{parseInfoOptions?.length > 1 && (
|
||||||
<div className={`${prefixCls}-content-parser-container`}>
|
<div className={`${prefixCls}-content-parser-container`}>
|
||||||
<div className={`${prefixCls}-content-options`}>
|
<div className={`${prefixCls}-content-options`}>
|
||||||
@@ -274,6 +248,7 @@ const ExpandParseTip: React.FC<Props> = ({
|
|||||||
if (currentParseInfo) {
|
if (currentParseInfo) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
setCurrentParseInfo(parseInfo);
|
||||||
onSelectParseInfo(parseInfo);
|
onSelectParseInfo(parseInfo);
|
||||||
}}
|
}}
|
||||||
key={parseInfo.id}
|
key={parseInfo.id}
|
||||||
|
|||||||
@@ -434,7 +434,7 @@ const ChatItem: React.FC<Props> = ({
|
|||||||
const { llmReq, llmResp } = parseInfo?.properties?.CONTEXT || {};
|
const { llmReq, llmResp } = parseInfo?.properties?.CONTEXT || {};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={prefixCls} key={parseInfo?.queryId}>
|
<div className={prefixCls}>
|
||||||
{!isMobile && <IconFont type="icon-zhinengsuanfa" className={`${prefixCls}-avatar`} />}
|
{!isMobile && <IconFont type="icon-zhinengsuanfa" className={`${prefixCls}-avatar`} />}
|
||||||
<div className={isMobile ? `${prefixCls}-mobile-msg-card` : ''}>
|
<div className={isMobile ? `${prefixCls}-mobile-msg-card` : ''}>
|
||||||
<div className={`${prefixCls}-time`}>
|
<div className={`${prefixCls}-time`}>
|
||||||
@@ -450,7 +450,6 @@ const ChatItem: React.FC<Props> = ({
|
|||||||
<ExpandParseTip
|
<ExpandParseTip
|
||||||
isSimpleMode={isSimpleMode}
|
isSimpleMode={isSimpleMode}
|
||||||
parseInfoOptions={preParseInfoOptions}
|
parseInfoOptions={preParseInfoOptions}
|
||||||
currentParseInfo={parseInfo}
|
|
||||||
agentId={agentId}
|
agentId={agentId}
|
||||||
integrateSystem={integrateSystem}
|
integrateSystem={integrateSystem}
|
||||||
parseTimeCost={parseTimeCost?.parseTime}
|
parseTimeCost={parseTimeCost?.parseTime}
|
||||||
@@ -516,6 +515,7 @@ const ChatItem: React.FC<Props> = ({
|
|||||||
queryMode={parseInfo?.queryMode}
|
queryMode={parseInfo?.queryMode}
|
||||||
executeLoading={executeLoading}
|
executeLoading={executeLoading}
|
||||||
executeTip={executeTip}
|
executeTip={executeTip}
|
||||||
|
executeErrorMsg={executeErrorMsg}
|
||||||
chartIndex={0}
|
chartIndex={0}
|
||||||
data={data}
|
data={data}
|
||||||
triggerResize={triggerResize}
|
triggerResize={triggerResize}
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
import { formatByDecimalPlaces, getFormattedValue } from '../../../utils/utils';
|
import {
|
||||||
|
formatByDecimalPlaces,
|
||||||
|
getFormattedValue,
|
||||||
|
formatByThousandSeperator,
|
||||||
|
} from '../../../utils/utils';
|
||||||
import { Table as AntTable } from 'antd';
|
import { Table as AntTable } from 'antd';
|
||||||
import { MsgDataType } from '../../../common/type';
|
import { MsgDataType } from '../../../common/type';
|
||||||
import { CLS_PREFIX } from '../../../common/constants';
|
import { CLS_PREFIX } from '../../../common/constants';
|
||||||
@@ -17,7 +21,6 @@ const Table: React.FC<Props> = ({ data, size, loading, onApplyAuth }) => {
|
|||||||
const { entityInfo, queryColumns, queryResults } = data;
|
const { entityInfo, queryColumns, queryResults } = data;
|
||||||
|
|
||||||
const prefixCls = `${CLS_PREFIX}-table`;
|
const prefixCls = `${CLS_PREFIX}-table`;
|
||||||
|
|
||||||
const tableColumns: any[] = queryColumns.map(
|
const tableColumns: any[] = queryColumns.map(
|
||||||
({ name, nameEn, showType, dataFormatType, dataFormat, authorized }) => {
|
({ name, nameEn, showType, dataFormatType, dataFormat, authorized }) => {
|
||||||
return {
|
return {
|
||||||
@@ -47,7 +50,8 @@ const Table: React.FC<Props> = ({ data, size, loading, onApplyAuth }) => {
|
|||||||
if (showType === 'NUMBER') {
|
if (showType === 'NUMBER') {
|
||||||
return (
|
return (
|
||||||
<div className={`${prefixCls}-formatted-value`}>
|
<div className={`${prefixCls}-formatted-value`}>
|
||||||
{getFormattedValue(value as number)}
|
{/* {getFormattedValue(value as number)} */}
|
||||||
|
{formatByThousandSeperator(value)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -214,8 +214,7 @@ const ChatMsg: React.FC<Props> = ({
|
|||||||
);
|
);
|
||||||
case MsgContentTypeEnum.MARKDOWN:
|
case MsgContentTypeEnum.MARKDOWN:
|
||||||
return (
|
return (
|
||||||
<div style={{ maxHeight: 800, overflow: 'scroll' }}>
|
<div style={{ maxHeight: 800 }}>
|
||||||
{/* {data.textResult} */}
|
|
||||||
<MarkDown markdown={data.textResult} loading={loading} />
|
<MarkDown markdown={data.textResult} loading={loading} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user