Merge branch 'main' into py-display

main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java

@@ -151,6 +151,11 @@ public interface Constant {
      */
     String MEMORY_NO_MEM = "Memory_nomem";
 
+    /**
+     * 仅上报聊天记录（不总结记忆）
+     */
+    String MEMORY_MEM_REPORT_ONLY = "Memory_mem_report_only";
+
     /**
      * 火山引擎双声道语音克隆
      */

main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java

@@ -251,4 +251,9 @@ public interface ErrorCode {
     int AGENT_TAG_NOT_EXIST = 10198; // 标签不存在
 
     int RAG_DOCUMENT_PARSING_DELETE_ERROR = 10199; // 文档解析中，禁止删除
+
+    // 智能体MCP相关错误码
+    int MCP_ACCESS_POINT_ADDRESS_NO_PERMISSION = 10200; // 没有权限查看该智能体的MCP接入点地址
+    int MCP_ACCESS_POINT_ADDRESS_NOT_CONFIGURED = 10201; // 请联系管理员进入参数管理配置mcp接入点地址
+    int MCP_ACCESS_POINT_TOOLS_LIST_NO_PERMISSION = 10202; // 没有权限查看该智能体的MCP工具列表
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentMcpAccessPointController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import xiaozhi.common.exception.ErrorCode;
 import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.Result;
 import xiaozhi.modules.agent.service.AgentMcpAccessPointService;
@@ -40,11 +41,11 @@ public class AgentMcpAccessPointController {
 
         // 检查权限
         if (!agentService.checkAgentPermission(agentId, user.getId())) {
-            return new Result<String>().error("没有权限查看该智能体的MCP接入点地址");
+            return new Result<String>().error(ErrorCode.MCP_ACCESS_POINT_ADDRESS_NO_PERMISSION);
         }
         String agentMcpAccessAddress = agentMcpAccessPointService.getAgentMcpAccessAddress(agentId);
         if (agentMcpAccessAddress == null) {
-            return new Result<String>().ok("请联系管理员进入参数管理配置mcp接入点地址");
+            return new Result<String>().error(ErrorCode.MCP_ACCESS_POINT_ADDRESS_NOT_CONFIGURED);
         }
         return new Result<String>().ok(agentMcpAccessAddress);
     }
@@ -58,7 +59,7 @@ public class AgentMcpAccessPointController {
 
         // 检查权限
         if (!agentService.checkAgentPermission(agentId, user.getId())) {
-            return new Result<List<String>>().error("没有权限查看该智能体的MCP工具列表");
+            return new Result<List<String>>().error(ErrorCode.MCP_ACCESS_POINT_TOOLS_LIST_NO_PERMISSION);
         }
         List<String> agentMcpToolsList = agentMcpAccessPointService.getAgentMcpToolsList(agentId);
         return new Result<List<String>>().ok(agentMcpToolsList);

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatSummaryServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import lombok.RequiredArgsConstructor;
+import xiaozhi.common.constant.Constant;
 import xiaozhi.modules.agent.dto.AgentChatHistoryDTO;
 import xiaozhi.modules.agent.dto.AgentChatSummaryDTO;
 import xiaozhi.modules.agent.dto.AgentMemoryDTO;
@@ -90,21 +91,28 @@ public class AgentChatSummaryServiceImpl implements AgentChatSummaryService {
     @Override
     public boolean generateAndSaveChatSummary(String sessionId) {
         try {
-            // 1. 生成总结
-            AgentChatSummaryDTO summaryDTO = generateChatSummary(sessionId);
-            if (!summaryDTO.isSuccess()) {
-                log.info("生成总结失败: {}", summaryDTO.getErrorMessage());
-                return false;
-            }
-
-            // 2. 获取设备信息（通过会话关联的设备）
+            // 1. 获取设备信息（通过会话关联的设备）
             DeviceEntity device = getDeviceBySessionId(sessionId);
             if (device == null) {
                 log.info("未找到与会话 {} 关联的设备", sessionId);
                 return false;
             }
 
-            // 3. 更新智能体记忆
+            // 2. 检查记忆模型类型，如果是仅上报聊天记录模式则跳过总结
+            String memModelId = agentService.getAgentById(device.getAgentId()).getMemModelId();
+            if (memModelId != null && memModelId.equals(Constant.MEMORY_MEM_REPORT_ONLY)) {
+                log.info("会话 {} 使用仅上报聊天记录模式，跳过记忆总结", sessionId);
+                return true;
+            }
+
+            // 3. 生成总结
+            AgentChatSummaryDTO summaryDTO = generateChatSummary(sessionId);
+            if (!summaryDTO.isSuccess()) {
+                log.info("生成总结失败: {}", summaryDTO.getErrorMessage());
+                return false;
+            }
+
+            // 4. 更新智能体记忆
             AgentMemoryDTO memoryDTO = new AgentMemoryDTO();
             memoryDTO.setSummaryMemory(summaryDTO.getSummary());
 

main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java

@@ -57,7 +57,8 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
                         .eq("model_type", modelType)
                         .eq("is_enabled", 1)
                         .like(StringUtils.isNotBlank(modelName), "model_name", modelName)
-                        .select("id", "model_name"));
+                        .select("id", "model_name")
+                        .orderByAsc("sort"));
         return ConvertUtils.sourceToTarget(entities, ModelBasicInfoDTO.class);
     }
 

main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java

@@ -95,6 +95,7 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
 
         QueryWrapper<ModelProviderEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("model_type", StringUtils.isBlank(modelType) ? "" : modelType);
+        queryWrapper.orderByAsc("sort");
         List<ModelProviderEntity> providerEntities = modelProviderDao.selectList(queryWrapper);
         return ConvertUtils.sourceToTarget(providerEntities, ModelProviderDTO.class);
     }
@@ -147,7 +148,8 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
         UserDetail user = SecurityUser.getUser();
         modelProviderDTO.setUpdater(user.getId());
         modelProviderDTO.setUpdateDate(new Date());
-        if (modelProviderDao.updateById(ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class)) == 0) {
+        if (modelProviderDao
+                .updateById(ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class)) == 0) {
             throw new RenException(ErrorCode.UPDATE_DATA_FAILED);
         }
         return ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderDTO.class);

