diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java index d3d4f96e4..7ebb4c3aa 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/agent/Agent.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.tencent.supersonic.common.config.LLMConfig; +import com.tencent.supersonic.common.config.VisualConfig; import com.tencent.supersonic.common.pojo.RecordInfo; import lombok.Data; import org.springframework.util.CollectionUtils; @@ -33,6 +34,7 @@ public class Agent extends RecordInfo { private String agentConfig; private LLMConfig llmConfig; private MultiTurnConfig multiTurnConfig; + private VisualConfig visualConfig; public List getTools(AgentToolType type) { Map map = JSONObject.parseObject(agentConfig, Map.class); diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/AgentDO.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/AgentDO.java index e84ae220d..00febd256 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/AgentDO.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/persistence/dataobject/AgentDO.java @@ -3,6 +3,7 @@ package com.tencent.supersonic.chat.server.persistence.dataobject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.tencent.supersonic.common.config.VisualConfig; import lombok.Data; import java.util.Date; @@ -60,4 +61,6 @@ public class AgentDO { private String multiTurnConfig; + private String visualConfig; + } diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java index eb9c394b9..9fa5cd066 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/AgentServiceImpl.java @@ -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.mapper.AgentDOMapper; 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.config.LLMConfig; import org.springframework.beans.BeanUtils; @@ -65,6 +66,7 @@ public class AgentServiceImpl extends ServiceImpl agent.setExamples(JsonUtil.toList(agentDO.getExamples(), String.class)); agent.setLlmConfig(JsonUtil.toObject(agentDO.getLlmConfig(), LLMConfig.class)); agent.setMultiTurnConfig(JsonUtil.toObject(agentDO.getMultiTurnConfig(), MultiTurnConfig.class)); + agent.setVisualConfig(JsonUtil.toObject(agentDO.getVisualConfig(), VisualConfig.class)); return agent; } @@ -75,6 +77,7 @@ public class AgentServiceImpl extends ServiceImpl agentDO.setExamples(JsonUtil.toString(agent.getExamples())); agentDO.setLlmConfig(JsonUtil.toString(agent.getLlmConfig())); agentDO.setMultiTurnConfig(JsonUtil.toString(agent.getMultiTurnConfig())); + agentDO.setVisualConfig(JsonUtil.toString(agent.getVisualConfig())); if (agentDO.getStatus() == null) { agentDO.setStatus(1); } diff --git a/common/src/main/java/com/tencent/supersonic/common/config/VisualConfig.java b/common/src/main/java/com/tencent/supersonic/common/config/VisualConfig.java new file mode 100644 index 000000000..c912b36df --- /dev/null +++ b/common/src/main/java/com/tencent/supersonic/common/config/VisualConfig.java @@ -0,0 +1,12 @@ +package com.tencent.supersonic.common.config; + +import lombok.Data; + +@Data +public class VisualConfig { + + private boolean enableSimpleMode; + + private boolean showDebugInfo; + +} diff --git a/launchers/standalone/src/main/resources/config.update/sql-update.sql b/launchers/standalone/src/main/resources/config.update/sql-update.sql index f5e3a571a..356288c43 100644 --- a/launchers/standalone/src/main/resources/config.update/sql-update.sql +++ b/launchers/standalone/src/main/resources/config.update/sql-update.sql @@ -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); --20240609 -alter table s2_user add column `salt` varchar(256) DEFAULT NULL COMMENT 'md5密码盐'; \ No newline at end of file +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 '可视化配置'; \ No newline at end of file diff --git a/launchers/standalone/src/main/resources/db/schema-h2.sql b/launchers/standalone/src/main/resources/db/schema-h2.sql index f954188bf..6a85aebf9 100644 --- a/launchers/standalone/src/main/resources/db/schema-h2.sql +++ b/launchers/standalone/src/main/resources/db/schema-h2.sql @@ -356,6 +356,7 @@ CREATE TABLE IF NOT EXISTS s2_agent config varchar(2000) null, llm_config varchar(2000) null, multi_turn_config varchar(2000) null, + visual_config varchar(2000) null, created_by varchar(100) null, created_at TIMESTAMP null, updated_by varchar(100) null, diff --git a/launchers/standalone/src/main/resources/db/schema-mysql.sql b/launchers/standalone/src/main/resources/db/schema-mysql.sql index cecc87af6..c7c72e133 100644 --- a/launchers/standalone/src/main/resources/db/schema-mysql.sql +++ b/launchers/standalone/src/main/resources/db/schema-mysql.sql @@ -74,6 +74,7 @@ CREATE TABLE `s2_agent` ( `config` varchar(6000) 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, + `visual_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL, `created_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, `created_at` datetime DEFAULT NULL, `updated_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, diff --git a/launchers/standalone/src/test/resources/db/schema-h2.sql b/launchers/standalone/src/test/resources/db/schema-h2.sql index feb056c38..e5c34cc36 100644 --- a/launchers/standalone/src/test/resources/db/schema-h2.sql +++ b/launchers/standalone/src/test/resources/db/schema-h2.sql @@ -356,6 +356,7 @@ CREATE TABLE IF NOT EXISTS s2_agent config varchar(2000) null, llm_config varchar(2000) null, multi_turn_config varchar(2000) null, + visual_config varchar(2000) null, created_by varchar(100) null, created_at TIMESTAMP null, updated_by varchar(100) null,