[improvement][chat]Refactor certain packages to make code cleaner

This commit is contained in:
jerryjzhang
2023-11-29 17:34:59 +08:00
parent 82cfb3050d
commit d76216a2ec
63 changed files with 189 additions and 190 deletions

View File

@@ -7,10 +7,10 @@ com.tencent.supersonic.chat.api.component.SchemaMapper=\
com.tencent.supersonic.chat.mapper.ModelClusterMapper
com.tencent.supersonic.chat.api.component.SemanticParser=\
com.tencent.supersonic.chat.parser.rule.RuleBasedParser, \
com.tencent.supersonic.chat.parser.llm.s2sql.LLMS2SQLParser, \
com.tencent.supersonic.chat.parser.plugin.embedding.EmbeddingBasedParser, \
com.tencent.supersonic.chat.parser.plugin.function.FunctionBasedParser, \
com.tencent.supersonic.chat.parser.sql.rule.RuleSqlParser, \
com.tencent.supersonic.chat.parser.sql.llm.LLMSqlParser, \
com.tencent.supersonic.chat.parser.plugin.embedding.EmbeddingRecallParser, \
com.tencent.supersonic.chat.parser.plugin.function.FunctionCallParser, \
com.tencent.supersonic.chat.parser.QueryTypeParser
com.tencent.supersonic.chat.api.component.SemanticCorrector=\
@@ -21,7 +21,7 @@ com.tencent.supersonic.chat.api.component.SemanticCorrector=\
com.tencent.supersonic.chat.corrector.HavingCorrector, \
com.tencent.supersonic.chat.corrector.FromCorrector
com.tencent.supersonic.chat.processor.ResponseProcessor=\
com.tencent.supersonic.chat.processor.ParseResultProcessor=\
com.tencent.supersonic.chat.processor.MetricCheckProcessor, \
com.tencent.supersonic.chat.processor.ParseInfoProcessor, \
com.tencent.supersonic.chat.processor.QueryRankProcessor, \
@@ -36,8 +36,8 @@ com.tencent.supersonic.chat.parser.LLMProxy=\
com.tencent.supersonic.chat.api.component.SemanticInterpreter=\
com.tencent.supersonic.knowledge.semantic.LocalSemanticInterpreter
com.tencent.supersonic.chat.parser.llm.s2sql.ModelResolver=\
com.tencent.supersonic.chat.parser.llm.s2sql.HeuristicModelResolver
com.tencent.supersonic.chat.parser.sql.llm.ModelResolver=\
com.tencent.supersonic.chat.parser.sql.llm.HeuristicModelResolver
com.tencent.supersonic.auth.authentication.interceptor.AuthenticationInterceptor=\
com.tencent.supersonic.auth.authentication.interceptor.DefaultAuthenticationInterceptor
@@ -45,6 +45,6 @@ com.tencent.supersonic.auth.authentication.interceptor.AuthenticationInterceptor
com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor=\
com.tencent.supersonic.auth.authentication.adaptor.DefaultUserAdaptor
com.tencent.supersonic.chat.responder.QueryResponder=\
com.tencent.supersonic.chat.responder.EntityInfoQueryResponder, \
com.tencent.supersonic.chat.responder.SimilarMetricQueryResponder
com.tencent.supersonic.chat.query.QueryResponder=\
com.tencent.supersonic.chat.query.EntityInfoQueryResponder, \
com.tencent.supersonic.chat.query.SimilarMetricQueryResponder

View File

@@ -8,7 +8,7 @@ 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;
import com.tencent.supersonic.chat.query.llm.interpret.LLMAnswerResp;
import com.tencent.supersonic.chat.query.llm.analytics.LLMAnswerResp;
import com.tencent.supersonic.chat.service.AgentService;
import com.tencent.supersonic.chat.service.QueryService;
import com.tencent.supersonic.util.DataUtils;

View File

