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

(improvement)(chat) add QueryResponder to recall history similar solved query

Browse Source
This commit is contained in:
jolunoluo
2023-09-19 15:36:15 +08:00
parent 13dcf0edb9
commit 31c8fea2dc
7 changed files with 187 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ public class ParseResp {
private ParseState state;
private List<SemanticParseInfo> selectedParses;
private List<SemanticParseInfo> candidateParses;
private List<SolvedQueryRecallResp> similarSolvedQuery;
public enum ParseState {
COMPLETED,

17
chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/SolvedQueryRecallResp.java Normal file
View File

@@ -0,0 +1,17 @@
package com.tencent.supersonic.chat.api.pojo.response;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class SolvedQueryRecallResp {
private Long queryId;
private Integer parseId;
private String queryText;
}

6
chat/core/src/main/java/com/tencent/supersonic/chat/parser/plugin/embedding/EmbeddingConfig.java
View File

@@ -23,4 +23,10 @@ public class EmbeddingConfig {
@Value("${embedding.nResult:1}")
private String nResult;
@Value("${embedding.solvedQuery.recall.path:/solved_query_retrival}")
private String solvedQueryRecallPath;
@Value("${embedding.solvedQuery.add.path:/solved_query_add}")
private String solvedQueryAddPath;
}

2
chat/core/src/main/java/com/tencent/supersonic/chat/parser/plugin/embedding/RecallRetrieval.java
View File

@@ -14,4 +14,6 @@ public class RecallRetrieval {
private String presetId;
private String query;
}

141
chat/core/src/main/java/com/tencent/supersonic/chat/queryresponder/DefaultQueryResponder.java Normal file
View File

@@ -0,0 +1,141 @@
package com.tencent.supersonic.chat.queryresponder;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.tencent.supersonic.chat.api.pojo.response.SolvedQueryRecallResp;
import com.tencent.supersonic.chat.parser.plugin.embedding.EmbeddingConfig;
import com.tencent.supersonic.chat.parser.plugin.embedding.EmbeddingResp;
import com.tencent.supersonic.chat.parser.plugin.embedding.RecallRetrieval;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.logging.log4j.util.Strings;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
import java.net.URI;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
@Slf4j
@Component
public class DefaultQueryResponder implements QueryResponder{
private EmbeddingConfig embeddingConfig;
private RestTemplate restTemplate;
public DefaultQueryResponder(EmbeddingConfig embeddingConfig,
RestTemplate restTemplate) {
this.embeddingConfig = embeddingConfig;
this.restTemplate = restTemplate;
}
@Override
public void saveSolvedQuery(String queryText, Long queryId, Integer parseId) {
try {
String uniqueId = generateUniqueId(queryId, parseId);
Map<String, String> requestMap = new HashMap<>();
requestMap.put("query", queryText);
requestMap.put("query_id", uniqueId);
doRequest(embeddingConfig.getSolvedQueryAddPath(),
JSONObject.toJSONString(Lists.newArrayList(requestMap)));
} catch (Exception e) {
log.warn("save history question to embedding failed, queryText:{}", queryText, e);
}
}
@Override
public List<SolvedQueryRecallResp> recallSolvedQuery(String queryText) {
List<SolvedQueryRecallResp> solvedQueryRecallResps = Lists.newArrayList();
try {
String url = embeddingConfig.getUrl() + embeddingConfig.getSolvedQueryRecallPath() + "?n_results="
+ embeddingConfig.getNResult();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
headers.setLocation(URI.create(url));
URI requestUrl = UriComponentsBuilder
.fromHttpUrl(url).build().encode().toUri();
String jsonBody = JSONObject.toJSONString(Lists.newArrayList(queryText));
HttpEntity<String> entity = new HttpEntity<>(jsonBody, headers);
log.info("[embedding] request body:{}, url:{}", jsonBody, url);
ResponseEntity<List<EmbeddingResp>> embeddingResponseEntity =
restTemplate.exchange(requestUrl, HttpMethod.POST, entity,
new ParameterizedTypeReference<List<EmbeddingResp>>() {
});
log.info("[embedding] recognize result body:{}", embeddingResponseEntity);
List<EmbeddingResp> embeddingResps = embeddingResponseEntity.getBody();
Set<String> querySet = new HashSet<>();
if (CollectionUtils.isNotEmpty(embeddingResps)) {
for (EmbeddingResp embeddingResp : embeddingResps) {
List<RecallRetrieval> embeddingRetrievals = embeddingResp.getRetrieval();
for (RecallRetrieval embeddingRetrieval : embeddingRetrievals) {
if (querySet.contains(embeddingRetrieval.getQuery())) {
continue;
}
String id = embeddingRetrieval.getId();
SolvedQueryRecallResp solvedQueryRecallResp =
SolvedQueryRecallResp.builder()
.queryText(embeddingRetrieval.getQuery())
.queryId(getQueryId(id)).parseId(getParseId(id))
.build();
solvedQueryRecallResps.add(solvedQueryRecallResp);
querySet.add(embeddingRetrieval.getQuery());
}
}
}
} catch (Exception e) {
log.warn("recall similar solved query failed", e);
}
return solvedQueryRecallResps;
}
private String generateUniqueId(Long queryId, Integer parseId) {
String uniqueId = queryId + String.valueOf(parseId);
if (parseId < 10) {
uniqueId = queryId + String.format("0%s", parseId);
}
return uniqueId;
}
private Long getQueryId(String uniqueId) {
return Long.parseLong(uniqueId) / 100;
}
private Integer getParseId(String uniqueId) {
return Integer.parseInt(uniqueId) % 100;
}
private ResponseEntity<String> doRequest(String path, String jsonBody) {
if (Strings.isEmpty(embeddingConfig.getUrl())) {
return ResponseEntity.of(Optional.empty());
}
String url = embeddingConfig.getUrl() + path;
try {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
headers.setLocation(URI.create(url));
URI requestUrl = UriComponentsBuilder
.fromHttpUrl(url).build().encode().toUri();
HttpEntity<String> entity = new HttpEntity<>(jsonBody, headers);
log.info("[embedding] request body :{}, url:{}", jsonBody, url);
ResponseEntity<String> responseEntity = restTemplate.exchange(requestUrl,
HttpMethod.POST, entity, new ParameterizedTypeReference<String>() {});
log.info("[embedding] result body:{}", responseEntity);
return responseEntity;
} catch (Exception e) {
log.warn("connect to embedding service failed, url:{}", url);
}
return ResponseEntity.of(Optional.empty());
}
}

12
chat/core/src/main/java/com/tencent/supersonic/chat/queryresponder/QueryResponder.java Normal file
View File

@@ -0,0 +1,12 @@
package com.tencent.supersonic.chat.queryresponder;
import com.tencent.supersonic.chat.api.pojo.response.SolvedQueryRecallResp;
import java.util.List;
public interface QueryResponder {
void saveSolvedQuery(String queryText, Long queryId, Integer parseId);
List<SolvedQueryRecallResp> recallSolvedQuery(String queryText);
}

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

@@ -15,12 +15,14 @@ import com.tencent.supersonic.chat.api.pojo.response.EntityInfo;
import com.tencent.supersonic.chat.api.pojo.response.ParseResp;
import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
import com.tencent.supersonic.chat.api.pojo.response.QueryState;
import com.tencent.supersonic.chat.api.pojo.response.SolvedQueryRecallResp;
import com.tencent.supersonic.chat.persistence.dataobject.ChatParseDO;
import com.tencent.supersonic.chat.persistence.dataobject.CostType;
import com.tencent.supersonic.chat.persistence.dataobject.StatisticsDO;
import com.tencent.supersonic.chat.query.QuerySelector;
import com.tencent.supersonic.chat.api.pojo.request.QueryDataReq;
import com.tencent.supersonic.chat.query.QueryManager;
import com.tencent.supersonic.chat.queryresponder.QueryResponder;
import com.tencent.supersonic.chat.service.ChatService;
import com.tencent.supersonic.chat.service.QueryService;
import com.tencent.supersonic.chat.service.SemanticService;
@@ -63,6 +65,8 @@ public class QueryServiceImpl implements QueryService {
private ChatService chatService;
@Autowired
private StatisticsService statisticsService;
@Autowired
private QueryResponder queryResponder;
private final String entity = "ENTITY";
@@ -129,10 +133,13 @@ public class QueryServiceImpl implements QueryService {
saveInfo(timeCostDOList, queryReq.getQueryText(), parseResult.getQueryId(),
queryReq.getUser().getName(), queryReq.getChatId().longValue());
} else {
List<SolvedQueryRecallResp> solvedQueryRecallResps =
queryResponder.recallSolvedQuery(queryCtx.getRequest().getQueryText());
parseResult = ParseResp.builder()
.chatId(queryReq.getChatId())
.queryText(queryReq.getQueryText())
.state(ParseResp.ParseState.FAILED)
.similarSolvedQuery(solvedQueryRecallResps)
.build();
}
return parseResult;
@@ -171,6 +178,7 @@ public class QueryServiceImpl implements QueryService {
chatCtx.setUser(queryReq.getUser().getName());
//chatService.addQuery(queryResult, chatCtx);
chatService.updateQuery(queryReq.getQueryId(), queryResult, chatCtx);
queryResponder.saveSolvedQuery(queryReq.getQueryText(), queryReq.getQueryId(), queryReq.getParseId());
} else {
chatService.deleteChatQuery(queryReq.getQueryId());
}