@lobehub/chat 1.24.0 → 1.24.1

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.24.1](https://github.com/lobehub/lobe-chat/compare/v1.24.0...v1.24.1)
+
+<sup>Released on **2024-10-25**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor the Google Gen AI.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor the Google Gen AI, closes [#4484](https://github.com/lobehub/lobe-chat/issues/4484) ([b890e8d](https://github.com/lobehub/lobe-chat/commit/b890e8d))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 1.24.0](https://github.com/lobehub/lobe-chat/compare/v1.23.1...v1.24.0)
 
 <sup>Released on **2024-10-25**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.24.0",
+  "version": "1.24.1",
   "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",
@@ -116,7 +116,7 @@
     "@clerk/themes": "^2.1.37",
     "@codesandbox/sandpack-react": "^2.19.9",
     "@cyntler/react-doc-viewer": "^1.17.0",
-    "@google/generative-ai": "^0.16.1",
+    "@google/generative-ai": "^0.21.0",
     "@huggingface/inference": "^2.8.1",
     "@icons-pack/react-simple-icons": "9.6.0",
     "@khmyznikov/pwa-install": "^0.3.9",

package/src/app/(main)/chat/(workspace)/_layout/Desktop/Portal.tsx

@@ -6,7 +6,11 @@ import { rgba } from 'polished';
 import { PropsWithChildren, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import { CHAT_DOCK_TOOL_UI_WIDTH, CHAT_DOCK_WIDTH, MAX_WIDTH } from '@/const/layoutTokens';
+import {
+  CHAT_PORTAL_MAX_WIDTH,
+  CHAT_PORTAL_TOOL_UI_WIDTH,
+  CHAT_PORTAL_WIDTH,
+} from '@/const/layoutTokens';
 import { useChatStore } from '@/store/chat';
 import { chatPortalSelectors } from '@/store/chat/slices/portal/selectors';
 
@@ -25,12 +29,8 @@ const useStyles = createStyles(({ css, token, isDarkMode }) => ({
   `,
   panel: css`
     overflow: hidden;
-
     height: 100%;
-    margin: 4px;
-
     background: ${isDarkMode ? rgba(token.colorBgElevated, 0.8) : token.colorBgElevated};
-    border-radius: 8px;
   `,
 }));
 
@@ -53,8 +53,8 @@ const PortalPanel = memo(({ children }: PropsWithChildren) => {
         }}
         expand
         hanlderStyle={{ display: 'none' }}
-        maxWidth={MAX_WIDTH}
-        minWidth={showArtifactUI || showToolUI ? CHAT_DOCK_TOOL_UI_WIDTH : CHAT_DOCK_WIDTH}
+        maxWidth={CHAT_PORTAL_MAX_WIDTH}
+        minWidth={showArtifactUI || showToolUI ? CHAT_PORTAL_TOOL_UI_WIDTH : CHAT_PORTAL_WIDTH}
         mode={md ? 'fixed' : 'float'}
         placement={'right'}
         showHandlerWhenUnexpand={false}
@@ -65,7 +65,7 @@ const PortalPanel = memo(({ children }: PropsWithChildren) => {
             flex: 'none',
             height: '100%',
             maxHeight: '100vh',
-            minWidth: CHAT_DOCK_WIDTH,
+            minWidth: CHAT_PORTAL_WIDTH,
           }}
         >
           <Flexbox className={styles.panel}>{children}</Flexbox>

package/src/const/layoutTokens.ts

@@ -8,8 +8,9 @@ export const CHAT_TEXTAREA_HEIGHT = 160;
 export const CHAT_TEXTAREA_HEIGHT_MOBILE = 108;
 export const CHAT_SIDEBAR_WIDTH = 280;
 
-export const CHAT_DOCK_WIDTH = 400;
-export const CHAT_DOCK_TOOL_UI_WIDTH = 600;
+export const CHAT_PORTAL_WIDTH = 400;
+export const CHAT_PORTAL_MAX_WIDTH = 1280;
+export const CHAT_PORTAL_TOOL_UI_WIDTH = 600;
 
 export const MARKET_SIDEBAR_WIDTH = 400;
 export const FOLDER_WIDTH = 270;

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

@@ -1,6 +1,5 @@
 // @vitest-environment edge-runtime
-import { FunctionDeclarationSchemaType, FunctionDeclarationsTool } from '@google/generative-ai';
-import { JSONSchema7 } from 'json-schema';
+import { FunctionDeclarationsTool } from '@google/generative-ai';
 import OpenAI from 'openai';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
@@ -479,10 +478,10 @@ describe('LobeGoogleAI', () => {
           name: 'testTool',
           description: 'A test tool',
           parameters: {
-            type: FunctionDeclarationSchemaType.OBJECT,
+            type: 'object',
             properties: {
-              param1: { type: FunctionDeclarationSchemaType.STRING },
-              param2: { type: FunctionDeclarationSchemaType.NUMBER },
+              param1: { type: 'string' },
+              param2: { type: 'number' },
             },
             required: ['param1'],
           },
@@ -490,92 +489,6 @@ describe('LobeGoogleAI', () => {
       });
     });
 
-    describe('convertSchemaObject', () => {
-      it('should correctly convert object schema', () => {
-        const schema: JSONSchema7 = {
-          type: 'object',
-          properties: {
-            prop1: { type: 'string' },
-            prop2: { type: 'number' },
-          },
-        };
-
-        const converted = instance['convertSchemaObject'](schema);
-
-        expect(converted).toEqual({
-          type: FunctionDeclarationSchemaType.OBJECT,
-          properties: {
-            prop1: { type: FunctionDeclarationSchemaType.STRING },
-            prop2: { type: FunctionDeclarationSchemaType.NUMBER },
-          },
-        });
-      });
-
-      it('should correctly convert nested schema', () => {
-        const schema: JSONSchema7 = {
-          type: 'object',
-          properties: {
-            nested: {
-              type: 'array',
-              items: {
-                type: 'object',
-                properties: {
-                  prop: { type: 'string' },
-                },
-              },
-            },
-          },
-        };
-
-        const converted = instance['convertSchemaObject'](schema);
-
-        expect(converted).toEqual({
-          type: FunctionDeclarationSchemaType.OBJECT,
-          properties: {
-            nested: {
-              type: FunctionDeclarationSchemaType.ARRAY,
-              items: {
-                type: FunctionDeclarationSchemaType.OBJECT,
-                properties: {
-                  prop: { type: FunctionDeclarationSchemaType.STRING },
-                },
-              },
-            },
-          },
-        });
-      });
-
-      it('should correctly convert array schema', () => {
-        const schema: JSONSchema7 = {
-          type: 'array',
-          items: { type: 'string' },
-        };
-        const converted = instance['convertSchemaObject'](schema);
-        expect(converted).toEqual({
-          type: FunctionDeclarationSchemaType.ARRAY,
-          items: { type: FunctionDeclarationSchemaType.STRING },
-        });
-      });
-
-      it('should correctly convert string schema', () => {
-        const schema: JSONSchema7 = { type: 'string' };
-        const converted = instance['convertSchemaObject'](schema);
-        expect(converted).toEqual({ type: FunctionDeclarationSchemaType.STRING });
-      });
-
-      it('should correctly convert number schema', () => {
-        const schema: JSONSchema7 = { type: 'number' };
-        const converted = instance['convertSchemaObject'](schema);
-        expect(converted).toEqual({ type: FunctionDeclarationSchemaType.NUMBER });
-      });
-
-      it('should correctly convert boolean schema', () => {
-        const schema: JSONSchema7 = { type: 'boolean' };
-        const converted = instance['convertSchemaObject'](schema);
-        expect(converted).toEqual({ type: FunctionDeclarationSchemaType.BOOLEAN });
-      });
-    });
-
     describe('convertOAIMessagesToGoogleMessage', () => {
       it('should correctly convert assistant message', async () => {
         const message: OpenAIChatMessage = {

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

@@ -2,14 +2,11 @@ import {
   Content,
   FunctionCallPart,
   FunctionDeclaration,
-  FunctionDeclarationSchemaProperty,
-  FunctionDeclarationSchemaType,
   Tool as GoogleFunctionCallTool,
   GoogleGenerativeAI,
   Part,
+  SchemaType,
 } from '@google/generative-ai';
-import { JSONSchema7 } from 'json-schema';
-import { transform } from 'lodash-es';
 
 import { imageUrlToBase64 } from '@/utils/imageToBase64';
 import { safeParseJSON } from '@/utils/safeParseJSON';
@@ -190,13 +187,12 @@ export class LobeGoogleAI implements LobeRuntimeAI {
     };
   };
 
-  // convert messages from the Vercel AI SDK Format to the format
-  // that is expected by the Google GenAI SDK
+  // convert messages from the OpenAI format to Google GenAI SDK
   private buildGoogleMessages = async (
     messages: OpenAIChatMessage[],
     model: string,
   ): Promise<Content[]> => {
-    // if the model is gemini-1.0 we don't need to pair messages
+    // if the model is gemini-1.0 we need to pair messages
     if (model.startsWith('gemini-1.0')) {
       const contents: Content[] = [];
       let lastRole = 'model';
@@ -298,52 +294,12 @@ export class LobeGoogleAI implements LobeRuntimeAI {
       name: functionDeclaration.name,
       parameters: {
         description: parameters?.description,
-        properties: transform(parameters?.properties, (result, value, key: string) => {
-          result[key] = this.convertSchemaObject(value as JSONSchema7);
-        }),
+        properties: parameters?.properties,
         required: parameters?.required,
-        type: FunctionDeclarationSchemaType.OBJECT,
+        type: SchemaType.OBJECT,
       },
     };
   };
-
-  private convertSchemaObject(schema: JSONSchema7): FunctionDeclarationSchemaProperty {
-    switch (schema.type) {
-      default:
-      case 'object': {
-        return {
-          ...schema,
-          properties: Object.fromEntries(
-            Object.entries(schema.properties || {}).map(([key, value]) => [
-              key,
-              this.convertSchemaObject(value as JSONSchema7),
-            ]),
-          ),
-          type: FunctionDeclarationSchemaType.OBJECT,
-        } as any;
-      }
-
-      case 'array': {
-        return {
-          ...schema,
-          items: this.convertSchemaObject(schema.items as JSONSchema7),
-          type: FunctionDeclarationSchemaType.ARRAY,
-        } as any;
-      }
-
-      case 'string': {
-        return { ...schema, type: FunctionDeclarationSchemaType.STRING } as any;
-      }
-
-      case 'number': {
-        return { ...schema, type: FunctionDeclarationSchemaType.NUMBER } as any;
-      }
-
-      case 'boolean': {
-        return { ...schema, type: FunctionDeclarationSchemaType.BOOLEAN } as any;
-      }
-    }
-  }
 }
 
 export default LobeGoogleAI;