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

Merge a number of fixes and improvements (#1896)

Browse Source
This commit is contained in:
Jun Zhang
2024-11-09 00:23:02 +08:00
committed by GitHub
parent 524ec38edc
commit c9c6dc4e44
9 changed files with 287 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/RuleSemanticQuery.java
View File

@@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -117,7 +117,6 @@ public abstract class RuleSemanticQuery extends BaseSemanticQuery {
parseInfo.setDataSet(semanticSchema.getDataSet(dataSetId));
parseInfo.setQueryConfig(semanticSchema.getQueryConfig(dataSetId));
Map<Long, List<SchemaElementMatch>> dim2Values = new HashMap<>();
Map<Long, List<SchemaElementMatch>> id2Values = new HashMap<>();
for (SchemaElementMatch schemaMatch : parseInfo.getElementMatches()) {
SchemaElement element = schemaMatch.getElement();
@@ -131,7 +130,7 @@ public abstract class RuleSemanticQuery extends BaseSemanticQuery {
dim2Values.get(element.getId()).add(schemaMatch);
} else {
dim2Values.put(element.getId(),
new ArrayList<>(Arrays.asList(schemaMatch)));
new ArrayList<>(Collections.singletonList(schemaMatch)));
}
}
break;
@@ -170,7 +169,7 @@ public abstract class RuleSemanticQuery extends BaseSemanticQuery {
} else {
QueryFilter dimensionFilter = new QueryFilter();
List<String> values = new ArrayList<>();
entry.getValue().stream().forEach(i -> values.add(i.getWord()));
entry.getValue().forEach(i -> values.add(i.getWord()));
dimensionFilter.setValue(values);
dimensionFilter.setBizName(dimension.getBizName());
dimensionFilter.setName(dimension.getName());

47
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/detail/DetailValueQuery.java Normal file
View File

@@ -0,0 +1,47 @@
package com.tencent.supersonic.headless.chat.query.rule.detail;
import com.tencent.supersonic.headless.api.pojo.SchemaElementMatch;
import com.tencent.supersonic.headless.api.pojo.SemanticSchema;
import com.tencent.supersonic.headless.chat.ChatQueryContext;
import org.springframework.stereotype.Component;
import static com.tencent.supersonic.headless.api.pojo.SchemaElementType.DIMENSION;
import static com.tencent.supersonic.headless.api.pojo.SchemaElementType.METRIC;
import static com.tencent.supersonic.headless.api.pojo.SchemaElementType.VALUE;
import static com.tencent.supersonic.headless.chat.query.rule.QueryMatchOption.OptionType.OPTIONAL;
import static com.tencent.supersonic.headless.chat.query.rule.QueryMatchOption.OptionType.REQUIRED;
import static com.tencent.supersonic.headless.chat.query.rule.QueryMatchOption.RequireNumberType.AT_LEAST;
import static com.tencent.supersonic.headless.chat.query.rule.QueryMatchOption.RequireNumberType.AT_MOST;
@Component
public class DetailValueQuery extends DetailSemanticQuery {
public static final String QUERY_MODE = "DETAIL_VALUE";
public DetailValueQuery() {
super();
queryMatcher.addOption(VALUE, REQUIRED, AT_LEAST, 1);
queryMatcher.addOption(DIMENSION, OPTIONAL, AT_MOST, 0);
queryMatcher.addOption(METRIC, OPTIONAL, AT_MOST, 0);
}
@Override
public String getQueryMode() {
return QUERY_MODE;
}
@Override
public void fillParseInfo(ChatQueryContext chatQueryContext) {
super.fillParseInfo(chatQueryContext);
SemanticSchema semanticSchema = chatQueryContext.getSemanticSchema();
parseInfo.getDimensions().addAll(semanticSchema.getDimensions());
parseInfo.getDimensions().forEach(d -> {
parseInfo.getElementMatches()
.add(SchemaElementMatch.builder().element(d).word(d.getName()).similarity(0)
.isInherited(false).detectWord(d.getName()).build());
});
}
}