From ff20ae400633a3b468af4ae13cdbfe20cff7827d Mon Sep 17 00:00:00 2001 From: tristanliu <37809633+sevenliu1896@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:22:19 +0800 Subject: [PATCH] [improvement][headless-fe] agent setting update (#1240) 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. * [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 --- webapp/packages/supersonic-fe/src/global.less | 6 + .../src/pages/Agent/AgentDetail.tsx | 53 +++++++ .../Agent/{AgentModal.tsx => AgentForm.tsx} | 143 ++++++++++++------ .../src/pages/Agent/AgentsSection.tsx | 92 +---------- .../src/pages/Agent/ToolModal.tsx | 13 +- .../src/pages/Agent/ToolsSection.tsx | 115 ++------------ .../supersonic-fe/src/pages/Agent/index.tsx | 64 +++++--- .../supersonic-fe/src/pages/Agent/style.less | 6 + 8 files changed, 228 insertions(+), 264 deletions(-) create mode 100644 webapp/packages/supersonic-fe/src/pages/Agent/AgentDetail.tsx rename webapp/packages/supersonic-fe/src/pages/Agent/{AgentModal.tsx => AgentForm.tsx} (63%) diff --git a/webapp/packages/supersonic-fe/src/global.less b/webapp/packages/supersonic-fe/src/global.less index aa9cffb97..235288718 100644 --- a/webapp/packages/supersonic-fe/src/global.less +++ b/webapp/packages/supersonic-fe/src/global.less @@ -273,6 +273,12 @@ ol { .supersonicForm { padding: 0 20px; :global { + .ant-form-item-label { + .anticon { + position: relative; + top: 2px; + } + } .ant-input-search .ant-input-search-button { height: 42px; } diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/AgentDetail.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/AgentDetail.tsx new file mode 100644 index 000000000..8e6558f16 --- /dev/null +++ b/webapp/packages/supersonic-fe/src/pages/Agent/AgentDetail.tsx @@ -0,0 +1,53 @@ +import { ArrowLeftOutlined } from '@ant-design/icons'; +import { Switch } from 'antd'; +import styles from './style.less'; +import { AgentType } from './type'; +import AgentForm from './AgentForm'; + +type Props = { + currentAgent?: AgentType; + onSaveAgent: (agent: AgentType, noTip?: boolean) => Promise; + onCreateToolBtnClick?: () => void; + goBack: () => void; +}; + +const ToolsSection: React.FC = ({ + currentAgent, + onSaveAgent, + onCreateToolBtnClick, + goBack, +}) => { + return ( +
+
+ +
{currentAgent?.name}
+
+ {currentAgent?.status === 0 ? '已禁用' : 已启用} + { + e.stopPropagation(); + }} + > + { + onSaveAgent({ ...currentAgent, status: value ? 1 : 0 }, true); + }} + /> + +
+
+
+ +
+
+ ); +}; + +export default ToolsSection; diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/AgentModal.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx similarity index 63% rename from webapp/packages/supersonic-fe/src/pages/Agent/AgentModal.tsx rename to webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx index 4a4bd27c4..efd9c4fd1 100644 --- a/webapp/packages/supersonic-fe/src/pages/Agent/AgentModal.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx @@ -16,7 +16,8 @@ import { AgentType } from './type'; import { useEffect, useState } from 'react'; import styles from './style.less'; import { DeleteOutlined, PlusOutlined } from '@ant-design/icons'; -import { uuid } from '@/utils/utils'; +import { uuid, jsonParse } from '@/utils/utils'; +import ToolsSection from './ToolsSection'; import globalStyles from '@/global.less'; const FormItem = Form.Item; @@ -25,18 +26,27 @@ const { TextArea } = Input; type Props = { editAgent?: AgentType; onSaveAgent: (agent: AgentType) => Promise; - onCancel: () => void; + onCreateToolBtnClick?: () => void; }; -const AgentModal: React.FC = ({ editAgent, onSaveAgent, onCancel }) => { +const defaultAgentConfig = { + simpleMode: false, + debugMode: true, +}; + +const AgentForm: React.FC = ({ editAgent, onSaveAgent, onCreateToolBtnClick }) => { const [saveLoading, setSaveLoading] = useState(false); const [examples, setExamples] = useState<{ id: string; question?: string }[]>([]); + const [activeKey, setActiveKey] = useState('basic'); const [formData, setFormData] = useState({ enableSearch: true, llmConfig: { timeOut: 60, provider: 'OPEN_AI', }, + agentConfig: { + ...defaultAgentConfig, + }, }); const [form] = Form.useForm(); @@ -46,7 +56,14 @@ const AgentModal: React.FC = ({ editAgent, onSaveAgent, onCancel }) => { if (!sourceData.llmConfig) { delete sourceData.llmConfig; } - form.setFieldsValue({ ...sourceData, enableSearch: editAgent.enableSearch !== 0 }); + + const config = jsonParse(editAgent.agentConfig, {}); + + form.setFieldsValue({ + ...sourceData, + enableSearch: editAgent.enableSearch !== 0, + agentConfig: { ...defaultAgentConfig, ...config }, + }); if (editAgent.examples) { setExamples(editAgent.examples.map((question) => ({ id: uuid(), question }))); } @@ -56,7 +73,7 @@ const AgentModal: React.FC = ({ editAgent, onSaveAgent, onCancel }) => { }, [editAgent]); const layout = { - labelCol: { span: 6 }, + labelCol: { span: 4 }, wrapperCol: { span: 16 }, // layout: 'vertical', }; @@ -64,10 +81,12 @@ const AgentModal: React.FC = ({ editAgent, onSaveAgent, onCancel }) => { const onOk = async () => { const values = await form.validateFields(); setSaveLoading(true); - await onSaveAgent({ + const config = jsonParse(editAgent?.agentConfig, {}); + await onSaveAgent?.({ id: editAgent?.id, ...(editAgent || {}), ...values, + agentConfig: JSON.stringify({ ...config, ...values.agentConfig }) as any, examples: examples.map((example) => example.question), enableSearch: values.enableSearch ? 1 : 0, }); @@ -77,8 +96,9 @@ const AgentModal: React.FC = ({ editAgent, onSaveAgent, onCancel }) => { const formTabList = [ { label: '基本信息', + key: 'basic', children: ( - <> +
= ({ editAgent, onSaveAgent, onCancel }) => { + + + + + + + +
{examples.map((example) => { @@ -153,14 +191,15 @@ const AgentModal: React.FC = ({ editAgent, onSaveAgent, onCancel }) => {