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

(improvement)(chat) fix test error (#349)

Browse Source
This commit is contained in:
lexluo09
2023-11-09 20:48:40 +08:00
committed by GitHub
parent a528ba6070
commit acee0a36da
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,8 +202,7 @@ public class QueryServiceImpl implements QueryService {
@Override @Override
@TimeCost @TimeCost
public QueryResult performExecution(ExecuteQueryReq queryReq) throws Exception { public QueryResult performExecution(ExecuteQueryReq queryReq) throws Exception {
ChatParseDO chatParseDO = chatService.getParseInfo(queryReq.getQueryId(), ChatParseDO chatParseDO = chatService.getParseInfo(queryReq.getQueryId(), queryReq.getParseId());
queryReq.getParseId());
ChatQueryDO chatQueryDO = chatService.getLastQuery(queryReq.getChatId()); ChatQueryDO chatQueryDO = chatService.getLastQuery(queryReq.getChatId());
List<StatisticsDO> timeCostDOList = new ArrayList<>(); List<StatisticsDO> timeCostDOList = new ArrayList<>();
SemanticParseInfo parseInfo = JsonUtil.toObject(chatParseDO.getParseInfo(), SemanticParseInfo.class); SemanticParseInfo parseInfo = JsonUtil.toObject(chatParseDO.getParseInfo(), SemanticParseInfo.class);

2
common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java
View File

@@ -66,7 +66,7 @@ public class FieldAndValueAcquireVisitor extends ExpressionVisitorAdapter {
List<Expression> expressions = rightExpressionList.getExpressions(); List<Expression> expressions = rightExpressionList.getExpressions();
if (CollectionUtils.isNotEmpty(expressions)) { if (CollectionUtils.isNotEmpty(expressions)) {
for (Expression expression : expressions) { for (Expression expression : expressions) {
result.add(expression.toString()); result.add(getFieldValue(expression));
} }
} }
} }

8
launchers/standalone/src/test/java/com/tencent/supersonic/integration/EntityQueryTest.java
View File

@@ -1,5 +1,7 @@
package com.tencent.supersonic.integration; package com.tencent.supersonic.integration;
import static com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum.NONE;
import com.tencent.supersonic.chat.api.pojo.SchemaElement; import com.tencent.supersonic.chat.api.pojo.SchemaElement;
import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo; import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
import com.tencent.supersonic.chat.api.pojo.request.QueryFilter; import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
@@ -7,12 +9,12 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
import com.tencent.supersonic.chat.query.rule.entity.EntityFilterQuery; import com.tencent.supersonic.chat.query.rule.entity.EntityFilterQuery;
import com.tencent.supersonic.chat.query.rule.metric.MetricEntityQuery; import com.tencent.supersonic.chat.query.rule.metric.MetricEntityQuery;
import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.DateConf;
import com.tencent.supersonic.common.pojo.DateConf.DateMode;
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
import com.tencent.supersonic.util.DataUtils; import com.tencent.supersonic.util.DataUtils;
import org.junit.Test;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum.NONE; import org.junit.Test;
public class EntityQueryTest extends BaseQueryTest { public class EntityQueryTest extends BaseQueryTest {
@@ -33,7 +35,7 @@ public class EntityQueryTest extends BaseQueryTest {
SchemaElement metric = SchemaElement.builder().name("播放量").build(); SchemaElement metric = SchemaElement.builder().name("播放量").build();
expectedParseInfo.getMetrics().add(metric); expectedParseInfo.getMetrics().add(metric);
expectedParseInfo.setDateInfo(DataUtils.getDateConf(DateConf.DateMode.RECENT, 7, period, startDay, endDay)); expectedParseInfo.setDateInfo(DataUtils.getDateConf(DateMode.BETWEEN, 1, period, startDay, endDay));
expectedParseInfo.setNativeQuery(false); expectedParseInfo.setNativeQuery(false);
assertQueryResult(expectedResult, actualResult); assertQueryResult(expectedResult, actualResult);

1
launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricInterpretTest.java
View File

@@ -58,6 +58,7 @@ public class MetricInterpretTest {
.queryId(parseResp.getQueryId()) .queryId(parseResp.getQueryId())
.queryText(parseResp.getQueryText()) .queryText(parseResp.getQueryText())
.parseInfo(parseResp.getSelectedParses().get(0)) .parseInfo(parseResp.getSelectedParses().get(0))
.parseId(parseResp.getSelectedParses().get(0).getId())
.build(); .build();
QueryResult queryResult = queryService.performExecution(executeReq); QueryResult queryResult = queryService.performExecution(executeReq);
Assert.assertEquals(queryResult.getQueryResults().get(0).get("answer"), lLmAnswerResp.getAssistantMessage()); Assert.assertEquals(queryResult.getQueryResults().get(0).get("answer"), lLmAnswerResp.getAssistantMessage());