@lobehub/chat 0.150.9 → 0.151.0

package/src/store/{global → user}/slices/settings/selectors/modelProvider.ts

@@ -5,7 +5,7 @@ import { ChatModelCard, ModelProviderCard } from '@/types/llm';
 import { ServerModelProviderConfig } from '@/types/serverConfig';
 import { GlobalLLMProviderKey } from '@/types/settings';
 
-import { GlobalStore } from '../../../store';
+import { UserStore } from '../../../store';
 import { currentSettings, getProviderConfigById } from './settings';
 
 /**
@@ -13,7 +13,7 @@ import { currentSettings, getProviderConfigById } from './settings';
  */
 const serverProviderModelCards =
   (provider: GlobalLLMProviderKey) =>
-  (s: GlobalStore): ChatModelCard[] | undefined => {
+  (s: UserStore): ChatModelCard[] | undefined => {
     const config = s.serverConfig.languageModel?.[provider] as
       | ServerModelProviderConfig
       | undefined;
@@ -25,7 +25,7 @@ const serverProviderModelCards =
 
 const remoteProviderModelCards =
   (provider: GlobalLLMProviderKey) =>
-  (s: GlobalStore): ChatModelCard[] | undefined => {
+  (s: UserStore): ChatModelCard[] | undefined => {
     const cards = currentSettings(s).languageModel?.[provider]?.remoteModelCards as
       | ChatModelCard[]
       | undefined;
@@ -35,7 +35,7 @@ const remoteProviderModelCards =
     return cards;
   };
 
-const isProviderEnabled = (provider: GlobalLLMProviderKey) => (s: GlobalStore) =>
+const isProviderEnabled = (provider: GlobalLLMProviderKey) => (s: UserStore) =>
   getProviderConfigById(provider)(s)?.enabled || false;
 
 // Default Model Provider List
@@ -43,10 +43,9 @@ const isProviderEnabled = (provider: GlobalLLMProviderKey) => (s: GlobalStore) =
 /**
  * define all the model list of providers
  */
-const defaultModelProviderList = (s: GlobalStore): ModelProviderCard[] =>
-  s.defaultModelProviderList;
+const defaultModelProviderList = (s: UserStore): ModelProviderCard[] => s.defaultModelProviderList;
 
-export const getDefaultModeProviderById = (provider: string) => (s: GlobalStore) =>
+export const getDefaultModeProviderById = (provider: string) => (s: UserStore) =>
   defaultModelProviderList(s).find((s) => s.id === provider);
 
 /**
@@ -54,7 +53,7 @@ export const getDefaultModeProviderById = (provider: string) => (s: GlobalStore)
  * it's a default enabled model list by Lobe Chat
  * e.g. openai is ['gpt-3.5-turbo','gpt-4-turbo']
  */
-const getDefaultEnabledModelsById = (provider: string) => (s: GlobalStore) => {
+const getDefaultEnabledModelsById = (provider: string) => (s: UserStore) => {
   const modelProvider = getDefaultModeProviderById(provider)(s);
 
   if (modelProvider) return filterEnabledModels(modelProvider);
@@ -62,7 +61,7 @@ const getDefaultEnabledModelsById = (provider: string) => (s: GlobalStore) => {
   return undefined;
 };
 
-const getDefaultModelCardById = (id: string) => (s: GlobalStore) => {
+const getDefaultModelCardById = (id: string) => (s: UserStore) => {
   const list = defaultModelProviderList(s);
 
   return list.flatMap((i) => i.chatModels).find((m) => m.id === id);
@@ -72,7 +71,7 @@ const getDefaultModelCardById = (id: string) => (s: GlobalStore) => {
 
 const getModelCardsById =
   (provider: string) =>
-  (s: GlobalStore): ChatModelCard[] => {
+  (s: UserStore): ChatModelCard[] => {
     const builtinCards = getDefaultModeProviderById(provider)(s)?.chatModels || [];
 
     const userCards = (getProviderConfigById(provider)(s)?.customModelCards || []).map((model) => ({
@@ -83,15 +82,15 @@ const getModelCardsById =
     return uniqBy([...userCards, ...builtinCards], 'id');
   };
 
-const getEnableModelsById = (provider: string) => (s: GlobalStore) => {
+const getEnableModelsById = (provider: string) => (s: UserStore) => {
   if (!getProviderConfigById(provider)(s)?.enabledModels) return;
 
   return getProviderConfigById(provider)(s)?.enabledModels?.filter(Boolean);
 };
 
-const modelProviderList = (s: GlobalStore): ModelProviderCard[] => s.modelProviderList;
+const modelProviderList = (s: UserStore): ModelProviderCard[] => s.modelProviderList;
 
-const modelProviderListForModelSelect = (s: GlobalStore): ModelProviderCard[] =>
+const modelProviderListForModelSelect = (s: UserStore): ModelProviderCard[] =>
   modelProviderList(s)
     .filter((s) => s.enabled)
     .map((provider) => ({
@@ -99,29 +98,29 @@ const modelProviderListForModelSelect = (s: GlobalStore): ModelProviderCard[] =>
       chatModels: provider.chatModels.filter((model) => model.enabled),
     }));
 
-const getModelCardById = (id: string) => (s: GlobalStore) => {
+const getModelCardById = (id: string) => (s: UserStore) => {
   const list = modelProviderList(s);
 
   return list.flatMap((i) => i.chatModels).find((m) => m.id === id);
 };
 
-const isModelEnabledFunctionCall = (id: string) => (s: GlobalStore) =>
+const isModelEnabledFunctionCall = (id: string) => (s: UserStore) =>
   getModelCardById(id)(s)?.functionCall || false;
 
 // vision model white list, these models will change the content from string to array
 // refs: https://github.com/lobehub/lobe-chat/issues/790
-const isModelEnabledVision = (id: string) => (s: GlobalStore) =>
+const isModelEnabledVision = (id: string) => (s: UserStore) =>
   getModelCardById(id)(s)?.vision || id.includes('vision');
 
-const isModelEnabledFiles = (id: string) => (s: GlobalStore) => getModelCardById(id)(s)?.files;
+const isModelEnabledFiles = (id: string) => (s: UserStore) => getModelCardById(id)(s)?.files;
 
-const isModelEnabledUpload = (id: string) => (s: GlobalStore) =>
+const isModelEnabledUpload = (id: string) => (s: UserStore) =>
   isModelEnabledVision(id)(s) || isModelEnabledFiles(id)(s);
 
-const isModelHasMaxToken = (id: string) => (s: GlobalStore) =>
+const isModelHasMaxToken = (id: string) => (s: UserStore) =>
   typeof getModelCardById(id)(s)?.tokens !== 'undefined';
 
-const modelMaxToken = (id: string) => (s: GlobalStore) => getModelCardById(id)(s)?.tokens || 0;
+const modelMaxToken = (id: string) => (s: UserStore) => getModelCardById(id)(s)?.tokens || 0;
 
 export const modelProviderSelectors = {
   defaultModelProviderList,

package/src/store/{global → user}/slices/settings/selectors/selectors.test.ts

@@ -1,4 +1,4 @@
-import { GlobalStore } from '../../../store';
+import { UserStore } from '../../../store';
 import { settingsSelectors } from './settings';
 
 describe('settingsSelectors', () => {
@@ -48,7 +48,7 @@ describe('settingsSelectors', () => {
             },
           },
         },
-      } as unknown as GlobalStore;
+      } as unknown as UserStore;
 
       const result = settingsSelectors.currentSettings(s);
 
@@ -71,7 +71,7 @@ describe('settingsSelectors', () => {
             },
           },
         },
-      } as unknown as GlobalStore;
+      } as unknown as UserStore;
 
       const result = settingsSelectors.defaultAgent(s);
 
@@ -90,7 +90,7 @@ describe('settingsSelectors', () => {
             },
           },
         },
-      } as unknown as GlobalStore;
+      } as unknown as UserStore;
 
       const result = settingsSelectors.defaultAgentMeta(s);
 
@@ -109,7 +109,7 @@ describe('settingsSelectors', () => {
             },
           },
         },
-      } as unknown as GlobalStore;
+      } as unknown as UserStore;
 
       const result = settingsSelectors.currentTTS(s);
 
@@ -123,7 +123,7 @@ describe('settingsSelectors', () => {
         settings: {
           language: 'fr',
         },
-      } as unknown as GlobalStore;
+      } as unknown as UserStore;
 
       const result = settingsSelectors.currentLanguage(s);
 
@@ -142,7 +142,7 @@ describe('settingsSelectors', () => {
             },
           },
         },
-      } as unknown as GlobalStore;
+      } as unknown as UserStore;
 
       const result = settingsSelectors.dalleConfig(s);
 
@@ -160,7 +160,7 @@ describe('settingsSelectors', () => {
             },
           },
         },
-      } as unknown as GlobalStore;
+      } as unknown as UserStore;
 
       const result = settingsSelectors.isDalleAutoGenerating(s);
 

