From bbad302efd013df89f4e6e74c300dbb176101d2e Mon Sep 17 00:00:00 2001 From: lexluo09 <39718951+lexluo09@users.noreply.github.com> Date: Tue, 9 Jan 2024 15:23:07 +0800 Subject: [PATCH] (improvement)(chat) Add the pluginList parameter to QueryContext. (#609) --- .../com/tencent/supersonic/chat/core/plugin/PluginManager.java | 2 +- .../com/tencent/supersonic/chat/core/pojo/QueryContext.java | 1 + .../supersonic/chat/server/service/impl/QueryServiceImpl.java | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/plugin/PluginManager.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/plugin/PluginManager.java index 37b5becc8..d55d97f0f 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/plugin/PluginManager.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/plugin/PluginManager.java @@ -51,7 +51,7 @@ public class PluginManager { } public static List getPluginAgentCanSupport(QueryContext queryContext) { - List plugins = new ArrayList<>(); + List plugins = queryContext.getPluginList(); if (Objects.isNull(queryContext.getAgent())) { return plugins; } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/pojo/QueryContext.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/pojo/QueryContext.java index cd658ccf9..944b05345 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/pojo/QueryContext.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/pojo/QueryContext.java @@ -36,6 +36,7 @@ public class QueryContext { private Agent agent; private Map modelIdToChatRichConfig; private Map nameToPlugin; + private List pluginList; public List getCandidateQueries() { OptimizationConfig optimizationConfig = ContextUtils.getBean(OptimizationConfig.class); diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/QueryServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/QueryServiceImpl.java index 4b147174e..69b2c9c36 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/QueryServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/QueryServiceImpl.java @@ -194,6 +194,8 @@ public class QueryServiceImpl implements QueryService { Map modelIdToChatRichConfig = configService.getModelIdToChatRichConfig(); Map nameToPlugin = pluginService.getNameToPlugin(); + List pluginList = pluginService.getPluginList(); + QueryContext queryCtx = QueryContext.builder() .request(queryReq) .queryFilters(queryReq.getQueryFilters()) @@ -203,6 +205,7 @@ public class QueryServiceImpl implements QueryService { .agent(agent) .modelIdToChatRichConfig(modelIdToChatRichConfig) .nameToPlugin(nameToPlugin) + .pluginList(pluginList) .build(); return queryCtx; }