From b0e120ef2ebd5924e0fe8ccf83befa0297121966 Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Sun, 29 Sep 2024 16:04:17 +0800 Subject: [PATCH] [improvement][headless-fe] Enhanced the memory management feature by adding sorting functionality and other optimization features. (#1738) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [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. * [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. --------- Co-authored-by: tristanliu --- webapp/packages/supersonic-fe/config/proxy.ts | 3 +- webapp/packages/supersonic-fe/src/global.less | 2 +- .../src/pages/Agent/AgentForm.tsx | 39 ++++-- .../src/pages/Agent/MemorySection.tsx | 114 ++++++++++++++++-- .../supersonic-fe/src/pages/Agent/service.ts | 13 +- .../components/ClassMetricTable.tsx | 1 + .../components/Term/TermTable.tsx | 1 - 7 files changed, 151 insertions(+), 22 deletions(-) diff --git a/webapp/packages/supersonic-fe/config/proxy.ts b/webapp/packages/supersonic-fe/config/proxy.ts index 166919713..98dc00814 100644 --- a/webapp/packages/supersonic-fe/config/proxy.ts +++ b/webapp/packages/supersonic-fe/config/proxy.ts @@ -1,7 +1,8 @@ export default { dev: { '/api/': { - target: 'http://localhost:9080', + target: 'http://10.91.206.51:9080', + // target: 'http://s2.tmeoa.com', changeOrigin: true, }, }, diff --git a/webapp/packages/supersonic-fe/src/global.less b/webapp/packages/supersonic-fe/src/global.less index 3359784ee..30ebda48d 100644 --- a/webapp/packages/supersonic-fe/src/global.less +++ b/webapp/packages/supersonic-fe/src/global.less @@ -276,7 +276,7 @@ ol { .ant-form-item-label { .anticon { position: relative; - top: 2px; + top: 1px; } } .ant-input-search .ant-input-search-button { diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx index 9e7f6c437..05ec97d33 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx @@ -11,6 +11,7 @@ import { Row, message, Space, + Tooltip, } from 'antd'; import MainTitleMark from '@/components/MainTitleMark'; import { AgentType } from './type'; @@ -20,6 +21,7 @@ import { DeleteOutlined, PlusOutlined } from '@ant-design/icons'; import { uuid, jsonParse, encryptPassword, decryptPassword } from '@/utils/utils'; import ToolsSection from './ToolsSection'; import globalStyles from '@/global.less'; +import { QuestionCircleOutlined } from '@ant-design/icons'; import { testLLMConn } from '../../services/system'; import MemorySection from './MemorySection'; @@ -118,6 +120,12 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli message.error('模型连接失败'); } }; + const tips = [ + '自定义提示词模板可嵌入以下变量，将由系统自动进行替换：', + '-{{exemplar}} :替换成few-shot示例，示例个数由系统配置', + '-{{question}} :替换成用户问题，拼接了一定的补充信息', + '-{{schema}} :替换成数据语义信息，根据用户问题映射而来', + ]; const formTabList = [ { @@ -397,14 +405,29 @@ const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnCli key: 'promptConfig', children: (
- - + + + 提示词模板 + + {tips.map((tip) => ( +
{tip}
+ ))} + + } + > + + + + + } + > +
), diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/MemorySection.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/MemorySection.tsx index fd6f92e89..5ae2ba586 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/MemorySection.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/MemorySection.tsx @@ -2,10 +2,11 @@ import type { ProColumns } from '@ant-design/pro-components'; import { EditableProTable } from '@ant-design/pro-components'; import React, { useState } from 'react'; import { MemoryType, ReviewEnum, StatusEnum } from './type'; -import { getMemeoryList, saveMemory } from './service'; -import { Popover, Input, Badge, Radio, Select, Button } from 'antd'; +import { getMemeoryList, saveMemory, batchDeleteMemory } from './service'; +import { Popover, Input, Badge, Radio, Select, Button, message } from 'antd'; import styles from './style.less'; - +import { isArrayOfValues } from '@/utils/utils'; +import dayjs from 'dayjs'; const { TextArea } = Input; const RadioGroup = Radio.Group; @@ -19,6 +20,24 @@ const MemorySection = ({ agentId }: Props) => { const [loading, setLoading] = useState(false); const [filters, setFilters] = useState({}); const { question, status, llmReviewRet, humanReviewRet } = filters; + const [selectedRowKeys, setSelectedRowKeys] = useState([]); + + const defaultPagination = { + current: 1, + pageSize: 10, + total: 0, + }; + const [pagination, setPagination] = useState(defaultPagination); + + const deleteTermConfig = async (ids: number[]) => { + const { code, msg } = await batchDeleteMemory(ids); + if (code === 200) { + loadMemoryList(); + setSelectedRowKeys([]); + } else { + message.error(msg); + } + }; const columns: ProColumns[] = [ { @@ -73,6 +92,7 @@ const MemorySection = ({ agentId }: Props) => { status: 'Error', }, }, + sorter: true, }, { title: '管理员评估意见', @@ -96,6 +116,7 @@ const MemorySection = ({ agentId }: Props) => { key: 'humanReviewRet', dataIndex: 'humanReviewRet', width: 150, + sorter: true, valueType: 'radio', renderFormItem: (_, { record }) => ( { dataIndex: 'status', valueType: 'radio', width: 120, + sorter: true, tooltip: '若启用，将会把这条记录加入到向量库中作为样例召回供大模型参考以及作为相似问题推荐给用户', valueEnum: { @@ -145,6 +167,26 @@ const MemorySection = ({ agentId }: Props) => { } }, }, + { + dataIndex: 'updatedAt', + title: '更新时间', + editable: false, + search: false, + sorter: true, + render: (value: any) => { + return value && value !== '-' ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '-'; + }, + }, + { + dataIndex: 'createdAt', + title: '创建时间', + search: false, + editable: false, + sorter: true, + render: (value: any) => { + return value && value !== '-' ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '-'; + }, + }, { title: '操作', valueType: 'option', @@ -162,10 +204,15 @@ const MemorySection = ({ agentId }: Props) => { }, ]; - const loadMemoryList = async ({ - filtersValue, - current, - }: { filtersValue?: any; current?: number } = {}) => { + const sortMap = { + ascend: 'asc', + descend: 'desc', + }; + + const loadMemoryList = async ( + { filtersValue, current }: { filtersValue?: any; current?: number } = {}, + sort?: any, + ) => { if (!agentId) { return { data: [], @@ -173,17 +220,49 @@ const MemorySection = ({ agentId }: Props) => { success: true, }; } + let sortParams: { orderCondition: string; sort: 'desc' | 'asc' } = { + orderCondition: 'updatedAt', + sort: 'desc', + }; + + if (sort) { + const target = Object.entries(sort)[0]; + if (target) { + const [sortKey, sortValue] = target; + if (sortKey && sortValue) { + sortParams = { + orderCondition: sortKey, + sort: sortMap[sortValue] || 'desc', + }; + } + } + } setLoading(true); - const res = await getMemeoryList(agentId, filtersValue || filters, current || 1); + const res = await getMemeoryList({ + agentId, + chatMemoryFilter: filtersValue || filters, + current: current || 1, + ...sortParams, + }); setLoading(false); - const { list, total } = res.data; + const { list, total, pageSize, pageNum } = res.data; setDataSource(list); + setPagination({ + pageSize, + current: pageNum, + total, + }); return { data: list, total: total, success: true, }; }; + const rowSelection = { + onChange: (selectedRowKeys: React.Key[]) => { + setSelectedRowKeys(selectedRowKeys as number[]); + }, + }; const onSave = async (_: any, data: any) => { await saveMemory(data); @@ -258,6 +337,16 @@ const MemorySection = ({ agentId }: Props) => { + rowKey="id" @@ -265,9 +354,14 @@ const MemorySection = ({ agentId }: Props) => { loading={loading} columns={columns} request={loadMemoryList} + rowSelection={{ + type: 'checkbox', + ...rowSelection, + }} value={dataSource} onChange={setDataSource} - pagination={{ pageSize: 10 }} + // pagination={{ pageSize: 10 }} + pagination={pagination} sticky={{ offsetHeader: 0 }} editable={{ type: 'multiple', diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/service.ts b/webapp/packages/supersonic-fe/src/pages/Agent/service.ts index 4c6fe3e60..1a3f45d9d 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/service.ts +++ b/webapp/packages/supersonic-fe/src/pages/Agent/service.ts @@ -35,13 +35,17 @@ export function getMetricList(modelId: number) { }); } -export function getMemeoryList(agentId: number, chatMemoryFilter: any, current: number) { +export function getMemeoryList(data: { agentId: number; chatMemoryFilter: any; current: number }) { + const { agentId, chatMemoryFilter, current } = data; return request>('/api/chat/memory/pageMemories', { method: 'POST', data: { + ...data, chatMemoryFilter: { agentId, ...chatMemoryFilter }, current, pageSize: 10, + sort: 'desc', + // orderCondition: 'updatedAt', }, }); } @@ -52,3 +56,10 @@ export function saveMemory(data: MemoryType) { data, }); } + +export function batchDeleteMemory(ids: number[]) { + return request>('/api/chat/memory/batchDelete', { + method: 'POST', + data: { ids }, + }); +} diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx index e15d32046..974105a88 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/ClassMetricTable.tsx @@ -222,6 +222,7 @@ const ClassMetricTable: React.FC = ({ onEmptyMetricData }) => { { ...columnsConfig.createInfo, }, + { title: '操作', dataIndex: 'x', diff --git a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx index 6ed97b7e2..70696c490 100644 --- a/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx +++ b/webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Term/TermTable.tsx @@ -167,7 +167,6 @@ const TermTable: React.FC = ({}) => { { queryTermList(value); }}