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

[improvement][chat]Modify core workflow of NL2SQLParser, always invoking rule-based parsers first.#1729

Browse Source
This commit is contained in:
jerryjzhang
2024-10-29 13:07:02 +08:00
parent b01751afdb
commit 400b9f86f0
9 changed files with 96 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryNLReq.java
View File

@@ -22,7 +22,7 @@ public class QueryNLReq extends SemanticQueryReq {
private User user;
private QueryFilters queryFilters;
private boolean saveAnswer = true;
private Text2SQLType text2SQLType = Text2SQLType.RULE_AND_LLM;
private Text2SQLType text2SQLType = Text2SQLType.LLM_OR_RULE;
private MapModeEnum mapModeEnum = MapModeEnum.STRICT;
private QueryDataType queryDataType = QueryDataType.ALL;
private Map<String, ChatApp> chatAppConfig;

15
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/utils/QueryReqBuilder.java
View File

@@ -60,15 +60,12 @@ public class QueryReqBuilder {
queryStructReq.setGroups(parseInfo.getDimensions().stream().map(SchemaElement::getBizName)
.collect(Collectors.toList()));
queryStructReq.setLimit(parseInfo.getLimit());
// only one metric is queried at once
Set<SchemaElement> metrics = parseInfo.getMetrics();
if (!CollectionUtils.isEmpty(metrics)) {
SchemaElement metricElement = parseInfo.getMetrics().iterator().next();
Set<Order> order =
getOrder(parseInfo.getOrders(), parseInfo.getAggType(), metricElement);
queryStructReq
.setAggregators(getAggregatorByMetric(parseInfo.getAggType(), metricElement));
queryStructReq.setOrders(new ArrayList<>(order));
for (SchemaElement metricElement : parseInfo.getMetrics()) {
queryStructReq.getAggregators()
.addAll(getAggregatorByMetric(parseInfo.getAggType(), metricElement));
queryStructReq.setOrders(new ArrayList<>(
getOrder(parseInfo.getOrders(), parseInfo.getAggType(), metricElement)));
}
deletionDuplicated(queryStructReq);