(improvement)(chat) Modify the query types supported by agent rule-type tools to metric type and tag types (#424)

Co-authored-by: jolunoluo

chat/core/src/main/java/com/tencent/supersonic/chat/agent/tool/RuleQueryTool.java

@@ -12,6 +12,8 @@ public class RuleQueryTool extends CommonAgentTool {
 
     private List<String> queryModes;
 
+    private List<String> queryTypes;
+
     public boolean isContainsAllModel() {
         return CollectionUtils.isNotEmpty(modelIds) && modelIds.contains(-1L);
     }

chat/core/src/main/java/com/tencent/supersonic/chat/parser/rule/AgentCheckParser.java

@@ -9,7 +9,9 @@ import com.tencent.supersonic.chat.api.component.SemanticParser;
 import com.tencent.supersonic.chat.api.component.SemanticQuery;
 import com.tencent.supersonic.chat.api.pojo.ChatContext;
 import com.tencent.supersonic.chat.api.pojo.QueryContext;
+import com.tencent.supersonic.chat.query.QueryManager;
 import com.tencent.supersonic.chat.service.AgentService;
+import com.tencent.supersonic.common.pojo.QueryType;
 import com.tencent.supersonic.common.util.ContextUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -46,6 +48,14 @@ public class AgentCheckParser implements SemanticParser {
                         && !tool.getQueryModes().contains(query.getQueryMode())) {
                     return true;
                 }
+                if (CollectionUtils.isNotEmpty(tool.getQueryTypes())) {
+                    if (QueryManager.isTagQuery(query.getQueryMode())) {
+                        return !tool.getQueryTypes().contains(QueryType.TAG.name());
+                    }
+                    if (QueryManager.isMetricQuery(query.getQueryMode())) {
+                        return !tool.getQueryTypes().contains(QueryType.METRIC.name());
+                    }
+                }
                 if (CollectionUtils.isEmpty(tool.getModelIds())) {
                     return true;
                 }

chat/core/src/main/java/com/tencent/supersonic/chat/query/QueryManager.java

@@ -79,7 +79,7 @@ public class QueryManager {
         return ruleQueryMap.get(queryMode) instanceof MetricSemanticQuery;
     }
 
-    public static boolean isEntityQuery(String queryMode) {
+    public static boolean isTagQuery(String queryMode) {
         if (queryMode == null || !ruleQueryMap.containsKey(queryMode)) {
             return false;
         }

chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java

@@ -51,7 +51,7 @@ public abstract class RuleSemanticQuery extends BaseSemanticQuery {
     }
 
     public List<SchemaElementMatch> match(List<SchemaElementMatch> candidateElementMatches,
-            QueryContext queryCtx) {
+                                          QueryContext queryCtx) {
         return queryMatcher.match(candidateElementMatches);
     }
 
@@ -76,8 +76,8 @@ public abstract class RuleSemanticQuery extends BaseSemanticQuery {
             return;
         }
 
-        if ((QueryManager.isEntityQuery(queryParseInfo.getQueryMode())
+        if ((QueryManager.isTagQuery(queryParseInfo.getQueryMode())
-                && QueryManager.isEntityQuery(chatParseInfo.getQueryMode()))
+                && QueryManager.isTagQuery(chatParseInfo.getQueryMode()))
                 || (QueryManager.isMetricQuery(queryParseInfo.getQueryMode())
                 && QueryManager.isMetricQuery(chatParseInfo.getQueryMode()))) {
             // inherit date info from context

chat/core/src/main/java/com/tencent/supersonic/chat/responder/parse/EntityInfoParseResponder.java

@@ -35,7 +35,7 @@ public class EntityInfoParseResponder implements ParseResponder {
             //1. set entity info
             SemanticService semanticService = ContextUtils.getBean(SemanticService.class);
             EntityInfo entityInfo = semanticService.getEntityInfo(parseInfo, queryReq.getUser());
-            if (QueryManager.isEntityQuery(queryMode)
+            if (QueryManager.isTagQuery(queryMode)
                     || QueryManager.isMetricQuery(queryMode)) {
                 parseInfo.setEntityInfo(entityInfo);
             }

launchers/standalone/src/main/java/com/tencent/supersonic/ConfigureDemo.java

@@ -27,6 +27,7 @@ import com.tencent.supersonic.chat.service.ChatService;
 import com.tencent.supersonic.chat.service.ConfigService;
 import com.tencent.supersonic.chat.service.PluginService;
 import com.tencent.supersonic.chat.service.QueryService;
+import com.tencent.supersonic.common.pojo.QueryType;
 import com.tencent.supersonic.common.pojo.SysParameter;
 import com.tencent.supersonic.common.service.SysParameterService;
 import com.tencent.supersonic.common.util.JsonUtil;
@@ -263,10 +264,7 @@ public class ConfigureDemo implements ApplicationListener<ApplicationReadyEvent>
         ruleQueryTool.setType(AgentToolType.RULE);
         ruleQueryTool.setId("0");
         ruleQueryTool.setModelIds(Lists.newArrayList(-1L));
-        ruleQueryTool.setQueryModes(Lists.newArrayList(
+        ruleQueryTool.setQueryTypes(Lists.newArrayList(QueryType.METRIC.name()));
-                "METRIC_ENTITY", "METRIC_FILTER", "METRIC_GROUPBY",
-                "METRIC_MODEL", "METRIC_ORDERBY"
-        ));
         agentConfig.getTools().add(ruleQueryTool);
 
         LLMParserTool llmParserTool = new LLMParserTool();
@@ -292,8 +290,7 @@ public class ConfigureDemo implements ApplicationListener<ApplicationReadyEvent>
         ruleQueryTool.setId("0");
         ruleQueryTool.setType(AgentToolType.RULE);
         ruleQueryTool.setModelIds(Lists.newArrayList(-1L));
-        ruleQueryTool.setQueryModes(Lists.newArrayList(
+        ruleQueryTool.setQueryTypes(Lists.newArrayList(QueryType.TAG.name()));
-                "TAG_DETAIL", "TAG_LIST_FILTER", "TAG_ID"));
         agentConfig.getTools().add(ruleQueryTool);
 
         LLMParserTool llmParserTool = new LLMParserTool();