mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-20 06:34:55 +00:00
(improvement)[build] Use Spotless to customize the code formatting (#1750)
This commit is contained in:
@@ -43,16 +43,12 @@ public class Agent extends RecordInfo {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
List<Map> toolList = (List) map.get("tools");
|
||||
return toolList.stream()
|
||||
.filter(
|
||||
tool -> {
|
||||
if (Objects.isNull(type)) {
|
||||
return true;
|
||||
}
|
||||
return type.name().equals(tool.get("type"));
|
||||
})
|
||||
.map(JSONObject::toJSONString)
|
||||
.collect(Collectors.toList());
|
||||
return toolList.stream().filter(tool -> {
|
||||
if (Objects.isNull(type)) {
|
||||
return true;
|
||||
}
|
||||
return type.name().equals(tool.get("type"));
|
||||
}).map(JSONObject::toJSONString).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public boolean enableSearch() {
|
||||
@@ -72,8 +68,7 @@ public class Agent extends RecordInfo {
|
||||
if (CollectionUtils.isEmpty(tools)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
return tools.stream()
|
||||
.map(tool -> JSONObject.parseObject(tool, NL2SQLTool.class))
|
||||
return tools.stream().map(tool -> JSONObject.parseObject(tool, NL2SQLTool.class))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@@ -120,10 +115,8 @@ public class Agent extends RecordInfo {
|
||||
if (CollectionUtils.isEmpty(commonAgentTools)) {
|
||||
return new HashSet<>();
|
||||
}
|
||||
return commonAgentTools.stream()
|
||||
.map(NL2SQLTool::getDataSetIds)
|
||||
.filter(modelIds -> !CollectionUtils.isEmpty(modelIds))
|
||||
.flatMap(Collection::stream)
|
||||
return commonAgentTools.stream().map(NL2SQLTool::getDataSetIds)
|
||||
.filter(modelIds -> !CollectionUtils.isEmpty(modelIds)).flatMap(Collection::stream)
|
||||
.collect(Collectors.toSet());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,9 +4,7 @@ import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public enum AgentToolType {
|
||||
NL2SQL_RULE("基于规则Text-to-SQL"),
|
||||
NL2SQL_LLM("基于大模型Text-to-SQL"),
|
||||
PLUGIN("第三方插件");
|
||||
NL2SQL_RULE("基于规则Text-to-SQL"), NL2SQL_LLM("基于大模型Text-to-SQL"), PLUGIN("第三方插件");
|
||||
|
||||
private String title;
|
||||
|
||||
|
||||
@@ -26,14 +26,10 @@ import static com.tencent.supersonic.chat.server.parser.ParserConfig.PARSER_MULT
|
||||
|
||||
public class PlainTextExecutor implements ChatQueryExecutor {
|
||||
|
||||
private static final String INSTRUCTION =
|
||||
""
|
||||
+ "#Role: You are a nice person to talk to.\n"
|
||||
+ "#Task: Respond quickly and nicely to the user."
|
||||
+ "#Rules: 1.ALWAYS use the same language as the input.\n"
|
||||
+ "#History Inputs: %s\n"
|
||||
+ "#Current Input: %s\n"
|
||||
+ "#Your response: ";
|
||||
private static final String INSTRUCTION = "" + "#Role: You are a nice person to talk to.\n"
|
||||
+ "#Task: Respond quickly and nicely to the user."
|
||||
+ "#Rules: 1.ALWAYS use the same language as the input.\n" + "#History Inputs: %s\n"
|
||||
+ "#Current Input: %s\n" + "#Your response: ";
|
||||
|
||||
@Override
|
||||
public QueryResult execute(ExecuteContext executeContext) {
|
||||
@@ -41,11 +37,8 @@ public class PlainTextExecutor implements ChatQueryExecutor {
|
||||
return null;
|
||||
}
|
||||
|
||||
String promptStr =
|
||||
String.format(
|
||||
INSTRUCTION,
|
||||
getHistoryInputs(executeContext),
|
||||
executeContext.getQueryText());
|
||||
String promptStr = String.format(INSTRUCTION, getHistoryInputs(executeContext),
|
||||
executeContext.getQueryText());
|
||||
Prompt prompt = PromptTemplate.from(promptStr).apply(Collections.EMPTY_MAP);
|
||||
|
||||
AgentService agentService = ContextUtils.getBean(AgentService.class);
|
||||
@@ -74,18 +67,15 @@ public class PlainTextExecutor implements ChatQueryExecutor {
|
||||
Boolean globalMultiTurnConfig =
|
||||
Boolean.valueOf(parserConfig.getParameterValue(PARSER_MULTI_TURN_ENABLE));
|
||||
Boolean multiTurnConfig =
|
||||
agentMultiTurnConfig != null
|
||||
? agentMultiTurnConfig.isEnableMultiTurn()
|
||||
agentMultiTurnConfig != null ? agentMultiTurnConfig.isEnableMultiTurn()
|
||||
: globalMultiTurnConfig;
|
||||
|
||||
if (Boolean.TRUE.equals(multiTurnConfig)) {
|
||||
List<QueryResp> queryResps = getHistoryQueries(executeContext.getChatId(), 5);
|
||||
queryResps.stream()
|
||||
.forEach(
|
||||
p -> {
|
||||
historyInput.append(p.getQueryText());
|
||||
historyInput.append(";");
|
||||
});
|
||||
queryResps.stream().forEach(p -> {
|
||||
historyInput.append(p.getQueryText());
|
||||
historyInput.append(";");
|
||||
});
|
||||
}
|
||||
|
||||
return historyInput.toString();
|
||||
@@ -93,18 +83,13 @@ public class PlainTextExecutor implements ChatQueryExecutor {
|
||||
|
||||
private List<QueryResp> getHistoryQueries(int chatId, int multiNum) {
|
||||
ChatManageService chatManageService = ContextUtils.getBean(ChatManageService.class);
|
||||
List<QueryResp> contextualParseInfoList =
|
||||
chatManageService.getChatQueries(chatId).stream()
|
||||
.filter(
|
||||
q ->
|
||||
Objects.nonNull(q.getQueryResult())
|
||||
&& q.getQueryResult().getQueryState()
|
||||
== QueryState.SUCCESS)
|
||||
.collect(Collectors.toList());
|
||||
List<QueryResp> contextualParseInfoList = chatManageService.getChatQueries(chatId).stream()
|
||||
.filter(q -> Objects.nonNull(q.getQueryResult())
|
||||
&& q.getQueryResult().getQueryState() == QueryState.SUCCESS)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
List<QueryResp> contextualList =
|
||||
contextualParseInfoList.subList(
|
||||
0, Math.min(multiNum, contextualParseInfoList.size()));
|
||||
List<QueryResp> contextualList = contextualParseInfoList.subList(0,
|
||||
Math.min(multiNum, contextualParseInfoList.size()));
|
||||
Collections.reverse(contextualList);
|
||||
|
||||
return contextualList;
|
||||
|
||||
@@ -31,35 +31,26 @@ public class SqlExecutor implements ChatQueryExecutor {
|
||||
QueryResult queryResult = doExecute(executeContext);
|
||||
|
||||
if (queryResult != null) {
|
||||
String textResult =
|
||||
ResultFormatter.transform2TextNew(
|
||||
queryResult.getQueryColumns(), queryResult.getQueryResults());
|
||||
String textResult = ResultFormatter.transform2TextNew(queryResult.getQueryColumns(),
|
||||
queryResult.getQueryResults());
|
||||
queryResult.setTextResult(textResult);
|
||||
|
||||
if (queryResult.getQueryState().equals(QueryState.SUCCESS)
|
||||
&& queryResult.getQueryMode().equals(LLMSqlQuery.QUERY_MODE)) {
|
||||
Text2SQLExemplar exemplar =
|
||||
JsonUtil.toObject(
|
||||
JsonUtil.toString(
|
||||
executeContext
|
||||
.getParseInfo()
|
||||
.getProperties()
|
||||
.get(Text2SQLExemplar.PROPERTY_KEY)),
|
||||
JsonUtil.toString(executeContext.getParseInfo().getProperties()
|
||||
.get(Text2SQLExemplar.PROPERTY_KEY)),
|
||||
Text2SQLExemplar.class);
|
||||
|
||||
MemoryService memoryService = ContextUtils.getBean(MemoryService.class);
|
||||
memoryService.createMemory(
|
||||
ChatMemoryDO.builder()
|
||||
.agentId(executeContext.getAgent().getId())
|
||||
.status(MemoryStatus.PENDING)
|
||||
.question(exemplar.getQuestion())
|
||||
.sideInfo(exemplar.getSideInfo())
|
||||
.dbSchema(exemplar.getDbSchema())
|
||||
.s2sql(exemplar.getSql())
|
||||
.createdBy(executeContext.getUser().getName())
|
||||
.updatedBy(executeContext.getUser().getName())
|
||||
.createdAt(new Date())
|
||||
.build());
|
||||
memoryService.createMemory(ChatMemoryDO.builder()
|
||||
.agentId(executeContext.getAgent().getId()).status(MemoryStatus.PENDING)
|
||||
.question(exemplar.getQuestion()).sideInfo(exemplar.getSideInfo())
|
||||
.dbSchema(exemplar.getDbSchema()).s2sql(exemplar.getSql())
|
||||
.createdBy(executeContext.getUser().getName())
|
||||
.updatedBy(executeContext.getUser().getName()).createdAt(new Date())
|
||||
.build());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,25 +27,22 @@ public class MemoryReviewTask {
|
||||
|
||||
private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
|
||||
|
||||
private static final String INSTRUCTION =
|
||||
""
|
||||
+ "\n#Role: You are a senior data engineer experienced in writing SQL."
|
||||
+ "\n#Task: Your will be provided with a user question and the SQL written by junior engineer,"
|
||||
+ "please take a review and give your opinion."
|
||||
+ "\n#Rules: "
|
||||
+ "1.ALWAYS follow the output format: `opinion=(POSITIVE|NEGATIVE),comment=(your comment)`."
|
||||
+ "2.NO NEED to include date filter in the where clause if not explicitly expressed in the `Question`."
|
||||
+ "\n#Question: %s"
|
||||
+ "\n#Schema: %s"
|
||||
+ "\n#SideInfo: %s"
|
||||
+ "\n#SQL: %s"
|
||||
+ "\n#Response: ";
|
||||
private static final String INSTRUCTION = ""
|
||||
+ "\n#Role: You are a senior data engineer experienced in writing SQL."
|
||||
+ "\n#Task: Your will be provided with a user question and the SQL written by junior engineer,"
|
||||
+ "please take a review and give your opinion." + "\n#Rules: "
|
||||
+ "1.ALWAYS follow the output format: `opinion=(POSITIVE|NEGATIVE),comment=(your comment)`."
|
||||
+ "2.NO NEED to include date filter in the where clause if not explicitly expressed in the `Question`."
|
||||
+ "\n#Question: %s" + "\n#Schema: %s" + "\n#SideInfo: %s" + "\n#SQL: %s"
|
||||
+ "\n#Response: ";
|
||||
|
||||
private static final Pattern OUTPUT_PATTERN = Pattern.compile("opinion=(.*),.*comment=(.*)");
|
||||
|
||||
@Autowired private MemoryService memoryService;
|
||||
@Autowired
|
||||
private MemoryService memoryService;
|
||||
|
||||
@Autowired private AgentService agentService;
|
||||
@Autowired
|
||||
private AgentService agentService;
|
||||
|
||||
@Scheduled(fixedDelay = 60 * 1000)
|
||||
public void review() {
|
||||
@@ -78,8 +75,8 @@ public class MemoryReviewTask {
|
||||
}
|
||||
|
||||
private String createPromptString(ChatMemoryDO m) {
|
||||
return String.format(
|
||||
INSTRUCTION, m.getQuestion(), m.getDbSchema(), m.getSideInfo(), m.getS2sql());
|
||||
return String.format(INSTRUCTION, m.getQuestion(), m.getDbSchema(), m.getSideInfo(),
|
||||
m.getS2sql());
|
||||
}
|
||||
|
||||
private void processResponse(String response, ChatMemoryDO m) {
|
||||
|
||||
@@ -21,13 +21,10 @@ public class NL2PluginParser implements ChatQueryParser {
|
||||
return;
|
||||
}
|
||||
|
||||
pluginRecognizers.forEach(
|
||||
pluginRecognizer -> {
|
||||
pluginRecognizer.recognize(parseContext, parseResp);
|
||||
log.info(
|
||||
"{} recallResult:{}",
|
||||
pluginRecognizer.getClass().getSimpleName(),
|
||||
JsonUtil.toString(parseResp));
|
||||
});
|
||||
pluginRecognizers.forEach(pluginRecognizer -> {
|
||||
pluginRecognizer.recognize(parseContext, parseResp);
|
||||
log.info("{} recallResult:{}", pluginRecognizer.getClass().getSimpleName(),
|
||||
JsonUtil.toString(parseResp));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,33 +52,27 @@ public class NL2SQLParser implements ChatQueryParser {
|
||||
|
||||
private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
|
||||
|
||||
private static final String REWRITE_USER_QUESTION_INSTRUCTION =
|
||||
""
|
||||
+ "#Role: You are a data product manager experienced in data requirements."
|
||||
+ "#Task: Your will be provided with current and history questions asked by a user,"
|
||||
+ "along with their mapped schema elements(metric, dimension and value),"
|
||||
+ "please try understanding the semantics and rewrite a question."
|
||||
+ "#Rules: "
|
||||
+ "1.ALWAYS keep relevant entities, metrics, dimensions, values and date ranges."
|
||||
+ "2.ONLY respond with the rewritten question."
|
||||
+ "#Current Question: {{current_question}}"
|
||||
+ "#Current Mapped Schema: {{current_schema}}"
|
||||
+ "#History Question: {{history_question}}"
|
||||
+ "#History Mapped Schema: {{history_schema}}"
|
||||
+ "#History SQL: {{history_sql}}"
|
||||
+ "#Rewritten Question: ";
|
||||
private static final String REWRITE_USER_QUESTION_INSTRUCTION = ""
|
||||
+ "#Role: You are a data product manager experienced in data requirements."
|
||||
+ "#Task: Your will be provided with current and history questions asked by a user,"
|
||||
+ "along with their mapped schema elements(metric, dimension and value),"
|
||||
+ "please try understanding the semantics and rewrite a question." + "#Rules: "
|
||||
+ "1.ALWAYS keep relevant entities, metrics, dimensions, values and date ranges."
|
||||
+ "2.ONLY respond with the rewritten question."
|
||||
+ "#Current Question: {{current_question}}"
|
||||
+ "#Current Mapped Schema: {{current_schema}}"
|
||||
+ "#History Question: {{history_question}}"
|
||||
+ "#History Mapped Schema: {{history_schema}}" + "#History SQL: {{history_sql}}"
|
||||
+ "#Rewritten Question: ";
|
||||
|
||||
private static final String REWRITE_ERROR_MESSAGE_INSTRUCTION =
|
||||
""
|
||||
+ "#Role: You are a data business partner who closely interacts with business people.\n"
|
||||
+ "#Task: Your will be provided with user input, system output and some examples, "
|
||||
+ "please respond shortly to teach user how to ask the right question, "
|
||||
+ "by using `Examples` as references."
|
||||
+ "#Rules: ALWAYS respond with the same language as the `Input`.\n"
|
||||
+ "#Input: {{user_question}}\n"
|
||||
+ "#Output: {{system_message}}\n"
|
||||
+ "#Examples: {{examples}}\n"
|
||||
+ "#Response: ";
|
||||
private static final String REWRITE_ERROR_MESSAGE_INSTRUCTION = ""
|
||||
+ "#Role: You are a data business partner who closely interacts with business people.\n"
|
||||
+ "#Task: Your will be provided with user input, system output and some examples, "
|
||||
+ "please respond shortly to teach user how to ask the right question, "
|
||||
+ "by using `Examples` as references."
|
||||
+ "#Rules: ALWAYS respond with the same language as the `Input`.\n"
|
||||
+ "#Input: {{user_question}}\n" + "#Output: {{system_message}}\n"
|
||||
+ "#Examples: {{examples}}\n" + "#Response: ";
|
||||
|
||||
@Override
|
||||
public void parse(ParseContext parseContext, ParseResp parseResp) {
|
||||
@@ -100,13 +94,10 @@ public class NL2SQLParser implements ChatQueryParser {
|
||||
parseResp.getSelectedParses().addAll(text2SqlParseResp.getSelectedParses());
|
||||
} else {
|
||||
if (parseContext.enbaleLLM()) {
|
||||
parseResp.setErrorMsg(
|
||||
rewriteErrorMessage(
|
||||
parseContext.getQueryText(),
|
||||
text2SqlParseResp.getErrorMsg(),
|
||||
queryNLReq.getDynamicExemplars(),
|
||||
parseContext.getAgent().getExamples(),
|
||||
parseContext.getAgent().getModelConfig()));
|
||||
parseResp.setErrorMsg(rewriteErrorMessage(parseContext.getQueryText(),
|
||||
text2SqlParseResp.getErrorMsg(), queryNLReq.getDynamicExemplars(),
|
||||
parseContext.getAgent().getExamples(),
|
||||
parseContext.getAgent().getModelConfig()));
|
||||
}
|
||||
}
|
||||
parseResp.setState(text2SqlParseResp.getState());
|
||||
@@ -141,40 +132,26 @@ public class NL2SQLParser implements ChatQueryParser {
|
||||
StringBuilder textBuilder = new StringBuilder();
|
||||
textBuilder.append("**数据集:** ").append(parseInfo.getDataSet().getName()).append(" ");
|
||||
Optional<SchemaElement> metric = parseInfo.getMetrics().stream().findFirst();
|
||||
metric.ifPresent(
|
||||
schemaElement ->
|
||||
textBuilder.append("**指标:** ").append(schemaElement.getName()).append(" "));
|
||||
List<String> dimensionNames =
|
||||
parseInfo.getDimensions().stream()
|
||||
.map(SchemaElement::getName)
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toList());
|
||||
metric.ifPresent(schemaElement -> textBuilder.append("**指标:** ")
|
||||
.append(schemaElement.getName()).append(" "));
|
||||
List<String> dimensionNames = parseInfo.getDimensions().stream().map(SchemaElement::getName)
|
||||
.filter(Objects::nonNull).collect(Collectors.toList());
|
||||
if (!CollectionUtils.isEmpty(dimensionNames)) {
|
||||
textBuilder.append("**维度:** ").append(String.join(",", dimensionNames));
|
||||
}
|
||||
textBuilder.append("\n\n**筛选条件:** \n");
|
||||
if (parseInfo.getDateInfo() != null) {
|
||||
textBuilder
|
||||
.append("**数据时间:** ")
|
||||
.append(parseInfo.getDateInfo().getStartDate())
|
||||
.append("~")
|
||||
.append(parseInfo.getDateInfo().getEndDate())
|
||||
.append(" ");
|
||||
textBuilder.append("**数据时间:** ").append(parseInfo.getDateInfo().getStartDate())
|
||||
.append("~").append(parseInfo.getDateInfo().getEndDate()).append(" ");
|
||||
}
|
||||
if (!CollectionUtils.isEmpty(parseInfo.getDimensionFilters())
|
||||
|| CollectionUtils.isEmpty(parseInfo.getMetricFilters())) {
|
||||
Set<QueryFilter> queryFilters = parseInfo.getDimensionFilters();
|
||||
queryFilters.addAll(parseInfo.getMetricFilters());
|
||||
for (QueryFilter queryFilter : queryFilters) {
|
||||
textBuilder
|
||||
.append("**")
|
||||
.append(queryFilter.getName())
|
||||
.append("**")
|
||||
.append(" ")
|
||||
.append(queryFilter.getOperator().getValue())
|
||||
.append(" ")
|
||||
.append(queryFilter.getValue())
|
||||
.append(" ");
|
||||
textBuilder.append("**").append(queryFilter.getName()).append("**").append(" ")
|
||||
.append(queryFilter.getOperator().getValue()).append(" ")
|
||||
.append(queryFilter.getValue()).append(" ");
|
||||
}
|
||||
}
|
||||
parseInfo.setTextInfo(textBuilder.toString());
|
||||
@@ -187,8 +164,7 @@ public class NL2SQLParser implements ChatQueryParser {
|
||||
Boolean.valueOf(parserConfig.getParameterValue(PARSER_MULTI_TURN_ENABLE));
|
||||
|
||||
Boolean multiTurnConfig =
|
||||
agentMultiTurnConfig != null
|
||||
? agentMultiTurnConfig.isEnableMultiTurn()
|
||||
agentMultiTurnConfig != null ? agentMultiTurnConfig.isEnableMultiTurn()
|
||||
: globalMultiTurnConfig;
|
||||
if (!Boolean.TRUE.equals(multiTurnConfig)) {
|
||||
return;
|
||||
@@ -232,30 +208,20 @@ public class NL2SQLParser implements ChatQueryParser {
|
||||
QueryNLReq rewrittenQueryNLReq = QueryReqConverter.buildText2SqlQueryReq(parseContext);
|
||||
MapResp rewrittenQueryMapResult = chatLayerService.performMapping(rewrittenQueryNLReq);
|
||||
parseContext.setMapInfo(rewrittenQueryMapResult.getMapInfo());
|
||||
log.info(
|
||||
"Last Query: {} Current Query: {}, Rewritten Query: {}",
|
||||
lastQuery.getQueryText(),
|
||||
currentMapResult.getQueryText(),
|
||||
rewrittenQuery);
|
||||
log.info("Last Query: {} Current Query: {}, Rewritten Query: {}", lastQuery.getQueryText(),
|
||||
currentMapResult.getQueryText(), rewrittenQuery);
|
||||
}
|
||||
|
||||
private String rewriteErrorMessage(
|
||||
String userQuestion,
|
||||
String errMsg,
|
||||
List<Text2SQLExemplar> similarExemplars,
|
||||
List<String> agentExamples,
|
||||
private String rewriteErrorMessage(String userQuestion, String errMsg,
|
||||
List<Text2SQLExemplar> similarExemplars, List<String> agentExamples,
|
||||
ChatModelConfig modelConfig) {
|
||||
Map<String, Object> variables = new HashMap<>();
|
||||
variables.put("user_question", userQuestion);
|
||||
variables.put("system_message", errMsg);
|
||||
|
||||
StringBuilder exampleStr = new StringBuilder();
|
||||
similarExemplars.forEach(
|
||||
e ->
|
||||
exampleStr.append(
|
||||
String.format(
|
||||
"<Question:{%s},Schema:{%s}> ",
|
||||
e.getQuestion(), e.getDbSchema())));
|
||||
similarExemplars.forEach(e -> exampleStr.append(
|
||||
String.format("<Question:{%s},Schema:{%s}> ", e.getQuestion(), e.getDbSchema())));
|
||||
agentExamples.forEach(e -> exampleStr.append(String.format("<Question:{%s}> ", e)));
|
||||
variables.put("examples", exampleStr);
|
||||
|
||||
@@ -297,18 +263,13 @@ public class NL2SQLParser implements ChatQueryParser {
|
||||
|
||||
private List<QueryResp> getHistoryQueries(int chatId, int multiNum) {
|
||||
ChatManageService chatManageService = ContextUtils.getBean(ChatManageService.class);
|
||||
List<QueryResp> contextualParseInfoList =
|
||||
chatManageService.getChatQueries(chatId).stream()
|
||||
.filter(
|
||||
q ->
|
||||
Objects.nonNull(q.getQueryResult())
|
||||
&& q.getQueryResult().getQueryState()
|
||||
== QueryState.SUCCESS)
|
||||
.collect(Collectors.toList());
|
||||
List<QueryResp> contextualParseInfoList = chatManageService.getChatQueries(chatId).stream()
|
||||
.filter(q -> Objects.nonNull(q.getQueryResult())
|
||||
&& q.getQueryResult().getQueryState() == QueryState.SUCCESS)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
List<QueryResp> contextualList =
|
||||
contextualParseInfoList.subList(
|
||||
0, Math.min(multiNum, contextualParseInfoList.size()));
|
||||
List<QueryResp> contextualList = contextualParseInfoList.subList(0,
|
||||
Math.min(multiNum, contextualParseInfoList.size()));
|
||||
Collections.reverse(contextualList);
|
||||
return contextualList;
|
||||
}
|
||||
@@ -320,9 +281,8 @@ public class NL2SQLParser implements ChatQueryParser {
|
||||
ParserConfig parserConfig = ContextUtils.getBean(ParserConfig.class);
|
||||
int exemplarRecallNumber =
|
||||
Integer.valueOf(parserConfig.getParameterValue(PARSER_EXEMPLAR_RECALL_NUMBER));
|
||||
List<Text2SQLExemplar> exemplars =
|
||||
exemplarManager.recallExemplars(
|
||||
memoryCollectionName, queryNLReq.getQueryText(), exemplarRecallNumber);
|
||||
List<Text2SQLExemplar> exemplars = exemplarManager.recallExemplars(memoryCollectionName,
|
||||
queryNLReq.getQueryText(), exemplarRecallNumber);
|
||||
queryNLReq.getDynamicExemplars().addAll(exemplars);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,11 +10,6 @@ import org.springframework.stereotype.Service;
|
||||
public class ParserConfig extends ParameterConfig {
|
||||
|
||||
public static final Parameter PARSER_MULTI_TURN_ENABLE =
|
||||
new Parameter(
|
||||
"s2.parser.multi-turn.enable",
|
||||
"false",
|
||||
"是否开启多轮对话",
|
||||
"开启多轮对话将消耗更多token",
|
||||
"bool",
|
||||
"Parser相关配置");
|
||||
new Parameter("s2.parser.multi-turn.enable", "false", "是否开启多轮对话", "开启多轮对话将消耗更多token",
|
||||
"bool", "Parser相关配置");
|
||||
}
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
package com.tencent.supersonic.chat.server.persistence.dataobject;
|
||||
|
||||
public enum CostType {
|
||||
MAPPER(1, "mapper"),
|
||||
PARSER(2, "parser"),
|
||||
QUERY(3, "query"),
|
||||
PROCESSOR(4, "processor");
|
||||
MAPPER(1, "mapper"), PARSER(2, "parser"), QUERY(3, "query"), PROCESSOR(4, "processor");
|
||||
|
||||
private Integer type;
|
||||
private String name;
|
||||
|
||||
@@ -5,4 +5,5 @@ import com.tencent.supersonic.chat.server.persistence.dataobject.AgentDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface AgentDOMapper extends BaseMapper<AgentDO> {}
|
||||
public interface AgentDOMapper extends BaseMapper<AgentDO> {
|
||||
}
|
||||
|
||||
@@ -5,4 +5,5 @@ import com.tencent.supersonic.chat.server.persistence.dataobject.ChatMemoryDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface ChatMemoryMapper extends BaseMapper<ChatMemoryDO> {}
|
||||
public interface ChatMemoryMapper extends BaseMapper<ChatMemoryDO> {
|
||||
}
|
||||
|
||||
@@ -5,4 +5,5 @@ import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface ChatQueryDOMapper extends BaseMapper<ChatQueryDO> {}
|
||||
public interface ChatQueryDOMapper extends BaseMapper<ChatQueryDO> {
|
||||
}
|
||||
|
||||
@@ -5,4 +5,5 @@ import com.tencent.supersonic.chat.server.persistence.dataobject.PluginDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface PluginDOMapper extends BaseMapper<PluginDO> {}
|
||||
public interface PluginDOMapper extends BaseMapper<PluginDO> {
|
||||
}
|
||||
|
||||
@@ -30,9 +30,7 @@ public interface ChatQueryRepository {
|
||||
|
||||
Long createChatQuery(ChatParseReq chatParseReq);
|
||||
|
||||
List<ChatParseDO> batchSaveParseInfo(
|
||||
ChatParseReq chatParseReq,
|
||||
ParseResp parseResult,
|
||||
List<ChatParseDO> batchSaveParseInfo(ChatParseReq chatParseReq, ParseResp parseResult,
|
||||
List<SemanticParseInfo> candidateParses);
|
||||
|
||||
ChatParseDO getParseInfo(Long questionId, int parseId);
|
||||
|
||||
@@ -23,8 +23,8 @@ public class ChatConfigRepositoryImpl implements ChatConfigRepository {
|
||||
private final ChatConfigHelper chatConfigHelper;
|
||||
private final ChatConfigMapper chatConfigMapper;
|
||||
|
||||
public ChatConfigRepositoryImpl(
|
||||
ChatConfigHelper chatConfigHelper, ChatConfigMapper chatConfigMapper) {
|
||||
public ChatConfigRepositoryImpl(ChatConfigHelper chatConfigHelper,
|
||||
ChatConfigMapper chatConfigMapper) {
|
||||
this.chatConfigHelper = chatConfigHelper;
|
||||
this.chatConfigMapper = chatConfigMapper;
|
||||
}
|
||||
@@ -52,11 +52,8 @@ public class ChatConfigRepositoryImpl implements ChatConfigRepository {
|
||||
List<ChatConfigDO> chaConfigDOList = chatConfigMapper.search(filterInternal);
|
||||
if (!CollectionUtils.isEmpty(chaConfigDOList)) {
|
||||
chaConfigDOList.stream()
|
||||
.forEach(
|
||||
chaConfigDO ->
|
||||
chaConfigDescriptorList.add(
|
||||
chatConfigHelper.chatConfigDO2Descriptor(
|
||||
chaConfigDO.getModelId(), chaConfigDO)));
|
||||
.forEach(chaConfigDO -> chaConfigDescriptorList.add(chatConfigHelper
|
||||
.chatConfigDO2Descriptor(chaConfigDO.getModelId(), chaConfigDO)));
|
||||
}
|
||||
return chaConfigDescriptorList;
|
||||
}
|
||||
|
||||
@@ -40,11 +40,14 @@ import java.util.stream.Collectors;
|
||||
@Slf4j
|
||||
public class ChatQueryRepositoryImpl implements ChatQueryRepository {
|
||||
|
||||
@Autowired private ChatQueryDOMapper chatQueryDOMapper;
|
||||
@Autowired
|
||||
private ChatQueryDOMapper chatQueryDOMapper;
|
||||
|
||||
@Autowired private ChatParseMapper chatParseMapper;
|
||||
@Autowired
|
||||
private ChatParseMapper chatParseMapper;
|
||||
|
||||
@Autowired private ShowCaseCustomMapper showCaseCustomMapper;
|
||||
@Autowired
|
||||
private ShowCaseCustomMapper showCaseCustomMapper;
|
||||
|
||||
@Override
|
||||
public PageInfo<QueryResp> getChatQuery(PageQueryInfoReq pageQueryInfoReq, Long chatId) {
|
||||
@@ -67,11 +70,9 @@ public class ChatQueryRepositoryImpl implements ChatQueryRepository {
|
||||
.doSelectPageInfo(() -> chatQueryDOMapper.selectList(queryWrapper));
|
||||
|
||||
PageInfo<QueryResp> chatQueryVOPageInfo = PageUtils.pageInfo2PageInfoVo(pageInfo);
|
||||
chatQueryVOPageInfo.setList(
|
||||
pageInfo.getList().stream()
|
||||
.sorted(Comparator.comparingInt(o -> o.getQuestionId().intValue()))
|
||||
.map(this::convertTo)
|
||||
.collect(Collectors.toList()));
|
||||
chatQueryVOPageInfo.setList(pageInfo.getList().stream()
|
||||
.sorted(Comparator.comparingInt(o -> o.getQuestionId().intValue()))
|
||||
.map(this::convertTo).collect(Collectors.toList()));
|
||||
return chatQueryVOPageInfo;
|
||||
}
|
||||
|
||||
@@ -94,22 +95,16 @@ public class ChatQueryRepositoryImpl implements ChatQueryRepository {
|
||||
QueryWrapper<ChatQueryDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.lambda().eq(ChatQueryDO::getChatId, chatId);
|
||||
queryWrapper.lambda().orderByDesc(ChatQueryDO::getQuestionId);
|
||||
return chatQueryDOMapper.selectList(queryWrapper).stream()
|
||||
.map(q -> convertTo(q))
|
||||
return chatQueryDOMapper.selectList(queryWrapper).stream().map(q -> convertTo(q))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<QueryResp> queryShowCase(PageQueryInfoReq pageQueryInfoReq, int agentId) {
|
||||
return showCaseCustomMapper
|
||||
.queryShowCase(
|
||||
pageQueryInfoReq.getLimitStart(),
|
||||
pageQueryInfoReq.getPageSize(),
|
||||
agentId,
|
||||
pageQueryInfoReq.getUserName())
|
||||
.stream()
|
||||
.map(this::convertTo)
|
||||
.collect(Collectors.toList());
|
||||
.queryShowCase(pageQueryInfoReq.getLimitStart(), pageQueryInfoReq.getPageSize(),
|
||||
agentId, pageQueryInfoReq.getUserName())
|
||||
.stream().map(this::convertTo).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private QueryResp convertTo(ChatQueryDO chatQueryDO) {
|
||||
@@ -121,9 +116,8 @@ public class ChatQueryRepositoryImpl implements ChatQueryRepository {
|
||||
queryResult.setQueryId(chatQueryDO.getQuestionId());
|
||||
queryResp.setQueryResult(queryResult);
|
||||
}
|
||||
queryResp.setSimilarQueries(
|
||||
JSONObject.parseArray(
|
||||
chatQueryDO.getSimilarQueries(), SimilarQueryRecallResp.class));
|
||||
queryResp.setSimilarQueries(JSONObject.parseArray(chatQueryDO.getSimilarQueries(),
|
||||
SimilarQueryRecallResp.class));
|
||||
queryResp.setParseTimeCost(
|
||||
JsonUtil.toObject(chatQueryDO.getParseTimeCost(), ParseTimeCostResp.class));
|
||||
return queryResp;
|
||||
@@ -147,9 +141,7 @@ public class ChatQueryRepositoryImpl implements ChatQueryRepository {
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ChatParseDO> batchSaveParseInfo(
|
||||
ChatParseReq chatParseReq,
|
||||
ParseResp parseResult,
|
||||
public List<ChatParseDO> batchSaveParseInfo(ChatParseReq chatParseReq, ParseResp parseResult,
|
||||
List<SemanticParseInfo> candidateParses) {
|
||||
List<ChatParseDO> chatParseDOList = new ArrayList<>();
|
||||
getChatParseDO(chatParseReq, parseResult.getQueryId(), candidateParses, chatParseDOList);
|
||||
@@ -159,11 +151,8 @@ public class ChatQueryRepositoryImpl implements ChatQueryRepository {
|
||||
return chatParseDOList;
|
||||
}
|
||||
|
||||
public void getChatParseDO(
|
||||
ChatParseReq chatParseReq,
|
||||
Long queryId,
|
||||
List<SemanticParseInfo> parses,
|
||||
List<ChatParseDO> chatParseDOList) {
|
||||
public void getChatParseDO(ChatParseReq chatParseReq, Long queryId,
|
||||
List<SemanticParseInfo> parses, List<ChatParseDO> chatParseDOList) {
|
||||
for (int i = 0; i < parses.size(); i++) {
|
||||
ChatParseDO chatParseDO = new ChatParseDO();
|
||||
chatParseDO.setChatId(chatParseReq.getChatId());
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.tencent.supersonic.chat.server.plugin;
|
||||
|
||||
public enum ParseMode {
|
||||
EMBEDDING_RECALL,
|
||||
FUNCTION_CALL;
|
||||
EMBEDDING_RECALL, FUNCTION_CALL;
|
||||
}
|
||||
|
||||
@@ -46,9 +46,11 @@ import java.util.stream.Collectors;
|
||||
@Component
|
||||
public class PluginManager {
|
||||
|
||||
@Autowired private EmbeddingConfig embeddingConfig;
|
||||
@Autowired
|
||||
private EmbeddingConfig embeddingConfig;
|
||||
|
||||
@Autowired private EmbeddingService embeddingService;
|
||||
@Autowired
|
||||
private EmbeddingService embeddingService;
|
||||
|
||||
public static List<ChatPlugin> getPluginAgentCanSupport(ParseContext parseContext) {
|
||||
PluginService pluginService = ContextUtils.getBean(PluginService.class);
|
||||
@@ -57,21 +59,14 @@ public class PluginManager {
|
||||
if (Objects.isNull(agent)) {
|
||||
return plugins;
|
||||
}
|
||||
List<Long> pluginIds =
|
||||
getPluginTools(agent).stream()
|
||||
.map(PluginTool::getPlugins)
|
||||
.flatMap(Collection::stream)
|
||||
.collect(Collectors.toList());
|
||||
List<Long> pluginIds = getPluginTools(agent).stream().map(PluginTool::getPlugins)
|
||||
.flatMap(Collection::stream).collect(Collectors.toList());
|
||||
if (CollectionUtils.isEmpty(pluginIds)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
plugins =
|
||||
plugins.stream()
|
||||
.filter(plugin -> pluginIds.contains(plugin.getId()))
|
||||
.collect(Collectors.toList());
|
||||
log.info(
|
||||
"plugins witch can be supported by cur agent :{} {}",
|
||||
agent.getName(),
|
||||
plugins = plugins.stream().filter(plugin -> pluginIds.contains(plugin.getId()))
|
||||
.collect(Collectors.toList());
|
||||
log.info("plugins witch can be supported by cur agent :{} {}", agent.getName(),
|
||||
plugins.stream().map(ChatPlugin::getName).collect(Collectors.toList()));
|
||||
return plugins;
|
||||
}
|
||||
@@ -84,8 +79,7 @@ public class PluginManager {
|
||||
if (CollectionUtils.isEmpty(tools)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
return tools.stream()
|
||||
.map(tool -> JSONObject.parseObject(tool, PluginTool.class))
|
||||
return tools.stream().map(tool -> JSONObject.parseObject(tool, PluginTool.class))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@@ -142,23 +136,18 @@ public class PluginManager {
|
||||
|
||||
public RetrieveQueryResult recognize(String embeddingText) {
|
||||
|
||||
RetrieveQuery retrieveQuery =
|
||||
RetrieveQuery.builder()
|
||||
.queryTextsList(Collections.singletonList(embeddingText))
|
||||
.build();
|
||||
RetrieveQuery retrieveQuery = RetrieveQuery.builder()
|
||||
.queryTextsList(Collections.singletonList(embeddingText)).build();
|
||||
|
||||
List<RetrieveQueryResult> resultList =
|
||||
embeddingService.retrieveQuery(
|
||||
embeddingConfig.getPresetCollection(),
|
||||
retrieveQuery,
|
||||
embeddingConfig.getNResult());
|
||||
List<RetrieveQueryResult> resultList = embeddingService.retrieveQuery(
|
||||
embeddingConfig.getPresetCollection(), retrieveQuery, embeddingConfig.getNResult());
|
||||
|
||||
if (CollectionUtils.isNotEmpty(resultList)) {
|
||||
for (RetrieveQueryResult embeddingResp : resultList) {
|
||||
List<Retrieval> embeddingRetrievals = embeddingResp.getRetrieval();
|
||||
for (Retrieval embeddingRetrieval : embeddingRetrievals) {
|
||||
embeddingRetrieval.setId(
|
||||
getPluginIdFromEmbeddingId(embeddingRetrieval.getId()));
|
||||
embeddingRetrieval
|
||||
.setId(getPluginIdFromEmbeddingId(embeddingRetrieval.getId()));
|
||||
}
|
||||
}
|
||||
return resultList.get(0);
|
||||
@@ -173,8 +162,8 @@ public class PluginManager {
|
||||
int num = 0;
|
||||
for (String pattern : exampleQuestions) {
|
||||
TextSegment query = TextSegment.from(pattern);
|
||||
TextSegmentConvert.addQueryId(
|
||||
query, generateUniqueEmbeddingId(num, plugin.getId()));
|
||||
TextSegmentConvert.addQueryId(query,
|
||||
generateUniqueEmbeddingId(num, plugin.getId()));
|
||||
queries.add(query);
|
||||
num++;
|
||||
}
|
||||
@@ -250,14 +239,10 @@ public class PluginManager {
|
||||
return Sets.newHashSet();
|
||||
}
|
||||
return schemaElementMatches.stream()
|
||||
.filter(
|
||||
schemaElementMatch ->
|
||||
SchemaElementType.VALUE.equals(
|
||||
schemaElementMatch.getElement().getType())
|
||||
|| SchemaElementType.ID.equals(
|
||||
schemaElementMatch.getElement().getType()))
|
||||
.map(SchemaElementMatch::getElement)
|
||||
.map(SchemaElement::getId)
|
||||
.filter(schemaElementMatch -> SchemaElementType.VALUE
|
||||
.equals(schemaElementMatch.getElement().getType())
|
||||
|| SchemaElementType.ID.equals(schemaElementMatch.getElement().getType()))
|
||||
.map(SchemaElementMatch::getElement).map(SchemaElement::getId)
|
||||
.collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
@@ -270,10 +255,8 @@ public class PluginManager {
|
||||
if (CollectionUtils.isEmpty(paramOptions)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
return paramOptions.stream()
|
||||
.filter(
|
||||
paramOption ->
|
||||
ParamOption.ParamType.SEMANTIC.equals(paramOption.getParamType()))
|
||||
return paramOptions.stream().filter(
|
||||
paramOption -> ParamOption.ParamType.SEMANTIC.equals(paramOption.getParamType()))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
|
||||
@@ -26,13 +26,10 @@ public class ParamOption {
|
||||
* forward
|
||||
*/
|
||||
public enum ParamType {
|
||||
CUSTOM,
|
||||
SEMANTIC,
|
||||
FORWARD
|
||||
CUSTOM, SEMANTIC, FORWARD
|
||||
}
|
||||
|
||||
public enum OptionType {
|
||||
REQUIRED,
|
||||
OPTIONAL
|
||||
REQUIRED, OPTIONAL
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,40 +43,31 @@ public abstract class PluginSemanticQuery {
|
||||
protected Map<String, Object> getElementMap(PluginParseResult pluginParseResult) {
|
||||
Map<String, Object> elementValueMap = new HashMap<>();
|
||||
Map<Long, Object> filterValueMap = getFilterMap(pluginParseResult);
|
||||
List<SchemaElementMatch> schemaElementMatchList =
|
||||
parseInfo.getElementMatches().stream()
|
||||
.filter(schemaElementMatch -> schemaElementMatch.getFrequency() != null)
|
||||
.sorted(
|
||||
Comparator.comparingLong(SchemaElementMatch::getFrequency)
|
||||
.reversed())
|
||||
.collect(Collectors.toList());
|
||||
List<SchemaElementMatch> schemaElementMatchList = parseInfo.getElementMatches().stream()
|
||||
.filter(schemaElementMatch -> schemaElementMatch.getFrequency() != null)
|
||||
.sorted(Comparator.comparingLong(SchemaElementMatch::getFrequency).reversed())
|
||||
.collect(Collectors.toList());
|
||||
if (!CollectionUtils.isEmpty(schemaElementMatchList)) {
|
||||
schemaElementMatchList.stream()
|
||||
.filter(
|
||||
schemaElementMatch ->
|
||||
SchemaElementType.VALUE.equals(
|
||||
schemaElementMatch.getElement().getType())
|
||||
|| SchemaElementType.ID.equals(
|
||||
schemaElementMatch.getElement().getType()))
|
||||
schemaElementMatchList.stream().filter(schemaElementMatch -> SchemaElementType.VALUE
|
||||
.equals(schemaElementMatch.getElement().getType())
|
||||
|| SchemaElementType.ID.equals(schemaElementMatch.getElement().getType()))
|
||||
.filter(schemaElementMatch -> schemaElementMatch.getSimilarity() == 1.0)
|
||||
.forEach(
|
||||
schemaElementMatch -> {
|
||||
Object queryFilterValue =
|
||||
filterValueMap.get(schemaElementMatch.getElement().getId());
|
||||
if (queryFilterValue != null) {
|
||||
if (String.valueOf(queryFilterValue)
|
||||
.equals(String.valueOf(schemaElementMatch.getWord()))) {
|
||||
elementValueMap.put(
|
||||
String.valueOf(
|
||||
schemaElementMatch.getElement().getId()),
|
||||
schemaElementMatch.getWord());
|
||||
}
|
||||
} else {
|
||||
elementValueMap.computeIfAbsent(
|
||||
String.valueOf(schemaElementMatch.getElement().getId()),
|
||||
k -> schemaElementMatch.getWord());
|
||||
}
|
||||
});
|
||||
.forEach(schemaElementMatch -> {
|
||||
Object queryFilterValue =
|
||||
filterValueMap.get(schemaElementMatch.getElement().getId());
|
||||
if (queryFilterValue != null) {
|
||||
if (String.valueOf(queryFilterValue)
|
||||
.equals(String.valueOf(schemaElementMatch.getWord()))) {
|
||||
elementValueMap.put(
|
||||
String.valueOf(schemaElementMatch.getElement().getId()),
|
||||
schemaElementMatch.getWord());
|
||||
}
|
||||
} else {
|
||||
elementValueMap.computeIfAbsent(
|
||||
String.valueOf(schemaElementMatch.getElement().getId()),
|
||||
k -> schemaElementMatch.getWord());
|
||||
}
|
||||
});
|
||||
}
|
||||
return elementValueMap;
|
||||
}
|
||||
|
||||
@@ -41,10 +41,8 @@ public class WebPageQuery extends PluginSemanticQuery {
|
||||
QueryResult queryResult = new QueryResult();
|
||||
queryResult.setQueryMode(QUERY_MODE);
|
||||
Map<String, Object> properties = parseInfo.getProperties();
|
||||
PluginParseResult pluginParseResult =
|
||||
JsonUtil.toObject(
|
||||
JsonUtil.toString(properties.get(Constants.CONTEXT)),
|
||||
PluginParseResult.class);
|
||||
PluginParseResult pluginParseResult = JsonUtil.toObject(
|
||||
JsonUtil.toString(properties.get(Constants.CONTEXT)), PluginParseResult.class);
|
||||
WebPageResp webPageResponse = buildResponse(pluginParseResult);
|
||||
queryResult.setResponse(webPageResponse);
|
||||
queryResult.setQueryState(QueryState.SUCCESS);
|
||||
|
||||
@@ -45,10 +45,8 @@ public class WebServiceQuery extends PluginSemanticQuery {
|
||||
QueryResult queryResult = new QueryResult();
|
||||
queryResult.setQueryMode(QUERY_MODE);
|
||||
Map<String, Object> properties = parseInfo.getProperties();
|
||||
PluginParseResult pluginParseResult =
|
||||
JsonUtil.toObject(
|
||||
JsonUtil.toString(properties.get(Constants.CONTEXT)),
|
||||
PluginParseResult.class);
|
||||
PluginParseResult pluginParseResult = JsonUtil.toObject(
|
||||
JsonUtil.toString(properties.get(Constants.CONTEXT)), PluginParseResult.class);
|
||||
WebServiceResp webServiceResponse = buildResponse(pluginParseResult);
|
||||
Object object = webServiceResponse.getResult();
|
||||
// in order to show webServiceQuery result int frontend conveniently,
|
||||
@@ -74,9 +72,8 @@ public class WebServiceQuery extends PluginSemanticQuery {
|
||||
protected WebServiceResp buildResponse(PluginParseResult pluginParseResult) {
|
||||
WebServiceResp webServiceResponse = new WebServiceResp();
|
||||
ChatPlugin plugin = pluginParseResult.getPlugin();
|
||||
WebBase webBase =
|
||||
fillWebBaseResult(
|
||||
JsonUtil.toObject(plugin.getConfig(), WebBase.class), pluginParseResult);
|
||||
WebBase webBase = fillWebBaseResult(JsonUtil.toObject(plugin.getConfig(), WebBase.class),
|
||||
pluginParseResult);
|
||||
webServiceResponse.setWebBase(webBase);
|
||||
List<ParamOption> paramOptions = webBase.getParamOptions();
|
||||
Map<String, Object> params = new HashMap<>();
|
||||
|
||||
@@ -41,17 +41,16 @@ public abstract class PluginRecognizer {
|
||||
|
||||
public abstract PluginRecallResult recallPlugin(ParseContext parseContext);
|
||||
|
||||
public void buildQuery(
|
||||
ParseContext parseContext, ParseResp parseResp, PluginRecallResult pluginRecallResult) {
|
||||
public void buildQuery(ParseContext parseContext, ParseResp parseResp,
|
||||
PluginRecallResult pluginRecallResult) {
|
||||
ChatPlugin plugin = pluginRecallResult.getPlugin();
|
||||
Set<Long> dataSetIds = pluginRecallResult.getDataSetIds();
|
||||
if (plugin.isContainsAllDataSet()) {
|
||||
dataSetIds = Sets.newHashSet(-1L);
|
||||
}
|
||||
for (Long dataSetId : dataSetIds) {
|
||||
SemanticParseInfo semanticParseInfo =
|
||||
buildSemanticParseInfo(
|
||||
dataSetId, plugin, parseContext, pluginRecallResult.getDistance());
|
||||
SemanticParseInfo semanticParseInfo = buildSemanticParseInfo(dataSetId, plugin,
|
||||
parseContext, pluginRecallResult.getDistance());
|
||||
semanticParseInfo.setQueryMode(plugin.getType());
|
||||
semanticParseInfo.setScore(pluginRecallResult.getScore());
|
||||
parseResp.getSelectedParses().add(semanticParseInfo);
|
||||
@@ -62,8 +61,8 @@ public abstract class PluginRecognizer {
|
||||
return PluginManager.getPluginAgentCanSupport(parseContext);
|
||||
}
|
||||
|
||||
protected SemanticParseInfo buildSemanticParseInfo(
|
||||
Long dataSetId, ChatPlugin plugin, ParseContext parseContext, double distance) {
|
||||
protected SemanticParseInfo buildSemanticParseInfo(Long dataSetId, ChatPlugin plugin,
|
||||
ParseContext parseContext, double distance) {
|
||||
List<SchemaElementMatch> schemaElementMatches =
|
||||
parseContext.getMapInfo().getMatchedElements(dataSetId);
|
||||
QueryFilters queryFilters = parseContext.getQueryFilters();
|
||||
@@ -97,21 +96,17 @@ public abstract class PluginRecognizer {
|
||||
return;
|
||||
}
|
||||
schemaElementMatches.stream()
|
||||
.filter(
|
||||
schemaElementMatch ->
|
||||
SchemaElementType.VALUE.equals(
|
||||
schemaElementMatch.getElement().getType())
|
||||
|| SchemaElementType.ID.equals(
|
||||
schemaElementMatch.getElement().getType()))
|
||||
.forEach(
|
||||
schemaElementMatch -> {
|
||||
QueryFilter queryFilter = new QueryFilter();
|
||||
queryFilter.setValue(schemaElementMatch.getWord());
|
||||
queryFilter.setElementID(schemaElementMatch.getElement().getId());
|
||||
queryFilter.setName(schemaElementMatch.getElement().getName());
|
||||
queryFilter.setOperator(FilterOperatorEnum.EQUALS);
|
||||
queryFilter.setBizName(schemaElementMatch.getElement().getBizName());
|
||||
semanticParseInfo.getDimensionFilters().add(queryFilter);
|
||||
});
|
||||
.filter(schemaElementMatch -> SchemaElementType.VALUE
|
||||
.equals(schemaElementMatch.getElement().getType())
|
||||
|| SchemaElementType.ID.equals(schemaElementMatch.getElement().getType()))
|
||||
.forEach(schemaElementMatch -> {
|
||||
QueryFilter queryFilter = new QueryFilter();
|
||||
queryFilter.setValue(schemaElementMatch.getWord());
|
||||
queryFilter.setElementID(schemaElementMatch.getElement().getId());
|
||||
queryFilter.setName(schemaElementMatch.getElement().getName());
|
||||
queryFilter.setOperator(FilterOperatorEnum.EQUALS);
|
||||
queryFilter.setBizName(schemaElementMatch.getElement().getBizName());
|
||||
semanticParseInfo.getDimensionFilters().add(queryFilter);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,12 +53,8 @@ public class EmbeddingRecallRecognizer extends PluginRecognizer {
|
||||
plugin.setParseMode(ParseMode.EMBEDDING_RECALL);
|
||||
double similarity = embeddingRetrieval.getSimilarity();
|
||||
double score = parseContext.getQueryText().length() * similarity;
|
||||
return PluginRecallResult.builder()
|
||||
.plugin(plugin)
|
||||
.dataSetIds(dataSetList)
|
||||
.score(score)
|
||||
.distance(similarity)
|
||||
.build();
|
||||
return PluginRecallResult.builder().plugin(plugin).dataSetIds(dataSetList)
|
||||
.score(score).distance(similarity).build();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
@@ -71,12 +67,9 @@ public class EmbeddingRecallRecognizer extends PluginRecognizer {
|
||||
|
||||
List<Retrieval> embeddingRetrievals = embeddingResp.getRetrieval();
|
||||
if (!CollectionUtils.isEmpty(embeddingRetrievals)) {
|
||||
embeddingRetrievals =
|
||||
embeddingRetrievals.stream()
|
||||
.sorted(
|
||||
Comparator.comparingDouble(
|
||||
o -> Math.abs(o.getSimilarity())))
|
||||
.collect(Collectors.toList());
|
||||
embeddingRetrievals = embeddingRetrievals.stream()
|
||||
.sorted(Comparator.comparingDouble(o -> Math.abs(o.getSimilarity())))
|
||||
.collect(Collectors.toList());
|
||||
embeddingResp.setRetrieval(embeddingRetrievals);
|
||||
}
|
||||
return embeddingRetrievals;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
package com.tencent.supersonic.chat.server.processor;
|
||||
|
||||
/** A ResultProcessor wraps things up before returning results to users. */
|
||||
public interface ResultProcessor {}
|
||||
public interface ResultProcessor {
|
||||
}
|
||||
|
||||
@@ -52,28 +52,20 @@ public class DimensionRecommendProcessor implements ExecuteResultProcessor {
|
||||
List<Long> drillDownDimensions = Lists.newArrayList();
|
||||
Set<SchemaElement> metricElements = dataSetSchema.getMetrics();
|
||||
if (!CollectionUtils.isEmpty(metricElements)) {
|
||||
Optional<SchemaElement> metric =
|
||||
metricElements.stream()
|
||||
.filter(
|
||||
schemaElement ->
|
||||
metricId.equals(schemaElement.getId())
|
||||
&& !CollectionUtils.isEmpty(
|
||||
schemaElement
|
||||
.getRelatedSchemaElements()))
|
||||
.findFirst();
|
||||
Optional<SchemaElement> metric = metricElements.stream()
|
||||
.filter(schemaElement -> metricId.equals(schemaElement.getId())
|
||||
&& !CollectionUtils.isEmpty(schemaElement.getRelatedSchemaElements()))
|
||||
.findFirst();
|
||||
if (metric.isPresent()) {
|
||||
drillDownDimensions =
|
||||
metric.get().getRelatedSchemaElements().stream()
|
||||
.map(RelatedSchemaElement::getDimensionId)
|
||||
.collect(Collectors.toList());
|
||||
drillDownDimensions = metric.get().getRelatedSchemaElements().stream()
|
||||
.map(RelatedSchemaElement::getDimensionId).collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
final List<Long> drillDownDimensionsFinal = drillDownDimensions;
|
||||
return dataSetSchema.getDimensions().stream()
|
||||
.filter(dim -> filterDimension(drillDownDimensionsFinal, dim))
|
||||
.sorted(Comparator.comparing(SchemaElement::getUseCnt).reversed())
|
||||
.limit(recommend_dimension_size)
|
||||
.collect(Collectors.toList());
|
||||
.limit(recommend_dimension_size).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private boolean filterDimension(List<Long> drillDownDimensions, SchemaElement dimension) {
|
||||
|
||||
@@ -69,19 +69,14 @@ public class MetricRatioProcessor implements ExecuteResultProcessor {
|
||||
queryResult.setAggregateInfo(aggregateInfo);
|
||||
}
|
||||
|
||||
public AggregateInfo getAggregateInfo(
|
||||
User user, SemanticParseInfo semanticParseInfo, QueryResult queryResult) {
|
||||
public AggregateInfo getAggregateInfo(User user, SemanticParseInfo semanticParseInfo,
|
||||
QueryResult queryResult) {
|
||||
|
||||
Set<String> resultMetricNames = new HashSet<>();
|
||||
queryResult.getQueryColumns().stream()
|
||||
.forEach(
|
||||
c ->
|
||||
resultMetricNames.addAll(
|
||||
SqlSelectHelper.getColumnFromExpr(c.getNameEn())));
|
||||
Optional<SchemaElement> ratioMetric =
|
||||
semanticParseInfo.getMetrics().stream()
|
||||
.filter(m -> resultMetricNames.contains(m.getBizName()))
|
||||
.findFirst();
|
||||
queryResult.getQueryColumns().stream().forEach(
|
||||
c -> resultMetricNames.addAll(SqlSelectHelper.getColumnFromExpr(c.getNameEn())));
|
||||
Optional<SchemaElement> ratioMetric = semanticParseInfo.getMetrics().stream()
|
||||
.filter(m -> resultMetricNames.contains(m.getBizName())).findFirst();
|
||||
|
||||
AggregateInfo aggregateInfo = new AggregateInfo();
|
||||
if (!ratioMetric.isPresent()) {
|
||||
@@ -90,20 +85,15 @@ public class MetricRatioProcessor implements ExecuteResultProcessor {
|
||||
|
||||
try {
|
||||
String dateField = QueryReqBuilder.getDateField(semanticParseInfo.getDateInfo());
|
||||
Optional<String> lastDayOp =
|
||||
queryResult.getQueryResults().stream()
|
||||
.filter(r -> r.containsKey(dateField))
|
||||
.map(r -> r.get(dateField).toString())
|
||||
.sorted(Comparator.reverseOrder())
|
||||
.findFirst();
|
||||
Optional<String> lastDayOp = queryResult.getQueryResults().stream()
|
||||
.filter(r -> r.containsKey(dateField)).map(r -> r.get(dateField).toString())
|
||||
.sorted(Comparator.reverseOrder()).findFirst();
|
||||
|
||||
if (!lastDayOp.isPresent()) {
|
||||
return new AggregateInfo();
|
||||
}
|
||||
Optional<Map<String, Object>> lastValue =
|
||||
queryResult.getQueryResults().stream()
|
||||
.filter(r -> r.get(dateField).toString().equals(lastDayOp.get()))
|
||||
.findFirst();
|
||||
Optional<Map<String, Object>> lastValue = queryResult.getQueryResults().stream()
|
||||
.filter(r -> r.get(dateField).toString().equals(lastDayOp.get())).findFirst();
|
||||
|
||||
MetricInfo metricInfo = new MetricInfo();
|
||||
metricInfo.setStatistics(new HashMap<>());
|
||||
@@ -115,23 +105,11 @@ public class MetricRatioProcessor implements ExecuteResultProcessor {
|
||||
metricInfo.setDate(lastValue.get().get(dateField).toString());
|
||||
|
||||
CompletableFuture<MetricInfo> metricInfoRoll =
|
||||
CompletableFuture.supplyAsync(
|
||||
() ->
|
||||
queryRatio(
|
||||
user,
|
||||
semanticParseInfo,
|
||||
ratioMetric.get(),
|
||||
AggOperatorEnum.RATIO_ROLL,
|
||||
queryResult));
|
||||
CompletableFuture.supplyAsync(() -> queryRatio(user, semanticParseInfo,
|
||||
ratioMetric.get(), AggOperatorEnum.RATIO_ROLL, queryResult));
|
||||
CompletableFuture<MetricInfo> metricInfoOver =
|
||||
CompletableFuture.supplyAsync(
|
||||
() ->
|
||||
queryRatio(
|
||||
user,
|
||||
semanticParseInfo,
|
||||
ratioMetric.get(),
|
||||
AggOperatorEnum.RATIO_OVER,
|
||||
queryResult));
|
||||
CompletableFuture.supplyAsync(() -> queryRatio(user, semanticParseInfo,
|
||||
ratioMetric.get(), AggOperatorEnum.RATIO_OVER, queryResult));
|
||||
CompletableFuture.allOf(metricInfoRoll, metricInfoOver);
|
||||
metricInfo.setName(metricInfoRoll.get().getName());
|
||||
metricInfo.setValue(metricInfoRoll.get().getValue());
|
||||
@@ -145,19 +123,15 @@ public class MetricRatioProcessor implements ExecuteResultProcessor {
|
||||
}
|
||||
|
||||
@SneakyThrows
|
||||
private MetricInfo queryRatio(
|
||||
User user,
|
||||
SemanticParseInfo semanticParseInfo,
|
||||
SchemaElement metric,
|
||||
AggOperatorEnum aggOperatorEnum,
|
||||
QueryResult queryResult) {
|
||||
private MetricInfo queryRatio(User user, SemanticParseInfo semanticParseInfo,
|
||||
SchemaElement metric, AggOperatorEnum aggOperatorEnum, QueryResult queryResult) {
|
||||
|
||||
QueryStructReq queryStructReq =
|
||||
QueryReqBuilder.buildStructRatioReq(semanticParseInfo, metric, aggOperatorEnum);
|
||||
String dateField = QueryReqBuilder.getDateField(semanticParseInfo.getDateInfo());
|
||||
queryStructReq.setGroups(new ArrayList<>(Arrays.asList(dateField)));
|
||||
queryStructReq.setDateInfo(
|
||||
getRatioDateConf(aggOperatorEnum, semanticParseInfo, queryResult));
|
||||
queryStructReq
|
||||
.setDateInfo(getRatioDateConf(aggOperatorEnum, semanticParseInfo, queryResult));
|
||||
queryStructReq.setConvertToSql(false);
|
||||
SemanticLayerService queryService = ContextUtils.getBean(SemanticLayerService.class);
|
||||
SemanticQueryResp queryResp = queryService.queryByReq(queryStructReq, user);
|
||||
@@ -168,26 +142,22 @@ public class MetricRatioProcessor implements ExecuteResultProcessor {
|
||||
}
|
||||
|
||||
Map<String, Object> result = queryResp.getResultList().get(0);
|
||||
Optional<QueryColumn> valueColumn =
|
||||
queryResp.getColumns().stream()
|
||||
.filter(c -> c.getNameEn().equals(metric.getBizName()))
|
||||
.findFirst();
|
||||
Optional<QueryColumn> valueColumn = queryResp.getColumns().stream()
|
||||
.filter(c -> c.getNameEn().equals(metric.getBizName())).findFirst();
|
||||
|
||||
if (!valueColumn.isPresent()) {
|
||||
return metricInfo;
|
||||
}
|
||||
String valueField =
|
||||
String.format(
|
||||
"%s_%s", valueColumn.get().getNameEn(), aggOperatorEnum.getOperator());
|
||||
String valueField = String.format("%s_%s", valueColumn.get().getNameEn(),
|
||||
aggOperatorEnum.getOperator());
|
||||
if (result.containsKey(valueColumn.get().getNameEn())) {
|
||||
DecimalFormat df = new DecimalFormat("#.####");
|
||||
metricInfo.setValue(df.format(result.get(valueColumn.get().getNameEn())));
|
||||
}
|
||||
String ratio = "";
|
||||
if (Objects.nonNull(result.get(valueField))) {
|
||||
ratio =
|
||||
String.format("%.2f", (Double.valueOf(result.get(valueField).toString()) * 100))
|
||||
+ "%";
|
||||
ratio = String.format("%.2f", (Double.valueOf(result.get(valueField).toString()) * 100))
|
||||
+ "%";
|
||||
}
|
||||
String statisticsRollName = RatioOverType.DAY_ON_DAY.getShowName();
|
||||
String statisticsOverName = RatioOverType.WEEK_ON_DAY.getShowName();
|
||||
@@ -199,28 +169,20 @@ public class MetricRatioProcessor implements ExecuteResultProcessor {
|
||||
statisticsRollName = RatioOverType.WEEK_ON_WEEK.getShowName();
|
||||
statisticsOverName = RatioOverType.MONTH_ON_WEEK.getShowName();
|
||||
}
|
||||
metricInfo
|
||||
.getStatistics()
|
||||
.put(
|
||||
aggOperatorEnum.equals(AggOperatorEnum.RATIO_ROLL)
|
||||
? statisticsRollName
|
||||
: statisticsOverName,
|
||||
ratio);
|
||||
metricInfo.getStatistics()
|
||||
.put(aggOperatorEnum.equals(AggOperatorEnum.RATIO_ROLL) ? statisticsRollName
|
||||
: statisticsOverName, ratio);
|
||||
metricInfo.setName(metric.getName());
|
||||
return metricInfo;
|
||||
}
|
||||
|
||||
private DateConf getRatioDateConf(
|
||||
AggOperatorEnum aggOperatorEnum,
|
||||
SemanticParseInfo semanticParseInfo,
|
||||
QueryResult queryResult) {
|
||||
private DateConf getRatioDateConf(AggOperatorEnum aggOperatorEnum,
|
||||
SemanticParseInfo semanticParseInfo, QueryResult queryResult) {
|
||||
String dateField = QueryReqBuilder.getDateField(semanticParseInfo.getDateInfo());
|
||||
|
||||
Optional<String> lastDayOp =
|
||||
queryResult.getQueryResults().stream()
|
||||
.map(r -> r.get(dateField).toString())
|
||||
.sorted(Comparator.reverseOrder())
|
||||
.findFirst();
|
||||
queryResult.getQueryResults().stream().map(r -> r.get(dateField).toString())
|
||||
.sorted(Comparator.reverseOrder()).findFirst();
|
||||
|
||||
if (!lastDayOp.isPresent()) {
|
||||
return semanticParseInfo.getDateInfo();
|
||||
@@ -236,31 +198,25 @@ public class MetricRatioProcessor implements ExecuteResultProcessor {
|
||||
DateTimeFormatter formatter =
|
||||
DateUtils.getDateFormatter(lastDay, new String[] {DAY_FORMAT, DAY_FORMAT_INT});
|
||||
LocalDate end = LocalDate.parse(lastDay, formatter);
|
||||
start =
|
||||
aggOperatorEnum.equals(AggOperatorEnum.RATIO_ROLL)
|
||||
? end.minusDays(1).format(formatter)
|
||||
: end.minusWeeks(1).format(formatter);
|
||||
start = aggOperatorEnum.equals(AggOperatorEnum.RATIO_ROLL)
|
||||
? end.minusDays(1).format(formatter)
|
||||
: end.minusWeeks(1).format(formatter);
|
||||
}
|
||||
if (DatePeriodEnum.WEEK.equals(semanticParseInfo.getDateInfo().getPeriod())) {
|
||||
DateTimeFormatter formatter =
|
||||
DateUtils.getTimeFormatter(
|
||||
lastDay,
|
||||
new String[] {TIMES_FORMAT, DAY_FORMAT, TIME_FORMAT, DAY_FORMAT_INT});
|
||||
DateTimeFormatter formatter = DateUtils.getTimeFormatter(lastDay,
|
||||
new String[] {TIMES_FORMAT, DAY_FORMAT, TIME_FORMAT, DAY_FORMAT_INT});
|
||||
LocalDateTime end = LocalDateTime.parse(lastDay, formatter);
|
||||
start =
|
||||
aggOperatorEnum.equals(AggOperatorEnum.RATIO_ROLL)
|
||||
? end.minusWeeks(1).format(formatter)
|
||||
: end.minusMonths(1).with(DayOfWeek.MONDAY).format(formatter);
|
||||
start = aggOperatorEnum.equals(AggOperatorEnum.RATIO_ROLL)
|
||||
? end.minusWeeks(1).format(formatter)
|
||||
: end.minusMonths(1).with(DayOfWeek.MONDAY).format(formatter);
|
||||
}
|
||||
if (DatePeriodEnum.MONTH.equals(semanticParseInfo.getDateInfo().getPeriod())) {
|
||||
DateTimeFormatter formatter =
|
||||
DateUtils.getDateFormatter(
|
||||
lastDay, new String[] {MONTH_FORMAT, MONTH_FORMAT_INT});
|
||||
DateTimeFormatter formatter = DateUtils.getDateFormatter(lastDay,
|
||||
new String[] {MONTH_FORMAT, MONTH_FORMAT_INT});
|
||||
YearMonth end = YearMonth.parse(lastDay, formatter);
|
||||
start =
|
||||
aggOperatorEnum.equals(AggOperatorEnum.RATIO_ROLL)
|
||||
? end.minusMonths(1).format(formatter)
|
||||
: end.minusYears(1).format(formatter);
|
||||
start = aggOperatorEnum.equals(AggOperatorEnum.RATIO_ROLL)
|
||||
? end.minusMonths(1).format(formatter)
|
||||
: end.minusYears(1).format(formatter);
|
||||
}
|
||||
dayList.add(start);
|
||||
dateConf.setDateList(dayList);
|
||||
|
||||
@@ -45,33 +45,24 @@ public class MetricRecommendProcessor implements ExecuteResultProcessor {
|
||||
List<String> metricNames =
|
||||
Collections.singletonList(parseInfo.getMetrics().iterator().next().getName());
|
||||
Map<String, Object> filterCondition = new HashMap<>();
|
||||
filterCondition.put(
|
||||
"modelId", parseInfo.getMetrics().iterator().next().getDataSetId().toString());
|
||||
filterCondition.put("modelId",
|
||||
parseInfo.getMetrics().iterator().next().getDataSetId().toString());
|
||||
filterCondition.put("type", SchemaElementType.METRIC.name());
|
||||
RetrieveQuery retrieveQuery =
|
||||
RetrieveQuery.builder()
|
||||
.queryTextsList(metricNames)
|
||||
.filterCondition(filterCondition)
|
||||
.queryEmbeddings(null)
|
||||
.build();
|
||||
RetrieveQuery retrieveQuery = RetrieveQuery.builder().queryTextsList(metricNames)
|
||||
.filterCondition(filterCondition).queryEmbeddings(null).build();
|
||||
MetaEmbeddingService metaEmbeddingService =
|
||||
ContextUtils.getBean(MetaEmbeddingService.class);
|
||||
List<RetrieveQueryResult> retrieveQueryResults =
|
||||
metaEmbeddingService.retrieveQuery(
|
||||
retrieveQuery, METRIC_RECOMMEND_SIZE + 1, new HashMap<>(), new HashSet<>());
|
||||
List<RetrieveQueryResult> retrieveQueryResults = metaEmbeddingService.retrieveQuery(
|
||||
retrieveQuery, METRIC_RECOMMEND_SIZE + 1, new HashMap<>(), new HashSet<>());
|
||||
if (CollectionUtils.isEmpty(retrieveQueryResults)) {
|
||||
return;
|
||||
}
|
||||
List<Retrieval> retrievals =
|
||||
retrieveQueryResults.stream()
|
||||
.flatMap(retrieveQueryResult -> retrieveQueryResult.getRetrieval().stream())
|
||||
.sorted(Comparator.comparingDouble(Retrieval::getSimilarity))
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
Set<Long> metricIds =
|
||||
parseInfo.getMetrics().stream()
|
||||
.map(SchemaElement::getId)
|
||||
.collect(Collectors.toSet());
|
||||
List<Retrieval> retrievals = retrieveQueryResults.stream()
|
||||
.flatMap(retrieveQueryResult -> retrieveQueryResult.getRetrieval().stream())
|
||||
.sorted(Comparator.comparingDouble(Retrieval::getSimilarity)).distinct()
|
||||
.collect(Collectors.toList());
|
||||
Set<Long> metricIds = parseInfo.getMetrics().stream().map(SchemaElement::getId)
|
||||
.collect(Collectors.toSet());
|
||||
int metricOrder = 0;
|
||||
for (SchemaElement metric : parseInfo.getMetrics()) {
|
||||
metric.setOrder(metricOrder++);
|
||||
@@ -79,23 +70,15 @@ public class MetricRecommendProcessor implements ExecuteResultProcessor {
|
||||
for (Retrieval retrieval : retrievals) {
|
||||
if (!metricIds.contains(Retrieval.getLongId(retrieval.getId()))) {
|
||||
if (Objects.nonNull(retrieval.getMetadata().get("id"))) {
|
||||
String idStr =
|
||||
retrieval
|
||||
.getMetadata()
|
||||
.get("id")
|
||||
.toString()
|
||||
.replaceAll(DictWordType.NATURE_SPILT, "");
|
||||
String idStr = retrieval.getMetadata().get("id").toString()
|
||||
.replaceAll(DictWordType.NATURE_SPILT, "");
|
||||
retrieval.getMetadata().put("id", idStr);
|
||||
}
|
||||
String metaStr = JSONObject.toJSONString(retrieval.getMetadata());
|
||||
SchemaElement schemaElement = JSONObject.parseObject(metaStr, SchemaElement.class);
|
||||
if (retrieval.getMetadata().containsKey("dataSetId")) {
|
||||
String dataSetId =
|
||||
retrieval
|
||||
.getMetadata()
|
||||
.get("dataSetId")
|
||||
.toString()
|
||||
.replace(Constants.UNDERLINE, "");
|
||||
String dataSetId = retrieval.getMetadata().get("dataSetId").toString()
|
||||
.replace(Constants.UNDERLINE, "");
|
||||
schemaElement.setDataSetId(Long.parseLong(dataSetId));
|
||||
}
|
||||
schemaElement.setOrder(++metricOrder);
|
||||
|
||||
@@ -43,13 +43,8 @@ public class QueryRecommendProcessor implements ParseResultProcessor {
|
||||
String memoryCollectionName = embeddingConfig.getMemoryCollectionName(agentId);
|
||||
List<Text2SQLExemplar> exemplars =
|
||||
exemplarService.recallExemplars(memoryCollectionName, queryText, 5);
|
||||
return exemplars.stream()
|
||||
.map(
|
||||
sqlExemplar ->
|
||||
SimilarQueryRecallResp.builder()
|
||||
.queryText(sqlExemplar.getQuestion())
|
||||
.build())
|
||||
.collect(Collectors.toList());
|
||||
return exemplars.stream().map(sqlExemplar -> SimilarQueryRecallResp.builder()
|
||||
.queryText(sqlExemplar.getQuestion()).build()).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private ChatQueryDO getChatQuery(Long queryId) {
|
||||
|
||||
@@ -11,11 +11,7 @@ public class TimeCostProcessor implements ParseResultProcessor {
|
||||
@Override
|
||||
public void process(ParseContext parseContext, ParseResp parseResp) {
|
||||
long parseStartTime = parseResp.getParseTimeCost().getParseStartTime();
|
||||
parseResp
|
||||
.getParseTimeCost()
|
||||
.setParseTime(
|
||||
System.currentTimeMillis()
|
||||
- parseStartTime
|
||||
- parseResp.getParseTimeCost().getSqlTime());
|
||||
parseResp.getParseTimeCost().setParseTime(System.currentTimeMillis() - parseStartTime
|
||||
- parseResp.getParseTimeCost().getSqlTime());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,21 +26,18 @@ import java.util.Map;
|
||||
@RequestMapping({"/api/chat/agent", "/openapi/chat/agent"})
|
||||
public class AgentController {
|
||||
|
||||
@Autowired private AgentService agentService;
|
||||
@Autowired
|
||||
private AgentService agentService;
|
||||
|
||||
@PostMapping
|
||||
public Agent createAgent(
|
||||
@RequestBody Agent agent,
|
||||
HttpServletRequest httpServletRequest,
|
||||
public Agent createAgent(@RequestBody Agent agent, HttpServletRequest httpServletRequest,
|
||||
HttpServletResponse httpServletResponse) {
|
||||
User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
|
||||
return agentService.createAgent(agent, user);
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
public Agent updateAgent(
|
||||
@RequestBody Agent agent,
|
||||
HttpServletRequest httpServletRequest,
|
||||
public Agent updateAgent(@RequestBody Agent agent, HttpServletRequest httpServletRequest,
|
||||
HttpServletResponse httpServletResponse) {
|
||||
User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
|
||||
return agentService.updateAgent(agent, user);
|
||||
|
||||
@@ -29,33 +29,29 @@ import java.util.List;
|
||||
@RequestMapping({"/api/chat/conf", "/openapi/chat/conf"})
|
||||
public class ChatConfigController {
|
||||
|
||||
@Autowired private ConfigService configService;
|
||||
@Autowired
|
||||
private ConfigService configService;
|
||||
|
||||
@Autowired private SemanticLayerService semanticLayerService;
|
||||
@Autowired
|
||||
private SemanticLayerService semanticLayerService;
|
||||
|
||||
@PostMapping
|
||||
public Long addChatConfig(
|
||||
@RequestBody ChatConfigBaseReq extendBaseCmd,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
public Long addChatConfig(@RequestBody ChatConfigBaseReq extendBaseCmd,
|
||||
HttpServletRequest request, HttpServletResponse response) {
|
||||
User user = UserHolder.findUser(request, response);
|
||||
return configService.addConfig(extendBaseCmd, user);
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
public Long editModelExtend(
|
||||
@RequestBody ChatConfigEditReqReq extendEditCmd,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
public Long editModelExtend(@RequestBody ChatConfigEditReqReq extendEditCmd,
|
||||
HttpServletRequest request, HttpServletResponse response) {
|
||||
User user = UserHolder.findUser(request, response);
|
||||
return configService.editConfig(extendEditCmd, user);
|
||||
}
|
||||
|
||||
@PostMapping("/search")
|
||||
public List<ChatConfigResp> search(
|
||||
@RequestBody ChatConfigFilter filter,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
public List<ChatConfigResp> search(@RequestBody ChatConfigFilter filter,
|
||||
HttpServletRequest request, HttpServletResponse response) {
|
||||
User user = UserHolder.findUser(request, response);
|
||||
return configService.search(filter, user);
|
||||
}
|
||||
|
||||
@@ -25,14 +25,13 @@ import java.util.List;
|
||||
@RequestMapping({"/api/chat/manage", "/openapi/chat/manage"})
|
||||
public class ChatController {
|
||||
|
||||
@Autowired private ChatManageService chatService;
|
||||
@Autowired
|
||||
private ChatManageService chatService;
|
||||
|
||||
@PostMapping("/save")
|
||||
public Boolean save(
|
||||
@RequestParam(value = "chatName") String chatName,
|
||||
public Boolean save(@RequestParam(value = "chatName") String chatName,
|
||||
@RequestParam(value = "agentId", required = false) Integer agentId,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
HttpServletRequest request, HttpServletResponse response) {
|
||||
chatService.addChat(UserHolder.findUser(request, response), chatName, agentId);
|
||||
return true;
|
||||
}
|
||||
@@ -40,50 +39,42 @@ public class ChatController {
|
||||
@GetMapping("/getAll")
|
||||
public List<ChatDO> getAllConversions(
|
||||
@RequestParam(value = "agentId", required = false) Integer agentId,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
HttpServletRequest request, HttpServletResponse response) {
|
||||
String userName = UserHolder.findUser(request, response).getName();
|
||||
return chatService.getAll(userName, agentId);
|
||||
}
|
||||
|
||||
@PostMapping("/delete")
|
||||
public Boolean deleteConversion(
|
||||
@RequestParam(value = "chatId") long chatId,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
public Boolean deleteConversion(@RequestParam(value = "chatId") long chatId,
|
||||
HttpServletRequest request, HttpServletResponse response) {
|
||||
String userName = UserHolder.findUser(request, response).getName();
|
||||
return chatService.deleteChat(chatId, userName);
|
||||
}
|
||||
|
||||
@PostMapping("/updateChatName")
|
||||
public Boolean updateConversionName(
|
||||
@RequestParam(value = "chatId") Long chatId,
|
||||
@RequestParam(value = "chatName") String chatName,
|
||||
HttpServletRequest request,
|
||||
public Boolean updateConversionName(@RequestParam(value = "chatId") Long chatId,
|
||||
@RequestParam(value = "chatName") String chatName, HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
String userName = UserHolder.findUser(request, response).getName();
|
||||
return chatService.updateChatName(chatId, chatName, userName);
|
||||
}
|
||||
|
||||
@PostMapping("/updateQAFeedback")
|
||||
public Boolean updateQAFeedback(
|
||||
@RequestParam(value = "id") Integer id,
|
||||
public Boolean updateQAFeedback(@RequestParam(value = "id") Integer id,
|
||||
@RequestParam(value = "score") Integer score,
|
||||
@RequestParam(value = "feedback", required = false) String feedback) {
|
||||
return chatService.updateFeedback(id, score, feedback);
|
||||
}
|
||||
|
||||
@PostMapping("/updateChatIsTop")
|
||||
public Boolean updateConversionIsTop(
|
||||
@RequestParam(value = "chatId") Long chatId, @RequestParam(value = "isTop") int isTop) {
|
||||
public Boolean updateConversionIsTop(@RequestParam(value = "chatId") Long chatId,
|
||||
@RequestParam(value = "isTop") int isTop) {
|
||||
return chatService.updateChatIsTop(chatId, isTop);
|
||||
}
|
||||
|
||||
@PostMapping("/pageQueryInfo")
|
||||
public PageInfo<QueryResp> pageQueryInfo(
|
||||
@RequestBody PageQueryInfoReq pageQueryInfoCommand,
|
||||
@RequestParam(value = "chatId") long chatId,
|
||||
HttpServletRequest request,
|
||||
public PageInfo<QueryResp> pageQueryInfo(@RequestBody PageQueryInfoReq pageQueryInfoCommand,
|
||||
@RequestParam(value = "chatId") long chatId, HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
pageQueryInfoCommand.setUserName(UserHolder.findUser(request, response).getName());
|
||||
return chatService.queryInfo(pageQueryInfoCommand, chatId);
|
||||
@@ -95,8 +86,7 @@ public class ChatController {
|
||||
}
|
||||
|
||||
@PostMapping("/queryShowCase")
|
||||
public ShowCaseResp queryShowCase(
|
||||
@RequestBody PageQueryInfoReq pageQueryInfoCommand,
|
||||
public ShowCaseResp queryShowCase(@RequestBody PageQueryInfoReq pageQueryInfoCommand,
|
||||
@RequestParam(value = "agentId") int agentId) {
|
||||
return chatService.queryShowCase(pageQueryInfoCommand, agentId);
|
||||
}
|
||||
|
||||
@@ -27,43 +27,33 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
@RequestMapping({"/api/chat/query", "/openapi/chat/query"})
|
||||
public class ChatQueryController {
|
||||
|
||||
@Autowired private ChatQueryService chatQueryService;
|
||||
@Autowired
|
||||
private ChatQueryService chatQueryService;
|
||||
|
||||
@PostMapping("search")
|
||||
public Object search(
|
||||
@RequestBody ChatParseReq chatParseReq,
|
||||
HttpServletRequest request,
|
||||
public Object search(@RequestBody ChatParseReq chatParseReq, HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
chatParseReq.setUser(UserHolder.findUser(request, response));
|
||||
return chatQueryService.search(chatParseReq);
|
||||
}
|
||||
|
||||
@PostMapping("parse")
|
||||
public Object parse(
|
||||
@RequestBody ChatParseReq chatParseReq,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response)
|
||||
throws Exception {
|
||||
public Object parse(@RequestBody ChatParseReq chatParseReq, HttpServletRequest request,
|
||||
HttpServletResponse response) throws Exception {
|
||||
chatParseReq.setUser(UserHolder.findUser(request, response));
|
||||
return chatQueryService.performParsing(chatParseReq);
|
||||
}
|
||||
|
||||
@PostMapping("execute")
|
||||
public Object execute(
|
||||
@RequestBody ChatExecuteReq chatExecuteReq,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response)
|
||||
throws Exception {
|
||||
public Object execute(@RequestBody ChatExecuteReq chatExecuteReq, HttpServletRequest request,
|
||||
HttpServletResponse response) throws Exception {
|
||||
chatExecuteReq.setUser(UserHolder.findUser(request, response));
|
||||
return chatQueryService.performExecution(chatExecuteReq);
|
||||
}
|
||||
|
||||
@PostMapping("/")
|
||||
public Object query(
|
||||
@RequestBody ChatParseReq chatParseReq,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response)
|
||||
throws Exception {
|
||||
public Object query(@RequestBody ChatParseReq chatParseReq, HttpServletRequest request,
|
||||
HttpServletResponse response) throws Exception {
|
||||
User user = UserHolder.findUser(request, response);
|
||||
chatParseReq.setUser(user);
|
||||
ParseResp parseResp = chatQueryService.performParsing(chatParseReq);
|
||||
@@ -80,22 +70,16 @@ public class ChatQueryController {
|
||||
}
|
||||
|
||||
@PostMapping("queryData")
|
||||
public Object queryData(
|
||||
@RequestBody ChatQueryDataReq chatQueryDataReq,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response)
|
||||
throws Exception {
|
||||
public Object queryData(@RequestBody ChatQueryDataReq chatQueryDataReq,
|
||||
HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
chatQueryDataReq.setUser(UserHolder.findUser(request, response));
|
||||
return chatQueryService.queryData(chatQueryDataReq, UserHolder.findUser(request, response));
|
||||
}
|
||||
|
||||
@PostMapping("queryDimensionValue")
|
||||
public Object queryDimensionValue(
|
||||
@RequestBody @Valid DimensionValueReq dimensionValueReq,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response)
|
||||
throws Exception {
|
||||
return chatQueryService.queryDimensionValue(
|
||||
dimensionValueReq, UserHolder.findUser(request, response));
|
||||
public Object queryDimensionValue(@RequestBody @Valid DimensionValueReq dimensionValueReq,
|
||||
HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
return chatQueryService.queryDimensionValue(dimensionValueReq,
|
||||
UserHolder.findUser(request, response));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,13 +21,12 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
@RequestMapping({"/api/chat/memory"})
|
||||
public class MemoryController {
|
||||
|
||||
@Autowired private MemoryService memoryService;
|
||||
@Autowired
|
||||
private MemoryService memoryService;
|
||||
|
||||
@PostMapping("/updateMemory")
|
||||
public Boolean updateMemory(
|
||||
@RequestBody ChatMemoryUpdateReq chatMemoryUpdateReq,
|
||||
HttpServletRequest request,
|
||||
HttpServletResponse response) {
|
||||
public Boolean updateMemory(@RequestBody ChatMemoryUpdateReq chatMemoryUpdateReq,
|
||||
HttpServletRequest request, HttpServletResponse response) {
|
||||
User user = UserHolder.findUser(request, response);
|
||||
memoryService.updateMemory(chatMemoryUpdateReq, user);
|
||||
return true;
|
||||
|
||||
@@ -25,23 +25,20 @@ import java.util.List;
|
||||
@RequestMapping("/api/chat/plugin")
|
||||
public class PluginController {
|
||||
|
||||
@Autowired protected PluginService pluginService;
|
||||
@Autowired
|
||||
protected PluginService pluginService;
|
||||
|
||||
@PostMapping
|
||||
public boolean createPlugin(
|
||||
@RequestBody ChatPlugin plugin,
|
||||
HttpServletRequest httpServletRequest,
|
||||
HttpServletResponse httpServletResponse) {
|
||||
public boolean createPlugin(@RequestBody ChatPlugin plugin,
|
||||
HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
|
||||
User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
|
||||
pluginService.createPlugin(plugin, user);
|
||||
return true;
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
public boolean updatePlugin(
|
||||
@RequestBody ChatPlugin plugin,
|
||||
HttpServletRequest httpServletRequest,
|
||||
HttpServletResponse httpServletResponse) {
|
||||
public boolean updatePlugin(@RequestBody ChatPlugin plugin,
|
||||
HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
|
||||
User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
|
||||
pluginService.updatePlugin(plugin, user);
|
||||
return true;
|
||||
@@ -59,18 +56,16 @@ public class PluginController {
|
||||
}
|
||||
|
||||
@PostMapping("/query")
|
||||
List<ChatPlugin> query(
|
||||
@RequestBody PluginQueryReq pluginQueryReq,
|
||||
HttpServletRequest httpServletRequest,
|
||||
HttpServletResponse httpServletResponse) {
|
||||
List<ChatPlugin> query(@RequestBody PluginQueryReq pluginQueryReq,
|
||||
HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
|
||||
User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
|
||||
return pluginService.queryWithAuthCheck(pluginQueryReq, user);
|
||||
}
|
||||
|
||||
@AuthenticationIgnore
|
||||
@PostMapping("/pluginDemo")
|
||||
public String pluginDemo(
|
||||
@RequestParam("queryText") String queryText, @RequestBody Object object) {
|
||||
public String pluginDemo(@RequestParam("queryText") String queryText,
|
||||
@RequestBody Object object) {
|
||||
return String.format("已收到您的问题:%s, 但这只是一个demo~", queryText);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,9 +33,11 @@ import java.util.stream.Collectors;
|
||||
@Service
|
||||
public class AgentServiceImpl extends ServiceImpl<AgentDOMapper, AgentDO> implements AgentService {
|
||||
|
||||
@Autowired private MemoryService memoryService;
|
||||
@Autowired
|
||||
private MemoryService memoryService;
|
||||
|
||||
@Autowired private ChatQueryService chatQueryService;
|
||||
@Autowired
|
||||
private ChatQueryService chatQueryService;
|
||||
|
||||
private ExecutorService executorService = Executors.newFixedThreadPool(1);
|
||||
|
||||
@@ -98,8 +100,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentDOMapper, AgentDO> implem
|
||||
}
|
||||
|
||||
private synchronized void doExecuteAgentExamples(Agent agent) {
|
||||
if (!agent.containsLLMTool()
|
||||
|| !LLMConnHelper.testConnection(agent.getModelConfig())
|
||||
if (!agent.containsLLMTool() || !LLMConnHelper.testConnection(agent.getModelConfig())
|
||||
|| CollectionUtils.isEmpty(agent.getExamples())) {
|
||||
return;
|
||||
}
|
||||
@@ -107,10 +108,8 @@ public class AgentServiceImpl extends ServiceImpl<AgentDOMapper, AgentDO> implem
|
||||
List<String> examples = agent.getExamples();
|
||||
ChatMemoryFilter chatMemoryFilter =
|
||||
ChatMemoryFilter.builder().agentId(agent.getId()).questions(examples).build();
|
||||
List<String> memoriesExisted =
|
||||
memoryService.getMemories(chatMemoryFilter).stream()
|
||||
.map(ChatMemoryDO::getQuestion)
|
||||
.collect(Collectors.toList());
|
||||
List<String> memoriesExisted = memoryService.getMemories(chatMemoryFilter).stream()
|
||||
.map(ChatMemoryDO::getQuestion).collect(Collectors.toList());
|
||||
for (String example : examples) {
|
||||
if (memoriesExisted.contains(example)) {
|
||||
continue;
|
||||
|
||||
@@ -37,8 +37,10 @@ import java.util.stream.Collectors;
|
||||
@Service
|
||||
public class ChatManageServiceImpl implements ChatManageService {
|
||||
|
||||
@Autowired private ChatRepository chatRepository;
|
||||
@Autowired private ChatQueryRepository chatQueryRepository;
|
||||
@Autowired
|
||||
private ChatRepository chatRepository;
|
||||
@Autowired
|
||||
private ChatQueryRepository chatQueryRepository;
|
||||
|
||||
@Override
|
||||
public Long addChat(User user, String chatName, Integer agentId) {
|
||||
@@ -121,30 +123,23 @@ public class ChatManageServiceImpl implements ChatManageService {
|
||||
if (CollectionUtils.isEmpty(queryResps)) {
|
||||
return showCaseResp;
|
||||
}
|
||||
queryResps.removeIf(
|
||||
queryResp -> {
|
||||
if (queryResp.getQueryResult() == null) {
|
||||
return true;
|
||||
}
|
||||
if (queryResp.getQueryResult().getResponse() != null) {
|
||||
return false;
|
||||
}
|
||||
if (CollectionUtils.isEmpty(queryResp.getQueryResult().getQueryResults())) {
|
||||
return true;
|
||||
}
|
||||
Map<String, Object> data = queryResp.getQueryResult().getQueryResults().get(0);
|
||||
return CollectionUtils.isEmpty(data);
|
||||
});
|
||||
queryResps =
|
||||
new ArrayList<>(
|
||||
queryResps.stream()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
QueryResp::getQueryText,
|
||||
Function.identity(),
|
||||
(existing, replacement) -> existing,
|
||||
LinkedHashMap::new))
|
||||
.values());
|
||||
queryResps.removeIf(queryResp -> {
|
||||
if (queryResp.getQueryResult() == null) {
|
||||
return true;
|
||||
}
|
||||
if (queryResp.getQueryResult().getResponse() != null) {
|
||||
return false;
|
||||
}
|
||||
if (CollectionUtils.isEmpty(queryResp.getQueryResult().getQueryResults())) {
|
||||
return true;
|
||||
}
|
||||
Map<String, Object> data = queryResp.getQueryResult().getQueryResults().get(0);
|
||||
return CollectionUtils.isEmpty(data);
|
||||
});
|
||||
queryResps = new ArrayList<>(queryResps.stream()
|
||||
.collect(Collectors.toMap(QueryResp::getQueryText, Function.identity(),
|
||||
(existing, replacement) -> existing, LinkedHashMap::new))
|
||||
.values());
|
||||
fillParseInfo(queryResps);
|
||||
Map<Long, List<QueryResp>> showCaseMap =
|
||||
queryResps.stream().collect(Collectors.groupingBy(QueryResp::getChatId));
|
||||
@@ -166,17 +161,11 @@ public class ChatManageServiceImpl implements ChatManageService {
|
||||
if (CollectionUtils.isEmpty(chatParseDOList)) {
|
||||
continue;
|
||||
}
|
||||
List<SemanticParseInfo> parseInfos =
|
||||
chatParseDOList.stream()
|
||||
.map(
|
||||
chatParseDO ->
|
||||
JsonUtil.toObject(
|
||||
chatParseDO.getParseInfo(),
|
||||
SemanticParseInfo.class))
|
||||
.sorted(
|
||||
Comparator.comparingDouble(SemanticParseInfo::getScore)
|
||||
.reversed())
|
||||
.collect(Collectors.toList());
|
||||
List<SemanticParseInfo> parseInfos = chatParseDOList.stream()
|
||||
.map(chatParseDO -> JsonUtil.toObject(chatParseDO.getParseInfo(),
|
||||
SemanticParseInfo.class))
|
||||
.sorted(Comparator.comparingDouble(SemanticParseInfo::getScore).reversed())
|
||||
.collect(Collectors.toList());
|
||||
queryResp.setParseInfos(parseInfos);
|
||||
}
|
||||
}
|
||||
@@ -188,10 +177,8 @@ public class ChatManageServiceImpl implements ChatManageService {
|
||||
chatQueryDO.setQueryResult(JsonUtil.toString(queryResult));
|
||||
chatQueryDO.setQueryState(1);
|
||||
updateQuery(chatQueryDO);
|
||||
chatRepository.updateLastQuestion(
|
||||
chatExecuteReq.getChatId().longValue(),
|
||||
chatExecuteReq.getQueryText(),
|
||||
getCurrentTime());
|
||||
chatRepository.updateLastQuestion(chatExecuteReq.getChatId().longValue(),
|
||||
chatExecuteReq.getQueryText(), getCurrentTime());
|
||||
return chatQueryDO;
|
||||
}
|
||||
|
||||
|
||||
@@ -78,10 +78,14 @@ import java.util.stream.Collectors;
|
||||
@Service
|
||||
public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
|
||||
@Autowired private ChatManageService chatManageService;
|
||||
@Autowired private ChatLayerService chatLayerService;
|
||||
@Autowired private SemanticLayerService semanticLayerService;
|
||||
@Autowired private AgentService agentService;
|
||||
@Autowired
|
||||
private ChatManageService chatManageService;
|
||||
@Autowired
|
||||
private ChatLayerService chatLayerService;
|
||||
@Autowired
|
||||
private SemanticLayerService semanticLayerService;
|
||||
@Autowired
|
||||
private AgentService agentService;
|
||||
|
||||
private List<ChatQueryParser> chatQueryParsers = ComponentFactory.getChatParsers();
|
||||
private List<ChatQueryExecutor> chatQueryExecutors = ComponentFactory.getChatExecutors();
|
||||
@@ -149,11 +153,8 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
chatParseReq.setUser(User.getFakeUser());
|
||||
ParseResp parseResp = performParsing(chatParseReq);
|
||||
if (CollectionUtils.isEmpty(parseResp.getSelectedParses())) {
|
||||
log.debug(
|
||||
"chatId:{}, agentId:{}, queryText:{}, parseResp.getSelectedParses() is empty",
|
||||
chatId,
|
||||
agentId,
|
||||
queryText);
|
||||
log.debug("chatId:{}, agentId:{}, queryText:{}, parseResp.getSelectedParses() is empty",
|
||||
chatId, agentId, queryText);
|
||||
return null;
|
||||
}
|
||||
ChatExecuteReq executeReq = new ChatExecuteReq();
|
||||
@@ -184,9 +185,8 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
private ExecuteContext buildExecuteContext(ChatExecuteReq chatExecuteReq) {
|
||||
ExecuteContext executeContext = new ExecuteContext();
|
||||
BeanMapper.mapper(chatExecuteReq, executeContext);
|
||||
SemanticParseInfo parseInfo =
|
||||
chatManageService.getParseInfo(
|
||||
chatExecuteReq.getQueryId(), chatExecuteReq.getParseId());
|
||||
SemanticParseInfo parseInfo = chatManageService.getParseInfo(chatExecuteReq.getQueryId(),
|
||||
chatExecuteReq.getParseId());
|
||||
Agent agent = agentService.getAgent(chatExecuteReq.getAgentId());
|
||||
executeContext.setAgent(agent);
|
||||
executeContext.setParseInfo(parseInfo);
|
||||
@@ -222,12 +222,8 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
return SqlSelectHelper.getAllSelectFields(sqlInfo.getCorrectedS2SQL());
|
||||
}
|
||||
|
||||
private void handleLLMQueryMode(
|
||||
ChatQueryDataReq chatQueryDataReq,
|
||||
SemanticQuery semanticQuery,
|
||||
DataSetSchema dataSetSchema,
|
||||
User user)
|
||||
throws Exception {
|
||||
private void handleLLMQueryMode(ChatQueryDataReq chatQueryDataReq, SemanticQuery semanticQuery,
|
||||
DataSetSchema dataSetSchema, User user) throws Exception {
|
||||
SemanticParseInfo parseInfo = semanticQuery.getParseInfo();
|
||||
List<String> fields = getFieldsFromSql(parseInfo);
|
||||
if (checkMetricReplace(fields, chatQueryDataReq.getMetrics())) {
|
||||
@@ -245,16 +241,16 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
}
|
||||
}
|
||||
|
||||
private void handleRuleQueryMode(
|
||||
SemanticQuery semanticQuery, DataSetSchema dataSetSchema, User user) {
|
||||
private void handleRuleQueryMode(SemanticQuery semanticQuery, DataSetSchema dataSetSchema,
|
||||
User user) {
|
||||
log.info("rule begin replace metrics and revise filters!");
|
||||
validFilter(semanticQuery.getParseInfo().getDimensionFilters());
|
||||
validFilter(semanticQuery.getParseInfo().getMetricFilters());
|
||||
semanticQuery.initS2Sql(dataSetSchema, user);
|
||||
}
|
||||
|
||||
private QueryResult executeQuery(
|
||||
SemanticQuery semanticQuery, User user, DataSetSchema dataSetSchema) throws Exception {
|
||||
private QueryResult executeQuery(SemanticQuery semanticQuery, User user,
|
||||
DataSetSchema dataSetSchema) throws Exception {
|
||||
SemanticQueryReq semanticQueryReq = semanticQuery.buildSemanticQueryReq();
|
||||
SemanticParseInfo parseInfo = semanticQuery.getParseInfo();
|
||||
QueryResult queryResult = doExecution(semanticQueryReq, parseInfo.getQueryMode(), user);
|
||||
@@ -275,8 +271,8 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
return !oriFields.containsAll(metricNames);
|
||||
}
|
||||
|
||||
private String reviseCorrectS2SQL(
|
||||
ChatQueryDataReq queryData, SemanticParseInfo parseInfo, DataSetSchema dataSetSchema) {
|
||||
private String reviseCorrectS2SQL(ChatQueryDataReq queryData, SemanticParseInfo parseInfo,
|
||||
DataSetSchema dataSetSchema) {
|
||||
String correctorSql = parseInfo.getSqlInfo().getCorrectedS2SQL();
|
||||
log.info("correctorSql before replacing:{}", correctorSql);
|
||||
// get where filter and having filter
|
||||
@@ -286,21 +282,12 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
// replace where filter
|
||||
List<Expression> addWhereConditions = new ArrayList<>();
|
||||
Set<String> removeWhereFieldNames =
|
||||
updateFilters(
|
||||
whereExpressionList,
|
||||
queryData.getDimensionFilters(),
|
||||
parseInfo.getDimensionFilters(),
|
||||
addWhereConditions);
|
||||
updateFilters(whereExpressionList, queryData.getDimensionFilters(),
|
||||
parseInfo.getDimensionFilters(), addWhereConditions);
|
||||
|
||||
Map<String, Map<String, String>> filedNameToValueMap = new HashMap<>();
|
||||
Set<String> removeDataFieldNames =
|
||||
updateDateInfo(
|
||||
queryData,
|
||||
parseInfo,
|
||||
dataSetSchema,
|
||||
filedNameToValueMap,
|
||||
whereExpressionList,
|
||||
addWhereConditions);
|
||||
Set<String> removeDataFieldNames = updateDateInfo(queryData, parseInfo, dataSetSchema,
|
||||
filedNameToValueMap, whereExpressionList, addWhereConditions);
|
||||
removeWhereFieldNames.addAll(removeDataFieldNames);
|
||||
|
||||
correctorSql = SqlReplaceHelper.replaceValue(correctorSql, filedNameToValueMap);
|
||||
@@ -311,11 +298,8 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
SqlSelectHelper.getHavingExpressions(correctorSql);
|
||||
List<Expression> addHavingConditions = new ArrayList<>();
|
||||
Set<String> removeHavingFieldNames =
|
||||
updateFilters(
|
||||
havingExpressionList,
|
||||
queryData.getDimensionFilters(),
|
||||
parseInfo.getDimensionFilters(),
|
||||
addHavingConditions);
|
||||
updateFilters(havingExpressionList, queryData.getDimensionFilters(),
|
||||
parseInfo.getDimensionFilters(), addHavingConditions);
|
||||
correctorSql = SqlReplaceHelper.replaceHavingValue(correctorSql, new HashMap<>());
|
||||
correctorSql = SqlRemoveHelper.removeHavingCondition(correctorSql, removeHavingFieldNames);
|
||||
|
||||
@@ -326,10 +310,8 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
}
|
||||
|
||||
private void replaceMetrics(SemanticParseInfo parseInfo, SchemaElement metric) {
|
||||
List<String> oriMetrics =
|
||||
parseInfo.getMetrics().stream()
|
||||
.map(SchemaElement::getName)
|
||||
.collect(Collectors.toList());
|
||||
List<String> oriMetrics = parseInfo.getMetrics().stream().map(SchemaElement::getName)
|
||||
.collect(Collectors.toList());
|
||||
String correctorSql = parseInfo.getSqlInfo().getCorrectedS2SQL();
|
||||
log.info("before replaceMetrics:{}", correctorSql);
|
||||
log.info("filteredMetrics:{},metrics:{}", oriMetrics, metric);
|
||||
@@ -362,20 +344,15 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
return queryResult;
|
||||
}
|
||||
|
||||
private Set<String> updateDateInfo(
|
||||
ChatQueryDataReq queryData,
|
||||
SemanticParseInfo parseInfo,
|
||||
DataSetSchema dataSetSchema,
|
||||
Map<String, Map<String, String>> filedNameToValueMap,
|
||||
List<FieldExpression> fieldExpressionList,
|
||||
List<Expression> addConditions) {
|
||||
private Set<String> updateDateInfo(ChatQueryDataReq queryData, SemanticParseInfo parseInfo,
|
||||
DataSetSchema dataSetSchema, Map<String, Map<String, String>> filedNameToValueMap,
|
||||
List<FieldExpression> fieldExpressionList, List<Expression> addConditions) {
|
||||
Set<String> removeFieldNames = new HashSet<>();
|
||||
if (Objects.isNull(queryData.getDateInfo())) {
|
||||
return removeFieldNames;
|
||||
}
|
||||
if (queryData.getDateInfo().getUnit() > 1) {
|
||||
queryData
|
||||
.getDateInfo()
|
||||
queryData.getDateInfo()
|
||||
.setStartDate(DateUtils.getBeforeDate(queryData.getDateInfo().getUnit() + 1));
|
||||
queryData.getDateInfo().setEndDate(DateUtils.getBeforeDate(0));
|
||||
}
|
||||
@@ -386,16 +363,10 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
// first remove,then add
|
||||
removeFieldNames.add(partitionDimension.getName());
|
||||
GreaterThanEquals greaterThanEquals = new GreaterThanEquals();
|
||||
addTimeFilters(
|
||||
queryData.getDateInfo().getStartDate(),
|
||||
greaterThanEquals,
|
||||
addConditions,
|
||||
partitionDimension);
|
||||
addTimeFilters(queryData.getDateInfo().getStartDate(), greaterThanEquals,
|
||||
addConditions, partitionDimension);
|
||||
MinorThanEquals minorThanEquals = new MinorThanEquals();
|
||||
addTimeFilters(
|
||||
queryData.getDateInfo().getEndDate(),
|
||||
minorThanEquals,
|
||||
addConditions,
|
||||
addTimeFilters(queryData.getDateInfo().getEndDate(), minorThanEquals, addConditions,
|
||||
partitionDimension);
|
||||
break;
|
||||
}
|
||||
@@ -403,8 +374,7 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
for (FieldExpression fieldExpression : fieldExpressionList) {
|
||||
for (QueryFilter queryFilter : queryData.getDimensionFilters()) {
|
||||
if (queryFilter.getOperator().equals(FilterOperatorEnum.LIKE)
|
||||
&& FilterOperatorEnum.LIKE
|
||||
.getValue()
|
||||
&& FilterOperatorEnum.LIKE.getValue()
|
||||
.equalsIgnoreCase(fieldExpression.getOperator())) {
|
||||
Map<String, String> replaceMap = new HashMap<>();
|
||||
String preValue = fieldExpression.getFieldValue().toString();
|
||||
@@ -425,11 +395,8 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
return removeFieldNames;
|
||||
}
|
||||
|
||||
private <T extends ComparisonOperator> void addTimeFilters(
|
||||
String date,
|
||||
T comparisonExpression,
|
||||
List<Expression> addConditions,
|
||||
SchemaElement partitionDimension) {
|
||||
private <T extends ComparisonOperator> void addTimeFilters(String date, T comparisonExpression,
|
||||
List<Expression> addConditions, SchemaElement partitionDimension) {
|
||||
Column column = new Column(partitionDimension.getName());
|
||||
StringValue stringValue = new StringValue(date);
|
||||
comparisonExpression.setLeftExpression(column);
|
||||
@@ -437,10 +404,8 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
addConditions.add(comparisonExpression);
|
||||
}
|
||||
|
||||
private Set<String> updateFilters(
|
||||
List<FieldExpression> fieldExpressionList,
|
||||
Set<QueryFilter> metricFilters,
|
||||
Set<QueryFilter> contextMetricFilters,
|
||||
private Set<String> updateFilters(List<FieldExpression> fieldExpressionList,
|
||||
Set<QueryFilter> metricFilters, Set<QueryFilter> contextMetricFilters,
|
||||
List<Expression> addConditions) {
|
||||
Set<String> removeFieldNames = new HashSet<>();
|
||||
if (CollectionUtils.isEmpty(metricFilters)) {
|
||||
@@ -460,15 +425,13 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
return removeFieldNames;
|
||||
}
|
||||
|
||||
private void handleFilter(
|
||||
QueryFilter dslQueryFilter,
|
||||
Set<QueryFilter> contextMetricFilters,
|
||||
private void handleFilter(QueryFilter dslQueryFilter, Set<QueryFilter> contextMetricFilters,
|
||||
List<Expression> addConditions) {
|
||||
FilterOperatorEnum operator = dslQueryFilter.getOperator();
|
||||
|
||||
if (operator == FilterOperatorEnum.IN) {
|
||||
addWhereInFilters(
|
||||
dslQueryFilter, new InExpression(), contextMetricFilters, addConditions);
|
||||
addWhereInFilters(dslQueryFilter, new InExpression(), contextMetricFilters,
|
||||
addConditions);
|
||||
} else {
|
||||
ComparisonOperator expression = FilterOperatorEnum.createExpression(operator);
|
||||
if (Objects.nonNull(expression)) {
|
||||
@@ -477,12 +440,9 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
}
|
||||
}
|
||||
|
||||
// add in condition to sql where condition
|
||||
private void addWhereInFilters(
|
||||
QueryFilter dslQueryFilter,
|
||||
InExpression inExpression,
|
||||
Set<QueryFilter> contextMetricFilters,
|
||||
List<Expression> addConditions) {
|
||||
// add in condition to sql where condition
|
||||
private void addWhereInFilters(QueryFilter dslQueryFilter, InExpression inExpression,
|
||||
Set<QueryFilter> contextMetricFilters, List<Expression> addConditions) {
|
||||
Column column = new Column(dslQueryFilter.getName());
|
||||
ParenthesedExpressionList parenthesedExpressionList = new ParenthesedExpressionList<>();
|
||||
List<String> valueList =
|
||||
@@ -490,30 +450,24 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
if (CollectionUtils.isEmpty(valueList)) {
|
||||
return;
|
||||
}
|
||||
valueList.stream()
|
||||
.forEach(
|
||||
o -> {
|
||||
StringValue stringValue = new StringValue(o);
|
||||
parenthesedExpressionList.add(stringValue);
|
||||
});
|
||||
valueList.stream().forEach(o -> {
|
||||
StringValue stringValue = new StringValue(o);
|
||||
parenthesedExpressionList.add(stringValue);
|
||||
});
|
||||
inExpression.setLeftExpression(column);
|
||||
inExpression.setRightExpression(parenthesedExpressionList);
|
||||
addConditions.add(inExpression);
|
||||
contextMetricFilters.stream()
|
||||
.forEach(
|
||||
o -> {
|
||||
if (o.getName().equals(dslQueryFilter.getName())) {
|
||||
o.setValue(dslQueryFilter.getValue());
|
||||
o.setOperator(dslQueryFilter.getOperator());
|
||||
}
|
||||
});
|
||||
contextMetricFilters.stream().forEach(o -> {
|
||||
if (o.getName().equals(dslQueryFilter.getName())) {
|
||||
o.setValue(dslQueryFilter.getValue());
|
||||
o.setOperator(dslQueryFilter.getOperator());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// add where filter
|
||||
private void addWhereFilters(
|
||||
QueryFilter dslQueryFilter,
|
||||
ComparisonOperator comparisonExpression,
|
||||
Set<QueryFilter> contextMetricFilters,
|
||||
private void addWhereFilters(QueryFilter dslQueryFilter,
|
||||
ComparisonOperator comparisonExpression, Set<QueryFilter> contextMetricFilters,
|
||||
List<Expression> addConditions) {
|
||||
String columnName = dslQueryFilter.getName();
|
||||
if (StringUtils.isNotBlank(dslQueryFilter.getFunction())) {
|
||||
@@ -533,18 +487,16 @@ public class ChatQueryServiceImpl implements ChatQueryService {
|
||||
comparisonExpression.setRightExpression(stringValue);
|
||||
}
|
||||
addConditions.add(comparisonExpression);
|
||||
contextMetricFilters.stream()
|
||||
.forEach(
|
||||
o -> {
|
||||
if (o.getName().equals(dslQueryFilter.getName())) {
|
||||
o.setValue(dslQueryFilter.getValue());
|
||||
o.setOperator(dslQueryFilter.getOperator());
|
||||
}
|
||||
});
|
||||
contextMetricFilters.stream().forEach(o -> {
|
||||
if (o.getName().equals(dslQueryFilter.getName())) {
|
||||
o.setValue(dslQueryFilter.getValue());
|
||||
o.setOperator(dslQueryFilter.getOperator());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private SemanticParseInfo mergeParseInfo(
|
||||
SemanticParseInfo parseInfo, ChatQueryDataReq queryData) {
|
||||
private SemanticParseInfo mergeParseInfo(SemanticParseInfo parseInfo,
|
||||
ChatQueryDataReq queryData) {
|
||||
if (LLMSqlQuery.QUERY_MODE.equals(parseInfo.getQueryMode())) {
|
||||
return parseInfo;
|
||||
}
|
||||
|
||||
@@ -51,10 +51,8 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
private final ChatConfigHelper chatConfigHelper;
|
||||
private final SemanticLayerService semanticLayerService;
|
||||
|
||||
public ConfigServiceImpl(
|
||||
ChatConfigRepository chatConfigRepository,
|
||||
ChatConfigHelper chatConfigHelper,
|
||||
SemanticLayerService semanticLayerService) {
|
||||
public ConfigServiceImpl(ChatConfigRepository chatConfigRepository,
|
||||
ChatConfigHelper chatConfigHelper, SemanticLayerService semanticLayerService) {
|
||||
this.chatConfigRepository = chatConfigRepository;
|
||||
this.chatConfigHelper = chatConfigHelper;
|
||||
this.semanticLayerService = semanticLayerService;
|
||||
@@ -80,9 +78,8 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
@Override
|
||||
public Long editConfig(ChatConfigEditReqReq configEditCmd, User user) {
|
||||
log.info("[edit model extend] object:{}", JsonUtil.toString(configEditCmd, true));
|
||||
if (Objects.isNull(configEditCmd)
|
||||
|| Objects.isNull(configEditCmd.getId())
|
||||
&& Objects.isNull(configEditCmd.getModelId())) {
|
||||
if (Objects.isNull(configEditCmd) || Objects.isNull(configEditCmd.getId())
|
||||
&& Objects.isNull(configEditCmd.getModelId())) {
|
||||
throw new RuntimeException(
|
||||
"editConfig, id and modelId are not allowed to be empty at the same time");
|
||||
}
|
||||
@@ -107,13 +104,13 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
List<Long> blackDimIdList = new ArrayList<>();
|
||||
if (Objects.nonNull(chatConfig.getChatAggConfig())
|
||||
&& Objects.nonNull(chatConfig.getChatAggConfig().getVisibility())) {
|
||||
blackDimIdList.addAll(
|
||||
chatConfig.getChatAggConfig().getVisibility().getBlackDimIdList());
|
||||
blackDimIdList
|
||||
.addAll(chatConfig.getChatAggConfig().getVisibility().getBlackDimIdList());
|
||||
}
|
||||
if (Objects.nonNull(chatConfig.getChatDetailConfig())
|
||||
&& Objects.nonNull(chatConfig.getChatDetailConfig().getVisibility())) {
|
||||
blackDimIdList.addAll(
|
||||
chatConfig.getChatDetailConfig().getVisibility().getBlackDimIdList());
|
||||
blackDimIdList
|
||||
.addAll(chatConfig.getChatDetailConfig().getVisibility().getBlackDimIdList());
|
||||
}
|
||||
List<Long> filterDimIdList =
|
||||
blackDimIdList.stream().distinct().collect(Collectors.toList());
|
||||
@@ -121,8 +118,8 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
List<Long> blackMetricIdList = new ArrayList<>();
|
||||
if (Objects.nonNull(chatConfig.getChatAggConfig())
|
||||
&& Objects.nonNull(chatConfig.getChatAggConfig().getVisibility())) {
|
||||
blackMetricIdList.addAll(
|
||||
chatConfig.getChatAggConfig().getVisibility().getBlackMetricIdList());
|
||||
blackMetricIdList
|
||||
.addAll(chatConfig.getChatAggConfig().getVisibility().getBlackMetricIdList());
|
||||
}
|
||||
if (Objects.nonNull(chatConfig.getChatDetailConfig())
|
||||
&& Objects.nonNull(chatConfig.getChatDetailConfig().getVisibility())) {
|
||||
@@ -138,20 +135,16 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
if (!CollectionUtils.isEmpty(blackDimIdList)) {
|
||||
List<DimensionResp> dimensionRespList = semanticLayerService.getDimensions(metaFilter);
|
||||
List<String> blackDimNameList =
|
||||
dimensionRespList.stream()
|
||||
.filter(o -> filterDimIdList.contains(o.getId()))
|
||||
.map(SchemaItem::getName)
|
||||
.collect(Collectors.toList());
|
||||
dimensionRespList.stream().filter(o -> filterDimIdList.contains(o.getId()))
|
||||
.map(SchemaItem::getName).collect(Collectors.toList());
|
||||
itemNameVisibility.setBlackDimNameList(blackDimNameList);
|
||||
}
|
||||
if (!CollectionUtils.isEmpty(blackMetricIdList)) {
|
||||
|
||||
List<MetricResp> metricRespList = semanticLayerService.getMetrics(metaFilter);
|
||||
List<String> blackMetricList =
|
||||
metricRespList.stream()
|
||||
.filter(o -> filterMetricIdList.contains(o.getId()))
|
||||
.map(SchemaItem::getName)
|
||||
.collect(Collectors.toList());
|
||||
metricRespList.stream().filter(o -> filterMetricIdList.contains(o.getId()))
|
||||
.map(SchemaItem::getName).collect(Collectors.toList());
|
||||
itemNameVisibility.setBlackMetricNameList(blackMetricList);
|
||||
}
|
||||
return itemNameVisibility;
|
||||
@@ -169,8 +162,8 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
return chatConfigRepository.getConfigByModelId(modelId);
|
||||
}
|
||||
|
||||
private ItemVisibilityInfo fetchVisibilityDescByConfig(
|
||||
ItemVisibility visibility, DataSetSchema modelSchema) {
|
||||
private ItemVisibilityInfo fetchVisibilityDescByConfig(ItemVisibility visibility,
|
||||
DataSetSchema modelSchema) {
|
||||
ItemVisibilityInfo itemVisibilityDesc = new ItemVisibilityInfo();
|
||||
|
||||
List<Long> dimIdAllList = chatConfigHelper.generateAllDimIdList(modelSchema);
|
||||
@@ -186,17 +179,12 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
blackMetricIdList.addAll(visibility.getBlackMetricIdList());
|
||||
}
|
||||
}
|
||||
List<Long> whiteMetricIdList =
|
||||
metricIdAllList.stream()
|
||||
.filter(
|
||||
id ->
|
||||
!blackMetricIdList.contains(id)
|
||||
&& metricIdAllList.contains(id))
|
||||
.collect(Collectors.toList());
|
||||
List<Long> whiteDimIdList =
|
||||
dimIdAllList.stream()
|
||||
.filter(id -> !blackDimIdList.contains(id) && dimIdAllList.contains(id))
|
||||
.collect(Collectors.toList());
|
||||
List<Long> whiteMetricIdList = metricIdAllList.stream()
|
||||
.filter(id -> !blackMetricIdList.contains(id) && metricIdAllList.contains(id))
|
||||
.collect(Collectors.toList());
|
||||
List<Long> whiteDimIdList = dimIdAllList.stream()
|
||||
.filter(id -> !blackDimIdList.contains(id) && dimIdAllList.contains(id))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
itemVisibilityDesc.setBlackDimIdList(blackDimIdList);
|
||||
itemVisibilityDesc.setBlackMetricIdList(blackMetricIdList);
|
||||
@@ -232,10 +220,8 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
return chatConfigRich;
|
||||
}
|
||||
|
||||
private ChatDetailRichConfigResp fillChatDetailRichConfig(
|
||||
DataSetSchema modelSchema,
|
||||
ChatConfigRichResp chatConfigRich,
|
||||
ChatConfigResp chatConfigResp) {
|
||||
private ChatDetailRichConfigResp fillChatDetailRichConfig(DataSetSchema modelSchema,
|
||||
ChatConfigRichResp chatConfigRich, ChatConfigResp chatConfigResp) {
|
||||
if (Objects.isNull(chatConfigResp)
|
||||
|| Objects.isNull(chatConfigResp.getChatDetailConfig())) {
|
||||
return null;
|
||||
@@ -248,9 +234,8 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
detailRichConfig.setKnowledgeInfos(
|
||||
fillKnowledgeBizName(chatDetailConfig.getKnowledgeInfos(), modelSchema));
|
||||
detailRichConfig.setGlobalKnowledgeConfig(chatDetailConfig.getGlobalKnowledgeConfig());
|
||||
detailRichConfig.setChatDefaultConfig(
|
||||
fetchDefaultConfig(
|
||||
chatDetailConfig.getChatDefaultConfig(), modelSchema, itemVisibilityInfo));
|
||||
detailRichConfig.setChatDefaultConfig(fetchDefaultConfig(
|
||||
chatDetailConfig.getChatDefaultConfig(), modelSchema, itemVisibilityInfo));
|
||||
|
||||
return detailRichConfig;
|
||||
}
|
||||
@@ -261,18 +246,15 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
return entityRichInfo;
|
||||
}
|
||||
BeanUtils.copyProperties(entity, entityRichInfo);
|
||||
Map<Long, SchemaElement> dimIdAndRespPair =
|
||||
modelSchema.getDimensions().stream()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
SchemaElement::getId, Function.identity(), (k1, k2) -> k1));
|
||||
Map<Long, SchemaElement> dimIdAndRespPair = modelSchema.getDimensions().stream().collect(
|
||||
Collectors.toMap(SchemaElement::getId, Function.identity(), (k1, k2) -> k1));
|
||||
|
||||
entityRichInfo.setDimItem(dimIdAndRespPair.get(entity.getEntityId()));
|
||||
return entityRichInfo;
|
||||
}
|
||||
|
||||
private ChatAggRichConfigResp fillChatAggRichConfig(
|
||||
DataSetSchema modelSchema, ChatConfigResp chatConfigResp) {
|
||||
private ChatAggRichConfigResp fillChatAggRichConfig(DataSetSchema modelSchema,
|
||||
ChatConfigResp chatConfigResp) {
|
||||
if (Objects.isNull(chatConfigResp) || Objects.isNull(chatConfigResp.getChatAggConfig())) {
|
||||
return null;
|
||||
}
|
||||
@@ -284,72 +266,53 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
chatAggRichConfig.setKnowledgeInfos(
|
||||
fillKnowledgeBizName(chatAggConfig.getKnowledgeInfos(), modelSchema));
|
||||
chatAggRichConfig.setGlobalKnowledgeConfig(chatAggConfig.getGlobalKnowledgeConfig());
|
||||
chatAggRichConfig.setChatDefaultConfig(
|
||||
fetchDefaultConfig(
|
||||
chatAggConfig.getChatDefaultConfig(), modelSchema, itemVisibilityInfo));
|
||||
chatAggRichConfig.setChatDefaultConfig(fetchDefaultConfig(
|
||||
chatAggConfig.getChatDefaultConfig(), modelSchema, itemVisibilityInfo));
|
||||
|
||||
return chatAggRichConfig;
|
||||
}
|
||||
|
||||
private ChatDefaultRichConfigResp fetchDefaultConfig(
|
||||
ChatDefaultConfigReq chatDefaultConfig,
|
||||
DataSetSchema modelSchema,
|
||||
ItemVisibilityInfo itemVisibilityInfo) {
|
||||
private ChatDefaultRichConfigResp fetchDefaultConfig(ChatDefaultConfigReq chatDefaultConfig,
|
||||
DataSetSchema modelSchema, ItemVisibilityInfo itemVisibilityInfo) {
|
||||
ChatDefaultRichConfigResp defaultRichConfig = new ChatDefaultRichConfigResp();
|
||||
if (Objects.isNull(chatDefaultConfig)) {
|
||||
return defaultRichConfig;
|
||||
}
|
||||
BeanUtils.copyProperties(chatDefaultConfig, defaultRichConfig);
|
||||
Map<Long, SchemaElement> dimIdAndRespPair =
|
||||
modelSchema.getDimensions().stream()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
SchemaElement::getId, Function.identity(), (k1, k2) -> k1));
|
||||
Map<Long, SchemaElement> dimIdAndRespPair = modelSchema.getDimensions().stream().collect(
|
||||
Collectors.toMap(SchemaElement::getId, Function.identity(), (k1, k2) -> k1));
|
||||
|
||||
Map<Long, SchemaElement> metricIdAndRespPair =
|
||||
modelSchema.getMetrics().stream()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
SchemaElement::getId, Function.identity(), (k1, k2) -> k1));
|
||||
Map<Long, SchemaElement> metricIdAndRespPair = modelSchema.getMetrics().stream().collect(
|
||||
Collectors.toMap(SchemaElement::getId, Function.identity(), (k1, k2) -> k1));
|
||||
|
||||
List<SchemaElement> dimensions = new ArrayList<>();
|
||||
List<SchemaElement> metrics = new ArrayList<>();
|
||||
if (!CollectionUtils.isEmpty(chatDefaultConfig.getDimensionIds())) {
|
||||
chatDefaultConfig.getDimensionIds().stream()
|
||||
.filter(
|
||||
dimId ->
|
||||
dimIdAndRespPair.containsKey(dimId)
|
||||
&& itemVisibilityInfo
|
||||
.getWhiteDimIdList()
|
||||
.contains(dimId))
|
||||
.forEach(
|
||||
dimId -> {
|
||||
SchemaElement dimSchemaResp = dimIdAndRespPair.get(dimId);
|
||||
if (Objects.nonNull(dimSchemaResp)) {
|
||||
SchemaElement dimSchema = new SchemaElement();
|
||||
BeanUtils.copyProperties(dimSchemaResp, dimSchema);
|
||||
dimensions.add(dimSchema);
|
||||
}
|
||||
});
|
||||
.filter(dimId -> dimIdAndRespPair.containsKey(dimId)
|
||||
&& itemVisibilityInfo.getWhiteDimIdList().contains(dimId))
|
||||
.forEach(dimId -> {
|
||||
SchemaElement dimSchemaResp = dimIdAndRespPair.get(dimId);
|
||||
if (Objects.nonNull(dimSchemaResp)) {
|
||||
SchemaElement dimSchema = new SchemaElement();
|
||||
BeanUtils.copyProperties(dimSchemaResp, dimSchema);
|
||||
dimensions.add(dimSchema);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (!CollectionUtils.isEmpty(chatDefaultConfig.getMetricIds())) {
|
||||
chatDefaultConfig.getMetricIds().stream()
|
||||
.filter(
|
||||
metricId ->
|
||||
metricIdAndRespPair.containsKey(metricId)
|
||||
&& itemVisibilityInfo
|
||||
.getWhiteMetricIdList()
|
||||
.contains(metricId))
|
||||
.forEach(
|
||||
metricId -> {
|
||||
SchemaElement metricSchemaResp = metricIdAndRespPair.get(metricId);
|
||||
if (Objects.nonNull(metricSchemaResp)) {
|
||||
SchemaElement metricSchema = new SchemaElement();
|
||||
BeanUtils.copyProperties(metricSchemaResp, metricSchema);
|
||||
metrics.add(metricSchema);
|
||||
}
|
||||
});
|
||||
.filter(metricId -> metricIdAndRespPair.containsKey(metricId)
|
||||
&& itemVisibilityInfo.getWhiteMetricIdList().contains(metricId))
|
||||
.forEach(metricId -> {
|
||||
SchemaElement metricSchemaResp = metricIdAndRespPair.get(metricId);
|
||||
if (Objects.nonNull(metricSchemaResp)) {
|
||||
SchemaElement metricSchema = new SchemaElement();
|
||||
BeanUtils.copyProperties(metricSchemaResp, metricSchema);
|
||||
metrics.add(metricSchema);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
defaultRichConfig.setDimensions(dimensions);
|
||||
@@ -357,27 +320,21 @@ public class ConfigServiceImpl implements ConfigService {
|
||||
return defaultRichConfig;
|
||||
}
|
||||
|
||||
private List<KnowledgeInfoReq> fillKnowledgeBizName(
|
||||
List<KnowledgeInfoReq> knowledgeInfos, DataSetSchema modelSchema) {
|
||||
private List<KnowledgeInfoReq> fillKnowledgeBizName(List<KnowledgeInfoReq> knowledgeInfos,
|
||||
DataSetSchema modelSchema) {
|
||||
if (CollectionUtils.isEmpty(knowledgeInfos)) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
Map<Long, SchemaElement> dimIdAndRespPair =
|
||||
modelSchema.getDimensions().stream()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
SchemaElement::getId, Function.identity(), (k1, k2) -> k1));
|
||||
knowledgeInfos.stream()
|
||||
.forEach(
|
||||
knowledgeInfo -> {
|
||||
if (Objects.nonNull(knowledgeInfo)) {
|
||||
SchemaElement dimSchemaResp =
|
||||
dimIdAndRespPair.get(knowledgeInfo.getItemId());
|
||||
if (Objects.nonNull(dimSchemaResp)) {
|
||||
knowledgeInfo.setBizName(dimSchemaResp.getBizName());
|
||||
}
|
||||
}
|
||||
});
|
||||
Map<Long, SchemaElement> dimIdAndRespPair = modelSchema.getDimensions().stream().collect(
|
||||
Collectors.toMap(SchemaElement::getId, Function.identity(), (k1, k2) -> k1));
|
||||
knowledgeInfos.stream().forEach(knowledgeInfo -> {
|
||||
if (Objects.nonNull(knowledgeInfo)) {
|
||||
SchemaElement dimSchemaResp = dimIdAndRespPair.get(knowledgeInfo.getItemId());
|
||||
if (Objects.nonNull(dimSchemaResp)) {
|
||||
knowledgeInfo.setBizName(dimSchemaResp.getBizName());
|
||||
}
|
||||
}
|
||||
});
|
||||
return knowledgeInfos;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,11 +25,14 @@ import java.util.List;
|
||||
@Service
|
||||
public class MemoryServiceImpl implements MemoryService {
|
||||
|
||||
@Autowired private ChatMemoryRepository chatMemoryRepository;
|
||||
@Autowired
|
||||
private ChatMemoryRepository chatMemoryRepository;
|
||||
|
||||
@Autowired private ExemplarService exemplarService;
|
||||
@Autowired
|
||||
private ExemplarService exemplarService;
|
||||
|
||||
@Autowired private EmbeddingConfig embeddingConfig;
|
||||
@Autowired
|
||||
private EmbeddingConfig embeddingConfig;
|
||||
|
||||
@Override
|
||||
public void createMemory(ChatMemoryDO memory) {
|
||||
@@ -85,20 +88,18 @@ public class MemoryServiceImpl implements MemoryService {
|
||||
queryWrapper.lambda().eq(ChatMemoryDO::getStatus, chatMemoryFilter.getStatus());
|
||||
}
|
||||
if (chatMemoryFilter.getHumanReviewRet() != null) {
|
||||
queryWrapper
|
||||
.lambda()
|
||||
.eq(ChatMemoryDO::getHumanReviewRet, chatMemoryFilter.getHumanReviewRet());
|
||||
queryWrapper.lambda().eq(ChatMemoryDO::getHumanReviewRet,
|
||||
chatMemoryFilter.getHumanReviewRet());
|
||||
}
|
||||
if (chatMemoryFilter.getLlmReviewRet() != null) {
|
||||
queryWrapper
|
||||
.lambda()
|
||||
.eq(ChatMemoryDO::getLlmReviewRet, chatMemoryFilter.getLlmReviewRet());
|
||||
queryWrapper.lambda().eq(ChatMemoryDO::getLlmReviewRet,
|
||||
chatMemoryFilter.getLlmReviewRet());
|
||||
}
|
||||
if (StringUtils.isBlank(chatMemoryFilter.getOrderCondition())) {
|
||||
queryWrapper.orderByDesc("id");
|
||||
} else {
|
||||
queryWrapper.orderBy(
|
||||
true, chatMemoryFilter.isAsc(), chatMemoryFilter.getOrderCondition());
|
||||
queryWrapper.orderBy(true, chatMemoryFilter.isAsc(),
|
||||
chatMemoryFilter.getOrderCondition());
|
||||
}
|
||||
return chatMemoryRepository.getMemories(queryWrapper);
|
||||
}
|
||||
@@ -106,9 +107,7 @@ public class MemoryServiceImpl implements MemoryService {
|
||||
@Override
|
||||
public List<ChatMemoryDO> getMemoriesForLlmReview() {
|
||||
QueryWrapper<ChatMemoryDO> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper
|
||||
.lambda()
|
||||
.eq(ChatMemoryDO::getStatus, MemoryStatus.PENDING)
|
||||
queryWrapper.lambda().eq(ChatMemoryDO::getStatus, MemoryStatus.PENDING)
|
||||
.isNull(ChatMemoryDO::getLlmReviewRet);
|
||||
return chatMemoryRepository.getMemories(queryWrapper);
|
||||
}
|
||||
@@ -116,26 +115,18 @@ public class MemoryServiceImpl implements MemoryService {
|
||||
@Override
|
||||
public void enableMemory(ChatMemoryDO memory) {
|
||||
memory.setStatus(MemoryStatus.ENABLED);
|
||||
exemplarService.storeExemplar(
|
||||
embeddingConfig.getMemoryCollectionName(memory.getAgentId()),
|
||||
Text2SQLExemplar.builder()
|
||||
.question(memory.getQuestion())
|
||||
.sideInfo(memory.getSideInfo())
|
||||
.dbSchema(memory.getDbSchema())
|
||||
.sql(memory.getS2sql())
|
||||
.build());
|
||||
exemplarService.storeExemplar(embeddingConfig.getMemoryCollectionName(memory.getAgentId()),
|
||||
Text2SQLExemplar.builder().question(memory.getQuestion())
|
||||
.sideInfo(memory.getSideInfo()).dbSchema(memory.getDbSchema())
|
||||
.sql(memory.getS2sql()).build());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disableMemory(ChatMemoryDO memory) {
|
||||
memory.setStatus(MemoryStatus.DISABLED);
|
||||
exemplarService.removeExemplar(
|
||||
embeddingConfig.getMemoryCollectionName(memory.getAgentId()),
|
||||
Text2SQLExemplar.builder()
|
||||
.question(memory.getQuestion())
|
||||
.sideInfo(memory.getSideInfo())
|
||||
.dbSchema(memory.getDbSchema())
|
||||
.sql(memory.getS2sql())
|
||||
.build());
|
||||
exemplarService.removeExemplar(embeddingConfig.getMemoryCollectionName(memory.getAgentId()),
|
||||
Text2SQLExemplar.builder().question(memory.getQuestion())
|
||||
.sideInfo(memory.getSideInfo()).dbSchema(memory.getDbSchema())
|
||||
.sql(memory.getS2sql()).build());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,8 +36,8 @@ public class PluginServiceImpl implements PluginService {
|
||||
|
||||
private ApplicationEventPublisher publisher;
|
||||
|
||||
public PluginServiceImpl(
|
||||
PluginRepository pluginRepository, ApplicationEventPublisher publisher) {
|
||||
public PluginServiceImpl(PluginRepository pluginRepository,
|
||||
ApplicationEventPublisher publisher) {
|
||||
this.pluginRepository = pluginRepository;
|
||||
this.publisher = publisher;
|
||||
}
|
||||
@@ -110,18 +110,11 @@ public class PluginServiceImpl implements PluginService {
|
||||
}
|
||||
List<PluginDO> pluginDOS = pluginRepository.query(queryWrapper);
|
||||
if (StringUtils.isNotBlank(pluginQueryReq.getPattern())) {
|
||||
pluginDOS =
|
||||
pluginDOS.stream()
|
||||
.filter(
|
||||
pluginDO ->
|
||||
pluginDO.getPattern()
|
||||
.contains(pluginQueryReq.getPattern())
|
||||
|| (pluginDO.getName() != null
|
||||
&& pluginDO.getName()
|
||||
.contains(
|
||||
pluginQueryReq
|
||||
.getPattern())))
|
||||
.collect(Collectors.toList());
|
||||
pluginDOS = pluginDOS.stream()
|
||||
.filter(pluginDO -> pluginDO.getPattern().contains(pluginQueryReq.getPattern())
|
||||
|| (pluginDO.getName() != null
|
||||
&& pluginDO.getName().contains(pluginQueryReq.getPattern())))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
return convertList(pluginDOS);
|
||||
}
|
||||
@@ -129,16 +122,13 @@ public class PluginServiceImpl implements PluginService {
|
||||
@Override
|
||||
public Optional<ChatPlugin> getPluginByName(String name) {
|
||||
log.info("name:{}", name);
|
||||
return getPluginList().stream()
|
||||
.filter(
|
||||
plugin -> {
|
||||
PluginParseConfig functionCallConfig = getPluginParseConfig(plugin);
|
||||
if (functionCallConfig == null) {
|
||||
return false;
|
||||
}
|
||||
return functionCallConfig.getName().equalsIgnoreCase(name);
|
||||
})
|
||||
.findFirst();
|
||||
return getPluginList().stream().filter(plugin -> {
|
||||
PluginParseConfig functionCallConfig = getPluginParseConfig(plugin);
|
||||
if (functionCallConfig == null) {
|
||||
return false;
|
||||
}
|
||||
return functionCallConfig.getName().equalsIgnoreCase(name);
|
||||
}).findFirst();
|
||||
}
|
||||
|
||||
private PluginParseConfig getPluginParseConfig(ChatPlugin plugin) {
|
||||
@@ -166,26 +156,17 @@ public class PluginServiceImpl implements PluginService {
|
||||
public Map<String, ChatPlugin> getNameToPlugin() {
|
||||
List<ChatPlugin> pluginList = getPluginList();
|
||||
|
||||
return pluginList.stream()
|
||||
.filter(
|
||||
plugin -> {
|
||||
PluginParseConfig functionCallConfig = getPluginParseConfig(plugin);
|
||||
if (functionCallConfig == null) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
})
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
a -> {
|
||||
PluginParseConfig functionCallConfig =
|
||||
JsonUtil.toObject(
|
||||
a.getParseModeConfig(),
|
||||
PluginParseConfig.class);
|
||||
return functionCallConfig.getName();
|
||||
},
|
||||
a -> a,
|
||||
(k1, k2) -> k1));
|
||||
return pluginList.stream().filter(plugin -> {
|
||||
PluginParseConfig functionCallConfig = getPluginParseConfig(plugin);
|
||||
if (functionCallConfig == null) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}).collect(Collectors.toMap(a -> {
|
||||
PluginParseConfig functionCallConfig =
|
||||
JsonUtil.toObject(a.getParseModeConfig(), PluginParseConfig.class);
|
||||
return functionCallConfig.getName();
|
||||
}, a -> a, (k1, k2) -> k1));
|
||||
}
|
||||
|
||||
// todo
|
||||
@@ -197,10 +178,8 @@ public class PluginServiceImpl implements PluginService {
|
||||
ChatPlugin plugin = new ChatPlugin();
|
||||
BeanUtils.copyProperties(pluginDO, plugin);
|
||||
if (StringUtils.isNotBlank(pluginDO.getDataSet())) {
|
||||
plugin.setDataSetList(
|
||||
Arrays.stream(pluginDO.getDataSet().split(","))
|
||||
.map(Long::parseLong)
|
||||
.collect(Collectors.toList()));
|
||||
plugin.setDataSetList(Arrays.stream(pluginDO.getDataSet().split(","))
|
||||
.map(Long::parseLong).collect(Collectors.toList()));
|
||||
}
|
||||
return plugin;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,8 @@ import java.util.List;
|
||||
@Slf4j
|
||||
public class StatisticsServiceImpl implements StatisticsService {
|
||||
|
||||
@Autowired private StatisticsMapper statisticsMapper;
|
||||
@Autowired
|
||||
private StatisticsMapper statisticsMapper;
|
||||
|
||||
@Async
|
||||
@Override
|
||||
|
||||
@@ -37,10 +37,8 @@ public class ChatConfigHelper {
|
||||
ChatConfig chatConfig = new ChatConfig();
|
||||
BeanUtils.copyProperties(extendBaseCmd, chatConfig);
|
||||
RecordInfo recordInfo = new RecordInfo();
|
||||
String creator =
|
||||
(Objects.isNull(user) || StringUtils.isEmpty(user.getName()))
|
||||
? ADMIN_LOWER
|
||||
: user.getName();
|
||||
String creator = (Objects.isNull(user) || StringUtils.isEmpty(user.getName())) ? ADMIN_LOWER
|
||||
: user.getName();
|
||||
recordInfo.createdBy(creator);
|
||||
chatConfig.setRecordInfo(recordInfo);
|
||||
chatConfig.setStatus(StatusEnum.ONLINE);
|
||||
@@ -52,10 +50,9 @@ public class ChatConfigHelper {
|
||||
|
||||
BeanUtils.copyProperties(extendEditCmd, chatConfig);
|
||||
RecordInfo recordInfo = new RecordInfo();
|
||||
String user =
|
||||
(Objects.isNull(facadeUser) || StringUtils.isEmpty(facadeUser.getName()))
|
||||
? ADMIN_LOWER
|
||||
: facadeUser.getName();
|
||||
String user = (Objects.isNull(facadeUser) || StringUtils.isEmpty(facadeUser.getName()))
|
||||
? ADMIN_LOWER
|
||||
: facadeUser.getName();
|
||||
recordInfo.updatedBy(user);
|
||||
chatConfig.setRecordInfo(recordInfo);
|
||||
return chatConfig;
|
||||
@@ -65,9 +62,8 @@ public class ChatConfigHelper {
|
||||
if (Objects.isNull(modelSchema) || CollectionUtils.isEmpty(modelSchema.getDimensions())) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
Map<Long, List<SchemaElement>> dimIdAndDescPair =
|
||||
modelSchema.getDimensions().stream()
|
||||
.collect(Collectors.groupingBy(SchemaElement::getId));
|
||||
Map<Long, List<SchemaElement>> dimIdAndDescPair = modelSchema.getDimensions().stream()
|
||||
.collect(Collectors.groupingBy(SchemaElement::getId));
|
||||
return new ArrayList<>(dimIdAndDescPair.keySet());
|
||||
}
|
||||
|
||||
@@ -75,9 +71,8 @@ public class ChatConfigHelper {
|
||||
if (Objects.isNull(modelSchema) || CollectionUtils.isEmpty(modelSchema.getMetrics())) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
Map<Long, List<SchemaElement>> metricIdAndDescPair =
|
||||
modelSchema.getMetrics().stream()
|
||||
.collect(Collectors.groupingBy(SchemaElement::getId));
|
||||
Map<Long, List<SchemaElement>> metricIdAndDescPair = modelSchema.getMetrics().stream()
|
||||
.collect(Collectors.groupingBy(SchemaElement::getId));
|
||||
return new ArrayList<>(metricIdAndDescPair.keySet());
|
||||
}
|
||||
|
||||
@@ -87,8 +82,8 @@ public class ChatConfigHelper {
|
||||
|
||||
chatConfigDO.setChatAggConfig(JsonUtil.toString(chatConfig.getChatAggConfig()));
|
||||
chatConfigDO.setChatDetailConfig(JsonUtil.toString(chatConfig.getChatDetailConfig()));
|
||||
chatConfigDO.setRecommendedQuestions(
|
||||
JsonUtil.toString(chatConfig.getRecommendedQuestions()));
|
||||
chatConfigDO
|
||||
.setRecommendedQuestions(JsonUtil.toString(chatConfig.getRecommendedQuestions()));
|
||||
|
||||
if (Objects.isNull(chatConfig.getStatus())) {
|
||||
chatConfigDO.setStatus(null);
|
||||
@@ -118,9 +113,8 @@ public class ChatConfigHelper {
|
||||
JsonUtil.toObject(chatConfigDO.getChatDetailConfig(), ChatDetailConfigReq.class));
|
||||
chatConfigDescriptor.setChatAggConfig(
|
||||
JsonUtil.toObject(chatConfigDO.getChatAggConfig(), ChatAggConfigReq.class));
|
||||
chatConfigDescriptor.setRecommendedQuestions(
|
||||
JsonUtil.toList(
|
||||
chatConfigDO.getRecommendedQuestions(), RecommendedQuestionReq.class));
|
||||
chatConfigDescriptor.setRecommendedQuestions(JsonUtil
|
||||
.toList(chatConfigDO.getRecommendedQuestions(), RecommendedQuestionReq.class));
|
||||
chatConfigDescriptor.setStatusEnum(StatusEnum.of(chatConfigDO.getStatus()));
|
||||
|
||||
chatConfigDescriptor.setCreatedBy(chatConfigDO.getCreatedBy());
|
||||
|
||||
@@ -51,15 +51,13 @@ public class ComponentFactory {
|
||||
}
|
||||
|
||||
private static <T> List<T> init(Class<T> factoryType, List list) {
|
||||
list.addAll(
|
||||
SpringFactoriesLoader.loadFactories(
|
||||
factoryType, Thread.currentThread().getContextClassLoader()));
|
||||
list.addAll(SpringFactoriesLoader.loadFactories(factoryType,
|
||||
Thread.currentThread().getContextClassLoader()));
|
||||
return list;
|
||||
}
|
||||
|
||||
private static <T> T init(Class<T> factoryType) {
|
||||
return SpringFactoriesLoader.loadFactories(
|
||||
factoryType, Thread.currentThread().getContextClassLoader())
|
||||
.get(0);
|
||||
return SpringFactoriesLoader
|
||||
.loadFactories(factoryType, Thread.currentThread().getContextClassLoader()).get(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,8 +8,8 @@ import java.util.Map;
|
||||
|
||||
public class ResultFormatter {
|
||||
|
||||
public static String transform2TextNew(
|
||||
List<QueryColumn> queryColumns, List<Map<String, Object>> queryResults) {
|
||||
public static String transform2TextNew(List<QueryColumn> queryColumns,
|
||||
List<Map<String, Object>> queryResults) {
|
||||
if (CollectionUtils.isEmpty(queryColumns)) {
|
||||
return "";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user