@@ -3,7 +3,7 @@ package com.tencent.supersonic.integration;
import com.google.common.collect.Lists;
import com.tencent.supersonic.common.config.EmbeddingConfig;
import com.tencent.supersonic.chat.parser.plugin.embedding.EmbeddingResp;
import com.tencent.supersonic.chat.parser.plugin.embedding.RecallRetrievalResp;
import com.tencent.supersonic.chat.parser.plugin.embedding.RecallRetrieval;
import com.tencent.supersonic.chat.plugin.PluginManager;
import com.tencent.supersonic.chat.service.AgentService;
@@ -20,7 +20,7 @@ import static org.mockito.Mockito.when;
public class MockConfiguration {
public static void mockEmbeddingRecognize(PluginManager pluginManager, String text, String id) {
EmbeddingResp embeddingResp = new EmbeddingResp();
RecallRetrievalResp embeddingResp = new RecallRetrievalResp();
RecallRetrieval embeddingRetrieval = new RecallRetrieval();
embeddingRetrieval.setId(id);
embeddingRetrieval.setPresetId(id);

View File

@@ -5,7 +5,7 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
import com.tencent.supersonic.chat.api.pojo.response.QueryState;
import com.tencent.supersonic.chat.query.plugin.WebBaseResult;
import com.tencent.supersonic.chat.query.plugin.webpage.WebPageQuery;
import com.tencent.supersonic.chat.query.plugin.webpage.WebPageResponse;
import com.tencent.supersonic.chat.query.plugin.webpage.WebPageResp;
import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.runner.RunWith;
@@ -22,7 +22,7 @@ public class BasePluginTest {
protected void assertPluginRecognizeResult(QueryResult queryResult) {
Assert.assertEquals(queryResult.getQueryState(), QueryState.SUCCESS);
Assert.assertEquals(queryResult.getQueryMode(), WebPageQuery.QUERY_MODE);
WebPageResponse webPageResponse = (WebPageResponse) queryResult.getResponse();
WebPageResp webPageResponse = (WebPageResp) queryResult.getResponse();
WebBaseResult webPage = webPageResponse.getWebPage();
Assert.assertEquals(webPage.getUrl(), "www.yourbi.com");
Assert.assertEquals(1, webPage.getParams().size());

View File

@@ -13,7 +13,7 @@ import com.tencent.supersonic.chat.api.pojo.SchemaElement;
import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
import com.tencent.supersonic.chat.parser.llm.analytics.MetricOption;
import com.tencent.supersonic.chat.parser.analytics.MetricOption;
import com.tencent.supersonic.common.pojo.DateConf;
import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;

View File

@@ -7,10 +7,10 @@ com.tencent.supersonic.chat.api.component.SchemaMapper=\
com.tencent.supersonic.chat.mapper.ModelClusterMapper
com.tencent.supersonic.chat.api.component.SemanticParser=\
com.tencent.supersonic.chat.parser.rule.RuleBasedParser, \
com.tencent.supersonic.chat.parser.llm.s2sql.LLMS2SQLParser, \
com.tencent.supersonic.chat.parser.plugin.embedding.EmbeddingBasedParser, \
com.tencent.supersonic.chat.parser.plugin.function.FunctionBasedParser, \
com.tencent.supersonic.chat.parser.sql.rule.RuleSqlParser, \
com.tencent.supersonic.chat.parser.sql.llm.LLMSqlParser, \
com.tencent.supersonic.chat.parser.plugin.embedding.EmbeddingRecallParser, \
com.tencent.supersonic.chat.parser.plugin.function.FunctionCallParser, \
com.tencent.supersonic.chat.parser.QueryTypeParser
com.tencent.supersonic.chat.api.component.SemanticCorrector=\
@@ -23,8 +23,8 @@ com.tencent.supersonic.chat.api.component.SemanticCorrector=\
com.tencent.supersonic.chat.api.component.SemanticInterpreter=\
com.tencent.supersonic.knowledge.semantic.LocalSemanticInterpreter
com.tencent.supersonic.chat.parser.llm.s2sql.ModelResolver=\
com.tencent.supersonic.chat.parser.llm.s2sql.HeuristicModelResolver
com.tencent.supersonic.chat.parser.sql.llm.ModelResolver=\
com.tencent.supersonic.chat.parser.sql.llm.HeuristicModelResolver
com.tencent.supersonic.auth.authentication.interceptor.AuthenticationInterceptor=\
com.tencent.supersonic.auth.authentication.interceptor.DefaultAuthenticationInterceptor
@@ -42,6 +42,6 @@ com.tencent.supersonic.chat.postprocessor.PostProcessor=\
com.tencent.supersonic.chat.postprocessor.RespBuildPostProcessor
com.tencent.supersonic.chat.responder.QueryResponder=\
com.tencent.supersonic.chat.responder.EntityInfoQueryResponder, \
com.tencent.supersonic.chat.responder.SimilarMetricQueryResponder
com.tencent.supersonic.chat.query.QueryResponder=\
com.tencent.supersonic.chat.query.EntityInfoQueryResponder, \
com.tencent.supersonic.chat.query.SimilarMetricQueryResponder