diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ParseResp.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ParseResp.java index a373a2d00..83a0e9367 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ParseResp.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ParseResp.java @@ -3,7 +3,6 @@ package com.tencent.supersonic.chat.api.pojo.response; import com.google.common.collect.Lists; import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo; import lombok.Data; -import org.apache.commons.collections.CollectionUtils; import java.util.List; @Data @@ -13,7 +12,6 @@ public class ParseResp { private Long queryId; private ParseState state; private List selectedParses = Lists.newArrayList(); - private List candidateParses = Lists.newArrayList(); private ParseTimeCostDO parseTimeCost = new ParseTimeCostDO(); public enum ParseState { @@ -22,14 +20,4 @@ public class ParseResp { FAILED } - //Compatible with front-end - public List getSelectedParses() { - selectedParses = Lists.newArrayList(); - if (CollectionUtils.isNotEmpty(candidateParses)) { - selectedParses.addAll(candidateParses); - candidateParses.clear(); - } - return selectedParses; - } - } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/processor/parse/RespBuildProcessor.java b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/parse/RespBuildProcessor.java index 88225aa69..2a3b028ec 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/processor/parse/RespBuildProcessor.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/parse/RespBuildProcessor.java @@ -27,9 +27,8 @@ public class RespBuildProcessor implements ParseResultProcessor { if (candidateQueries.size() > 0) { List candidateParses = candidateQueries.stream() .map(SemanticQuery::getParseInfo).collect(Collectors.toList()); - parseResp.setCandidateParses(candidateParses); + parseResp.setSelectedParses(candidateParses); parseResp.setState(ParseResp.ParseState.COMPLETED); - parseResp.setCandidateParses(candidateParses); ChatService chatService = ContextUtils.getBean(ChatService.class); chatService.batchAddParse(chatContext, queryReq, parseResp); } else { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java index d97f64f6e..a05f2c7b0 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java @@ -215,7 +215,7 @@ public class ChatServiceImpl implements ChatService { @Override public List batchAddParse(ChatContext chatCtx, QueryReq queryReq, ParseResp parseResult) { - List candidateParses = parseResult.getCandidateParses(); + List candidateParses = parseResult.getSelectedParses(); return chatQueryRepository.batchSaveParseInfo(chatCtx, queryReq, parseResult, candidateParses); } diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java index f345182e5..1fb5cc6c0 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java @@ -26,7 +26,7 @@ public class ModelSchemaBuilder { public static ModelSchema build(ModelSchemaResp resp) { ModelSchema modelSchema = new ModelSchema(); - SchemaElement domain = SchemaElement.builder() + SchemaElement model = SchemaElement.builder() .model(resp.getId()) .id(resp.getId()) .name(resp.getName()) @@ -34,7 +34,7 @@ public class ModelSchemaBuilder { .type(SchemaElementType.MODEL) .alias(SchemaItem.getAliasList(resp.getAlias())) .build(); - modelSchema.setModel(domain); + modelSchema.setModel(model); modelSchema.setModelRelas(resp.getModelRelas()); Set metrics = new HashSet<>(); diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java b/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java index 4f68c5407..597cdc1d3 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java @@ -92,9 +92,9 @@ public class ChatDemoLoader { ExecuteQueryReq executeReq = ExecuteQueryReq.builder().build(); executeReq.setQueryId(parseResp.getQueryId()); - executeReq.setParseId(parseResp.getCandidateParses().get(0).getId()); + executeReq.setParseId(parseResp.getSelectedParses().get(0).getId()); executeReq.setQueryText(queryRequest.getQueryText()); - executeReq.setParseInfo(parseResp.getCandidateParses().get(0)); + executeReq.setParseInfo(parseResp.getSelectedParses().get(0)); executeReq.setChatId(parseResp.getChatId()); executeReq.setUser(queryRequest.getUser()); executeReq.setAgentId(1); diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/BaseQueryTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/BaseQueryTest.java index 416f94c10..410bf8251 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/BaseQueryTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/BaseQueryTest.java @@ -53,11 +53,11 @@ public class BaseQueryTest { ExecuteQueryReq request = ExecuteQueryReq.builder() .queryId(parseResp.getQueryId()) - .parseId(parseResp.getCandidateParses().get(0).getId()) + .parseId(parseResp.getSelectedParses().get(0).getId()) .chatId(parseResp.getChatId()) .queryText(parseResp.getQueryText()) .user(DataUtils.getUser()) - .parseInfo(parseResp.getCandidateParses().get(0)) + .parseInfo(parseResp.getSelectedParses().get(0)) .saveAnswer(true) .build(); @@ -69,11 +69,11 @@ public class BaseQueryTest { ExecuteQueryReq request = ExecuteQueryReq.builder() .queryId(parseResp.getQueryId()) - .parseId(parseResp.getCandidateParses().get(0).getId()) + .parseId(parseResp.getSelectedParses().get(0).getId()) .chatId(parseResp.getChatId()) .queryText(parseResp.getQueryText()) .user(DataUtils.getUser()) - .parseInfo(parseResp.getCandidateParses().get(0)) + .parseInfo(parseResp.getSelectedParses().get(0)) .saveAnswer(true) .build(); diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricQueryTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricQueryTest.java index 27354a408..cdffed69c 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricQueryTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricQueryTest.java @@ -54,8 +54,8 @@ public class MetricQueryTest extends BaseQueryTest { //agent only support METRIC_ENTITY, METRIC_FILTER MockConfiguration.mockAgent(agentService); ParseResp parseResp = submitParseWithAgent("alice的访问次数", DataUtils.getAgent().getId()); - Assert.assertNotNull(parseResp.getCandidateParses()); - List queryModes = parseResp.getCandidateParses().stream() + Assert.assertNotNull(parseResp.getSelectedParses()); + List queryModes = parseResp.getSelectedParses().stream() .map(SemanticParseInfo::getQueryMode).collect(Collectors.toList()); Assert.assertTrue(queryModes.contains("METRIC_FILTER")); } @@ -84,7 +84,7 @@ public class MetricQueryTest extends BaseQueryTest { //agent only support METRIC_ENTITY, METRIC_FILTER MockConfiguration.mockAgent(agentService); ParseResp parseResp = submitParseWithAgent("超音数的访问次数", DataUtils.getAgent().getId()); - List queryModes = parseResp.getCandidateParses().stream() + List queryModes = parseResp.getSelectedParses().stream() .map(SemanticParseInfo::getQueryMode).collect(Collectors.toList()); Assert.assertTrue(queryModes.contains("METRIC_MODEL")); } diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/PluginRecognizeTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/PluginRecognizeTest.java index 0119f4cfe..ac8a577ea 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/PluginRecognizeTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/PluginRecognizeTest.java @@ -44,7 +44,7 @@ public class PluginRecognizeTest extends BasePluginTest { .chatId(parseResp.getChatId()) .queryId(parseResp.getQueryId()) .queryText(parseResp.getQueryText()) - .parseInfo(parseResp.getCandidateParses().get(0)) + .parseInfo(parseResp.getSelectedParses().get(0)) .build(); QueryResult queryResult = queryService.performExecution(executeReq); @@ -69,7 +69,7 @@ public class PluginRecognizeTest extends BasePluginTest { .chatId(parseResp.getChatId()) .queryId(parseResp.getQueryId()) .queryText(parseResp.getQueryText()) - .parseInfo(parseResp.getCandidateParses().get(0)) + .parseInfo(parseResp.getSelectedParses().get(0)) .build(); QueryResult queryResult = queryService.performExecution(executeReq); @@ -84,8 +84,8 @@ public class PluginRecognizeTest extends BasePluginTest { QueryReq queryContextReq = DataUtils.getQueryReqWithAgent(1000, "alice最近的访问情况怎么样", DataUtils.getAgent().getId()); ParseResp parseResp = queryService.performParsing(queryContextReq); - Assert.assertTrue(parseResp.getCandidateParses() != null - && parseResp.getCandidateParses().size() > 0); + Assert.assertTrue(parseResp.getSelectedParses() != null + && parseResp.getSelectedParses().size() > 0); } }