From 7f3cb5812c1e395fae529e58102632d07a5f1a8e Mon Sep 17 00:00:00 2001 From: LXW <1264174498@qq.com> Date: Fri, 15 Mar 2024 13:04:05 +0800 Subject: [PATCH] (improvement)(Chat) Fix integrating test (#824) Co-authored-by: jolunoluo --- .../headless/api/pojo/response/ParseResp.java | 13 ++++--- .../test/resources/META-INF/spring.factories | 39 +++++++++++++++++-- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ParseResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ParseResp.java index b071fd7a4..031395c6a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ParseResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ParseResp.java @@ -24,9 +24,15 @@ public class ParseResp { FAILED } + public ParseResp(Integer chatId, String queryText) { + this.chatId = chatId; + this.queryText = queryText; + parseTimeCost.setParseStartTime(System.currentTimeMillis()); + } + public List getSelectedParses() { selectedParses = selectedParses.stream() - .sorted(Comparator.comparingDouble(SemanticParseInfo::getScore)) + .sorted(Comparator.comparingDouble(SemanticParseInfo::getScore).reversed()) .collect(Collectors.toList()); generateParseInfoId(selectedParses); return selectedParses; @@ -48,9 +54,4 @@ public class ParseResp { } } - public ParseResp(Integer chatId, String queryText) { - this.chatId = chatId; - this.queryText = queryText; - parseTimeCost.setParseStartTime(System.currentTimeMillis()); - } } diff --git a/launchers/standalone/src/test/resources/META-INF/spring.factories b/launchers/standalone/src/test/resources/META-INF/spring.factories index 8ea931c7e..e8efe39a2 100644 --- a/launchers/standalone/src/test/resources/META-INF/spring.factories +++ b/launchers/standalone/src/test/resources/META-INF/spring.factories @@ -9,17 +9,40 @@ com.tencent.supersonic.headless.core.chat.parser.SemanticParser=\ com.tencent.supersonic.headless.core.chat.parser.llm.LLMSqlParser, \ com.tencent.supersonic.headless.core.chat.parser.QueryTypeParser +com.tencent.supersonic.chat.server.parser.ChatParser=\ + com.tencent.supersonic.chat.server.parser.NL2PluginParser, \ + com.tencent.supersonic.chat.server.parser.NL2SQLParser + +com.tencent.supersonic.chat.server.executor.ChatExecutor=\ + com.tencent.supersonic.chat.server.executor.PluginExecutor, \ + com.tencent.supersonic.chat.server.executor.SqlExecutor + com.tencent.supersonic.headless.core.chat.corrector.SemanticCorrector=\ com.tencent.supersonic.headless.core.chat.corrector.SchemaCorrector, \ com.tencent.supersonic.headless.core.chat.corrector.TimeCorrector, \ com.tencent.supersonic.headless.core.chat.corrector.GrammarCorrector +com.tencent.supersonic.headless.core.parser.converter.HeadlessConverter=\ + com.tencent.supersonic.headless.core.parser.converter.DefaultDimValueConverter,\ + com.tencent.supersonic.headless.core.parser.converter.SqlVariableParseConverter,\ + com.tencent.supersonic.headless.core.parser.converter.CalculateAggConverter,\ + com.tencent.supersonic.headless.core.parser.converter.ParserDefaultConverter + +com.tencent.supersonic.headless.core.planner.QueryOptimizer=\ + com.tencent.supersonic.headless.core.planner.DetailQueryOptimizer + +com.tencent.supersonic.headless.core.executor.QueryExecutor=\ + com.tencent.supersonic.headless.core.executor.JdbcExecutor + +com.tencent.supersonic.headless.core.parser.SqlParser=\ + com.tencent.supersonic.headless.core.parser.calcite.CalciteSqlParser + +com.tencent.supersonic.headless.core.cache.QueryCache=\ + com.tencent.supersonic.headless.core.cache.DefaultQueryCache + com.tencent.supersonic.headless.server.processor.ResultProcessor=\ com.tencent.supersonic.headless.server.processor.ParseInfoProcessor, \ - com.tencent.supersonic.headless.server.processor.QueryRankProcessor, \ - com.tencent.supersonic.headless.server.processor.SqlInfoProcessor, \ - com.tencent.supersonic.chat.server.processor.parse.TimeCostProcessor, \ - com.tencent.supersonic.headless.server.processor.RespBuildProcessor + com.tencent.supersonic.headless.server.processor.SqlInfoProcessor com.tencent.supersonic.headless.core.chat.parser.llm.DataSetResolver=\ com.tencent.supersonic.headless.core.chat.parser.llm.HeuristicDataSetResolver @@ -30,6 +53,14 @@ com.tencent.supersonic.auth.authentication.interceptor.AuthenticationInterceptor com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor=\ com.tencent.supersonic.auth.authentication.adaptor.DefaultUserAdaptor +com.tencent.supersonic.chat.server.plugin.recognize.PluginRecognizer=\ + com.tencent.supersonic.chat.server.plugin.recognize.embedding.EmbeddingRecallRecognizer + +com.tencent.supersonic.chat.server.processor.parse.ParseResultProcessor=\ + com.tencent.supersonic.chat.server.processor.parse.QueryRecommendProcessor,\ + com.tencent.supersonic.chat.server.processor.parse.EntityInfoProcessor,\ + com.tencent.supersonic.chat.server.processor.parse.TimeCostProcessor + com.tencent.supersonic.chat.server.processor.execute.ExecuteResultProcessor=\ com.tencent.supersonic.chat.server.processor.execute.MetricRecommendProcessor,\ com.tencent.supersonic.chat.server.processor.execute.DimensionRecommendProcessor,\