From a7fe90039499f316df78ad1d6a037e74d2d41fc7 Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Sat, 12 Oct 2024 20:33:22 +0800 Subject: [PATCH] [fix][launcher]Config chat apps for `S2ArtistDemo` --- .../tencent/supersonic/chat/server/agent/Agent.java | 6 +++--- .../com/tencent/supersonic/demo/S2ArtistDemo.java | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) 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 86533a85b..d5c8528cb 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 @@ -19,10 +19,10 @@ public class Agent extends RecordInfo { private String name; private String description; /** 0 offline, 1 online */ - private Integer status; + private Integer status = 1; private List examples; - private Integer enableSearch; - private Integer enableFeedback; + private Integer enableSearch = 1; + private Integer enableFeedback = 0; private String toolConfig; private Map chatAppConfig = Collections.EMPTY_MAP; private VisualConfig visualConfig; diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java index ed3d0c6fd..66fb67468 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java @@ -2,12 +2,15 @@ package com.tencent.supersonic.demo; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.tencent.supersonic.chat.server.agent.Agent; import com.tencent.supersonic.chat.server.agent.AgentToolType; import com.tencent.supersonic.chat.server.agent.DatasetTool; import com.tencent.supersonic.chat.server.agent.ToolConfig; +import com.tencent.supersonic.common.pojo.ChatApp; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; +import com.tencent.supersonic.common.util.ChatAppManager; import com.tencent.supersonic.headless.api.pojo.*; import com.tencent.supersonic.headless.api.pojo.DetailTypeDefaultConfig; import com.tencent.supersonic.headless.api.pojo.enums.DimensionType; @@ -31,6 +34,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Map; @Component @Slf4j @@ -167,6 +171,8 @@ public class S2ArtistDemo extends S2BaseDemo { agent.setStatus(1); agent.setEnableSearch(1); agent.setExamples(Lists.newArrayList("国风流派歌手", "港台歌手", "周杰伦流派")); + + // configure tools ToolConfig toolConfig = new ToolConfig(); DatasetTool datasetTool = new DatasetTool(); datasetTool.setId("1"); @@ -174,6 +180,11 @@ public class S2ArtistDemo extends S2BaseDemo { datasetTool.setDataSetIds(Lists.newArrayList(dataSetId)); toolConfig.getTools().add(datasetTool); agent.setToolConfig(JSONObject.toJSONString(toolConfig)); + + // configure chat apps + Map chatAppConfig = Maps.newHashMap(ChatAppManager.getAllApps()); + chatAppConfig.values().forEach(app -> app.setChatModelId(demoChatModel.getId())); + agent.setChatAppConfig(chatAppConfig); agentService.createAgent(agent, defaultUser); } }