From 612f046c0d2c66f9fe6c070f526478ac6024988d Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Sat, 12 Oct 2024 16:39:13 +0800 Subject: [PATCH] [feature][chat]Add switch to allow human involvement.#1729 --- .../java/com/tencent/supersonic/chat/server/agent/Agent.java | 4 +++- .../chat/server/persistence/dataobject/AgentDO.java | 2 ++ .../src/main/resources/config.update/sql-update.sql | 3 +++ launchers/standalone/src/main/resources/db/schema-h2.sql | 1 + launchers/standalone/src/main/resources/db/schema-mysql.sql | 1 + launchers/standalone/src/test/resources/db/schema-h2.sql | 1 + 6 files changed, 11 insertions(+), 1 deletion(-) 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 1998c17e4..86533a85b 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 @@ -3,6 +3,7 @@ package com.tencent.supersonic.chat.server.agent; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.tencent.supersonic.chat.server.memory.MemoryReviewTask; import com.tencent.supersonic.common.pojo.ChatApp; import com.tencent.supersonic.common.pojo.RecordInfo; import lombok.Data; @@ -21,6 +22,7 @@ public class Agent extends RecordInfo { private Integer status; private List examples; private Integer enableSearch; + private Integer enableFeedback; private String toolConfig; private Map chatAppConfig = Collections.EMPTY_MAP; private VisualConfig visualConfig; @@ -44,7 +46,7 @@ public class Agent extends RecordInfo { } public boolean enableMemoryReview() { - return false; + return chatAppConfig.get(MemoryReviewTask.APP_KEY).isEnable(); } public static boolean containsAllModel(Set detectViewIds) { 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 b2a12705b..58645c621 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 @@ -33,6 +33,8 @@ public class AgentDO { private Integer enableSearch; + private Integer enableFeedback; + private String toolConfig; private String chatModelConfig; 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 61091bf0a..ac219e399 100644 --- a/launchers/standalone/src/main/resources/config.update/sql-update.sql +++ b/launchers/standalone/src/main/resources/config.update/sql-update.sql @@ -392,3 +392,6 @@ ALTER TABLE s2_agent RENAME COLUMN model_config TO chat_model_config; ALTER TABLE s2_agent DROP COLUMN prompt_config; ALTER TABLE s2_agent DROP COLUMN multi_turn_config; ALTER TABLE s2_agent DROP COLUMN enable_memory_review; + +--20241012 +alter table s2_agent add column `enable_feedback` tinyint DEFAULT 1; \ 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 b1d500d5a..4d3d6ec37 100644 --- a/launchers/standalone/src/main/resources/db/schema-h2.sql +++ b/launchers/standalone/src/main/resources/db/schema-h2.sql @@ -397,6 +397,7 @@ CREATE TABLE IF NOT EXISTS s2_agent updated_by varchar(100) null, updated_at TIMESTAMP null, enable_search int null, + enable_feedback int null, PRIMARY KEY (`id`) ); COMMENT ON TABLE s2_agent IS 'agent information table'; diff --git a/launchers/standalone/src/main/resources/db/schema-mysql.sql b/launchers/standalone/src/main/resources/db/schema-mysql.sql index f13d3190d..646eb7d35 100644 --- a/launchers/standalone/src/main/resources/db/schema-mysql.sql +++ b/launchers/standalone/src/main/resources/db/schema-mysql.sql @@ -75,6 +75,7 @@ CREATE TABLE IF NOT EXISTS `s2_agent` ( `chat_model_config` text COLLATE utf8_unicode_ci DEFAULT NULL, `visual_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL, `enable_search` tinyint DEFAULT 1, + `enable_feedback` tinyint DEFAULT 1, `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 92728f4ff..7439debac 100644 --- a/launchers/standalone/src/test/resources/db/schema-h2.sql +++ b/launchers/standalone/src/test/resources/db/schema-h2.sql @@ -397,6 +397,7 @@ CREATE TABLE IF NOT EXISTS s2_agent updated_by varchar(100) null, updated_at TIMESTAMP null, enable_search int null, + enable_feedback int null, PRIMARY KEY (`id`) ); COMMENT ON TABLE s2_agent IS 'agent information table';