|
@@ -103,6 +103,7 @@ public class OllamaUtil {
|
|
/*
|
|
/*
|
|
---------------------- line ----------------------
|
|
---------------------- line ----------------------
|
|
{"model":"deepseek-r1:1.5b","created_at":"2025-03-05T10:51:17.443189986Z","response":"\u003cthink\u003e","done":false}
|
|
{"model":"deepseek-r1:1.5b","created_at":"2025-03-05T10:51:17.443189986Z","response":"\u003cthink\u003e","done":false}
|
|
|
|
+ {"model":"deepseek-r1:1.5b","created_at":"2025-03-06T11:08:30.9219611Z","response":"\n\n","done":false}
|
|
--------------------------------------------------
|
|
--------------------------------------------------
|
|
*/
|
|
*/
|
|
|
|
|
|
@@ -136,7 +137,7 @@ public class OllamaUtil {
|
|
if (isThinking) {
|
|
if (isThinking) {
|
|
System.out.println("think: " + content);
|
|
System.out.println("think: " + content);
|
|
|
|
|
|
- if (!content.contains("<think>") && !content.contains("\n\n")) {
|
|
|
|
|
|
+ if (!content.contains("<think>") && !content.contains("\\n\\n")) {
|
|
// [SSE] 发送消息
|
|
// [SSE] 发送消息
|
|
ChatSseMessage chatSseMessage = new ChatSseMessage("THINK", content);
|
|
ChatSseMessage chatSseMessage = new ChatSseMessage("THINK", content);
|
|
sseUtil.send(user_id, new SseResponse(SseResponseEnum.DEEPSEEK, chatSseMessage).toJsonStr());
|
|
sseUtil.send(user_id, new SseResponse(SseResponseEnum.DEEPSEEK, chatSseMessage).toJsonStr());
|
|
@@ -150,7 +151,7 @@ public class OllamaUtil {
|
|
if (!isThinking) {
|
|
if (!isThinking) {
|
|
System.out.println("content: " + content);
|
|
System.out.println("content: " + content);
|
|
|
|
|
|
- if (!content.contains("</think>") && !content.contains("\n\n")) {
|
|
|
|
|
|
+ if (!content.contains("</think>") && !content.contains("\\n\\n")) {
|
|
// [SSE] 发送消息
|
|
// [SSE] 发送消息
|
|
ChatSseMessage chatSseMessage = new ChatSseMessage("REPLY", content);
|
|
ChatSseMessage chatSseMessage = new ChatSseMessage("REPLY", content);
|
|
sseUtil.send(user_id, new SseResponse(SseResponseEnum.DEEPSEEK, chatSseMessage).toJsonStr());
|
|
sseUtil.send(user_id, new SseResponse(SseResponseEnum.DEEPSEEK, chatSseMessage).toJsonStr());
|