main/manager-api/src/main/resources/db/changelog/202603231037.sql

@@ -0,0 +1,7 @@
+-- 新增仅上报聊天记录记忆模型供应器
+
+delete from `ai_model_provider` where `id` = 'SYSTEM_Memory_mem_report_only';
+delete from `ai_model_config` where `id` = 'Memory_mem_report_only';
+
+INSERT INTO `ai_model_provider` VALUES ('SYSTEM_Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', '[]', 4, 1, NOW(), 1, NOW());
+INSERT INTO `ai_model_config` VALUES ('Memory_mem_report_only', 'Memory', 'mem_report_only', '仅上报聊天记录', 0, 1, '{"type": "mem_report_only"}', NULL, '仅上报聊天记录，不总结记忆', 3, NULL, NULL, NULL, NULL);

main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml

@@ -571,6 +571,13 @@ databaseChangeLog:
         - sqlFile:
             encoding: utf8
             path: classpath:db/changelog/202603111131.sql
+  - changeSet:
+      id: 202603231037
+      author: rainv123
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202603231037.sql
   - changeSet:
       id: 202603311200
       author: cgd
@@ -578,3 +585,4 @@ databaseChangeLog:
         - sqlFile:
             encoding: utf8
             path: classpath:db/changelog/202603311200.sql
+

main/manager-api/src/main/resources/i18n/messages.properties

@@ -206,4 +206,7 @@
 10197=\u6807\u7B7E\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
 10198=\u6807\u7B7E\u4E0D\u5B58\u5728
 10199=\u89E3\u6790\u4E2D\u6587\u4EF6\u6682\u4E0D\u652F\u6301\u6B64\u64CD\u4F5C
+10200=\u6CA1\u6709\u6743\u9650\u67E5\u770B\u8BE5\u667A\u80FD\u4F53\u7684MCP\u63A5\u5165\u70B9\u5730\u5740
+10201=\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u8FDB\u5165\u53C2\u6570\u7BA1\u7406\u914D\u7F6Emcp\u63A5\u5165\u70B9\u5730\u5740
+10202=\u6CA1\u6709\u6743\u9650\u67E5\u770B\u8BE5\u667A\u80FD\u4F53\u7684MCP\u5DE5\u5177\u5217\u8868
 

main/manager-api/src/main/resources/i18n/messages_de_DE.properties

@@ -206,4 +206,7 @@
 10197=Tag-Name darf nicht leer sein
 10198=Tag nicht gefunden
 10199=Dateianalyse l\u00E4uft, dieser Vorgang wird nicht unterst\u00FCtzt
+10200=Keine Berechtigung, die MCP-Endpunktadresse dieses Agenten anzuzeigen
+10201=Bitte kontaktieren Sie den Administrator, um die MCP-Endpunktadresse in der Parameterverwaltung zu konfigurieren
+10202=Keine Berechtigung, die MCP-Tool-Liste dieses Agenten anzuzeigen
 

main/manager-api/src/main/resources/i18n/messages_en_US.properties

@@ -206,4 +206,7 @@
 10197=Tag name cannot be empty
 10198=Tag not found
 10199=Parsing in progress, this operation is not supported
