@lobehub/chat 1.96.8 → 1.96.9

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.96.9](https://github.com/lobehub/lobe-chat/compare/v1.96.8...v1.96.9)
+
+<sup>Released on **2025-06-23**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Google Gemini tools declarations.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Google Gemini tools declarations, closes [#8256](https://github.com/lobehub/lobe-chat/issues/8256) ([08f5d73](https://github.com/lobehub/lobe-chat/commit/08f5d73))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.96.8](https://github.com/lobehub/lobe-chat/compare/v1.96.7...v1.96.8)
 
 <sup>Released on **2025-06-23**</sup>

package/changelog/v1.json

@@ -1,4 +1,13 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "Google Gemini tools declarations."
+      ]
+    },
+    "date": "2025-06-23",
+    "version": "1.96.9"
+  },
   {
     "children": {
       "improvements": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.96.8",
+  "version": "1.96.9",
   "description": "Lobe Chat - an open-source, high-performance chatbot 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",

package/src/libs/model-runtime/google/index.test.ts

@@ -560,6 +560,58 @@ describe('LobeGoogleAI', () => {
           },
         ]);
       });
+
+      it('should correctly convert function response message', async () => {
+        const messages: OpenAIChatMessage[] = [
+          {
+            content: '',
+            role: 'assistant',
+            tool_calls: [
+              {
+                id: 'call_1',
+                function: {
+                  name: 'get_current_weather',
+                  arguments: JSON.stringify({ location: 'London', unit: 'celsius' }),
+                },
+                type: 'function',
+              },
+            ],
+          },
+          {
+            content: '{"success":true,"data":{"temperature":"14°C"}}',
+            name: 'get_current_weather',
+            role: 'tool',
+            tool_call_id: 'call_1',
+          },
+        ];
+
+        const contents = await instance['buildGoogleMessages'](messages);
+        expect(contents).toHaveLength(2);
+        expect(contents).toEqual([
+          {
+            parts: [
+              {
+                functionCall: {
+                  args: { location: 'London', unit: 'celsius' },
+                  name: 'get_current_weather',
+                },
+              },
+            ],
+            role: 'model',
+          },
+          {
+            parts: [
+              {
+                functionResponse: {
+                  name: 'get_current_weather',
+                  response: { result: '{"success":true,"data":{"temperature":"14°C"}}' },
+                },
+              },
+            ],
+            role: 'user',
+          },
+        ]);
+      });
     });
 
     describe('buildGoogleTools', () => {
@@ -690,7 +742,7 @@ describe('LobeGoogleAI', () => {
 
         const converted = await instance['convertOAIMessagesToGoogleMessage'](message);
         expect(converted).toEqual({
-          role: 'function',
+          role: 'model',
           parts: [
             {
               functionCall: {

package/src/libs/model-runtime/google/index.ts

@@ -353,6 +353,7 @@ export class LobeGoogleAI implements LobeRuntimeAI {
       system: system_message?.content,
     };
   }
+
   private convertContentToGooglePart = async (
     content: UserMessageContentPart,
   ): Promise<Part | undefined> => {
@@ -399,6 +400,7 @@ export class LobeGoogleAI implements LobeRuntimeAI {
 
   private convertOAIMessagesToGoogleMessage = async (
     message: OpenAIChatMessage,
+    toolCallNameMap?: Map<string, string>,
   ): Promise<Content> => {
     const content = message.content as string | UserMessageContentPart[];
     if (!!message.tool_calls) {
@@ -409,10 +411,28 @@ export class LobeGoogleAI implements LobeRuntimeAI {
             name: tool.function.name,
           },
         })),
-        role: 'function',
+        role: 'model',
       };
     }
 
+    // 将 tool_call result 转成 functionResponse part
+    if (message.role === 'tool' && toolCallNameMap && message.tool_call_id) {
+      const functionName = toolCallNameMap.get(message.tool_call_id);
+      if (functionName) {
+        return {
+          parts: [
+            {
+              functionResponse: {
+                name: functionName,
+                response: { result: message.content },
+              },
+            },
+          ],
+          role: 'user',
+        };
+      }
+    }
+
     const getParts = async () => {
       if (typeof content === 'string') return [{ text: content }];
 
@@ -430,9 +450,20 @@ export class LobeGoogleAI implements LobeRuntimeAI {
 
   // convert messages from the OpenAI format to Google GenAI SDK
   private buildGoogleMessages = async (messages: OpenAIChatMessage[]): Promise<Content[]> => {
+    const toolCallNameMap = new Map<string, string>();
+    messages.forEach((message) => {
+      if (message.role === 'assistant' && message.tool_calls) {
+        message.tool_calls.forEach((toolCall) => {
+          if (toolCall.type === 'function') {
+            toolCallNameMap.set(toolCall.id, toolCall.function.name);
+          }
+        });
+      }
+    });
+
     const pools = messages
       .filter((message) => message.role !== 'function')
-      .map(async (msg) => await this.convertOAIMessagesToGoogleMessage(msg));
+      .map(async (msg) => await this.convertOAIMessagesToGoogleMessage(msg, toolCallNameMap));
 
     return Promise.all(pools);
   };
@@ -493,12 +524,18 @@ export class LobeGoogleAI implements LobeRuntimeAI {
   ): GoogleFunctionCallTool[] | undefined {
     // 目前 Tools (例如 googleSearch) 无法与其他 FunctionCall 同时使用
     if (payload?.messages?.some((m) => m.tool_calls?.length)) {
-      return; // 若历史消息中已有 function calling，则不再注入任何 Tools
+      return this.buildFunctionDeclarations(tools);
     }
     if (payload?.enabledSearch) {
       return [{ googleSearch: {} } as GoogleSearchRetrievalTool];
     }
 
+    return this.buildFunctionDeclarations(tools);
+  }
+
+  private buildFunctionDeclarations(
+    tools: ChatCompletionTool[] | undefined,
+  ): GoogleFunctionCallTool[] | undefined {
     if (!tools || tools.length === 0) return;
 
     return [

package/src/libs/model-runtime/utils/streams/google-ai.test.ts

@@ -7,7 +7,7 @@ import { GoogleGenerativeAIStream } from './google-ai';
 
 describe('GoogleGenerativeAIStream', () => {
   it('should transform Google Generative AI stream to protocol stream', async () => {
-    vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1');
+    vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1').mockReturnValueOnce('abcd1234');
 
     const mockGenerateContentResponse = (text: string, functionCalls?: any[]) =>
       ({
@@ -59,7 +59,7 @@ describe('GoogleGenerativeAIStream', () => {
       // tool call
       'id: chat_1\n',
       'event: tool_calls\n',
-      `data: [{"function":{"arguments":"{\\"arg1\\":\\"value1\\"}","name":"testFunction"},"id":"testFunction_0","index":0,"type":"function"}]\n\n`,
+      `data: [{"function":{"arguments":"{\\"arg1\\":\\"value1\\"}","name":"testFunction"},"id":"testFunction_0_abcd1234","index":0,"type":"function"}]\n\n`,
 
       // text
       'id: chat_1\n',

package/src/libs/model-runtime/utils/streams/ollama.test.ts

@@ -30,7 +30,7 @@ describe('OllamaStream', () => {
       });
 
       const protocolStream = OllamaStream(mockOllamaStream);
-    
+
       const decoder = new TextDecoder();
       const chunks = [];
 
@@ -62,7 +62,7 @@ describe('OllamaStream', () => {
           'id: chat_2',
           'event: stop',
           `data: "finished"\n`,
-        ].map((line) => `${line}\n`)
+        ].map((line) => `${line}\n`),
       );
     });
 
@@ -116,7 +116,7 @@ describe('OllamaStream', () => {
     });
 
     it('tools use', async () => {
-      vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1');
+      vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1').mockReturnValueOnce('abcd1234');
 
       const mockOllamaStream = new ReadableStream<ChatResponse>({
         start(controller) {
@@ -178,7 +178,7 @@ describe('OllamaStream', () => {
         [
           'id: chat_1',
           'event: tool_calls',
-          `data: [{"function":{"arguments":"{\\"city\\":\\"杭州\\"}","name":"realtime-weather____fetchCurrentWeather"},"id":"realtime-weather____fetchCurrentWeather_0","index":0,"type":"function"}]\n`,
+          `data: [{"function":{"arguments":"{\\"city\\":\\"杭州\\"}","name":"realtime-weather____fetchCurrentWeather"},"id":"realtime-weather____fetchCurrentWeather_0_abcd1234","index":0,"type":"function"}]\n`,
           'id: chat_1',
           'event: stop',
           `data: "finished"\n`,

package/src/libs/model-runtime/utils/streams/protocol.ts

@@ -1,5 +1,6 @@
 import { CitationItem, ModelSpeed, ModelTokensUsage } from '@/types/message';
 import { safeParseJSON } from '@/utils/safeParseJSON';
+import { nanoid } from '@/utils/uuid';
 
 import { AgentRuntimeErrorType } from '../../error';
 import { parseToolCalls } from '../../helpers';
@@ -98,7 +99,7 @@ export interface StreamProtocolToolCallChunk {
 }
 
 export const generateToolCallId = (index: number, functionName?: string) =>
-  `${functionName || 'unknown_tool_call'}_${index}`;
+  `${functionName || 'unknown_tool_call'}_${index}_${nanoid()}`;
 
 const chatStreamable = async function* <T>(stream: AsyncIterable<T>) {
   for await (const response of stream) {

package/src/libs/model-runtime/utils/streams/vertex-ai.test.ts

@@ -137,7 +137,7 @@ describe('VertexAIStream', () => {
   });
 
   it('tool_calls', async () => {
-    vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1');
+    vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1').mockReturnValueOnce('abcd1234');
 
     const rawChunks = [
       {
@@ -227,7 +227,7 @@ describe('VertexAIStream', () => {
       // text
       'id: chat_1\n',
       'event: tool_calls\n',
-      `data: [{"function":{"arguments":"{\\"city\\":\\"杭州\\"}","name":"realtime-weather____fetchCurrentWeather"},"id":"realtime-weather____fetchCurrentWeather_0","index":0,"type":"function"}]\n\n`,
+      `data: [{"function":{"arguments":"{\\"city\\":\\"杭州\\"}","name":"realtime-weather____fetchCurrentWeather"},"id":"realtime-weather____fetchCurrentWeather_0_abcd1234","index":0,"type":"function"}]\n\n`,
       'id: chat_1\n',
       'event: stop\n',
       'data: "STOP"\n\n',