topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-13 04:57:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(improvement)(chat) Remove candidateParses in ParseResp (#536)

Browse Source 
Co-authored-by: jolunoluo
This commit is contained in:
LXW
2023-12-18 21:10:53 +08:00
committed by GitHub
parent 4c26e0c972
commit d7f1f06daf
8 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/ParseResp.java
View File

@@ -3,7 +3,6 @@ package com.tencent.supersonic.chat.api.pojo.response;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo; import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
import lombok.Data; import lombok.Data;
import org.apache.commons.collections.CollectionUtils;
import java.util.List; import java.util.List;
@Data @Data
@@ -13,7 +12,6 @@ public class ParseResp {
private Long queryId; private Long queryId;
private ParseState state; private ParseState state;
private List<SemanticParseInfo> selectedParses = Lists.newArrayList(); private List<SemanticParseInfo> selectedParses = Lists.newArrayList();
private List<SemanticParseInfo> candidateParses = Lists.newArrayList();
private ParseTimeCostDO parseTimeCost = new ParseTimeCostDO(); private ParseTimeCostDO parseTimeCost = new ParseTimeCostDO();
public enum ParseState { public enum ParseState {
@@ -22,14 +20,4 @@ public class ParseResp {
FAILED FAILED
} }
//Compatible with front-end
public List<SemanticParseInfo> getSelectedParses() {
selectedParses = Lists.newArrayList();
if (CollectionUtils.isNotEmpty(candidateParses)) {
selectedParses.addAll(candidateParses);
candidateParses.clear();
}
return selectedParses;
}
} }

3
chat/core/src/main/java/com/tencent/supersonic/chat/processor/parse/RespBuildProcessor.java
View File

@@ -27,9 +27,8 @@ public class RespBuildProcessor implements ParseResultProcessor {
if (candidateQueries.size() > 0) { if (candidateQueries.size() > 0) {
List<SemanticParseInfo> candidateParses = candidateQueries.stream() List<SemanticParseInfo> candidateParses = candidateQueries.stream()
.map(SemanticQuery::getParseInfo).collect(Collectors.toList()); .map(SemanticQuery::getParseInfo).collect(Collectors.toList());
parseResp.setCandidateParses(candidateParses); parseResp.setSelectedParses(candidateParses);
parseResp.setState(ParseResp.ParseState.COMPLETED); parseResp.setState(ParseResp.ParseState.COMPLETED);
parseResp.setCandidateParses(candidateParses);
ChatService chatService = ContextUtils.getBean(ChatService.class); ChatService chatService = ContextUtils.getBean(ChatService.class);
chatService.batchAddParse(chatContext, queryReq, parseResp); chatService.batchAddParse(chatContext, queryReq, parseResp);
} else { } else {

2
chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java
View File

@@ -215,7 +215,7 @@ public class ChatServiceImpl implements ChatService {
@Override @Override
public List<ChatParseDO> batchAddParse(ChatContext chatCtx, QueryReq queryReq, ParseResp parseResult) { public List<ChatParseDO> batchAddParse(ChatContext chatCtx, QueryReq queryReq, ParseResp parseResult) {
List<SemanticParseInfo> candidateParses = parseResult.getCandidateParses(); List<SemanticParseInfo> candidateParses = parseResult.getSelectedParses();
return chatQueryRepository.batchSaveParseInfo(chatCtx, queryReq, parseResult, candidateParses); return chatQueryRepository.batchSaveParseInfo(chatCtx, queryReq, parseResult, candidateParses);
} }

4
chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java
View File

@@ -26,7 +26,7 @@ public class ModelSchemaBuilder {
public static ModelSchema build(ModelSchemaResp resp) { public static ModelSchema build(ModelSchemaResp resp) {
ModelSchema modelSchema = new ModelSchema(); ModelSchema modelSchema = new ModelSchema();
SchemaElement domain = SchemaElement.builder() SchemaElement model = SchemaElement.builder()
.model(resp.getId()) .model(resp.getId())
.id(resp.getId()) .id(resp.getId())
.name(resp.getName()) .name(resp.getName())
@@ -34,7 +34,7 @@ public class ModelSchemaBuilder {
.type(SchemaElementType.MODEL) .type(SchemaElementType.MODEL)
.alias(SchemaItem.getAliasList(resp.getAlias())) .alias(SchemaItem.getAliasList(resp.getAlias()))
.build(); .build();
modelSchema.setModel(domain); modelSchema.setModel(model);
modelSchema.setModelRelas(resp.getModelRelas()); modelSchema.setModelRelas(resp.getModelRelas());
Set<SchemaElement> metrics = new HashSet<>(); Set<SchemaElement> metrics = new HashSet<>();

4
launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java
View File

@@ -92,9 +92,9 @@ public class ChatDemoLoader {
ExecuteQueryReq executeReq = ExecuteQueryReq.builder().build(); ExecuteQueryReq executeReq = ExecuteQueryReq.builder().build();
executeReq.setQueryId(parseResp.getQueryId()); executeReq.setQueryId(parseResp.getQueryId());
executeReq.setParseId(parseResp.getCandidateParses().get(0).getId()); executeReq.setParseId(parseResp.getSelectedParses().get(0).getId());
executeReq.setQueryText(queryRequest.getQueryText()); executeReq.setQueryText(queryRequest.getQueryText());
executeReq.setParseInfo(parseResp.getCandidateParses().get(0)); executeReq.setParseInfo(parseResp.getSelectedParses().get(0));
executeReq.setChatId(parseResp.getChatId()); executeReq.setChatId(parseResp.getChatId());
executeReq.setUser(queryRequest.getUser()); executeReq.setUser(queryRequest.getUser());
executeReq.setAgentId(1); executeReq.setAgentId(1);

8
launchers/standalone/src/test/java/com/tencent/supersonic/integration/BaseQueryTest.java
View File

@@ -53,11 +53,11 @@ public class BaseQueryTest {
ExecuteQueryReq request = ExecuteQueryReq.builder() ExecuteQueryReq request = ExecuteQueryReq.builder()
.queryId(parseResp.getQueryId()) .queryId(parseResp.getQueryId())
.parseId(parseResp.getCandidateParses().get(0).getId()) .parseId(parseResp.getSelectedParses().get(0).getId())
.chatId(parseResp.getChatId()) .chatId(parseResp.getChatId())
.queryText(parseResp.getQueryText()) .queryText(parseResp.getQueryText())
.user(DataUtils.getUser()) .user(DataUtils.getUser())
.parseInfo(parseResp.getCandidateParses().get(0)) .parseInfo(parseResp.getSelectedParses().get(0))
.saveAnswer(true) .saveAnswer(true)
.build(); .build();
@@ -69,11 +69,11 @@ public class BaseQueryTest {
ExecuteQueryReq request = ExecuteQueryReq.builder() ExecuteQueryReq request = ExecuteQueryReq.builder()
.queryId(parseResp.getQueryId()) .queryId(parseResp.getQueryId())
.parseId(parseResp.getCandidateParses().get(0).getId()) .parseId(parseResp.getSelectedParses().get(0).getId())
.chatId(parseResp.getChatId()) .chatId(parseResp.getChatId())
.queryText(parseResp.getQueryText()) .queryText(parseResp.getQueryText())
.user(DataUtils.getUser()) .user(DataUtils.getUser())
.parseInfo(parseResp.getCandidateParses().get(0)) .parseInfo(parseResp.getSelectedParses().get(0))
.saveAnswer(true) .saveAnswer(true)
.build(); .build();

6
launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricQueryTest.java
View File

@@ -54,8 +54,8 @@ public class MetricQueryTest extends BaseQueryTest {
//agent only support METRIC_ENTITY, METRIC_FILTER //agent only support METRIC_ENTITY, METRIC_FILTER
MockConfiguration.mockAgent(agentService); MockConfiguration.mockAgent(agentService);
ParseResp parseResp = submitParseWithAgent("alice的访问次数", DataUtils.getAgent().getId()); ParseResp parseResp = submitParseWithAgent("alice的访问次数", DataUtils.getAgent().getId());
Assert.assertNotNull(parseResp.getCandidateParses()); Assert.assertNotNull(parseResp.getSelectedParses());
List<String> queryModes = parseResp.getCandidateParses().stream() List<String> queryModes = parseResp.getSelectedParses().stream()
.map(SemanticParseInfo::getQueryMode).collect(Collectors.toList()); .map(SemanticParseInfo::getQueryMode).collect(Collectors.toList());
Assert.assertTrue(queryModes.contains("METRIC_FILTER")); Assert.assertTrue(queryModes.contains("METRIC_FILTER"));
} }
@@ -84,7 +84,7 @@ public class MetricQueryTest extends BaseQueryTest {
//agent only support METRIC_ENTITY, METRIC_FILTER //agent only support METRIC_ENTITY, METRIC_FILTER
MockConfiguration.mockAgent(agentService); MockConfiguration.mockAgent(agentService);
ParseResp parseResp = submitParseWithAgent("超音数的访问次数", DataUtils.getAgent().getId()); ParseResp parseResp = submitParseWithAgent("超音数的访问次数", DataUtils.getAgent().getId());
List<String> queryModes = parseResp.getCandidateParses().stream() List<String> queryModes = parseResp.getSelectedParses().stream()
.map(SemanticParseInfo::getQueryMode).collect(Collectors.toList()); .map(SemanticParseInfo::getQueryMode).collect(Collectors.toList());
Assert.assertTrue(queryModes.contains("METRIC_MODEL")); Assert.assertTrue(queryModes.contains("METRIC_MODEL"));
} }

8
launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/PluginRecognizeTest.java
View File

@@ -44,7 +44,7 @@ public class PluginRecognizeTest extends BasePluginTest {
.chatId(parseResp.getChatId()) .chatId(parseResp.getChatId())
.queryId(parseResp.getQueryId()) .queryId(parseResp.getQueryId())
.queryText(parseResp.getQueryText()) .queryText(parseResp.getQueryText())
.parseInfo(parseResp.getCandidateParses().get(0)) .parseInfo(parseResp.getSelectedParses().get(0))
.build(); .build();
QueryResult queryResult = queryService.performExecution(executeReq); QueryResult queryResult = queryService.performExecution(executeReq);
@@ -69,7 +69,7 @@ public class PluginRecognizeTest extends BasePluginTest {
.chatId(parseResp.getChatId()) .chatId(parseResp.getChatId())
.queryId(parseResp.getQueryId()) .queryId(parseResp.getQueryId())
.queryText(parseResp.getQueryText()) .queryText(parseResp.getQueryText())
.parseInfo(parseResp.getCandidateParses().get(0)) .parseInfo(parseResp.getSelectedParses().get(0))
.build(); .build();
QueryResult queryResult = queryService.performExecution(executeReq); QueryResult queryResult = queryService.performExecution(executeReq);
@@ -84,8 +84,8 @@ public class PluginRecognizeTest extends BasePluginTest {
QueryReq queryContextReq = DataUtils.getQueryReqWithAgent(1000, "alice最近的访问情况怎么样", QueryReq queryContextReq = DataUtils.getQueryReqWithAgent(1000, "alice最近的访问情况怎么样",
DataUtils.getAgent().getId()); DataUtils.getAgent().getId());
ParseResp parseResp = queryService.performParsing(queryContextReq); ParseResp parseResp = queryService.performParsing(queryContextReq);
Assert.assertTrue(parseResp.getCandidateParses() != null Assert.assertTrue(parseResp.getSelectedParses() != null
&& parseResp.getCandidateParses().size() > 0); && parseResp.getSelectedParses().size() > 0);
} }
} }