From 01bfaefb04f25cbdd53f1b3a7ef03ac593e06fce Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 27 Aug 2025 11:08:34 +0800
Subject: [PATCH] debug(ai): 在处理消息内容时添加控制台输出
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiServiceImpl.java | 84 ++++++++++++++++++++++++++++--------------
1 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiServiceImpl.java
index b059230..73aa812 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiServiceImpl.java
@@ -15,6 +15,7 @@
import cc.mrbird.febs.ai.service.AiTalkItemService;
import cc.mrbird.febs.common.entity.FebsResponse;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
@@ -407,7 +408,7 @@
ChatMessage message = choice.getMessage();
if (message.getReasoningContent()!= null &&!message.getReasoningContent().isEmpty()) {
apiMemberTalkStreamVo.setReasoningContent(message.getReasoningContent());
- System.out.print(message.getReasoningContent());
+// System.out.print(message.getReasoningContent());
}
String content = message.getContent() == null ? "" : message.getContent().toString();
@@ -417,7 +418,7 @@
})
.onErrorResume(throwable -> {
log.error("流式调用AI服务失败，问题输入: {}", question, throwable);
- FebsResponse errorResponse = new FebsResponse().message("AI服务调用失败");
+ FebsResponse errorResponse = new FebsResponse().fail().message("AI服务调用失败");
return Flux.just(errorResponse);
});
}
@@ -425,31 +426,30 @@
@Override
public Flux<FebsResponse> answerStreamV2(AiTalkAnswerStream dto) {
String question = dto.getQuestion();
- //获取消息记录
- List<AiTalkItem> aiTalkItems = aiTalkItemService.getListByTalkId(dto.getTalkId());
log.info("----- standard request -----");
+
+ // 参数校验
+ if (StrUtil.isBlank(question)) {
+ return Flux.just(new FebsResponse().fail().message("问题不能为空"));
+ }
+
+ List<ChatMessage> messages = new ArrayList<>();
final ChatMessage systemMessage = ChatMessage.builder()
.role(ChatMessageRole.SYSTEM)
.content("你是豆包，是由字节跳动开发的 AI 人工智能助手")
.build();
+ messages.add(systemMessage);
- List<ChatMessage> messages = Arrays.asList(systemMessage);
- if(CollUtil.isNotEmpty(aiTalkItems)){
- for (AiTalkItem aiTalkItem : aiTalkItems){
- if (aiTalkItem.getType() == 1){
- ChatMessage userMessage = ChatMessage.builder()
- .role(ChatMessageRole.USER)
- .content(aiTalkItem.getContext())
- .build();
- messages.add(userMessage);
- }
- if (aiTalkItem.getType() == 2){
- ChatMessage assistantMessage = ChatMessage.builder()
- .role(ChatMessageRole.ASSISTANT)
- .content(aiTalkItem.getContext())
- .build();
- messages.add(assistantMessage);
+ // 获取历史消息记录
+ if (StrUtil.isNotEmpty(dto.getTalkId())) {
+ List<AiTalkItem> aiTalkItems = aiTalkItemService.getListByTalkId(dto.getTalkId());
+ if (CollUtil.isNotEmpty(aiTalkItems)) {
+ for (AiTalkItem aiTalkItem : aiTalkItems) {
+ ChatMessage chatMessage = buildChatMessageFromItem(aiTalkItem);
+ if (chatMessage != null) {
+ messages.add(chatMessage);
+ }
}
}
}
@@ -482,27 +482,55 @@
return new FebsResponse().success().data("END");
}
-
- ApiMemberTalkStreamVo apiMemberTalkStreamVo = new ApiMemberTalkStreamVo();
- // 判断是否触发深度思考，触发则打印模型输出的思维链内容
ChatMessage message = choice.getMessage();
- if (message.getReasoningContent()!= null &&!message.getReasoningContent().isEmpty()) {
- apiMemberTalkStreamVo.setReasoningContent(message.getReasoningContent());
- System.out.print(message.getReasoningContent());
+ ApiMemberTalkStreamVo apiMemberTalkStreamVo = new ApiMemberTalkStreamVo();
+
+ // 处理 reasoning content
+ String reasoningContent = message.getReasoningContent();
+ if (StrUtil.isNotEmpty(reasoningContent)) {
+ apiMemberTalkStreamVo.setReasoningContent(reasoningContent);
+ log.debug("Reasoning Content: {}", reasoningContent);
}
- String content = message.getContent() == null ? "" : message.getContent().toString();
+ // 安全处理 content
+ String content = "";
+ if (message.getContent() != null) {
+ content = message.getContent().toString();
+ }
apiMemberTalkStreamVo.setContent(content);
System.out.print(content);
+ log.debug("Content: {}", content);
+
return new FebsResponse().success().data(apiMemberTalkStreamVo);
})
.onErrorResume(throwable -> {
log.error("流式调用AI服务失败，问题输入: {}", question, throwable);
- FebsResponse errorResponse = new FebsResponse().message("AI服务调用失败");
+ FebsResponse errorResponse = new FebsResponse().fail().message("AI服务调用失败");
return Flux.just(errorResponse);
});
}
+ // 提取为私有方法，提高可读性和复用性
+ private ChatMessage buildChatMessageFromItem(AiTalkItem item) {
+ if (item == null) return null;
+
+ switch (item.getType()) {
+ case 1:
+ return ChatMessage.builder()
+ .role(ChatMessageRole.USER)
+ .content(item.getContext())
+ .build();
+ case 2:
+ return ChatMessage.builder()
+ .role(ChatMessageRole.ASSISTANT)
+ .content(item.getContext())
+ .build();
+ default:
+ return null;
+ }
+ }
+
+
private Report tryRepairTruncatedJson(String truncatedJson) {
String[] repairAttempts = {
--
Gitblit v1.9.1