package/src/store/{global → user}/slices/settings/selectors/settings.ts

@@ -6,33 +6,33 @@ import { GeneralModelProviderConfig, GlobalLLMProviderKey, GlobalSettings } from
 import { isOnServerSide } from '@/utils/env';
 import { merge } from '@/utils/merge';
 
-import { GlobalStore } from '../../../store';
+import { UserStore } from '../../../store';
 
-export const currentSettings = (s: GlobalStore): GlobalSettings =>
+export const currentSettings = (s: UserStore): GlobalSettings =>
   merge(s.defaultSettings, s.settings);
 
-export const currentLLMSettings = (s: GlobalStore) => currentSettings(s).languageModel;
+export const currentLLMSettings = (s: UserStore) => currentSettings(s).languageModel;
 
-export const getProviderConfigById = (provider: string) => (s: GlobalStore) =>
+export const getProviderConfigById = (provider: string) => (s: UserStore) =>
   currentLLMSettings(s)[provider as GlobalLLMProviderKey] as GeneralModelProviderConfig | undefined;
 
-const password = (s: GlobalStore) => currentSettings(s).password;
+const password = (s: UserStore) => currentSettings(s).password;
 
-const currentTTS = (s: GlobalStore) => merge(DEFAULT_TTS_CONFIG, currentSettings(s).tts);
+const currentTTS = (s: UserStore) => merge(DEFAULT_TTS_CONFIG, currentSettings(s).tts);
 
