[improvement][headless-chat]Rename methods of ChatQuery and ChatLayer service.

This commit is contained in:
jerryjzhang
2024-10-08 17:48:28 +08:00
parent 27e654a873
commit aa32a2a640
8 changed files with 26 additions and 26 deletions

View File

@@ -40,21 +40,21 @@ public class ChatQueryApiController {
public Object map(@RequestBody QueryNLReq queryNLReq, HttpServletRequest request,
HttpServletResponse response) {
queryNLReq.setUser(UserHolder.findUser(request, response));
return chatLayerService.performMapping(queryNLReq);
return chatLayerService.map(queryNLReq);
}
@PostMapping("/chat/parse")
public Object parse(@RequestBody QueryNLReq queryNLReq, HttpServletRequest request,
HttpServletResponse response) throws Exception {
queryNLReq.setUser(UserHolder.findUser(request, response));
return chatLayerService.performParsing(queryNLReq);
return chatLayerService.parse(queryNLReq);
}
@PostMapping("/chat")
public Object queryByNL(@RequestBody QueryNLReq queryNLReq, HttpServletRequest request,
HttpServletResponse response) throws Exception {
User user = UserHolder.findUser(request, response);
ParseResp parseResp = chatLayerService.performParsing(queryNLReq);
ParseResp parseResp = chatLayerService.parse(queryNLReq);
if (parseResp.getState().equals(ParseResp.ParseState.COMPLETED)) {
SemanticParseInfo parseInfo = parseResp.getSelectedParses().get(0);
QuerySqlReq sqlReq = new QuerySqlReq();

View File

@@ -15,14 +15,14 @@ import java.util.List;
/** This interface adds natural language support to the semantic layer. */
public interface ChatLayerService {
MapResp performMapping(QueryNLReq queryNLReq);
ParseResp performParsing(QueryNLReq queryNLReq);
MapResp map(QueryNLReq queryNLReq);
MapInfoResp map(QueryMapReq queryMapReq);
List<SearchResult> retrieve(QueryNLReq queryNLReq);
ParseResp parse(QueryNLReq queryNLReq);
void correct(QuerySqlReq querySqlReq, User user);
SqlEvaluation validate(QuerySqlReq querySqlReq, User user);

View File

@@ -63,7 +63,7 @@ public class S2ChatLayerService implements ChatLayerService {
private ChatWorkflowEngine chatWorkflowEngine;
@Override
public MapResp performMapping(QueryNLReq queryNLReq) {
public MapResp map(QueryNLReq queryNLReq) {
MapResp mapResp = new MapResp(queryNLReq.getQueryText());
ChatQueryContext queryCtx = buildChatQueryContext(queryNLReq);
ComponentFactory.getSchemaMappers().forEach(mapper -> {
@@ -82,13 +82,13 @@ public class S2ChatLayerService implements ChatLayerService {
Set<Long> dataSetIds = dataSets.stream().map(SchemaItem::getId).collect(Collectors.toSet());
queryNLReq.setDataSetIds(dataSetIds);
MapResp mapResp = performMapping(queryNLReq);
MapResp mapResp = map(queryNLReq);
dataSetIds.retainAll(mapResp.getMapInfo().getDataSetElementMatches().keySet());
return convert(mapResp, queryMapReq.getTopN(), dataSetIds);
}
@Override
public ParseResp performParsing(QueryNLReq queryNLReq) {
public ParseResp parse(QueryNLReq queryNLReq) {
ParseResp parseResult = new ParseResp(queryNLReq.getQueryText());
ChatQueryContext queryCtx = buildChatQueryContext(queryNLReq);
chatWorkflowEngine.execute(queryCtx, parseResult);