Skip to content

Commit eef7b3c

Browse files
committed
[improvement][chat]Make a few code restructure.
1 parent c34b85c commit eef7b3c

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ParseResp.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package com.tencent.supersonic.headless.api.pojo.response;
22

33
import com.google.common.collect.Lists;
4-
import com.tencent.supersonic.common.pojo.Text2SQLExemplar;
54
import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
65
import lombok.Data;
76

7+
import java.io.Serializable;
88
import java.util.Comparator;
99
import java.util.List;
1010
import java.util.stream.Collectors;
1111

1212
@Data
13-
public class ParseResp {
13+
public class ParseResp implements Serializable {
1414
private final String queryText;
1515
private ParseState state = ParseState.PENDING;
1616
private String errorMsg;

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ParseTimeCostResp.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import lombok.Data;
44

5+
import java.io.Serializable;
6+
57
@Data
6-
public class ParseTimeCostResp {
8+
public class ParseTimeCostResp implements Serializable {
79

810
private long parseStartTime;
911
private long parseTime;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/ChatQueryContext.java

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.tencent.supersonic.headless.api.pojo.SemanticSchema;
99
import com.tencent.supersonic.headless.api.pojo.enums.ChatWorkflowState;
1010
import com.tencent.supersonic.headless.api.pojo.request.QueryNLReq;
11+
import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
1112
import com.tencent.supersonic.headless.chat.query.SemanticQuery;
1213
import lombok.Data;
1314

@@ -23,6 +24,7 @@
2324
public class ChatQueryContext implements Serializable {
2425

2526
private QueryNLReq request;
27+
private ParseResp parseResp;
2628
private Map<Long, List<Long>> modelIdToDataSetIds;
2729
private List<SemanticQuery> candidateQueries = new ArrayList<>();
2830
private SchemaMapInfo mapInfo = new SchemaMapInfo();

headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2ChatLayerService.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,15 @@ public MapInfoResp map(QueryMapReq queryMapReq) {
6565

6666
@Override
6767
public ParseResp parse(QueryNLReq queryNLReq) {
68-
ParseResp parseResult = new ParseResp(queryNLReq.getQueryText());
68+
ParseResp parseResp = new ParseResp(queryNLReq.getQueryText());
6969
ChatQueryContext queryCtx = buildChatQueryContext(queryNLReq);
70+
queryCtx.setParseResp(parseResp);
7071
if (queryCtx.getMapInfo().isEmpty()) {
71-
chatWorkflowEngine.start(ChatWorkflowState.MAPPING, queryCtx, parseResult);
72+
chatWorkflowEngine.start(ChatWorkflowState.MAPPING, queryCtx);
7273
} else {
73-
chatWorkflowEngine.start(ChatWorkflowState.PARSING, queryCtx, parseResult);
74+
chatWorkflowEngine.start(ChatWorkflowState.PARSING, queryCtx);
7475
}
75-
return parseResult;
76+
return parseResp;
7677
}
7778

7879
public void correct(QuerySqlReq querySqlReq, User user) {

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ChatWorkflowEngine.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public class ChatWorkflowEngine {
3434
private final List<SemanticCorrector> semanticCorrectors =
3535
CoreComponentFactory.getSemanticCorrectors();
3636

37-
public void start(ChatWorkflowState initialState, ChatQueryContext queryCtx,
38-
ParseResp parseResult) {
37+
public void start(ChatWorkflowState initialState, ChatQueryContext queryCtx) {
38+
ParseResp parseResult = queryCtx.getParseResp();
3939
queryCtx.setChatWorkflowState(initialState);
4040
while (queryCtx.getChatWorkflowState() != ChatWorkflowState.FINISHED) {
4141
switch (queryCtx.getChatWorkflowState()) {

0 commit comments

Comments
 (0)