+10200=No permission to view the MCP endpoint address of this agent
+10201=Please contact the administrator to configure the MCP endpoint address in parameter management
+10202=No permission to view the MCP tool list of this agent
 

main/manager-api/src/main/resources/i18n/messages_pt_BR.properties

@@ -205,4 +205,7 @@
 10196=Nome da etiqueta j\u00E1 existe
 10197=Nome da etiqueta n\u00E3o pode ser vazio
 10198=Etiqueta n\u00E3o existe
-10199=Esta opera\u00E7\u00E3o n\u00E3o � suportada na an\u00E1lise de arquivos chineses
+10199=Esta opera\u00E7\u00E3o n\u00E3o � suportada na an\u00E1lise de arquivos chineses
+10200=Sem permiss\u00e3o para visualizar o endere\u00e7o do endpoint MCP deste agente
+10201=Por favor, contate o administrador para configurar o endere\u00e7o do endpoint MCP no gerenciamento de par\u00e2metros
+10202=Sem permiss\u00e3o para visualizar a lista de ferramentas MCP deste agente

main/manager-api/src/main/resources/i18n/messages_vi_VN.properties

@@ -206,4 +206,6 @@
 10197=T\u00EAn th\u1EB9\uFFFD kh\u00F4ng th\u1EC3 \u0111\u1EC3 tr\u1ED1ng
 10198=Kh\u00F4ng t\u00ECm th\u1EA5y th\u1EB9\uFFFD
 10199=T\u1EC7p \u0111ang \u0111\u01B0\u1EE3c ph\u00E2n t\u00EDch, thao t\u00E1c n\u00E0y kh\u00F4ng \u0111\u01B0\u1EE3c h\u1ED7 tr\u1EE3
-
+10200=Kh\u00f4ng c\u00f3 quy\u1ec1n xem \u0111\u1ecba ch\u1ec9 \u0111i\u1ec3m cu\u1ed1i MCP c\u1ee7a \u0111\u1ea1i l\u00fd n\u00e0y
+10201=Vui l\u00f2ng li\u00ean h\u1ec7 qu\u1ea3n tr\u1ecb vi\u00ean \u0111\u1ec3 c\u1ea5u h\u00ecnh \u0111\u1ecba ch\u1ec9 \u0111i\u1ec3m cu\u1ed1i MCP trong qu\u1ea3n l\u00fd tham s\u1ed1
+10202=Kh\u00f4ng c\u00f3 quy\u1ec1n xem danh s\u00e1ch c\u00f4ng c\u1ee5 MCP c\u1ee7a \u0111\u1ea1i l\u00fd n\u00e0y

main/manager-api/src/main/resources/i18n/messages_zh_CN.properties

@@ -206,3 +206,6 @@
 10197=\u6807\u7B7E\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
 10198=\u6807\u7B7E\u4E0D\u5B58\u5728
 10199=\u89E3\u6790\u4E2D\u6587\u4EF6\u6682\u4E0D\u652F\u6301\u6B64\u64CD\u4F5C
+10200=\u6CA1\u6709\u6743\u9650\u67E5\u770B\u8BE5\u667A\u80FD\u4F53\u7684MCP\u63A5\u5165\u70B9\u5730\u5740
+10201=\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u8FDB\u5165\u53C2\u6570\u7BA1\u7406\u914D\u7F6Emcp\u63A5\u5165\u70B9\u5730\u5740
+10202=\u6CA1\u6709\u6743\u9650\u67E5\u770B\u8BE5\u667A\u80FD\u4F53\u7684MCP\u5DE5\u5177\u5217\u8868

main/manager-api/src/main/resources/i18n/messages_zh_TW.properties

@@ -206,4 +206,6 @@
 10197=\u6A19\u7C64\u540D\u7A31\u4E0D\u80FD\u4E3A\u7A7A
 10198=\u6A19\u7C64\u4E0D\u5B58\u5728
 10199=\u89E3\u6790\u4E2D\u6587\u4EF6\u66AB\u4E0D\u652F\u6301\u6B64\u64CD\u4F5C
-
+10200=\u6C92\u6709\u6B0A\u9650\u67E5\u770B\u8A72\u667A\u80FD\u9AD4\u7684MCP\u63A5\u5165\u9EDE\u5730\u5740
+10201=\u8ACB\u806F\u7E6B\u7BA1\u7406\u54E1\u9032\u5165\u53C3\u6578\u7BA1\u7406\u914D\u7F6Emcp\u63A5\u5165\u9EDE\u5730\u5740
+10202=\u6C92\u6709\u6B0A\u9650\u67E5\u770B\u8A72\u667A\u80FD\u9AD4\u7684MCP\u5DE5\u5177\u5217\u8868