Merge fa65b6eff7 into 6f497b142e

[fix][chat]Memory deletion should disable it first.
Update NL2PluginParser.java 去除多数据集条件判断
2026-04-19 13:04:21 +08:00 · 2025-07-03 11:31:12 +08:00 · 2025-07-02 18:59:56 +08:00 · 2025-05-28 15:47:58 +08:00 · 2025-05-27 14:54:49 +08:00 · 2025-05-27 14:42:34 +08:00
3 changed files with 11 additions and 4 deletions
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java
@@ -88,10 +88,10 @@ public class WebServiceQuery extends PluginSemanticQuery {
        restTemplate = ContextUtils.getBean(RestTemplate.class);
        try {
            responseEntity =
-                    restTemplate.exchange(requestUrl, HttpMethod.POST, entity, Object.class);
+                    restTemplate.exchange(requestUrl, HttpMethod.POST, entity, String.class);
            objectResponse = responseEntity.getBody();
            log.info("objectResponse:{}", objectResponse);
-            Map<String, Object> response = JsonUtil.objectToMap(objectResponse);
+            Map<String, Object> response = JSON.parseObject(objectResponse.toString());
            webServiceResponse.setResult(response);
        } catch (Exception e) {
            log.info("Exception:{}", e.getMessage());
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java
@@ -19,7 +19,7 @@ public class ParseContext {
    }

    public boolean enableNL2SQL() {
-        return Objects.nonNull(agent) && agent.containsDatasetTool();
+        return Objects.nonNull(agent) && agent.containsDatasetTool()&&response.getSelectedParses().size() == 0;
    }

    public boolean enableLLM() {
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java
@@ -26,7 +26,6 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -110,6 +109,14 @@ public class MemoryServiceImpl implements MemoryService, CommandLineRunner {

    @Override
    public void batchDelete(List<Long> ids) {
+        QueryWrapper<ChatMemoryDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().in(ChatMemoryDO::getId, ids);
+        List<ChatMemoryDO> chatMemoryDOS = chatMemoryRepository.getMemories(queryWrapper);
+        chatMemoryDOS.forEach(chatMemoryDO -> {
+            if (MemoryStatus.ENABLED.toString().equals(chatMemoryDO.getStatus().trim())) {
+                disableMemory(chatMemoryDO);
+            }
+        });
        chatMemoryRepository.batchDelete(ids);
    }
Author	SHA1	Message	Date
QJ_wonder	c0b440d57e	Merge `fa65b6eff7` into `6f497b142e`	2025-07-03 11:31:12 +08:00
jerryjzhang	6f497b142e	[fix][chat]Memory deletion should disable it first. Some checks failed supersonic CentOS CI / build (21) (push) Has been cancelled Details supersonic mac CI / build (21) (push) Has been cancelled Details supersonic ubuntu CI / build (21) (push) Has been cancelled Details supersonic windows CI / build (21) (push) Has been cancelled Details	2025-07-02 18:59:56 +08:00
QJ_wonder	fa65b6eff7	Update NL2PluginParser.java 去除多数据集条件判断	2025-05-28 15:47:58 +08:00
QJ_wonder	0ab44c0866	Merge branch 'tencentmusic:master' into master_fixplugin	2025-05-27 14:54:49 +08:00
QJ_wonder	449fdf180f	(fix)(chat)多个数据集也只保留召回的第一个结果这里的多数据集其实对召回的结果没有影响，取第一个就好了	2025-05-27 14:42:34 +08:00
QJ_wonder	d275a145d5	Update WebServiceQuery.java	2025-05-27 14:07:32 +08:00
QJ_wonder	c8f690c1c2	(fix)(chat) 修改判断是否需要NL2SQL的条件判断修改判断是否需要NL2SQL的条件判断，如果respone里已经有返回体，则不需要NL2SQL的执行，直接返回。避免插件返回体被NL2SQL返回体覆盖的问题	2025-05-27 13:39:48 +08:00
QJ_wonder	38af6e3a28	(fix)(chat) 修复插件调用问题修复插件调用问题，将原有的Json解析替换成fastjson的json解析，并按String解析返回体，否则会报：Error while extracting response for type [class java.lang.Object] and content type [application/xml;charset=UTF-8]	2025-05-27 13:34:34 +08:00