mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-13 04:57:28 +00:00
(improvement)(Chat) Agent supports configuring whether to enable simple mode and whether to display debugging information. (#1181)
Co-authored-by: lxwcodemonkey
This commit is contained in:
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
|
|||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
import com.google.common.collect.Sets;
|
import com.google.common.collect.Sets;
|
||||||
import com.tencent.supersonic.common.config.LLMConfig;
|
import com.tencent.supersonic.common.config.LLMConfig;
|
||||||
|
import com.tencent.supersonic.common.config.VisualConfig;
|
||||||
import com.tencent.supersonic.common.pojo.RecordInfo;
|
import com.tencent.supersonic.common.pojo.RecordInfo;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
@@ -33,6 +34,7 @@ public class Agent extends RecordInfo {
|
|||||||
private String agentConfig;
|
private String agentConfig;
|
||||||
private LLMConfig llmConfig;
|
private LLMConfig llmConfig;
|
||||||
private MultiTurnConfig multiTurnConfig;
|
private MultiTurnConfig multiTurnConfig;
|
||||||
|
private VisualConfig visualConfig;
|
||||||
|
|
||||||
public List<String> getTools(AgentToolType type) {
|
public List<String> getTools(AgentToolType type) {
|
||||||
Map map = JSONObject.parseObject(agentConfig, Map.class);
|
Map map = JSONObject.parseObject(agentConfig, Map.class);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.tencent.supersonic.chat.server.persistence.dataobject;
|
|||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import com.tencent.supersonic.common.config.VisualConfig;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@@ -60,4 +61,6 @@ public class AgentDO {
|
|||||||
|
|
||||||
private String multiTurnConfig;
|
private String multiTurnConfig;
|
||||||
|
|
||||||
|
private String visualConfig;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import com.tencent.supersonic.chat.server.agent.MultiTurnConfig;
|
|||||||
import com.tencent.supersonic.chat.server.persistence.dataobject.AgentDO;
|
import com.tencent.supersonic.chat.server.persistence.dataobject.AgentDO;
|
||||||
import com.tencent.supersonic.chat.server.persistence.mapper.AgentDOMapper;
|
import com.tencent.supersonic.chat.server.persistence.mapper.AgentDOMapper;
|
||||||
import com.tencent.supersonic.chat.server.service.AgentService;
|
import com.tencent.supersonic.chat.server.service.AgentService;
|
||||||
|
import com.tencent.supersonic.common.config.VisualConfig;
|
||||||
import com.tencent.supersonic.common.util.JsonUtil;
|
import com.tencent.supersonic.common.util.JsonUtil;
|
||||||
import com.tencent.supersonic.common.config.LLMConfig;
|
import com.tencent.supersonic.common.config.LLMConfig;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
@@ -65,6 +66,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentDOMapper, AgentDO>
|
|||||||
agent.setExamples(JsonUtil.toList(agentDO.getExamples(), String.class));
|
agent.setExamples(JsonUtil.toList(agentDO.getExamples(), String.class));
|
||||||
agent.setLlmConfig(JsonUtil.toObject(agentDO.getLlmConfig(), LLMConfig.class));
|
agent.setLlmConfig(JsonUtil.toObject(agentDO.getLlmConfig(), LLMConfig.class));
|
||||||
agent.setMultiTurnConfig(JsonUtil.toObject(agentDO.getMultiTurnConfig(), MultiTurnConfig.class));
|
agent.setMultiTurnConfig(JsonUtil.toObject(agentDO.getMultiTurnConfig(), MultiTurnConfig.class));
|
||||||
|
agent.setVisualConfig(JsonUtil.toObject(agentDO.getVisualConfig(), VisualConfig.class));
|
||||||
return agent;
|
return agent;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,6 +77,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentDOMapper, AgentDO>
|
|||||||
agentDO.setExamples(JsonUtil.toString(agent.getExamples()));
|
agentDO.setExamples(JsonUtil.toString(agent.getExamples()));
|
||||||
agentDO.setLlmConfig(JsonUtil.toString(agent.getLlmConfig()));
|
agentDO.setLlmConfig(JsonUtil.toString(agent.getLlmConfig()));
|
||||||
agentDO.setMultiTurnConfig(JsonUtil.toString(agent.getMultiTurnConfig()));
|
agentDO.setMultiTurnConfig(JsonUtil.toString(agent.getMultiTurnConfig()));
|
||||||
|
agentDO.setVisualConfig(JsonUtil.toString(agent.getVisualConfig()));
|
||||||
if (agentDO.getStatus() == null) {
|
if (agentDO.getStatus() == null) {
|
||||||
agentDO.setStatus(1);
|
agentDO.setStatus(1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package com.tencent.supersonic.common.config;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class VisualConfig {
|
||||||
|
|
||||||
|
private boolean enableSimpleMode;
|
||||||
|
|
||||||
|
private boolean showDebugInfo;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -322,4 +322,7 @@ alter table s2_sys_parameter rename to s2_system_config;
|
|||||||
alter table s2_chat_query add column `parse_time_cost` varchar(1024);
|
alter table s2_chat_query add column `parse_time_cost` varchar(1024);
|
||||||
|
|
||||||
--20240609
|
--20240609
|
||||||
alter table s2_user add column `salt` varchar(256) DEFAULT NULL COMMENT 'md5密码盐';
|
alter table s2_user add column `salt` varchar(256) DEFAULT NULL COMMENT 'md5密码盐';
|
||||||
|
|
||||||
|
--20240621
|
||||||
|
alter table s2_agent add column `visual_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '可视化配置';
|
||||||
@@ -356,6 +356,7 @@ CREATE TABLE IF NOT EXISTS s2_agent
|
|||||||
config varchar(2000) null,
|
config varchar(2000) null,
|
||||||
llm_config varchar(2000) null,
|
llm_config varchar(2000) null,
|
||||||
multi_turn_config varchar(2000) null,
|
multi_turn_config varchar(2000) null,
|
||||||
|
visual_config varchar(2000) null,
|
||||||
created_by varchar(100) null,
|
created_by varchar(100) null,
|
||||||
created_at TIMESTAMP null,
|
created_at TIMESTAMP null,
|
||||||
updated_by varchar(100) null,
|
updated_by varchar(100) null,
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ CREATE TABLE `s2_agent` (
|
|||||||
`config` varchar(6000) COLLATE utf8_unicode_ci DEFAULT NULL,
|
`config` varchar(6000) COLLATE utf8_unicode_ci DEFAULT NULL,
|
||||||
`llm_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL,
|
`llm_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL,
|
||||||
`multi_turn_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL,
|
`multi_turn_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL,
|
||||||
|
`visual_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL,
|
||||||
`created_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
|
`created_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
|
||||||
`created_at` datetime DEFAULT NULL,
|
`created_at` datetime DEFAULT NULL,
|
||||||
`updated_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
|
`updated_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
|
||||||
|
|||||||
@@ -356,6 +356,7 @@ CREATE TABLE IF NOT EXISTS s2_agent
|
|||||||
config varchar(2000) null,
|
config varchar(2000) null,
|
||||||
llm_config varchar(2000) null,
|
llm_config varchar(2000) null,
|
||||||
multi_turn_config varchar(2000) null,
|
multi_turn_config varchar(2000) null,
|
||||||
|
visual_config varchar(2000) null,
|
||||||
created_by varchar(100) null,
|
created_by varchar(100) null,
|
||||||
created_at TIMESTAMP null,
|
created_at TIMESTAMP null,
|
||||||
updated_by varchar(100) null,
|
updated_by varchar(100) null,
|
||||||
|
|||||||
Reference in New Issue
Block a user