@lobehub/lobehub 2.0.0-next.67 → 2.0.0-next.68

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+## [Version 2.0.0-next.68](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.67...v2.0.0-next.68)
+
+<sup>Released on **2025-11-16**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: The tool to fail execution on ollama when a message contains b….
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: The tool to fail execution on ollama when a message contains b…, closes [#10259](https://github.com/lobehub/lobe-chat/issues/10259) ([1ad8080](https://github.com/lobehub/lobe-chat/commit/1ad8080))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 2.0.0-next.67](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.66...v2.0.0-next.67)
 
 <sup>Released on **2025-11-16**</sup>

package/changelog/v1.json

@@ -1,4 +1,13 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "The tool to fail execution on ollama when a message contains b…."
+      ]
+    },
+    "date": "2025-11-16",
+    "version": "2.0.0-next.68"
+  },
   {
     "children": {
       "improvements": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/lobehub",
-  "version": "2.0.0-next.67",
+  "version": "2.0.0-next.68",
   "description": "LobeHub - an open-source,comprehensive AI Agent framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",
@@ -122,9 +122,6 @@
       "eslint --fix"
     ]
   },
-  "overrides": {
-    "eta": "4.0.1"
-  },
   "dependencies": {
     "@ant-design/icons": "^5.6.1",
     "@ant-design/pro-components": "^2.8.10",
@@ -398,9 +395,6 @@
   "pnpm": {
     "onlyBuiltDependencies": [
       "@vercel/speed-insights"
-    ],
-    "overrides": {
-      "eta": "4.0.1"
-    }
+    ]
   }
 }

package/packages/model-runtime/src/core/streams/ollama.test.ts

@@ -235,6 +235,73 @@ describe('OllamaStream', () => {
       expect(onToolCall).toHaveBeenCalledTimes(1);
       expect(onCompletionMock).toHaveBeenCalledTimes(1);
     });
+
+    it('tools use with a done', async () => {
+      vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1').mockReturnValueOnce('abcd1234');
+
+      const mockOllamaStream = new ReadableStream<ChatResponse>({
+        start(controller) {
+          controller.enqueue({
+            model: 'qwen2.5',
+            created_at: new Date('2024-12-01T03:34:55.166692Z'),
+            message: {
+              role: 'assistant',
+              content: '',
+              tool_calls: [
+                {
+                  function: {
+                    name: 'realtime-weather____fetchCurrentWeather',
+                    arguments: { city: '杭州' },
+                  },
+                },
+              ],
+            },
+            done_reason: 'stop',
+            done: true,
+            total_duration: 1122415333,
+            load_duration: 26178333,
+            prompt_eval_count: 221,
+            prompt_eval_duration: 507000000,
+            eval_count: 26,
+            eval_duration: 583000000,
+          } as unknown as ChatResponse);
+
+          controller.close();
+        },
+      });
+      const onStartMock = vi.fn();
+      const onTextMock = vi.fn();
+      const onToolCall = vi.fn();
+      const onCompletionMock = vi.fn();
+
+      const protocolStream = OllamaStream(mockOllamaStream, {
+        onStart: onStartMock,
+        onText: onTextMock,
+        onCompletion: onCompletionMock,
+        onToolsCalling: onToolCall,
+      });
+
+      const decoder = new TextDecoder();
+      const chunks = [];
+
+      // @ts-ignore
+      for await (const chunk of protocolStream) {
+        chunks.push(decoder.decode(chunk, { stream: true }));
+      }
+
+      expect(chunks).toEqual(
+        [
+          'id: chat_1',
+          'event: tool_calls',
+          `data: [{"function":{"arguments":"{\\"city\\":\\"杭州\\"}","name":"realtime-weather____fetchCurrentWeather"},"id":"realtime-weather____fetchCurrentWeather_0_abcd1234","index":0,"type":"function"}]\n`,
+        ].map((i) => `${i}\n`),
+      );
+
+      expect(onTextMock).toHaveBeenCalledTimes(0);
+      expect(onStartMock).toHaveBeenCalledTimes(1);
+      expect(onToolCall).toHaveBeenCalledTimes(1);
+      expect(onCompletionMock).toHaveBeenCalledTimes(1);
+    });
   });
 
   it('should handle empty stream', async () => {

package/packages/model-runtime/src/core/streams/ollama.ts

@@ -11,11 +11,6 @@ import {
 } from './protocol';
 
 const transformOllamaStream = (chunk: ChatResponse, stack: StreamContext): StreamProtocolChunk => {
-  // maybe need another structure to add support for multiple choices
-  if (chunk.done && !chunk.message.content) {
-    return { data: 'finished', id: stack.id, type: 'stop' };
-  }
-
   if (chunk.message.thinking) {
     return { data: chunk.message.thinking, id: stack.id, type: 'reasoning' };
   }
@@ -36,6 +31,11 @@ const transformOllamaStream = (chunk: ChatResponse, stack: StreamContext): Strea
     };
   }
 
+  // maybe need another structure to add support for multiple choices
+  if (chunk.done && !chunk.message.content) {
+    return { data: 'finished', id: stack.id, type: 'stop' };
+  }
+
   // 判断是否有 <think> 或 </think> 标签，更新 thinkingInContent 状态
   if (chunk.message.content.includes('<think>')) {
     stack.thinkingInContent = true;