mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-13 04:57:28 +00:00
[improvement][Headless] Unit tests do not use the LLM parsing tool by default. (#699)
This commit is contained in:
@@ -100,6 +100,9 @@ public class LLMRequestService {
|
|||||||
|
|
||||||
public NL2SQLTool getParserTool(QueryContext queryCtx, Set<Long> modelIdSet) {
|
public NL2SQLTool getParserTool(QueryContext queryCtx, Set<Long> modelIdSet) {
|
||||||
Agent agent = queryCtx.getAgent();
|
Agent agent = queryCtx.getAgent();
|
||||||
|
if (Objects.isNull(agent)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
List<NL2SQLTool> commonAgentTools = agent.getParserTools(AgentToolType.NL2SQL_LLM);
|
List<NL2SQLTool> commonAgentTools = agent.getParserTools(AgentToolType.NL2SQL_LLM);
|
||||||
Optional<NL2SQLTool> llmParserTool = commonAgentTools.stream()
|
Optional<NL2SQLTool> llmParserTool = commonAgentTools.stream()
|
||||||
.filter(tool -> {
|
.filter(tool -> {
|
||||||
|
|||||||
@@ -67,6 +67,9 @@ public class ChatDemoLoader implements CommandLineRunner {
|
|||||||
@Value("${demo.enabled:false}")
|
@Value("${demo.enabled:false}")
|
||||||
private boolean demoEnabled;
|
private boolean demoEnabled;
|
||||||
|
|
||||||
|
@Value("${demo.nl2SqlLlm.enabled:true}")
|
||||||
|
private boolean demoEnabledNl2SqlLlm;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run(String... args) throws Exception {
|
public void run(String... args) throws Exception {
|
||||||
if (!checkEnable()) {
|
if (!checkEnable()) {
|
||||||
@@ -451,12 +454,13 @@ public class ChatDemoLoader implements CommandLineRunner {
|
|||||||
ruleQueryTool.setQueryTypes(Lists.newArrayList(QueryType.METRIC.name()));
|
ruleQueryTool.setQueryTypes(Lists.newArrayList(QueryType.METRIC.name()));
|
||||||
agentConfig.getTools().add(ruleQueryTool);
|
agentConfig.getTools().add(ruleQueryTool);
|
||||||
|
|
||||||
LLMParserTool llmParserTool = new LLMParserTool();
|
if (demoEnabledNl2SqlLlm) {
|
||||||
llmParserTool.setId("1");
|
LLMParserTool llmParserTool = new LLMParserTool();
|
||||||
llmParserTool.setType(AgentToolType.NL2SQL_LLM);
|
llmParserTool.setId("1");
|
||||||
llmParserTool.setModelIds(Lists.newArrayList(-1L));
|
llmParserTool.setType(AgentToolType.NL2SQL_LLM);
|
||||||
agentConfig.getTools().add(llmParserTool);
|
llmParserTool.setModelIds(Lists.newArrayList(-1L));
|
||||||
|
agentConfig.getTools().add(llmParserTool);
|
||||||
|
}
|
||||||
agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
|
agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
|
||||||
agentService.createAgent(agent, User.getFakeUser());
|
agentService.createAgent(agent, User.getFakeUser());
|
||||||
}
|
}
|
||||||
@@ -477,12 +481,13 @@ public class ChatDemoLoader implements CommandLineRunner {
|
|||||||
ruleQueryTool.setQueryTypes(Lists.newArrayList(QueryType.TAG.name()));
|
ruleQueryTool.setQueryTypes(Lists.newArrayList(QueryType.TAG.name()));
|
||||||
agentConfig.getTools().add(ruleQueryTool);
|
agentConfig.getTools().add(ruleQueryTool);
|
||||||
|
|
||||||
LLMParserTool llmParserTool = new LLMParserTool();
|
if (demoEnabledNl2SqlLlm) {
|
||||||
llmParserTool.setId("1");
|
LLMParserTool llmParserTool = new LLMParserTool();
|
||||||
llmParserTool.setType(AgentToolType.NL2SQL_LLM);
|
llmParserTool.setId("1");
|
||||||
llmParserTool.setModelIds(Lists.newArrayList(-1L));
|
llmParserTool.setType(AgentToolType.NL2SQL_LLM);
|
||||||
agentConfig.getTools().add(llmParserTool);
|
llmParserTool.setModelIds(Lists.newArrayList(-1L));
|
||||||
|
agentConfig.getTools().add(llmParserTool);
|
||||||
|
}
|
||||||
agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
|
agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
|
||||||
agentService.createAgent(agent, User.getFakeUser());
|
agentService.createAgent(agent, User.getFakeUser());
|
||||||
}
|
}
|
||||||
@@ -498,12 +503,13 @@ public class ChatDemoLoader implements CommandLineRunner {
|
|||||||
"“孟加拉语”歌曲的平均评分和分辨率是多少?",
|
"“孟加拉语”歌曲的平均评分和分辨率是多少?",
|
||||||
"找出所有至少有一首“英文”歌曲的艺术家的名字和作品数量。"));
|
"找出所有至少有一首“英文”歌曲的艺术家的名字和作品数量。"));
|
||||||
AgentConfig agentConfig = new AgentConfig();
|
AgentConfig agentConfig = new AgentConfig();
|
||||||
|
if (demoEnabledNl2SqlLlm) {
|
||||||
LLMParserTool llmParserTool = new LLMParserTool();
|
LLMParserTool llmParserTool = new LLMParserTool();
|
||||||
llmParserTool.setId("1");
|
llmParserTool.setId("1");
|
||||||
llmParserTool.setType(AgentToolType.NL2SQL_LLM);
|
llmParserTool.setType(AgentToolType.NL2SQL_LLM);
|
||||||
llmParserTool.setModelIds(Lists.newArrayList(5L, 6L, 7L, 8L));
|
llmParserTool.setModelIds(Lists.newArrayList(5L, 6L, 7L, 8L));
|
||||||
agentConfig.getTools().add(llmParserTool);
|
agentConfig.getTools().add(llmParserTool);
|
||||||
|
}
|
||||||
|
|
||||||
agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
|
agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
|
||||||
agentService.createAgent(agent, User.getFakeUser());
|
agentService.createAgent(agent, User.getFakeUser());
|
||||||
@@ -519,11 +525,13 @@ public class ChatDemoLoader implements CommandLineRunner {
|
|||||||
agent.setExamples(Lists.newArrayList());
|
agent.setExamples(Lists.newArrayList());
|
||||||
AgentConfig agentConfig = new AgentConfig();
|
AgentConfig agentConfig = new AgentConfig();
|
||||||
|
|
||||||
LLMParserTool llmParserTool = new LLMParserTool();
|
if (demoEnabledNl2SqlLlm) {
|
||||||
llmParserTool.setId("1");
|
LLMParserTool llmParserTool = new LLMParserTool();
|
||||||
llmParserTool.setType(AgentToolType.NL2SQL_LLM);
|
llmParserTool.setId("1");
|
||||||
llmParserTool.setModelIds(Lists.newArrayList(9L, 10L, 11L, 12L));
|
llmParserTool.setType(AgentToolType.NL2SQL_LLM);
|
||||||
agentConfig.getTools().add(llmParserTool);
|
llmParserTool.setModelIds(Lists.newArrayList(9L, 10L, 11L, 12L));
|
||||||
|
agentConfig.getTools().add(llmParserTool);
|
||||||
|
}
|
||||||
|
|
||||||
agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
|
agent.setAgentConfig(JSONObject.toJSONString(agentConfig));
|
||||||
agentService.createAgent(agent, User.getFakeUser());
|
agentService.createAgent(agent, User.getFakeUser());
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ spring:
|
|||||||
|
|
||||||
demo:
|
demo:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
nl2SqlLlm:
|
||||||
|
enabled: false
|
||||||
|
|
||||||
server:
|
server:
|
||||||
port: 9080
|
port: 9080
|
||||||
|
|||||||
Reference in New Issue
Block a user