@lobehub/chat 0.36.0 → 0.37.0

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 0.37.0](https://github.com/lobehub/lobe-chat/compare/v0.36.1...v0.37.0)
+
+<sup>Released on **2023-08-03**</sup>
+
+#### ✨ Features
+
+- **misc**: 支持使用全局助手的设置作为默认助手的创建角色.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: 支持使用全局助手的设置作为默认助手的创建角色, closes [#44](https://github.com/lobehub/lobe-chat/issues/44) ([f91857d](https://github.com/lobehub/lobe-chat/commit/f91857d))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.36.1](https://github.com/lobehub/lobe-chat/compare/v0.36.0...v0.36.1)
+
+<sup>Released on **2023-08-03**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor zustand usage with v4.4.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor zustand usage with v4.4, closes [#52](https://github.com/lobehub/lobe-chat/issues/52) ([4c65aa7](https://github.com/lobehub/lobe-chat/commit/4c65aa7))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 0.36.0](https://github.com/lobehub/lobe-chat/compare/v0.35.1...v0.36.0)
 
 <sup>Released on **2023-08-03**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.36.0",
+  "version": "0.37.0",
   "description": "Lobe Chat is an open-source chatbot client using LangChain, Typescript and Next.js",
   "keywords": [
     "chatbot",
@@ -93,7 +93,7 @@
     "swr": "^2",
     "ts-md5": "^1",
     "uuid": "^9",
-    "zustand": "^4",
+    "zustand": "^4.4",
     "zustand-utils": "^1"
   },
   "devDependencies": {

package/src/const/settings.ts

@@ -12,18 +12,12 @@ export const DEFAULT_BASE_SETTINGS: GlobalBaseSettings = {
   enableMaxTokens: true,
   endpoint: '',
   fontSize: 14,
-  frequencyPenalty: 0,
   historyCount: 24,
   language: 'zh-CN',
-  maxTokens: 2000,
-  model: LanguageModel.GPT3_5,
   neutralColor: '',
   password: '',
-  presencePenalty: 0,
   primaryColor: '',
-  temperature: 0.5,
   themeMode: 'auto',
-  topP: 1,
 };
 
 export const DEFAULT_AGENT_CONFIG: LobeAgentConfig = {

package/src/pages/chat/SessionList/List/SessionItem.tsx

@@ -29,7 +29,7 @@ const SessionItem: FC<SessionItemProps> = memo(({ id, active = true, loading })
   const { t } = useTranslation('common');
 
   const { styles, theme } = useStyles();
-  const [defaultModel] = useSettings((s) => [s.settings.model], shallow);
+  const [defaultModel] = useSettings((s) => [s.settings.defaultAgent.config?.model], shallow);
 
   const [
     pin,

package/src/store/session/index.ts

@@ -1,5 +1,6 @@
-import { create } from 'zustand';
+import equal from 'fast-deep-equal';
 import { PersistOptions, devtools, persist } from 'zustand/middleware';
+import { createWithEqualityFn } from 'zustand/traditional';
 
 import { isDev } from '@/utils/env';
 
@@ -22,13 +23,14 @@ const persistOptions: PersistOptions<SessionStore, SessionPersist> = {
   // version: Migration.targetVersion,
 };
 
-export const useSessionStore = create<SessionStore>()(
+export const useSessionStore = createWithEqualityFn<SessionStore>()(
   persist(
     devtools(createStore, {
       name: LOBE_CHAT + (isDev ? '_DEV' : ''),
     }),
     persistOptions,
   ),
+  equal,
 );
 
 export * from './selectors';

package/src/store/session/slices/session/action.ts

@@ -4,6 +4,7 @@ import Router from 'next/router';
 import { StateCreator } from 'zustand/vanilla';
 
 import { SessionStore, initLobeSession } from '@/store/session';
+import { useSettings } from '@/store/settings';
 import { LobeAgentSession, LobeSessions } from '@/types/session';
 import { setNamespace } from '@/utils/storeDebug';
 import { uuid } from '@/utils/uuid';
@@ -77,8 +78,9 @@ export const createSessionSlice: StateCreator<
 
     const timestamp = Date.now();
 
-    // TODO: 等 settings 里的 defaultAgent 都改好以后，做个合并即可
-    const newSession: LobeAgentSession = merge({}, initLobeSession, {
+    // 合并 settings 里的 defaultAgent
+    const globalDefaultAgent = useSettings.getState().settings.defaultAgent;
+    const newSession: LobeAgentSession = merge({}, initLobeSession, globalDefaultAgent, {
       createAt: timestamp,
       id: uuid(),
       updateAt: timestamp,

package/src/store/settings/index.ts

@@ -1,5 +1,6 @@
-import { create } from 'zustand';
+import equal from 'fast-deep-equal';
 import { type PersistOptions, devtools, persist } from 'zustand/middleware';
+import { createWithEqualityFn } from 'zustand/traditional';
 
 import { isDev } from '@/utils/env';
 
@@ -12,13 +13,14 @@ const persistOptions: PersistOptions<SettingsStore> = {
   skipHydration: true,
 };
 
-export const useSettings = create<SettingsStore>()(
+export const useSettings = createWithEqualityFn<SettingsStore>()(
   persist(
     devtools(createStore, {
       name: LOBE_SETTINGS + (isDev ? '_DEV' : ''),
     }),
     persistOptions,
   ),
+  equal,
 );
 
 export * from './selectors';

package/src/types/settings.ts

@@ -2,7 +2,6 @@ import type { NeutralColors, PrimaryColors } from '@lobehub/ui';
 import type { ThemeMode } from 'antd-style';
 
 import type { Locales } from '@/locales/resources';
-import type { LanguageModel } from '@/types/llm';
 import type { LobeAgentSession } from '@/types/session';
 
 export interface GlobalBaseSettings {
@@ -14,18 +13,12 @@ export interface GlobalBaseSettings {
   enableMaxTokens: boolean;
   endpoint: string;
   fontSize: number;
-  frequencyPenalty: number;
   historyCount: number;
   language: Locales;
-  maxTokens: number;
-  model: LanguageModel;
   neutralColor: NeutralColors | '';
   password: string;
-  presencePenalty: number;
   primaryColor: PrimaryColors | '';
-  temperature: number;
   themeMode: ThemeMode;
-  topP: number;
 }
 
 export type GlobalDefaultAgent = Partial<LobeAgentSession>;