(improvement)(chat) Remove QueryReq parameter from QueryContext. (#656)

2025-12-14 22:25:19 +00:00 · 2024-01-19 16:17:31 +08:00
parent f017f41201
commit cbf38ed785
35 changed files with 115 additions and 152 deletions
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/BaseMatchStrategy.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/BaseMatchStrategy.java
@@ -28,7 +28,7 @@ public abstract class BaseMatchStrategy<T> implements MatchStrategy<T> {

    @Override
    public Map<MatchText, List<T>> match(QueryContext queryContext, List<Term> terms, Set<Long> detectModelIds) {
-        String text = queryContext.getRequest().getQueryText();
+        String text = queryContext.getQueryText();
        if (Objects.isNull(terms) || StringUtils.isEmpty(text)) {
            return null;
        }
@@ -44,7 +44,7 @@ public abstract class BaseMatchStrategy<T> implements MatchStrategy<T> {

    public List<T> detect(QueryContext queryContext, List<Term> terms, Set<Long> detectModelIds) {
        Map<Integer, Integer> regOffsetToLength = getRegOffsetToLength(terms);
-        String text = queryContext.getRequest().getQueryText();
+        String text = queryContext.getQueryText();
        Set<T> results = new HashSet<>();

        Set<String> detectSegments = new HashSet<>();
@@ -102,7 +102,7 @@ public abstract class BaseMatchStrategy<T> implements MatchStrategy<T> {
    }

    public List<T> getMatches(QueryContext queryContext, List<Term> terms) {
-        Set<Long> detectModelIds = mapperHelper.getModelIds(queryContext.getRequest(), queryContext.getAgent());
+        Set<Long> detectModelIds = mapperHelper.getModelIds(queryContext.getModelId(), queryContext.getAgent());
        terms = filterByModelIds(terms, detectModelIds);
        Map<MatchText, List<T>> matchResult = match(queryContext, terms, detectModelIds);
        List<T> matches = new ArrayList<>();
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/DatabaseMatchStrategy.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/DatabaseMatchStrategy.java
@@ -55,11 +55,11 @@ public class DatabaseMatchStrategy extends BaseMatchStrategy<DatabaseMapResult>

    public void detectByStep(QueryContext queryContext, Set<DatabaseMapResult> existResults, Set<Long> detectModelIds,
            Integer startIndex, Integer index, int offset) {
-        String detectSegment = queryContext.getRequest().getQueryText().substring(startIndex, index);
+        String detectSegment = queryContext.getQueryText().substring(startIndex, index);
        if (StringUtils.isBlank(detectSegment)) {
            return;
        }
-        Set<Long> modelIds = mapperHelper.getModelIds(queryContext.getRequest(), queryContext.getAgent());
+        Set<Long> modelIds = mapperHelper.getModelIds(queryContext.getModelId(), queryContext.getAgent());

        Double metricDimensionThresholdConfig = getThreshold(queryContext);

--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/EmbeddingMapper.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/EmbeddingMapper.java
@@ -23,7 +23,7 @@ public class EmbeddingMapper extends BaseMapper {
    @Override
    public void doMap(QueryContext queryContext) {
        //1. query from embedding by queryText
-        String queryText = queryContext.getRequest().getQueryText();
+        String queryText = queryContext.getQueryText();
        List<Term> terms = HanlpHelper.getTerms(queryText);

        EmbeddingMatchStrategy matchStrategy = ContextUtils.getBean(EmbeddingMatchStrategy.class);
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/HanlpDictMatchStrategy.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/HanlpDictMatchStrategy.java
@@ -1,11 +1,10 @@
 package com.tencent.supersonic.chat.core.mapper;

 import com.hankcs.hanlp.seg.common.Term;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.core.config.OptimizationConfig;
 import com.tencent.supersonic.chat.core.knowledge.HanlpMapResult;
 import com.tencent.supersonic.chat.core.knowledge.SearchService;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.common.pojo.Constants;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
@@ -38,8 +37,7 @@ public class HanlpDictMatchStrategy extends BaseMatchStrategy<HanlpMapResult> {
    @Override
    public Map<MatchText, List<HanlpMapResult>> match(QueryContext queryContext, List<Term> terms,
            Set<Long> detectModelIds) {
-        QueryReq queryReq = queryContext.getRequest();
-        String text = queryReq.getQueryText();
+        String text = queryContext.getQueryText();
        if (Objects.isNull(terms) || StringUtils.isEmpty(text)) {
            return null;
        }
@@ -61,9 +59,8 @@ public class HanlpDictMatchStrategy extends BaseMatchStrategy<HanlpMapResult> {

    public void detectByStep(QueryContext queryContext, Set<HanlpMapResult> existResults, Set<Long> detectModelIds,
            Integer startIndex, Integer index, int offset) {
-        QueryReq queryReq = queryContext.getRequest();
-        String text = queryReq.getQueryText();
-        Integer agentId = queryReq.getAgentId();
+        String text = queryContext.getQueryText();
+        Integer agentId = queryContext.getAgentId();
        String detectSegment = text.substring(startIndex, index);

        // step1. pre search
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/KeywordMapper.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/KeywordMapper.java
@@ -29,7 +29,7 @@ public class KeywordMapper extends BaseMapper {

    @Override
    public void doMap(QueryContext queryContext) {
-        String queryText = queryContext.getRequest().getQueryText();
+        String queryText = queryContext.getQueryText();
        //1.hanlpDict Match
        List<Term> terms = HanlpHelper.getTerms(queryText);
        HanlpDictMatchStrategy hanlpMatchStrategy = ContextUtils.getBean(HanlpDictMatchStrategy.class);
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/MapperHelper.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/MapperHelper.java
@@ -2,7 +2,6 @@ package com.tencent.supersonic.chat.core.mapper;

 import com.hankcs.hanlp.algorithm.EditDistance;
 import com.hankcs.hanlp.seg.common.Term;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.core.agent.Agent;
 import com.tencent.supersonic.chat.core.config.OptimizationConfig;
 import com.tencent.supersonic.chat.core.utils.NatureHelper;
@@ -82,9 +81,8 @@ public class MapperHelper {
                detectSegment.length());
    }

-    public Set<Long> getModelIds(QueryReq request, Agent agent) {
+    public Set<Long> getModelIds(Long modelId, Agent agent) {

-        Long modelId = request.getModelId();
        Set<Long> detectModelIds = new HashSet<>();
        if (Objects.nonNull(agent)) {
            detectModelIds = agent.getModelIds(null);
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/QueryFilterMapper.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/QueryFilterMapper.java
@@ -1,15 +1,14 @@
 package com.tencent.supersonic.chat.core.mapper;

 import com.google.common.collect.Lists;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
 import com.tencent.supersonic.chat.api.pojo.SchemaMapInfo;
 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;
 import com.tencent.supersonic.chat.core.knowledge.builder.BaseWordBuilder;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.common.pojo.Constants;
 import java.util.List;
 import java.util.Map;
@@ -24,8 +23,7 @@ public class QueryFilterMapper implements SchemaMapper {

    @Override
    public void map(QueryContext queryContext) {
-        QueryReq queryReq = queryContext.getRequest();
-        Long modelId = queryReq.getModelId();
+        Long modelId = queryContext.getModelId();
        if (modelId == null || modelId <= 0) {
            return;
        }
@@ -62,7 +60,7 @@ public class QueryFilterMapper implements SchemaMapper {
                    .name(String.valueOf(filter.getValue()))
                    .type(SchemaElementType.VALUE)
                    .bizName(filter.getBizName())
-                    .model(queryContext.getRequest().getModelId())
+                    .model(queryContext.getModelId())
                    .build();
            SchemaElementMatch schemaElementMatch = SchemaElementMatch.builder()
                    .element(element)
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/SearchMatchStrategy.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/mapper/SearchMatchStrategy.java
@@ -2,7 +2,6 @@ package com.tencent.supersonic.chat.core.mapper;

 import com.google.common.collect.Lists;
 import com.hankcs.hanlp.seg.common.Term;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.core.knowledge.HanlpMapResult;
 import com.tencent.supersonic.chat.core.knowledge.SearchService;
 import com.tencent.supersonic.chat.core.pojo.QueryContext;
@@ -29,8 +28,7 @@ public class SearchMatchStrategy extends BaseMatchStrategy<HanlpMapResult> {
    @Override
    public Map<MatchText, List<HanlpMapResult>> match(QueryContext queryContext, List<Term> originals,
            Set<Long> detectModelIds) {
-        QueryReq queryReq = queryContext.getRequest();
-        String text = queryReq.getQueryText();
+        String text = queryContext.getQueryText();
        Map<Integer, Integer> regOffsetToLength = getRegOffsetToLength(originals);

        List<Integer> detectIndexList = Lists.newArrayList();
@@ -54,9 +52,9 @@ public class SearchMatchStrategy extends BaseMatchStrategy<HanlpMapResult> {

                    if (StringUtils.isNotEmpty(detectSegment)) {
                        List<HanlpMapResult> hanlpMapResults = SearchService.prefixSearch(detectSegment,
-                                SearchService.SEARCH_SIZE, queryReq.getAgentId(), detectModelIds);
+                                SearchService.SEARCH_SIZE, queryContext.getAgentId(), detectModelIds);
                        List<HanlpMapResult> suffixHanlpMapResults = SearchService.suffixSearch(
-                                detectSegment, SEARCH_SIZE, queryReq.getAgentId(), detectModelIds);
+                                detectSegment, SEARCH_SIZE, queryContext.getAgentId(), detectModelIds);
                        hanlpMapResults.addAll(suffixHanlpMapResults);
                        // remove entity name where search
                        hanlpMapResults = hanlpMapResults.stream().filter(entry -> {
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/QueryTypeParser.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/QueryTypeParser.java
@@ -31,7 +31,7 @@ public class QueryTypeParser implements SemanticParser {
    public void parse(QueryContext queryContext, ChatContext chatContext) {

        List<SemanticQuery> candidateQueries = queryContext.getCandidateQueries();
-        User user = queryContext.getRequest().getUser();
+        User user = queryContext.getUser();

        for (SemanticQuery semanticQuery : candidateQueries) {
            // 1.init S2SQL
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/SatisfactionChecker.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/SatisfactionChecker.java
@@ -23,7 +23,7 @@ public class SatisfactionChecker {
            if (query.getQueryMode().equals(LLMSqlQuery.QUERY_MODE)) {
                continue;
            }
-            if (checkThreshold(queryContext.getRequest().getQueryText(), query.getParseInfo())) {
+            if (checkThreshold(queryContext.getQueryText(), query.getParseInfo())) {
                return true;
            }
        }
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/PluginParser.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/PluginParser.java
@@ -2,30 +2,29 @@ package com.tencent.supersonic.chat.core.parser.plugin;

 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.tencent.supersonic.chat.core.parser.SemanticParser;
-import com.tencent.supersonic.chat.core.query.SemanticQuery;
-import com.tencent.supersonic.chat.core.pojo.ChatContext;
-import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementMatch;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
 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.QueryReq;
+import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
+import com.tencent.supersonic.chat.core.parser.SemanticParser;
 import com.tencent.supersonic.chat.core.plugin.Plugin;
 import com.tencent.supersonic.chat.core.plugin.PluginManager;
 import com.tencent.supersonic.chat.core.plugin.PluginParseResult;
 import com.tencent.supersonic.chat.core.plugin.PluginRecallResult;
-import com.tencent.supersonic.chat.core.query.plugin.PluginSemanticQuery;
+import com.tencent.supersonic.chat.core.pojo.ChatContext;
+import com.tencent.supersonic.chat.core.pojo.QueryContext;
 import com.tencent.supersonic.chat.core.query.QueryManager;
+import com.tencent.supersonic.chat.core.query.SemanticQuery;
+import com.tencent.supersonic.chat.core.query.plugin.PluginSemanticQuery;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.ModelCluster;
 import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
-import org.springframework.util.CollectionUtils;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.springframework.util.CollectionUtils;


 /**
@@ -36,7 +35,7 @@ public abstract class PluginParser implements SemanticParser {
    @Override
    public void parse(QueryContext queryContext, ChatContext chatContext) {
        for (SemanticQuery semanticQuery : queryContext.getCandidateQueries()) {
-            if (queryContext.getRequest().getQueryText().length() <= semanticQuery.getParseInfo().getScore()
+            if (queryContext.getQueryText().length() <= semanticQuery.getParseInfo().getScore()
                    && (QueryManager.getPluginQueryModes().contains(semanticQuery.getQueryMode()))) {
                return;
            }
@@ -64,8 +63,7 @@ public abstract class PluginParser implements SemanticParser {
        for (Long modelId : modelIds) {
            PluginSemanticQuery pluginQuery = QueryManager.createPluginQuery(plugin.getType());
            SemanticParseInfo semanticParseInfo = buildSemanticParseInfo(modelId, plugin,
-                    queryContext.getRequest(),
-                    queryContext.getModelClusterMapInfo().getMatchedElements(modelId),
+                    queryContext.getQueryFilters(), queryContext.getModelClusterMapInfo().getMatchedElements(modelId),
                    pluginRecallResult.getDistance());
            semanticParseInfo.setQueryMode(pluginQuery.getQueryMode());
            semanticParseInfo.setScore(pluginRecallResult.getScore());
@@ -78,8 +76,8 @@ public abstract class PluginParser implements SemanticParser {
        return PluginManager.getPluginAgentCanSupport(queryContext);
    }

-    protected SemanticParseInfo buildSemanticParseInfo(Long modelId, Plugin plugin, QueryReq queryReq,
-                                                       List<SchemaElementMatch> schemaElementMatches, double distance) {
+    protected SemanticParseInfo buildSemanticParseInfo(Long modelId, Plugin plugin, QueryFilters queryFilters,
+            List<SchemaElementMatch> schemaElementMatches, double distance) {
        if (modelId == null && !CollectionUtils.isEmpty(plugin.getModelList())) {
            modelId = plugin.getModelList().get(0);
        }
@@ -92,7 +90,7 @@ public abstract class PluginParser implements SemanticParser {
        Map<String, Object> properties = new HashMap<>();
        PluginParseResult pluginParseResult = new PluginParseResult();
        pluginParseResult.setPlugin(plugin);
-        pluginParseResult.setRequest(queryReq);
+        pluginParseResult.setQueryFilters(queryFilters);
        pluginParseResult.setDistance(distance);
        properties.put(Constants.CONTEXT, pluginParseResult);
        properties.put("type", "plugin");
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/embedding/EmbeddingRecallParser.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/embedding/EmbeddingRecallParser.java
@@ -42,7 +42,7 @@ public class EmbeddingRecallParser extends PluginParser {

    @Override
    public PluginRecallResult recallPlugin(QueryContext queryContext) {
-        String text = queryContext.getRequest().getQueryText();
+        String text = queryContext.getQueryText();
        List<Retrieval> embeddingRetrievals = embeddingRecall(text);
        if (CollectionUtils.isEmpty(embeddingRetrievals)) {
            return null;
@@ -63,7 +63,7 @@ public class EmbeddingRecallParser extends PluginParser {
                }
                plugin.setParseMode(ParseMode.EMBEDDING_RECALL);
                double distance = embeddingRetrieval.getDistance();
-                double score = queryContext.getRequest().getQueryText().length() * (1 - distance);
+                double score = queryContext.getQueryText().length() * (1 - distance);
                return PluginRecallResult.builder()
                        .plugin(plugin).modelIds(modelList).score(score).distance(distance).build();
            }
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/function/FunctionCallParser.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/plugin/function/FunctionCallParser.java
@@ -33,7 +33,7 @@ public class FunctionCallParser extends PluginParser {
        String functionUrl = functionCallConfig.getUrl();
        if (StringUtils.isBlank(functionUrl) && ComponentFactory.getLLMProxy() instanceof PythonLLMProxy) {
            log.info("functionUrl:{}, skip function parser, queryText:{}", functionUrl,
-                    queryContext.getRequest().getQueryText());
+                    queryContext.getQueryText());
            return false;
        }
        List<Plugin> plugins = getPluginList(queryContext);
@@ -60,7 +60,7 @@ public class FunctionCallParser extends PluginParser {
            if (CollectionUtils.isEmpty(modelList)) {
                return null;
            }
-            double score = queryContext.getRequest().getQueryText().length();
+            double score = queryContext.getQueryText().length();
            return PluginRecallResult.builder().plugin(plugin).modelIds(modelList).score(score).build();
        }
        return null;
@@ -68,7 +68,7 @@ public class FunctionCallParser extends PluginParser {

    public FunctionResp functionCall(QueryContext queryContext) {
        List<PluginParseConfig> pluginToFunctionCall =
-                getPluginToFunctionCall(queryContext.getRequest().getModelId(), queryContext);
+                getPluginToFunctionCall(queryContext.getModelId(), queryContext);
        if (CollectionUtils.isEmpty(pluginToFunctionCall)) {
            log.info("function call parser, plugin is empty, skip");
            return null;
@@ -78,7 +78,7 @@ public class FunctionCallParser extends PluginParser {
            functionResp.setToolSelection(pluginToFunctionCall.iterator().next().getName());
        } else {
            FunctionReq functionReq = FunctionReq.builder()
-                    .queryText(queryContext.getRequest().getQueryText())
+                    .queryText(queryContext.getQueryText())
                    .pluginConfigs(pluginToFunctionCall).build();
            functionResp = ComponentFactory.getLLMProxy().requestFunction(functionReq);
        }
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/HeuristicModelResolver.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/HeuristicModelResolver.java
@@ -116,7 +116,7 @@ public class HeuristicModelResolver implements ModelResolver {
    public String resolve(QueryContext queryContext, ChatContext chatCtx, Set<Long> restrictiveModels) {
        SchemaModelClusterMapInfo mapInfo = queryContext.getModelClusterMapInfo();
        Set<String> matchedModelClusters = mapInfo.getElementMatchesByModelIds(restrictiveModels).keySet();
-        Long modelId = queryContext.getRequest().getModelId();
+        Long modelId = queryContext.getModelId();
        if (Objects.nonNull(modelId) && modelId > 0) {
            if (CollectionUtils.isEmpty(restrictiveModels) || restrictiveModels.contains(modelId)) {
                return getModelClusterByModelId(modelId, matchedModelClusters);
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMRequestService.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMRequestService.java
@@ -57,7 +57,7 @@ public class LLMRequestService {
            return true;
        }
        if (SatisfactionChecker.isSkip(queryCtx)) {
-            log.info("skip {}, queryText:{}", LLMSqlParser.class, queryCtx.getRequest().getQueryText());
+            log.info("skip {}, queryText:{}", LLMSqlParser.class, queryCtx.getQueryText());
            return true;
        }
        return false;
@@ -121,7 +121,7 @@ public class LLMRequestService {
    public LLMReq getLlmReq(QueryContext queryCtx, SemanticSchema semanticSchema,
            ModelCluster modelCluster, List<ElementValue> linkingValues) {
        Map<Long, String> modelIdToName = semanticSchema.getModelIdToName();
-        String queryText = queryCtx.getRequest().getQueryText();
+        String queryText = queryCtx.getQueryText();

        LLMReq llmReq = new LLMReq();
        llmReq.setQueryText(queryText);
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMResponseService.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMResponseService.java
@@ -39,7 +39,7 @@ public class LLMResponseService {
        properties.put("name", commonAgentTool.getName());

        parseInfo.setProperties(properties);
-        parseInfo.setScore(queryCtx.getRequest().getQueryText().length() * (1 + weight));
+        parseInfo.setScore(queryCtx.getQueryText().length() * (1 + weight));
        parseInfo.setQueryMode(semanticQuery.getQueryMode());
        parseInfo.getSqlInfo().setS2SQL(s2SQL);
        parseInfo.setModel(parseResult.getModelCluster());
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMSqlParser.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMSqlParser.java
@@ -1,7 +1,6 @@
 package com.tencent.supersonic.chat.core.parser.sql.llm;

 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.core.agent.NL2SQLTool;
 import com.tencent.supersonic.chat.core.parser.SemanticParser;
 import com.tencent.supersonic.chat.core.pojo.ChatContext;
@@ -24,7 +23,6 @@ public class LLMSqlParser implements SemanticParser {

    @Override
    public void parse(QueryContext queryCtx, ChatContext chatCtx) {
-        QueryReq request = queryCtx.getRequest();
        LLMRequestService requestService = ContextUtils.getBean(LLMRequestService.class);
        //1.determine whether to skip this parser.
        if (requestService.isSkip(queryCtx)) {
@@ -56,7 +54,6 @@ public class LLMSqlParser implements SemanticParser {
            LLMResponseService responseService = ContextUtils.getBean(LLMResponseService.class);
            Map<String, LLMSqlResp> deduplicationSqlResp = responseService.getDeduplicationSqlResp(llmResp);
            ParseResult parseResult = ParseResult.builder()
-                    .request(request)
                    .modelCluster(modelCluster)
                    .commonAgentTool(commonAgentTool)
                    .llmReq(llmReq)
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/rule/AggregateTypeParser.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/rule/AggregateTypeParser.java
@@ -49,7 +49,7 @@ public class AggregateTypeParser implements SemanticParser {

    @Override
    public void parse(QueryContext queryContext, ChatContext chatContext) {
-        String queryText = queryContext.getRequest().getQueryText();
+        String queryText = queryContext.getQueryText();
        AggregateConf aggregateConf = resolveAggregateConf(queryText);

        for (SemanticQuery semanticQuery : queryContext.getCandidateQueries()) {
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/rule/TimeRangeParser.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/rule/TimeRangeParser.java
@@ -42,12 +42,13 @@ public class TimeRangeParser implements SemanticParser {

    @Override
    public void parse(QueryContext queryContext, ChatContext chatContext) {
-        DateConf dateConf = parseRecent(queryContext.getRequest().getQueryText());
+        String queryText = queryContext.getQueryText();
+        DateConf dateConf = parseRecent(queryText);
        if (dateConf == null) {
-            dateConf = parseDateNumber(queryContext.getRequest().getQueryText());
+            dateConf = parseDateNumber(queryText);
        }
        if (dateConf == null) {
-            dateConf = parseDateCN(queryContext.getRequest().getQueryText());
+            dateConf = parseDateCN(queryText);
        }

        if (dateConf != null) {
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/plugin/PluginParseResult.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/plugin/PluginParseResult.java
@@ -1,12 +1,12 @@
 package com.tencent.supersonic.chat.core.plugin;

-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
+import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
 import lombok.Data;

@Data
 public class PluginParseResult {

    private Plugin plugin;
-    private QueryReq request;
+    private QueryFilters queryFilters;
    private double distance;
 }
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/pojo/QueryContext.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/pojo/QueryContext.java
@@ -1,10 +1,10 @@
 package com.tencent.supersonic.chat.core.pojo;

+import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.SchemaMapInfo;
 import com.tencent.supersonic.chat.api.pojo.SchemaModelClusterMapInfo;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
-import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.api.pojo.response.ChatConfigRichResp;
 import com.tencent.supersonic.chat.core.agent.Agent;
 import com.tencent.supersonic.chat.core.config.OptimizationConfig;
@@ -27,7 +27,12 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class QueryContext {

-    private QueryReq request;
+    private String queryText;
+    private Integer chatId;
+    private Long modelId;
+    private User user;
+    private boolean saveAnswer = true;
+    private Integer agentId;
    private QueryFilters queryFilters;
    private List<SemanticQuery> candidateQueries = new ArrayList<>();
    private SchemaMapInfo mapInfo = new SchemaMapInfo();
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/plugin/PluginSemanticQuery.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/plugin/PluginSemanticQuery.java
@@ -7,7 +7,6 @@ import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
 import com.tencent.supersonic.chat.api.pojo.SemanticSchema;
 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;
 import com.tencent.supersonic.chat.core.plugin.PluginParseResult;
 import com.tencent.supersonic.chat.core.query.BaseSemanticQuery;
 import lombok.extern.slf4j.Slf4j;
@@ -31,11 +30,10 @@ public abstract class PluginSemanticQuery extends BaseSemanticQuery {

    private Map<Long, Object> getFilterMap(PluginParseResult pluginParseResult) {
        Map<Long, Object> map = new HashMap<>();
-        QueryReq queryReq = pluginParseResult.getRequest();
-        if (queryReq == null || queryReq.getQueryFilters() == null) {
+        QueryFilters queryFilters = pluginParseResult.getQueryFilters();
+        if (queryFilters == null) {
            return map;
        }
-        QueryFilters queryFilters = queryReq.getQueryFilters();
        List<QueryFilter> queryFilterList = queryFilters.getFilters();
        if (CollectionUtils.isEmpty(queryFilterList)) {
            return map;
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricTopNQuery.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricTopNQuery.java
@@ -36,7 +36,7 @@ public class MetricTopNQuery extends MetricSemanticQuery {
    @Override
    public List<SchemaElementMatch> match(List<SchemaElementMatch> candidateElementMatches,
            QueryContext queryCtx) {
-        Matcher matcher = INTENT_PATTERN.matcher(queryCtx.getRequest().getQueryText());
+        Matcher matcher = INTENT_PATTERN.matcher(queryCtx.getQueryText());
        if (matcher.matches()) {
            return super.match(candidateElementMatches, queryCtx);
        }