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

[improvement][chat] Remove deprecated executeQuery method

Browse Source
This commit is contained in:
jerryjzhang
2023-11-09 14:21:18 +08:00
parent 2aeeb1a14e
commit cd972d0850
6 changed files with 38 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ExecuteQueryReq.java
View File

@@ -3,8 +3,10 @@ package com.tencent.supersonic.chat.api.pojo.request;
import com.tencent.supersonic.auth.api.authentication.pojo.User;
import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
import lombok.Builder;
import lombok.Data;
@Builder
@Data
public class ExecuteQueryReq {
private User user;

7
chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatQueryController.java
View File

@@ -41,13 +41,6 @@ public class ChatQueryController {
return searchService.search(queryCtx);
}
@PostMapping("query")
public Object query(@RequestBody QueryReq queryCtx, HttpServletRequest request, HttpServletResponse response)
throws Exception {
queryCtx.setUser(UserHolder.findUser(request, response));
return queryService.executeQuery(queryCtx);
}
@PostMapping("parse")
public Object parse(@RequestBody QueryReq queryCtx, HttpServletRequest request, HttpServletResponse response)
throws Exception {

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

@@ -20,8 +20,6 @@ public interface QueryService {
QueryResult performExecution(ExecuteQueryReq queryReq) throws Exception;
QueryResult executeQuery(QueryReq queryReq) throws Exception;
SemanticParseInfo queryContext(QueryReq queryReq);
QueryResult executeDirectQuery(QueryDataReq queryData, User user) throws SqlParseException;

49
chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java
View File

@@ -254,7 +254,7 @@ public class QueryServiceImpl implements QueryService {
}
// save time cost data
public void saveInfo(List<StatisticsDO> timeCostDOList,
private void saveInfo(List<StatisticsDO> timeCostDOList,
String queryText, Long queryId,
String userName, Long chatId) {
List<StatisticsDO> list = timeCostDOList.stream()
@@ -284,47 +284,6 @@ public class QueryServiceImpl implements QueryService {
.queryText(queryReq.getQueryText()).build());
}
@Override
public QueryResult executeQuery(QueryReq queryReq) throws Exception {
QueryContext queryCtx = new QueryContext(queryReq);
// in order to support multi-turn conversation, chat context is needed
ChatContext chatCtx = chatService.getOrCreateContext(queryReq.getChatId());
schemaMappers.stream().forEach(mapper -> {
mapper.map(queryCtx);
log.info("{} result:{}", mapper.getClass().getSimpleName(), JsonUtil.toString(queryCtx));
});
semanticParsers.stream().forEach(parser -> {
parser.parse(queryCtx, chatCtx);
log.info("{} result:{}", parser.getClass().getSimpleName(), JsonUtil.toString(queryCtx));
});
QueryResult queryResult = null;
if (queryCtx.getCandidateQueries().size() > 0) {
log.info("pick before [{}]", queryCtx.getCandidateQueries().stream().collect(
Collectors.toList()));
List<SemanticQuery> selectedQueries = querySelector.select(queryCtx.getCandidateQueries(), queryReq);
log.info("pick after [{}]", selectedQueries.stream().collect(
Collectors.toList()));
SemanticQuery semanticQuery = selectedQueries.get(0);
queryResult = semanticQuery.execute(queryReq.getUser());
if (queryResult != null) {
chatCtx.setQueryText(queryReq.getQueryText());
// update chat context after a successful semantic query
if (queryReq.isSaveAnswer() && QueryState.SUCCESS.equals(queryResult.getQueryState())) {
chatCtx.setParseInfo(semanticQuery.getParseInfo());
chatService.updateContext(chatCtx);
}
queryResult.setChatContext(chatCtx.getParseInfo());
chatService.addQuery(queryResult, chatCtx);
}
}
return queryResult;
}
@Override
public SemanticParseInfo queryContext(QueryReq queryCtx) {
ChatContext context = chatService.getOrCreateContext(queryCtx.getChatId());
@@ -463,7 +422,7 @@ public class QueryServiceImpl implements QueryService {
parseInfo.setDateInfo(queryData.getDateInfo());
}
public <T extends ComparisonOperator> void addTimeFilters(String date,
private <T extends ComparisonOperator> void addTimeFilters(String date,
T comparisonExpression,
List<Expression> addConditions) {
Column column = new Column(TimeDimensionEnum.DAY.getChName());
@@ -513,7 +472,7 @@ public class QueryServiceImpl implements QueryService {
}
// add in condition to sql where condition
public void addWhereInFilters(QueryFilter dslQueryFilter,
private void addWhereInFilters(QueryFilter dslQueryFilter,
InExpression inExpression,
Set<QueryFilter> contextMetricFilters,
List<Expression> addConditions) {
@@ -542,7 +501,7 @@ public class QueryServiceImpl implements QueryService {
}
// add where filter
public <T extends ComparisonOperator> void addWhereFilters(QueryFilter dslQueryFilter,
private <T extends ComparisonOperator> void addWhereFilters(QueryFilter dslQueryFilter,
T comparisonExpression,
Set<QueryFilter> contextMetricFilters,
List<Expression> addConditions) {