diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java index 28cbda888..aeb3c5baa 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/memory/MemoryReviewTask.java @@ -22,10 +22,10 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.Collections; +import java.util.List; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.List; @Component @Slf4j @@ -61,10 +61,11 @@ public class MemoryReviewTask { public void review() { List agentList = agentService.getAgents(); for (Agent agent : agentList) { - if(!agent.enableMemoryReview()){ + if (!agent.enableMemoryReview()) { continue; } - ChatMemoryFilter chatMemoryFilter = ChatMemoryFilter.builder().agentId(agent.getId()).build(); + ChatMemoryFilter chatMemoryFilter = + ChatMemoryFilter.builder().agentId(agent.getId()).build(); memoryService.getMemories(chatMemoryFilter).stream().forEach(memory -> { try { processMemory(memory, agent); diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryNLReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryNLReq.java index 990effc72..a6fef7d7a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryNLReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryNLReq.java @@ -30,6 +30,7 @@ public class QueryNLReq extends SemanticQueryReq implements Serializable { private List dynamicExemplars = Lists.newArrayList(); private SemanticParseInfo contextParseInfo; private SemanticParseInfo selectedParseInfo; + private boolean descriptionMapped; @Override public String toCustomizedString() { diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/TermDescMapper.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/TermDescMapper.java index dbb79d722..3010b58a7 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/TermDescMapper.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/TermDescMapper.java @@ -20,7 +20,8 @@ public class TermDescMapper extends BaseMapper { public void doMap(ChatQueryContext chatQueryContext) { SchemaMapInfo mapInfo = chatQueryContext.getMapInfo(); List termElements = mapInfo.getTermDescriptionToMap(); - if (CollectionUtils.isEmpty(termElements)) { + if (CollectionUtils.isEmpty(termElements) + || chatQueryContext.getRequest().isDescriptionMapped()) { return; } for (SchemaElement schemaElement : termElements) { @@ -39,6 +40,7 @@ public class TermDescMapper extends BaseMapper { queryContext.setSemanticSchema(chatQueryContext.getSemanticSchema()); queryContext.setModelIdToDataSetIds(chatQueryContext.getModelIdToDataSetIds()); queryContext.setChatWorkflowState(chatQueryContext.getChatWorkflowState()); + queryContext.getRequest().setDescriptionMapped(true); return queryContext; } }