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

[fix](chat) fix visibility when searching (#72)

Browse Source
This commit is contained in:
mainmain
2023-09-11 18:05:24 +08:00
committed by GitHub
parent a4fc11887c
commit eca92d2493
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/SearchServiceImpl.java
View File

@@ -197,6 +197,15 @@ public class SearchServiceImpl implements SearchService {
.schemaElementType(schemaElementType)
.subRecommend(wordName)
.build();
ItemNameVisibilityInfo visibility = (ItemNameVisibilityInfo) caffeineCache.getIfPresent(modelId);
if (visibility == null) {
visibility = configService.getVisibilityByModelId(modelId);
caffeineCache.put(modelId, visibility);
}
if (visibility.getBlackMetricNameList().contains(searchResult.getRecommend())
|| visibility.getBlackDimNameList().contains(searchResult.getRecommend())) {
return searchResults;
}
if (metricModelCount <= 0 && !existMetricAndDimension) {
if (filterByQueryFilter(wordName, queryFilters)) {
return searchResults;
@@ -204,12 +213,7 @@ public class SearchServiceImpl implements SearchService {
searchResults.add(searchResult);
int metricSize = getMetricSize(natureToNameMap);
//invisibility to filter metrics
ItemNameVisibilityInfo itemNameVisibility = (ItemNameVisibilityInfo) caffeineCache.getIfPresent(modelId);
if (itemNameVisibility == null) {
itemNameVisibility = configService.getVisibilityByModelId(modelId);
caffeineCache.put(modelId, itemNameVisibility);
}
List<String> blackMetricNameList = itemNameVisibility.getBlackMetricNameList();
List<String> blackMetricNameList = visibility.getBlackMetricNameList();
List<String> metrics = filerMetricsByModel(metricsDb, modelId, metricSize * 3)
.stream().filter(o -> !blackMetricNameList.contains(o))
.limit(metricSize).collect(Collectors.toList());
@@ -328,14 +332,10 @@ public class SearchServiceImpl implements SearchService {
visibility = configService.getVisibilityByModelId(modelId);
caffeineCache.put(modelId, visibility);
}
if (semanticType.equals(SchemaElementType.DIMENSION)
if (!visibility.getBlackMetricNameList().contains(mapResult.getName())
&& !visibility.getBlackDimNameList().contains(mapResult.getName())) {
searchResults.add(searchResult);
}
if (semanticType.equals(SchemaElementType.METRIC)
&& !visibility.getBlackMetricNameList().contains(mapResult.getName())) {
searchResults.add(searchResult);
}
}
log.info("parseResult:{},dimensionMetricClassIds:{},possibleModels:{}", mapResult, dimensionMetricClassIds,
possibleModels);

2
chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/utils/HanlpHelper.java
View File

@@ -167,7 +167,7 @@ public class HanlpHelper {
public static void removeFromCustomDictionary(DictWord dictWord) {
log.info("dictWord:{}", dictWord);
CoreDictionary.Attribute attribute = getDynamicCustomDictionary().get(dictWord.getWord());
if (attribute != null) {
if (attribute == null) {
return;
}
log.info("get attribute:{}", attribute);