mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-10 02:46:56 +00:00
[improvement][headless-fe] Introduced a new configuration option in the assistant module specifically for large model applications. (#1756)
* [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. * [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. --------- Co-authored-by: tristanliu <tristanliu@tencent.com>
This commit is contained in:
tristanliu
@@ -95,7 +95,7 @@ const Chat: ForwardRefRenderFunction<any, Props> = (
|
||||
};
|
||||
|
||||
const updateAgentConfigMode = (agent: AgentType) => {
|
||||
const agentConfig = jsonParse(agent?.agentConfig, {});
|
||||
const agentConfig = jsonParse(agent?.toolConfig, {});
|
||||
const { simpleMode, debugMode } = agentConfig;
|
||||
if (isBoolean(simpleMode)) {
|
||||
setIsSimpleMode(simpleMode);
|
||||
|
||||
@@ -16,7 +16,7 @@ export default {
|
||||
'menu.database': '数据库管理',
|
||||
'menu.llm': '大模型管理',
|
||||
'menu.chatSetting': '问答设置',
|
||||
'menu.plugin': '插件管理',
|
||||
'menu.plugin': '工具管理',
|
||||
'menu.login': '登录',
|
||||
'menu.system': '系统设置',
|
||||
'menu.chat': '问答对话',
|
||||
|
||||
@@ -1,28 +1,14 @@
|
||||
import {
|
||||
Form,
|
||||
Modal,
|
||||
Input,
|
||||
Button,
|
||||
Switch,
|
||||
Tabs,
|
||||
Slider,
|
||||
InputNumber,
|
||||
Select,
|
||||
Row,
|
||||
message,
|
||||
Space,
|
||||
Tooltip,
|
||||
} from 'antd';
|
||||
import { Form, Input, Button, Switch, Tabs, Select, message, Space, Tooltip } from 'antd';
|
||||
import MainTitleMark from '@/components/MainTitleMark';
|
||||
import { AgentType } from './type';
|
||||
import { useEffect, useState } from 'react';
|
||||
import styles from './style.less';
|
||||
import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
|
||||
import { uuid, jsonParse, encryptPassword, decryptPassword } from '@/utils/utils';
|
||||
import { uuid, jsonParse } from '@/utils/utils';
|
||||
import ToolsSection from './ToolsSection';
|
||||
import globalStyles from '@/global.less';
|
||||
import { QuestionCircleOutlined } from '@ant-design/icons';
|
||||
import { testLLMConn } from '../../services/system';
|
||||
import { getLlmModelTypeList, getLlmList } from '../../services/system';
|
||||
import MemorySection from './MemorySection';
|
||||
|
||||
const FormItem = Form.Item;
|
||||
@@ -43,7 +29,8 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
|
||||
const [saveLoading, setSaveLoading] = useState(false);
|
||||
const [examples, setExamples] = useState<{ id: string; question?: string }[]>([]);
|
||||
const [activeKey, setActiveKey] = useState('basic');
|
||||
const [llmTestLoading, setLlmTestLoading] = useState<boolean>(false);
|
||||
const [modelTypeOptions, setModelTypeOptions] = useState<any[]>([]);
|
||||
const [llmConfigListOptions, setLlmConfigListOptions] = useState<any[]>([]);
|
||||
const [formData, setFormData] = useState<any>({
|
||||
enableSearch: true,
|
||||
modelConfig: {
|
||||
@@ -51,10 +38,6 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
|
||||
provider: 'OPEN_AI',
|
||||
temperature: 0,
|
||||
},
|
||||
// embeddingStore: {
|
||||
// provider: 'MILVUS',
|
||||
// timeOut: 60,
|
||||
// },
|
||||
agentConfig: {
|
||||
...defaultAgentConfig,
|
||||
},
|
||||
@@ -68,7 +51,7 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
|
||||
delete sourceData.modelConfig;
|
||||
}
|
||||
|
||||
const config = jsonParse(editAgent.agentConfig, {});
|
||||
const config = jsonParse(editAgent.toolConfig, {});
|
||||
const initData = {
|
||||
...sourceData,
|
||||
enableSearch: editAgent.enableSearch !== 0,
|
||||
@@ -82,26 +65,57 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
|
||||
} else {
|
||||
form.resetFields();
|
||||
}
|
||||
queryModelTypeList();
|
||||
queryLlmList();
|
||||
}, [editAgent]);
|
||||
|
||||
const queryLlmList = async () => {
|
||||
const { code, data } = await getLlmList();
|
||||
if (code === 200 && data) {
|
||||
const options = data.map((item) => {
|
||||
return {
|
||||
label: item.name,
|
||||
value: item.id,
|
||||
};
|
||||
});
|
||||
setLlmConfigListOptions(options);
|
||||
} else {
|
||||
message.error('获取模型场景类型失败');
|
||||
}
|
||||
};
|
||||
const queryModelTypeList = async () => {
|
||||
const { code, data } = await getLlmModelTypeList();
|
||||
if (code === 200 && data) {
|
||||
const options = data.map((item) => {
|
||||
return {
|
||||
label: item.name,
|
||||
value: item.type,
|
||||
description: item.description,
|
||||
};
|
||||
});
|
||||
setModelTypeOptions(options);
|
||||
} else {
|
||||
message.error('获取模型场景类型失败');
|
||||
}
|
||||
};
|
||||
|
||||
const layout = {
|
||||
labelCol: { span: 4 },
|
||||
wrapperCol: { span: 16 },
|
||||
// layout: 'vertical',
|
||||
};
|
||||
|
||||
const onOk = async () => {
|
||||
const values = await form.validateFields();
|
||||
setSaveLoading(true);
|
||||
const config = jsonParse(editAgent?.agentConfig, {});
|
||||
const config = jsonParse(editAgent?.toolConfig, {});
|
||||
await onSaveAgent?.({
|
||||
id: editAgent?.id,
|
||||
...(editAgent || {}),
|
||||
...values,
|
||||
agentConfig: JSON.stringify({
|
||||
...config,
|
||||
...values.agentConfig,
|
||||
debugMode: values.agentConfig?.simpleMode === true ? false : values.agentConfig?.debugMode,
|
||||
...values.toolConfig,
|
||||
debugMode: values.toolConfig?.simpleMode === true ? false : values.toolConfig?.debugMode,
|
||||
}) as any,
|
||||
examples: examples.map((example) => example.question),
|
||||
enableSearch: values.enableSearch ? 1 : 0,
|
||||
@@ -110,16 +124,6 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
|
||||
setSaveLoading(false);
|
||||
};
|
||||
|
||||
const testLLMConnect = async (params: any) => {
|
||||
setLlmTestLoading(true);
|
||||
const { code, data } = await testLLMConn(params);
|
||||
setLlmTestLoading(false);
|
||||
if (code === 200 && data) {
|
||||
message.success('连接成功');
|
||||
} else {
|
||||
message.error('模型连接失败');
|
||||
}
|
||||
};
|
||||
const tips = [
|
||||
'自定义提示词模板可嵌入以下变量，将由系统自动进行替换：',
|
||||
'-{{exemplar}} :替换成few-shot示例，示例个数由系统配置',
|
||||
@@ -140,25 +144,6 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
|
||||
>
|
||||
<Input placeholder="请输入助理名称" />
|
||||
</FormItem>
|
||||
{/* <FormItem name={['visualConfig', 'defaultShowType']} label="问答默认格式">
|
||||
<Select
|
||||
placeholder=""
|
||||
options={[
|
||||
{
|
||||
label: '文本',
|
||||
value: 'TEXT',
|
||||
},
|
||||
{
|
||||
label: '表格',
|
||||
value: 'TABLE',
|
||||
},
|
||||
{
|
||||
label: '图表',
|
||||
value: 'WIDGET',
|
||||
},
|
||||
]}
|
||||
/>
|
||||
</FormItem> */}
|
||||
<FormItem name="enableSearch" label="开启输入联想" valuePropName="checked">
|
||||
<Switch />
|
||||
</FormItem>
|
||||
@@ -184,7 +169,7 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
|
||||
<FormItem
|
||||
name={['agentConfig', 'debugMode']}
|
||||
label="开启调试信息"
|
||||
hidden={formData?.agentConfig?.simpleMode === true}
|
||||
hidden={formData?.toolConfig?.simpleMode === true}
|
||||
tooltip="包含Schema映射、SQL生成每阶段的关键信息"
|
||||
valuePropName="checked"
|
||||
>
|
||||
@@ -238,168 +223,19 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
|
||||
<div className={styles.agentFormContainer}>
|
||||
<div className={styles.agentFormTitle}>
|
||||
<Space>
|
||||
对话模型 <MainTitleMark />
|
||||
应用场景 <MainTitleMark />
|
||||
</Space>
|
||||
</div>
|
||||
<FormItem name={['modelConfig', 'provider']} label="接口协议">
|
||||
<Select placeholder="">
|
||||
{['OPEN_AI', 'OLLAMA'].map((item) => (
|
||||
<Select.Option key={item} value={item}>
|
||||
{item}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
</FormItem>
|
||||
<FormItem name={['modelConfig', 'modelName']} label="Model Name">
|
||||
<Input placeholder="请输入语言模型名称" />
|
||||
</FormItem>
|
||||
<FormItem name={['modelConfig', 'baseUrl']} label="Base URL">
|
||||
<Input placeholder="请输入Base URL" />
|
||||
</FormItem>
|
||||
<FormItem
|
||||
name={['modelConfig', 'apiKey']}
|
||||
label="API Key"
|
||||
hidden={formData?.modelConfig?.provider === 'OLLAMA'}
|
||||
getValueFromEvent={(event) => {
|
||||
const value = event.target.value;
|
||||
return encryptPassword(value);
|
||||
}}
|
||||
getValueProps={(value) => {
|
||||
return {
|
||||
value: value ? decryptPassword(value) : '',
|
||||
};
|
||||
}}
|
||||
>
|
||||
<Input.Password placeholder="请输入API Key" visibilityToggle />
|
||||
</FormItem>
|
||||
|
||||
<FormItem name={['modelConfig', 'temperature']} label="Temperature">
|
||||
<Slider
|
||||
min={0}
|
||||
max={1}
|
||||
step={0.1}
|
||||
marks={{
|
||||
0: '精准',
|
||||
1: '随机',
|
||||
}}
|
||||
/>
|
||||
</FormItem>
|
||||
<FormItem name={['modelConfig', 'timeOut']} label="超时时间(秒)">
|
||||
<InputNumber />
|
||||
</FormItem>
|
||||
|
||||
{/* <div className={styles.agentFormTitle}>
|
||||
<Space>
|
||||
向量模型 <MainTitleMark />
|
||||
</Space>
|
||||
</div>
|
||||
|
||||
<FormItem name={['modelConfig', 'embeddingModel', 'provider']} label="接口协议">
|
||||
<Select placeholder="">
|
||||
{[
|
||||
'OPEN_AI',
|
||||
'OLLAMA',
|
||||
'LOCAL_AI',
|
||||
'IN_MEMORY',
|
||||
'ZHIPU',
|
||||
'AZURE',
|
||||
'QIANFAN',
|
||||
'DASHSCOPE',
|
||||
].map((item) => (
|
||||
<Select.Option key={item} value={item}>
|
||||
{item}
|
||||
</Select.Option>
|
||||
))}
|
||||
</Select>
|
||||
</FormItem>
|
||||
<FormItem name={['modelConfig', 'embeddingModel', 'modelName']} label="Model Name">
|
||||
<Input placeholder="请输入向量模型名称" />
|
||||
</FormItem>
|
||||
{formData?.modelConfig?.embeddingModel?.provider === 'IN_MEMORY' ? (
|
||||
<>
|
||||
<FormItem name={['modelConfig', 'embeddingModel', 'modelPath']} label="模型路径">
|
||||
<Input placeholder="请输入模型路径" />
|
||||
{modelTypeOptions.map((item) => {
|
||||
return (
|
||||
<FormItem name={['chatModelConfig', item.value]} label={item.label}>
|
||||
<Select placeholder="" options={llmConfigListOptions} />
|
||||
</FormItem>
|
||||
<FormItem
|
||||
name={['modelConfig', 'embeddingModel', 'vocabularyPath']}
|
||||
label="词汇表路径"
|
||||
>
|
||||
<Input placeholder="请输入模型路径" />
|
||||
</FormItem>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<FormItem name={['modelConfig', 'embeddingModel', 'baseUrl']} label="Base URL">
|
||||
<Input placeholder="请输入Base URL" />
|
||||
</FormItem>
|
||||
<FormItem
|
||||
name={['modelConfig', 'embeddingModel', 'apiKey']}
|
||||
label="API Key"
|
||||
getValueFromEvent={(event) => {
|
||||
const value = event.target.value;
|
||||
return encryptPassword(value);
|
||||
}}
|
||||
getValueProps={(value) => {
|
||||
return {
|
||||
value: value ? decryptPassword(value) : '',
|
||||
};
|
||||
}}
|
||||
>
|
||||
<Input.Password placeholder="请输入API Key" visibilityToggle />
|
||||
</FormItem>
|
||||
</>
|
||||
)} */}
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
),
|
||||
},
|
||||
// {
|
||||
// label: '向量库配置',
|
||||
// key: 'embeddingStore',
|
||||
// children: (
|
||||
// <div className={styles.agentFormContainer}>
|
||||
// <FormItem name={['embeddingStore', 'provider']} label="接口协议">
|
||||
// <Select placeholder="">
|
||||
// {['MILVUS', 'CHROMA', 'IN_MEMORY'].map((item) => (
|
||||
// <Select.Option key={item} value={item}>
|
||||
// {item}
|
||||
// </Select.Option>
|
||||
// ))}
|
||||
// </Select>
|
||||
// </FormItem>
|
||||
// {formData?.embeddingStore?.provider === 'IN_MEMORY' ? (
|
||||
// <>
|
||||
// <FormItem name={['embeddingStore', 'persistPath']} label="持久化路径">
|
||||
// <Input placeholder="请输入持久化路径" />
|
||||
// </FormItem>
|
||||
// </>
|
||||
// ) : (
|
||||
// <>
|
||||
// <FormItem name={['embeddingStore', 'baseUrl']} label="Base URL">
|
||||
// <Input placeholder="请输入Base URL" />
|
||||
// </FormItem>
|
||||
// <FormItem
|
||||
// name={['embeddingStore', 'apiKey']}
|
||||
// label="API Key"
|
||||
// getValueFromEvent={(event) => {
|
||||
// const value = event.target.value;
|
||||
// return encryptPassword(value);
|
||||
// }}
|
||||
// getValueProps={(value) => {
|
||||
// return {
|
||||
// value: value ? decryptPassword(value) : '',
|
||||
// };
|
||||
// }}
|
||||
// >
|
||||
// <Input.Password placeholder="请输入API Key" visibilityToggle />
|
||||
// </FormItem>
|
||||
// <FormItem name={['embeddingStore', 'timeOut']} label="超时时间(秒)">
|
||||
// <InputNumber />
|
||||
// </FormItem>
|
||||
// </>
|
||||
// )}
|
||||
// </div>
|
||||
// ),
|
||||
// },
|
||||
{
|
||||
label: '提示词配置',
|
||||
key: 'promptConfig',
|
||||
@@ -433,7 +269,7 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
|
||||
),
|
||||
},
|
||||
{
|
||||
label: '工具管理',
|
||||
label: '工具配置',
|
||||
key: 'tools',
|
||||
children: <ToolsSection currentAgent={editAgent} onSaveAgent={onSaveAgent} />,
|
||||
},
|
||||
@@ -478,17 +314,6 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
|
||||
<PlusOutlined /> 新增工具
|
||||
</Button>
|
||||
)}
|
||||
{activeKey === 'modelConfig' && (
|
||||
<Button
|
||||
type="primary"
|
||||
loading={llmTestLoading}
|
||||
onClick={() => {
|
||||
testLLMConnect(formData.modelConfig);
|
||||
}}
|
||||
>
|
||||
大模型连接测试
|
||||
</Button>
|
||||
)}
|
||||
</Space>
|
||||
}
|
||||
defaultActiveKey="basic"
|
||||
|
||||
@@ -15,7 +15,7 @@ const ToolsSection: React.FC<Props> = ({ currentAgent, onSaveAgent }) => {
|
||||
const [modalVisible, setModalVisible] = useState(false);
|
||||
const [editTool, setEditTool] = useState<AgentToolType>();
|
||||
|
||||
const agentConfig = currentAgent?.agentConfig ? JSON.parse(currentAgent.agentConfig as any) : {};
|
||||
const agentConfig = currentAgent?.toolConfig ? JSON.parse(currentAgent.toolConfig as any) : {};
|
||||
|
||||
const saveAgent = async (agent: AgentType) => {
|
||||
await onSaveAgent(agent);
|
||||
|
||||
@@ -17,7 +17,7 @@ const Agent = () => {
|
||||
const [agentConfig, setAgentConfig] = useState<any>({});
|
||||
|
||||
useEffect(() => {
|
||||
const config = jsonParse(currentAgent?.agentConfig, {});
|
||||
const config = jsonParse(currentAgent?.toolConfig, {});
|
||||
setAgentConfig(config);
|
||||
}, [currentAgent]);
|
||||
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
import { useEffect, forwardRef, useImperativeHandle, useState } from 'react';
|
||||
import { useEffect, forwardRef, useImperativeHandle, useState, useRef } from 'react';
|
||||
import type { ForwardRefRenderFunction } from 'react';
|
||||
import { message, Form, Input, Select, Button, Space, Slider, InputNumber } from 'antd';
|
||||
import { saveLlmConfig } from '../../service';
|
||||
import { testLLMConn } from '@/services/system';
|
||||
import { ConfigParametersItem, SystemConfig, dependenciesItem } from '@/pages/System/types';
|
||||
import { testLLMConn, getLlmConfig } from '@/services/system';
|
||||
import { formLayout } from '@/components/FormHelper/utils';
|
||||
import { encryptPassword, decryptPassword } from '@/utils/utils';
|
||||
|
||||
import { genneratorFormItemList } from '../../utils';
|
||||
import styles from '../style.less';
|
||||
type Props = {
|
||||
llmItem?: any;
|
||||
@@ -14,9 +16,9 @@ type Props = {
|
||||
const FormItem = Form.Item;
|
||||
const TextArea = Input.TextArea;
|
||||
|
||||
const DatabaseCreateForm: ForwardRefRenderFunction<any, Props> = ({ llmItem, onSubmit }, ref) => {
|
||||
const LlmCreateForm: ForwardRefRenderFunction<any, Props> = ({ llmItem, onSubmit }, ref) => {
|
||||
const [form] = Form.useForm();
|
||||
|
||||
const [config, setConfig] = useState<any>([]);
|
||||
const [formData, setFormData] = useState<any>({
|
||||
config: {
|
||||
timeOut: 60,
|
||||
@@ -24,7 +26,6 @@ const DatabaseCreateForm: ForwardRefRenderFunction<any, Props> = ({ llmItem, onS
|
||||
temperature: 0,
|
||||
},
|
||||
});
|
||||
|
||||
const [testLoading, setTestLoading] = useState<boolean>(false);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -32,6 +33,7 @@ const DatabaseCreateForm: ForwardRefRenderFunction<any, Props> = ({ llmItem, onS
|
||||
if (llmItem) {
|
||||
form.setFieldsValue({ ...llmItem });
|
||||
}
|
||||
queryConfig();
|
||||
}, [llmItem]);
|
||||
|
||||
const getFormValidateFields = async () => {
|
||||
@@ -40,15 +42,18 @@ const DatabaseCreateForm: ForwardRefRenderFunction<any, Props> = ({ llmItem, onS
|
||||
|
||||
useImperativeHandle(ref, () => ({
|
||||
getFormValidateFields,
|
||||
saveDatabaseConfig,
|
||||
testDatabaseConnection,
|
||||
saveLlmConfig: save,
|
||||
testLlmConnection,
|
||||
}));
|
||||
|
||||
const saveDatabaseConfig = async () => {
|
||||
const save = async () => {
|
||||
const values = await form.validateFields();
|
||||
console.log(values, 22222);
|
||||
|
||||
const { code, msg } = await saveLlmConfig({
|
||||
...(llmItem || {}),
|
||||
...values,
|
||||
config: values,
|
||||
});
|
||||
|
||||
if (code === 200) {
|
||||
@@ -58,7 +63,43 @@ const DatabaseCreateForm: ForwardRefRenderFunction<any, Props> = ({ llmItem, onS
|
||||
}
|
||||
message.error(msg);
|
||||
};
|
||||
const testDatabaseConnection = async () => {
|
||||
const queryConfig = async () => {
|
||||
setTestLoading(true);
|
||||
const { code, data } = await getLlmConfig();
|
||||
setTestLoading(false);
|
||||
if (code === 200 && data) {
|
||||
let parameters = data;
|
||||
if (llmItem?.config) {
|
||||
parameters = data.map((item) => {
|
||||
const target = llmItem.config[item.name];
|
||||
if (target) {
|
||||
return {
|
||||
...item,
|
||||
value: target,
|
||||
};
|
||||
}
|
||||
return item;
|
||||
});
|
||||
}
|
||||
const parametersMap = parameters.reduce(
|
||||
(configReduceMap: Record<string, ConfigParametersItem>, item: ConfigParametersItem) => {
|
||||
return {
|
||||
...configReduceMap,
|
||||
[item.name]: item,
|
||||
};
|
||||
},
|
||||
{},
|
||||
);
|
||||
|
||||
configMap.current = parametersMap;
|
||||
initDepConfig(parameters);
|
||||
setConfig(parameters);
|
||||
return;
|
||||
}
|
||||
message.error('获取大模型配置信息失败');
|
||||
};
|
||||
|
||||
const testLlmConnection = async () => {
|
||||
const values = await form.validateFields();
|
||||
setTestLoading(true);
|
||||
const { code, data } = await testLLMConn({
|
||||
@@ -71,6 +112,107 @@ const DatabaseCreateForm: ForwardRefRenderFunction<any, Props> = ({ llmItem, onS
|
||||
}
|
||||
message.error('连接测试失败');
|
||||
};
|
||||
const configIocDepMap = useRef<Record<string, any>>();
|
||||
const configMap = useRef<Record<string, ConfigParametersItem>>();
|
||||
|
||||
const getDepIoc = (parameters: ConfigParametersItem[]) => {
|
||||
const iocMap: Record<string, Record<string, ConfigParametersItem>> = {};
|
||||
parameters.forEach((item) => {
|
||||
const { name: itemName, dependencies } = item;
|
||||
if (Array.isArray(dependencies)) {
|
||||
dependencies.forEach((depItem) => {
|
||||
const { name } = depItem;
|
||||
|
||||
if (iocMap[name]) {
|
||||
iocMap[name] = {
|
||||
...iocMap[name],
|
||||
[itemName]: item,
|
||||
};
|
||||
} else {
|
||||
iocMap[name] = {
|
||||
[itemName]: item,
|
||||
};
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
return iocMap;
|
||||
};
|
||||
const setInitData = (systemConfigParameters: ConfigParametersItem[]) => {
|
||||
const fieldsValue = systemConfigParameters.reduce((fields, item) => {
|
||||
const { name, value } = item;
|
||||
return {
|
||||
...fields,
|
||||
[name]: value,
|
||||
};
|
||||
}, {});
|
||||
form.setFieldsValue(fieldsValue);
|
||||
return fieldsValue;
|
||||
};
|
||||
|
||||
const initDepConfig = (parameters: ConfigParametersItem[]) => {
|
||||
const iocMap = getDepIoc(parameters);
|
||||
configIocDepMap.current = iocMap;
|
||||
const initFormValues = setInitData(parameters);
|
||||
Object.keys(initFormValues).forEach((itemName) => {
|
||||
const targetDep = iocMap[itemName] || {};
|
||||
const excuteStack = Object.values(targetDep);
|
||||
if (Array.isArray(excuteStack)) {
|
||||
excuteDepConfig(itemName, initFormValues, true);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
const excuteDepConfig = (
|
||||
itemName: string,
|
||||
formValues: Record<string, any>,
|
||||
isInit: boolean = false,
|
||||
) => {
|
||||
const targetDep = configIocDepMap?.current?.[itemName];
|
||||
if (!targetDep) {
|
||||
return;
|
||||
}
|
||||
const excuteStack = Object.values(targetDep);
|
||||
if (!Array.isArray(excuteStack)) {
|
||||
return;
|
||||
}
|
||||
const tempConfigMap: any = { ...configMap.current };
|
||||
const currentFormValues = formValues;
|
||||
excuteStack.forEach((configItem: any) => {
|
||||
const showStateList: boolean[] = [];
|
||||
const hasValueFieldsSetDefaultValueList: any[] = [];
|
||||
const { dependencies, name: configItemName } = configItem;
|
||||
dependencies.forEach((item: dependenciesItem) => {
|
||||
const { name, setDefaultValue } = item;
|
||||
const currentDepValue = currentFormValues[name];
|
||||
const showIncludesValue = item.show?.includesValue;
|
||||
if (Array.isArray(showIncludesValue)) {
|
||||
showStateList.push(showIncludesValue.includes(currentDepValue));
|
||||
}
|
||||
if (setDefaultValue && currentDepValue) {
|
||||
hasValueFieldsSetDefaultValueList.push({
|
||||
excuteItem: configItemName,
|
||||
...item,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
const visible = showStateList.every((item) => item);
|
||||
tempConfigMap[configItemName].visible = visible;
|
||||
const lastSetDefaultValueItem =
|
||||
hasValueFieldsSetDefaultValueList[hasValueFieldsSetDefaultValueList.length - 1];
|
||||
const lastSetDefaultValue = lastSetDefaultValueItem?.setDefaultValue;
|
||||
|
||||
if (lastSetDefaultValue) {
|
||||
const targetValue = lastSetDefaultValue[currentFormValues[lastSetDefaultValueItem.name]];
|
||||
if (targetValue && !isInit) {
|
||||
form.setFieldValue(lastSetDefaultValueItem.excuteItem, targetValue);
|
||||
}
|
||||
}
|
||||
});
|
||||
setConfig(Object.values(tempConfigMap));
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<Form
|
||||
@@ -79,6 +221,10 @@ const DatabaseCreateForm: ForwardRefRenderFunction<any, Props> = ({ llmItem, onS
|
||||
layout="vertical"
|
||||
className={styles.form}
|
||||
initialValues={formData}
|
||||
onValuesChange={(value, values) => {
|
||||
const valueKey = Object.keys(value)[0];
|
||||
excuteDepConfig(valueKey, values);
|
||||
}}
|
||||
>
|
||||
<FormItem
|
||||
name="name"
|
||||
@@ -87,7 +233,8 @@ const DatabaseCreateForm: ForwardRefRenderFunction<any, Props> = ({ llmItem, onS
|
||||
>
|
||||
<Input placeholder="请输入连接名称" />
|
||||
</FormItem>
|
||||
<FormItem name={['config', 'provider']} label="接口协议">
|
||||
{genneratorFormItemList(config)}
|
||||
{/* <FormItem name={['config', 'provider']} label="接口协议">
|
||||
<Select placeholder="">
|
||||
{['OPEN_AI', 'OLLAMA'].map((item) => (
|
||||
<Select.Option key={item} value={item}>
|
||||
@@ -132,36 +279,13 @@ const DatabaseCreateForm: ForwardRefRenderFunction<any, Props> = ({ llmItem, onS
|
||||
</FormItem>
|
||||
<FormItem name={['config', 'timeOut']} label="超时时间(秒)">
|
||||
<InputNumber />
|
||||
</FormItem>
|
||||
</FormItem> */}
|
||||
<FormItem name="description" label="描述">
|
||||
<TextArea placeholder="请输入大模型连接描述" style={{ height: 100 }} />
|
||||
</FormItem>
|
||||
|
||||
<FormItem>
|
||||
<Space>
|
||||
<Button
|
||||
type="primary"
|
||||
loading={testLoading}
|
||||
onClick={() => {
|
||||
testDatabaseConnection();
|
||||
}}
|
||||
>
|
||||
连接测试
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={() => {
|
||||
saveDatabaseConfig();
|
||||
}}
|
||||
>
|
||||
保 存
|
||||
</Button>
|
||||
</Space>
|
||||
</FormItem>
|
||||
</Form>
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default forwardRef(DatabaseCreateForm);
|
||||
export default forwardRef(LlmCreateForm);
|
||||
|
||||
@@ -17,7 +17,7 @@ const DatabaseSettingModal: React.FC<CreateFormProps> = ({ onCancel, llmItem, op
|
||||
|
||||
const handleTestConnection = async () => {
|
||||
setTestLoading(true);
|
||||
await createFormRef.current.testDatabaseConnection();
|
||||
await createFormRef.current.testLlmConnection();
|
||||
setTestLoading(false);
|
||||
};
|
||||
|
||||
@@ -38,7 +38,7 @@ const DatabaseSettingModal: React.FC<CreateFormProps> = ({ onCancel, llmItem, op
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={() => {
|
||||
createFormRef.current.saveDatabaseConfig();
|
||||
createFormRef.current.saveLlmConfig();
|
||||
}}
|
||||
>
|
||||
保 存
|
||||
|
||||
@@ -4,8 +4,8 @@ import { message, Button, Space, Popconfirm } from 'antd';
|
||||
import React, { useRef, useState, useEffect } from 'react';
|
||||
import LlmSettingModal from './LlmSettingModal';
|
||||
import { ISemantic } from '../../data';
|
||||
import { getLlmList, deleteLlmConfig } from '../../service';
|
||||
|
||||
import { deleteLlmConfig } from '../../service';
|
||||
import { getLlmList } from '@/services/system';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
type Props = {};
|
||||
|
||||
@@ -781,12 +781,6 @@ export function deleteTerm(data: any): Promise<any> {
|
||||
});
|
||||
}
|
||||
|
||||
export function getLlmList(): Promise<any> {
|
||||
return request(`${process.env.CHAT_API_BASE_URL}model/getModelList`, {
|
||||
method: 'GET',
|
||||
});
|
||||
}
|
||||
|
||||
export function createLlmConfig(data: any): Promise<any> {
|
||||
return request(`${process.env.CHAT_API_BASE_URL}chat/model`, {
|
||||
method: 'POST',
|
||||
|
||||
@@ -24,7 +24,6 @@ const System: React.FC = () => {
|
||||
|
||||
const configIocDepMap = useRef<Record<string, any>>();
|
||||
const [llmTestLoading, setLlmTestLoading] = useState<boolean>(false);
|
||||
const [formData, setFormData] = useState({});
|
||||
|
||||
useEffect(() => {
|
||||
querySystemConfig();
|
||||
@@ -49,7 +48,7 @@ const System: React.FC = () => {
|
||||
configMap.current = parametersMap;
|
||||
|
||||
groupConfigAndSet(parameters);
|
||||
|
||||
console.log(parameters, admins, 232323);
|
||||
initDepConfig(parameters, admins);
|
||||
|
||||
setConfigSource(data);
|
||||
@@ -226,28 +225,6 @@ const System: React.FC = () => {
|
||||
>
|
||||
保 存
|
||||
</Button>
|
||||
<Button
|
||||
type="primary"
|
||||
loading={llmTestLoading}
|
||||
onClick={() => {
|
||||
const submitData = form.getFieldsValue();
|
||||
const params = {
|
||||
provider: submitData['s2.chat.model.provider'],
|
||||
baseUrl: submitData['s2.chat.model.base.url'],
|
||||
apiKey: submitData['s2.chat.model.api.key'],
|
||||
modelName: submitData['s2.chat.model.name'],
|
||||
temperature: submitData['s2.chat.model.temperature'],
|
||||
timeOut: submitData['s2.chat.model.timeout'],
|
||||
endpoint: submitData['s2.chat.model.endpoint'],
|
||||
secretKey: submitData['s2.chat.model.secretKey'],
|
||||
logRequests: submitData['s2.chat.model.enableSearch'],
|
||||
enableSearch: submitData['s2.chat.model.enableSearch'],
|
||||
};
|
||||
testLLMConnect(params);
|
||||
}}
|
||||
>
|
||||
大模型连接测试
|
||||
</Button>
|
||||
</Space>
|
||||
}
|
||||
>
|
||||
@@ -256,7 +233,6 @@ const System: React.FC = () => {
|
||||
layout="vertical"
|
||||
className={styles.form}
|
||||
onValuesChange={(value, values) => {
|
||||
setFormData(values);
|
||||
const valueKey = Object.keys(value)[0];
|
||||
excuteDepConfig(valueKey, values);
|
||||
}}
|
||||
@@ -277,7 +253,7 @@ const System: React.FC = () => {
|
||||
bordered
|
||||
id={key}
|
||||
>
|
||||
{genneratorFormItemList(itemList, form)}
|
||||
{genneratorFormItemList(itemList)}
|
||||
</ProCard>
|
||||
);
|
||||
})}
|
||||
|
||||
@@ -6,3 +6,21 @@ export function testLLMConn(data: any) {
|
||||
data,
|
||||
});
|
||||
}
|
||||
|
||||
export function getLlmModelTypeList(): Promise<any> {
|
||||
return request(`${process.env.CHAT_API_BASE_URL}model/getModelTypeList`, {
|
||||
method: 'GET',
|
||||
});
|
||||
}
|
||||
|
||||
export function getLlmList(): Promise<any> {
|
||||
return request(`${process.env.CHAT_API_BASE_URL}model/getModelList`, {
|
||||
method: 'GET',
|
||||
});
|
||||
}
|
||||
|
||||
export function getLlmConfig(): Promise<any> {
|
||||
return request(`${process.env.CHAT_API_BASE_URL}model/getModelParameters`, {
|
||||
method: 'GET',
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user