[improvement][chat] Remove deprecated executeQuery method

This commit is contained in:
jerryjzhang
2023-11-09 14:21:18 +08:00
parent 2aeeb1a14e
commit cd972d0850
6 changed files with 38 additions and 57 deletions

View File

@@ -2,7 +2,9 @@ package com.tencent.supersonic.integration;
import com.alibaba.fastjson.JSONObject;
import com.tencent.supersonic.StandaloneLauncher;
import com.tencent.supersonic.chat.api.pojo.request.ExecuteQueryReq;
import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
import com.tencent.supersonic.chat.api.pojo.response.ParseResp;
import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
import com.tencent.supersonic.common.config.EmbeddingConfig;
import com.tencent.supersonic.chat.plugin.PluginManager;
@@ -49,7 +51,15 @@ public class MetricInterpretTest {
ResponseEntity.ok(JSONObject.toJSONString(lLmAnswerResp)));
QueryReq queryReq = DataUtils.getQueryReqWithAgent(1000, "能不能帮我解读分析下最近alice在超音数的访问情况",
DataUtils.getAgent().getId());
QueryResult queryResult = queryService.executeQuery(queryReq);
ParseResp parseResp = queryService.performParsing(queryReq);
ExecuteQueryReq executeReq = ExecuteQueryReq.builder().user(queryReq.getUser())
.chatId(parseResp.getChatId())
.queryId(parseResp.getQueryId())
.queryText(parseResp.getQueryText())
.parseInfo(parseResp.getSelectedParses().get(0))
.build();
QueryResult queryResult = queryService.performExecution(executeReq);
Assert.assertEquals(queryResult.getQueryResults().get(0).get("answer"), lLmAnswerResp.getAssistantMessage());
}

View File

@@ -1,5 +1,6 @@
package com.tencent.supersonic.integration.plugin;
import com.tencent.supersonic.chat.api.pojo.request.ExecuteQueryReq;
import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
@@ -37,7 +38,16 @@ public class PluginRecognizeTest extends BasePluginTest {
MockConfiguration.mockEmbeddingRecognize(pluginManager, "alice最近的访问情况怎么样", "1");
MockConfiguration.mockEmbeddingUrl(embeddingConfig);
QueryReq queryContextReq = DataUtils.getQueryReqWithAgent(1000, "alice最近的访问情况怎么样", 1);
QueryResult queryResult = queryService.executeQuery(queryContextReq);
ParseResp parseResp = queryService.performParsing(queryContextReq);
ExecuteQueryReq executeReq = ExecuteQueryReq.builder().user(queryContextReq.getUser())
.chatId(parseResp.getChatId())
.queryId(parseResp.getQueryId())
.queryText(parseResp.getQueryText())
.parseInfo(parseResp.getSelectedParses().get(0))
.build();
QueryResult queryResult = queryService.performExecution(executeReq);
assertPluginRecognizeResult(queryResult);
}
@@ -53,7 +63,16 @@ public class PluginRecognizeTest extends BasePluginTest {
queryRequest.setModelId(1L);
queryFilters.getFilters().add(queryFilter);
queryRequest.setQueryFilters(queryFilters);
QueryResult queryResult = queryService.executeQuery(queryRequest);
ParseResp parseResp = queryService.performParsing(queryRequest);
ExecuteQueryReq executeReq = ExecuteQueryReq.builder().user(queryRequest.getUser())
.chatId(parseResp.getChatId())
.queryId(parseResp.getQueryId())
.queryText(parseResp.getQueryText())
.parseInfo(parseResp.getSelectedParses().get(0))
.build();
QueryResult queryResult = queryService.performExecution(executeReq);
assertPluginRecognizeResult(queryResult);
}