-const defaultAgent = (s: GlobalStore) => merge(DEFAULT_AGENT, currentSettings(s).defaultAgent);
+const defaultAgent = (s: UserStore) => merge(DEFAULT_AGENT, currentSettings(s).defaultAgent);
 
-const defaultAgentMeta = (s: GlobalStore) => merge(DEFAULT_AGENT_META, defaultAgent(s).meta);
+const defaultAgentMeta = (s: UserStore) => merge(DEFAULT_AGENT_META, defaultAgent(s).meta);
 
 // TODO: Maybe we can also export settings difference
-const exportSettings = (s: GlobalStore) => {
+const exportSettings = (s: UserStore) => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { password: _, ...settings } = currentSettings(s);
 
   return settings as GlobalSettings;
 };
 
-const currentLanguage = (s: GlobalStore) => {
+const currentLanguage = (s: UserStore) => {
   const locale = currentSettings(s).language;
 
   if (locale === 'auto') {
@@ -44,8 +44,8 @@ const currentLanguage = (s: GlobalStore) => {
   return locale;
 };
 
-const dalleConfig = (s: GlobalStore) => currentSettings(s).tool?.dalle || {};
-const isDalleAutoGenerating = (s: GlobalStore) => currentSettings(s).tool?.dalle?.autoGenerate;
+const dalleConfig = (s: UserStore) => currentSettings(s).tool?.dalle || {};
+const isDalleAutoGenerating = (s: UserStore) => currentSettings(s).tool?.dalle?.autoGenerate;
 
 export const settingsSelectors = {
   currentLanguage,

package/src/store/user/slices/settings/selectors/sync.ts

@@ -0,0 +1,14 @@
+import { UserStore } from '../../../store';
+import { currentSettings } from './settings';
+
+const webrtcConfig = (s: UserStore) => currentSettings(s).sync.webrtc;
+const webrtcChannelName = (s: UserStore) => webrtcConfig(s).channelName;
+const enableWebRTC = (s: UserStore) => webrtcConfig(s).enabled;
+const deviceName = (s: UserStore) => currentSettings(s).sync.deviceName;
+
+export const syncSettingsSelectors = {
+  deviceName,
+  enableWebRTC,
+  webrtcChannelName,
+  webrtcConfig,
+};

package/src/store/user/store.ts

@@ -0,0 +1,33 @@
+import { devtools, subscribeWithSelector } from 'zustand/middleware';
+import { shallow } from 'zustand/shallow';
+import { createWithEqualityFn } from 'zustand/traditional';
+import { StateCreator } from 'zustand/vanilla';
+
+import { isDev } from '@/utils/env';
+
+import { type UserState, initialState } from './initialState';
+import { type CommonAction, createCommonSlice } from './slices/common/action';
+import { type PreferenceAction, createPreferenceSlice } from './slices/preference/action';
+import { type SettingsAction, createSettingsSlice } from './slices/settings/actions';
+
+//  ===============  聚合 createStoreFn ============ //
+
+export type UserStore = CommonAction & UserState & SettingsAction & PreferenceAction;
+
+const createStore: StateCreator<UserStore, [['zustand/devtools', never]]> = (...parameters) => ({
+  ...initialState,
+  ...createCommonSlice(...parameters),
+  ...createSettingsSlice(...parameters),
+  ...createPreferenceSlice(...parameters),
+});
+
+//  ===============  实装 useStore ============ //
+
+export const useUserStore = createWithEqualityFn<UserStore>()(
+  subscribeWithSelector(
+    devtools(createStore, {
+      name: 'LobeChat_User' + (isDev ? '_DEV' : ''),
+    }),
+  ),
+  shallow,
+);

package/src/tools/dalle/Render/ToolBar.tsx

@@ -5,8 +5,8 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
 import { chatToolSelectors } from '@/store/chat/selectors';
-import { useGlobalStore } from '@/store/global';
-import { settingsSelectors } from '@/store/global/selectors';
+import { useUserStore } from '@/store/user';
+import { settingsSelectors } from '@/store/user/selectors';
 import { DallEImageItem } from '@/types/tool/dalle';
 
 interface ToolBarProps {
@@ -19,7 +19,7 @@ const ToolBar = memo<ToolBarProps>(({ content, messageId }) => {
   const generateImageFromPrompts = useChatStore((s) => s.generateImageFromPrompts);
   const isLoading = useChatStore(chatToolSelectors.isGeneratingDallEImage);
 
-  const [isAutoGenerate, setSettings] = useGlobalStore((s) => [
+  const [isAutoGenerate, setSettings] = useUserStore((s) => [
     settingsSelectors.isDalleAutoGenerating(s),
     s.setSettings,
   ]);

package/src/types/settings/modelProvider.ts

@@ -46,6 +46,7 @@ export interface GlobalLLMConfig {
   bedrock: AWSBedrockConfig;
   google: GeneralModelProviderConfig;
   groq: GeneralModelProviderConfig;
+  minimax: GeneralModelProviderConfig;
   mistral: GeneralModelProviderConfig;
   moonshot: GeneralModelProviderConfig;
   ollama: GeneralModelProviderConfig;

package/src/utils/localStorage.ts

@@ -1,6 +1,8 @@
 const PREV_KEY = 'LOBE_GLOBAL';
 
-type StorageKey = 'LOBE_PREFERENCE';
+// LOBE_PREFERENCE for userStore
+// LOBE_GLOBAL_PREFERENCE for globalStore
+type StorageKey = 'LOBE_PREFERENCE' | 'LOBE_GLOBAL_PREFERENCE';
 
 export class AsyncLocalStorage<State> {
   private storageKey: StorageKey;

package/src/store/global/slices/common/initialState.ts

@@ -1,42 +0,0 @@
-import { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.shared-runtime';
-
-import { PeerSyncStatus, SyncAwarenessState } from '@/types/sync';
-
-export enum SidebarTabKey {
-  Chat = 'chat',
-  Market = 'market',
-  Setting = 'settings',
-}
-
-export enum SettingsTabs {
-  About = 'about',
-  Agent = 'agent',
-  Common = 'common',
-  LLM = 'llm',
-  Sync = 'sync',
-  TTS = 'tts',
-}
-
-export interface Guide {
-  // Topic 引导
-  topic?: boolean;
-}
-
-export interface GlobalCommonState {
-  hasNewVersion?: boolean;
-  isMobile?: boolean;
-  latestVersion?: string;
-  router?: AppRouterInstance;
-  sidebarKey: SidebarTabKey;
-  syncAwareness: SyncAwarenessState[];
-  syncEnabled: boolean;
-  syncStatus: PeerSyncStatus;
-}
-
-export const initialCommonState: GlobalCommonState = {
-  isMobile: false,
-  sidebarKey: SidebarTabKey.Chat,
-  syncAwareness: [],
-  syncEnabled: false,
-  syncStatus: PeerSyncStatus.Disabled,
-};

package/src/store/global/slices/common/selectors.ts

@@ -1,6 +0,0 @@
-import { GlobalStore } from '@/store/global';
-
-export const commonSelectors = {
-  userAvatar: (s: GlobalStore) => s.avatar || '',
-  userId: (s: GlobalStore) => s.userId,
-};

package/src/store/global/slices/preference/initialState.ts

@@ -1,51 +0,0 @@
-import { SessionDefaultGroup, SessionGroupId } from '@/types/session';
-import { AsyncLocalStorage } from '@/utils/localStorage';
-
-export interface Guide {
-  // Topic 引导
-  topic?: boolean;
-}
-
-export interface GlobalPreference {
-  // which sessionGroup should expand
-  expandSessionGroupKeys: SessionGroupId[];
-  guide?: Guide;
-  hideSyncAlert?: boolean;
-  inputHeight: number;
-  mobileShowTopic?: boolean;
-
-  sessionsWidth: number;
-  showChatSideBar?: boolean;
-  showSessionPanel?: boolean;
-  showSystemRole?: boolean;
-  telemetry: boolean | null;
-
-  /**
-   * whether to use cmd + enter to send message
-   */
-  useCmdEnterToSend?: boolean;
-}
-
-export interface GlobalPreferenceState {
-  /**
-   * the user preference, which only store in local storage
-   */
-  preference: GlobalPreference;
-  preferenceStorage: AsyncLocalStorage<GlobalPreference>;
-}
-
-export const initialPreferenceState: GlobalPreferenceState = {
-  preference: {
-    expandSessionGroupKeys: [SessionDefaultGroup.Pinned, SessionDefaultGroup.Default],
-    guide: {},
-    inputHeight: 200,
-    mobileShowTopic: false,
-    sessionsWidth: 320,
-    showChatSideBar: true,
-    showSessionPanel: true,
-    showSystemRole: false,
-    telemetry: null,
-    useCmdEnterToSend: false,
-  },
-  preferenceStorage: new AsyncLocalStorage('LOBE_PREFERENCE'),
-};

package/src/store/global/slices/preference/selectors.ts

@@ -1,18 +0,0 @@
-import { GlobalStore } from '@/store/global';
-import { SessionDefaultGroup } from '@/types/session';
-
-const sessionGroupKeys = (s: GlobalStore): string[] =>
-  s.preference.expandSessionGroupKeys || [SessionDefaultGroup.Pinned, SessionDefaultGroup.Default];
-
-const useCmdEnterToSend = (s: GlobalStore): boolean => s.preference.useCmdEnterToSend || false;
-
-const userAllowTrace = (s: GlobalStore) => s.preference.telemetry;
-
-const hideSyncAlert = (s: GlobalStore) => s.preference.hideSyncAlert;
-
-export const preferenceSelectors = {
-  hideSyncAlert,
-  sessionGroupKeys,
-  useCmdEnterToSend,
-  userAllowTrace,
-};

package/src/store/global/slices/settings/selectors/sync.ts

@@ -1,14 +0,0 @@
-import { GlobalStore } from '../../../store';
-import { currentSettings } from './settings';
-
-const webrtcConfig = (s: GlobalStore) => currentSettings(s).sync.webrtc;
-const webrtcChannelName = (s: GlobalStore) => webrtcConfig(s).channelName;
-const enableWebRTC = (s: GlobalStore) => webrtcConfig(s).enabled;
-const deviceName = (s: GlobalStore) => currentSettings(s).sync.deviceName;
-
-export const syncSettingsSelectors = {
-  deviceName,
-  enableWebRTC,
-  webrtcChannelName,
-  webrtcConfig,
-};