(feature)(project) change dsl to s2ql in project and queryMode to llmParser (#250)

This commit is contained in:
lexluo09
2023-10-18 09:53:01 +08:00
committed by GitHub
parent bf5be11549
commit 8d81f63e08
77 changed files with 320 additions and 305 deletions

View File

@@ -6,7 +6,7 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User;
import com.tencent.supersonic.chat.agent.Agent;
import com.tencent.supersonic.chat.agent.AgentConfig;
import com.tencent.supersonic.chat.agent.tool.AgentToolType;
import com.tencent.supersonic.chat.agent.tool.DslTool;
import com.tencent.supersonic.chat.agent.tool.LLMParserTool;
import com.tencent.supersonic.chat.agent.tool.RuleQueryTool;
import com.tencent.supersonic.chat.api.pojo.request.ChatAggConfigReq;
import com.tencent.supersonic.chat.api.pojo.request.ChatConfigBaseReq;
@@ -228,11 +228,11 @@ public class ConfigureDemo implements ApplicationListener<ApplicationReadyEvent>
));
agentConfig.getTools().add(ruleQueryTool);
DslTool dslTool = new DslTool();
dslTool.setId("1");
dslTool.setType(AgentToolType.DSL);
dslTool.setModelIds(Lists.newArrayList(-1L));
agentConfig.getTools().add(dslTool);
LLMParserTool llmParserTool = new LLMParserTool();
llmParserTool.setId("1");
llmParserTool.setType(AgentToolType.LLM_S2QL);
llmParserTool.setModelIds(Lists.newArrayList(-1L));
agentConfig.getTools().add(llmParserTool);
agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
agentService.createAgent(agent, User.getFakeUser());
@@ -255,11 +255,11 @@ public class ConfigureDemo implements ApplicationListener<ApplicationReadyEvent>
"ENTITY_DETAIL", "ENTITY_LIST_FILTER", "ENTITY_ID"));
agentConfig.getTools().add(ruleQueryTool);
DslTool dslTool = new DslTool();
dslTool.setId("1");
dslTool.setType(AgentToolType.DSL);
dslTool.setModelIds(Lists.newArrayList(-1L));
agentConfig.getTools().add(dslTool);
LLMParserTool llmParserTool = new LLMParserTool();
llmParserTool.setId("1");
llmParserTool.setType(AgentToolType.LLM_S2QL);
llmParserTool.setModelIds(Lists.newArrayList(-1L));
agentConfig.getTools().add(llmParserTool);
agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
agentService.createAgent(agent, User.getFakeUser());

View File

@@ -11,7 +11,7 @@ com.tencent.supersonic.chat.api.component.SemanticParser=\
com.tencent.supersonic.chat.parser.rule.MetricCheckParser, \
com.tencent.supersonic.chat.parser.rule.TimeRangeParser, \
com.tencent.supersonic.chat.parser.rule.AggregateTypeParser, \
com.tencent.supersonic.chat.parser.llm.dsl.LLMDslParser, \
com.tencent.supersonic.chat.parser.llm.s2ql.LLMS2QLParser, \
com.tencent.supersonic.chat.parser.plugin.embedding.EmbeddingBasedParser, \
com.tencent.supersonic.chat.parser.plugin.function.FunctionBasedParser
@@ -22,8 +22,8 @@ com.tencent.supersonic.chat.api.component.SemanticInterpreter=\
com.tencent.supersonic.chat.query.QuerySelector=\
com.tencent.supersonic.chat.query.HeuristicQuerySelector
com.tencent.supersonic.chat.parser.llm.dsl.ModelResolver=\
com.tencent.supersonic.chat.parser.llm.dsl.HeuristicModelResolver
com.tencent.supersonic.chat.parser.llm.s2ql.ModelResolver=\
com.tencent.supersonic.chat.parser.llm.s2ql.HeuristicModelResolver
com.tencent.supersonic.auth.authentication.interceptor.AuthenticationInterceptor=\
com.tencent.supersonic.auth.authentication.interceptor.DefaultAuthenticationInterceptor

View File

@@ -66,3 +66,5 @@ alter table s2_dimension add column data_type varchar(50) not null DEFAULT 'va
alter table s2_query_stat_info add column `query_opt_mode` varchar(20) DEFAULT NULL COMMENT '优化模式';
alter table s2_datasource add column depends text COMMENT '上游依赖标识' after datasource_detail;
--20231018
UPDATE `s2_agent` SET `config` = replace (`config`,'DSL','LLM_S2QL') WHERE `config` LIKE '%DSL%';