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

[fix][headless-chat]Fix NPE during word searching process.#1672

Browse Source
This commit is contained in:
jerryjzhang
2024-09-20 17:54:29 +08:00
parent 6a8686f513
commit ac250907f0
2 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/NatureHelper.java
View File

@@ -113,10 +113,6 @@ public class NatureHelper {
&& StringUtils.isNumeric(nature.split(DictWordType.NATURE_SPILT)[1]); && StringUtils.isNumeric(nature.split(DictWordType.NATURE_SPILT)[1]);
} }
public static boolean isTermNature(String nature) {
return isNatureValid(nature) && nature.endsWith(DictWordType.TERM.getType());
}
public static DataSetInfoStat getDataSetStat(List<S2Term> terms) { public static DataSetInfoStat getDataSetStat(List<S2Term> terms) {
return DataSetInfoStat.builder() return DataSetInfoStat.builder()
.dataSetCount(getDataSetCount(terms)) .dataSetCount(getDataSetCount(terms))

32
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/RetrieveServiceImpl.java
View File

@@ -105,8 +105,7 @@ public class RetrieveServiceImpl implements RetrieveService {
Set<SearchResult> searchResults = new LinkedHashSet(); Set<SearchResult> searchResults = new LinkedHashSet();
DataSetInfoStat dataSetInfoStat = NatureHelper.getDataSetStat(originals); DataSetInfoStat dataSetInfoStat = NatureHelper.getDataSetStat(originals);
List<Long> possibleDataSets = List<Long> possibleDataSets = getPossibleDataSets(queryNLReq, originals, dataSetIds);
getPossibleDataSets(queryNLReq, originals, dataSetInfoStat, dataSetIds);
// 5.1 priority dimension metric // 5.1 priority dimension metric
boolean existMetricAndDimension = boolean existMetricAndDimension =
@@ -141,36 +140,19 @@ public class RetrieveServiceImpl implements RetrieveService {
} }
private List<Long> getPossibleDataSets( private List<Long> getPossibleDataSets(
QueryNLReq queryCtx, QueryNLReq queryCtx, List<S2Term> originals, Set<Long> dataSetIds) {
List<S2Term> originals,
DataSetInfoStat dataSetInfoStat,
Set<Long> dataSetIds) {
if (CollectionUtils.isNotEmpty(dataSetIds)) { if (CollectionUtils.isNotEmpty(dataSetIds)) {
return new ArrayList<>(dataSetIds); return new ArrayList<>(dataSetIds);
} }
List<Long> possibleDataSets = NatureHelper.selectPossibleDataSets(originals); List<Long> possibleDataSets = NatureHelper.selectPossibleDataSets(originals);
if (possibleDataSets.isEmpty()) {
Long contextDataset = queryCtx.getContextParseInfo().getDataSetId(); if (Objects.nonNull(queryCtx.getContextParseInfo())) {
possibleDataSets.add(queryCtx.getContextParseInfo().getDataSetId());
log.debug( }
"possibleDataSets:{},dataSetInfoStat:{},contextDataset:{}",
possibleDataSets,
dataSetInfoStat,
contextDataset);
// If nothing is recognized or only metric are present, then add the contextDataset.
if (nothingOrOnlyMetric(dataSetInfoStat)) {
return Lists.newArrayList(contextDataset);
} }
return possibleDataSets;
}
private boolean nothingOrOnlyMetric(DataSetInfoStat modelStat) { return possibleDataSets;
return modelStat.getMetricDataSetCount() >= 0
&& modelStat.getDimensionDataSetCount() <= 0
&& modelStat.getDimensionValueDataSetCount() <= 0
&& modelStat.getDataSetCount() <= 0;
} }
private Set<SearchResult> searchDimensionValue( private Set<SearchResult> searchDimensionValue(