@lobehub/chat 1.19.30 → 1.19.32

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

@@ -1,5 +1,6 @@
 import {
   Content,
+  FunctionCallPart,
   FunctionDeclaration,
   FunctionDeclarationSchemaProperty,
   FunctionDeclarationSchemaType,
@@ -11,6 +12,7 @@ import { JSONSchema7 } from 'json-schema';
 import { transform } from 'lodash-es';
 
 import { imageUrlToBase64 } from '@/utils/imageToBase64';
+import { safeParseJSON } from '@/utils/safeParseJSON';
 
 import { LobeRuntimeAI } from '../BaseAI';
 import { AgentRuntimeErrorType, ILobeAgentRuntimeErrorType } from '../error';
@@ -50,8 +52,9 @@ export class LobeGoogleAI implements LobeRuntimeAI {
     this.baseURL = baseURL;
   }
 
-  async chat(payload: ChatStreamPayload, options?: ChatCompetitionOptions) {
+  async chat(rawPayload: ChatStreamPayload, options?: ChatCompetitionOptions) {
     try {
+      const payload = this.buildPayload(rawPayload);
       const model = payload.model;
 
       const contents = await this.buildGoogleMessages(payload.messages, model);
@@ -88,7 +91,11 @@ export class LobeGoogleAI implements LobeRuntimeAI {
           },
           { apiVersion: 'v1beta', baseUrl: this.baseURL },
         )
-        .generateContentStream({ contents, tools: this.buildGoogleTools(payload.tools) });
+        .generateContentStream({
+          contents,
+          systemInstruction: payload.system as string,
+          tools: this.buildGoogleTools(payload.tools),
+        });
 
       const googleStream = googleGenAIResultToStream(geminiStreamResult);
       const [prod, useForDebug] = googleStream.tee();
@@ -111,6 +118,16 @@ export class LobeGoogleAI implements LobeRuntimeAI {
     }
   }
 
+  private buildPayload(payload: ChatStreamPayload) {
+    const system_message = payload.messages.find((m) => m.role === 'system');
+    const user_messages = payload.messages.filter((m) => m.role !== 'system');
+
+    return {
+      ...payload,
+      messages: user_messages,
+      system: system_message?.content,
+    };
+  }
   private convertContentToGooglePart = async (content: UserMessageContentPart): Promise<Part> => {
     switch (content.type) {
       case 'text': {
@@ -152,6 +169,17 @@ export class LobeGoogleAI implements LobeRuntimeAI {
     message: OpenAIChatMessage,
   ): Promise<Content> => {
     const content = message.content as string | UserMessageContentPart[];
+    if (!!message.tool_calls) {
+      return {
+        parts: message.tool_calls.map<FunctionCallPart>((tool) => ({
+          functionCall: {
+            args: safeParseJSON(tool.function.arguments)!,
+            name: tool.function.name,
+          },
+        })),
+        role: 'function',
+      };
+    }
 
     return {
       parts:
@@ -168,44 +196,44 @@ export class LobeGoogleAI implements LobeRuntimeAI {
     messages: OpenAIChatMessage[],
     model: string,
   ): Promise<Content[]> => {
-    // if the model is gemini-1.5-pro-latest, we don't need any special handling
-    if (model === 'gemini-1.5-pro-latest') {
-      const pools = messages
-        .filter((message) => message.role !== 'function')
-        .map(async (msg) => await this.convertOAIMessagesToGoogleMessage(msg));
+    // if the model is gemini-1.0 we don't need to pair messages
+    if (model.startsWith('gemini-1.0')) {
+      const contents: Content[] = [];
+      let lastRole = 'model';
+
+      for (const message of messages) {
+        // current to filter function message
+        if (message.role === 'function') {
+          continue;
+        }
+        const googleMessage = await this.convertOAIMessagesToGoogleMessage(message);
 
-      return Promise.all(pools);
-    }
+        // if the last message is a model message and the current message is a model message
+        // then we need to add a user message to separate them
+        if (lastRole === googleMessage.role) {
+          contents.push({ parts: [{ text: '' }], role: lastRole === 'user' ? 'model' : 'user' });
+        }
 
-    const contents: Content[] = [];
-    let lastRole = 'model';
+        // add the current message to the contents
+        contents.push(googleMessage);
 
-    for (const message of messages) {
-      // current to filter function message
-      if (message.role === 'function') {
-        continue;
+        // update the last role
+        lastRole = googleMessage.role;
       }
-      const googleMessage = await this.convertOAIMessagesToGoogleMessage(message);
 
-      // if the last message is a model message and the current message is a model message
-      // then we need to add a user message to separate them
-      if (lastRole === googleMessage.role) {
-        contents.push({ parts: [{ text: '' }], role: lastRole === 'user' ? 'model' : 'user' });
+      // if the last message is a user message, then we need to add a model message to separate them
+      if (lastRole === 'model') {
+        contents.push({ parts: [{ text: '' }], role: 'user' });
       }
 
-      // add the current message to the contents
-      contents.push(googleMessage);
-
-      // update the last role
-      lastRole = googleMessage.role;
+      return contents;
     }
 
-    // if the last message is a user message, then we need to add a model message to separate them
-    if (lastRole === 'model') {
-      contents.push({ parts: [{ text: '' }], role: 'user' });
-    }
+    const pools = messages
+      .filter((message) => message.role !== 'function')
+      .map(async (msg) => await this.convertOAIMessagesToGoogleMessage(msg));
 
-    return contents;
+    return Promise.all(pools);
   };
 
   private parseErrorMessage(message: string): {

package/src/server/services/discover/index.ts

@@ -212,7 +212,7 @@ export class DiscoverService {
   // Providers
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  getProviderList = async (locale: Locales): Promise<DiscoverProviderItem[]> => {
+  getProviderList = async (_locale: Locales): Promise<DiscoverProviderItem[]> => {
     const list = DEFAULT_MODEL_PROVIDER_LIST.filter((item) => item.chatModels.length > 0);
     return list.map((item) => {
       const provider = {

package/src/services/message/server.ts

@@ -79,7 +79,7 @@ export class ServerService implements IMessageService {
     return lambdaClient.message.updatePluginState.mutate({ id, value });
   }
 
-  bindMessagesToTopic(topicId: string, messageIds: string[]): Promise<any> {
+  bindMessagesToTopic(_topicId: string, _messageIds: string[]): Promise<any> {
     throw new Error('Method not implemented.');
   }
 

package/src/services/session/server.ts

@@ -91,7 +91,7 @@ export class ServerService implements ISessionService {
     return lambdaClient.session.updateSessionChatConfig.mutate({ id, value }, { signal });
   }
 
-  getSessionsByType(type: 'agent' | 'group' | 'all' = 'all'): Promise<LobeSessions> {
+  getSessionsByType(_type: 'agent' | 'group' | 'all' = 'all'): Promise<LobeSessions> {
     // TODO: need be fixed
     // @ts-ignore
     return lambdaClient.session.getSessions.query({});
@@ -121,7 +121,7 @@ export class ServerService implements ISessionService {
     return lambdaClient.sessionGroup.getSessionGroup.query();
   }
 
-  batchCreateSessionGroups(groups: SessionGroups): Promise<BatchTaskResult> {
+  batchCreateSessionGroups(_groups: SessionGroups): Promise<BatchTaskResult> {
     return Promise.resolve({ added: 0, ids: [], skips: [], success: true });
   }
 

package/src/store/chat/slices/plugin/action.ts

@@ -141,7 +141,9 @@ export const chatPlugin: StateCreator<
 
     try {
       content = JSON.parse(data);
-    } catch {}
+    } catch {
+      /* empty block */
+    }
 
     if (!content) return;
 

package/tsconfig.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "compilerOptions": {
     "target": "ESNext",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": ["dom", "dom.iterable", "esnext", "webworker"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -16,7 +16,7 @@
     "jsx": "preserve",
     "incremental": true,
     "baseUrl": ".",
-    "types": ["vitest/globals"],
+    "types": ["vitest/globals", "@serwist/next/typings"],
     "paths": {
       "@/*": ["./src/*"],
       "~test-utils": ["./tests/utils.tsx"]
@@ -27,7 +27,7 @@
       }
     ]
   },
-  "exclude": ["node_modules"],
+  "exclude": ["node_modules", "public/sw.js"],
   "include": [
     "next-env.d.ts",
     "vitest.config.ts",