@lobehub/chat 0.151.5 → 0.151.6

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.151.6](https://github.com/lobehub/lobe-chat/compare/v0.151.5...v0.151.6)
+
+<sup>Released on **2024-04-30**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Plugins with multiple settings cannot be correctly configured.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Plugins with multiple settings cannot be correctly configured, closes [#1991](https://github.com/lobehub/lobe-chat/issues/1991) ([0c041aa](https://github.com/lobehub/lobe-chat/commit/0c041aa))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.151.5](https://github.com/lobehub/lobe-chat/compare/v0.151.4...v0.151.5)
 
 <sup>Released on **2024-04-30**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.151.5",
+  "version": "0.151.6",
   "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/store/tool/slices/plugin/action.test.ts

@@ -4,6 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { pluginService } from '@/services/plugin';
 import { LobeTool } from '@/types/tool';
+import { merge } from '@/utils/merge';
 
 import { useToolStore } from '../../store';
 
@@ -91,6 +92,24 @@ describe('useToolStore:plugin', () => {
 
       expect(pluginService.updatePluginSettings).toBeCalledWith(pluginId, newSettings);
     });
+
+    it('should merge settings for a plugin with existing settings', async () => {
+      const pluginId = 'test-plugin';
+      const existingSettings = { setting1: 'old-value', setting2: 'old-value' };
+      const newSettings = { setting1: 'new-value' };
+      const mergedSettings = merge(existingSettings, newSettings);
+      useToolStore.setState({
+        installedPlugins: [{ identifier: pluginId, settings: existingSettings }] as LobeTool[],
+      });
+
+      const { result } = renderHook(() => useToolStore());
+
+      await act(async () => {
+        await result.current.updatePluginSettings(pluginId, newSettings);
+      });
+
+      expect(pluginService.updatePluginSettings).toBeCalledWith(pluginId, mergedSettings);
+    });
   });
 
   describe('removeAllPlugins', () => {

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

@@ -3,6 +3,7 @@ import useSWR, { SWRResponse } from 'swr';
 import { StateCreator } from 'zustand/vanilla';
 
 import { pluginService } from '@/services/plugin';
+import { merge } from '@/utils/merge';
 
 import { ToolStore } from '../../store';
 import { pluginStoreSelectors } from '../store/selectors';
@@ -44,7 +45,11 @@ export const createPluginSlice: StateCreator<
     await get().refreshPlugins();
   },
   updatePluginSettings: async (id, settings) => {
-    await pluginService.updatePluginSettings(id, settings);
+    const previousSettings = pluginSelectors.getPluginSettingsById(id)(get());
+
+    const nextSettings = merge(previousSettings, settings);
+    await pluginService.updatePluginSettings(id, nextSettings);
+
     await get().refreshPlugins();
   },
   useCheckPluginsIsInstalled: (plugins) => useSWR(plugins, get().checkPluginsIsInstalled),