@lobehub/chat 0.161.21 → 0.161.23

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

@@ -117,45 +117,6 @@ describe('settingsSelectors', () => {
     });
   });
 
-  describe('currentLanguage', () => {
-    it('should return the correct language setting', () => {
-      const s = {
-        settings: {
-          language: 'fr',
-        },
-      } as unknown as UserStore;
-
-      const result = settingsSelectors.currentLanguage(s);
-
-      expect(result).toBe('fr');
-    });
-  });
-
-  describe('currentThemeMode', () => {
-    it('should return the correct theme', () => {
-      const s = {
-        settings: {
-          themeMode: 'light',
-        },
-      } as unknown as UserStore;
-
-      const result = settingsSelectors.currentThemeMode(s);
-
-      expect(result).toBe('light');
-    });
-    it('should return the auto if not set the themeMode', () => {
-      const s = {
-        settings: {
-          themeMode: undefined,
-        },
-      } as unknown as UserStore;
-
-      const result = settingsSelectors.currentThemeMode(s);
-
-      expect(result).toBe('auto');
-    });
-  });
-
   describe('dalleConfig', () => {
     it('should return the dalle configuration', () => {
       const s = {

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

@@ -1,4 +1,3 @@
-import { DEFAULT_LANG } from '@/const/locale';
 import { DEFAULT_AGENT_META } from '@/const/meta';
 import {
   DEFAULT_AGENT,
@@ -6,22 +5,25 @@ import {
   DEFAULT_SYSTEM_AGENT_CONFIG,
   DEFAULT_TTS_CONFIG,
 } from '@/const/settings';
-import { Locales } from '@/locales/resources';
-import { GeneralModelProviderConfig, GlobalLLMProviderKey, GlobalSettings } from '@/types/settings';
-import { isOnServerSide } from '@/utils/env';
+import {
+  GlobalLLMProviderKey,
+  ProviderConfig,
+  UserSettings,
+} from '@/types/user/settings';
 import { merge } from '@/utils/merge';
 
 import { UserStore } from '../../../store';
 
-export const currentSettings = (s: UserStore): GlobalSettings =>
-  merge(s.defaultSettings, s.settings);
+export const currentSettings = (s: UserStore): UserSettings => merge(s.defaultSettings, s.settings);
 
 export const currentLLMSettings = (s: UserStore) => currentSettings(s).languageModel;
 
 export const getProviderConfigById = (provider: string) => (s: UserStore) =>
-  currentLLMSettings(s)[provider as GlobalLLMProviderKey] as GeneralModelProviderConfig | undefined;
+  currentLLMSettings(s)[provider as GlobalLLMProviderKey] as
+    | ProviderConfig
+    | undefined;
 
-const password = (s: UserStore) => currentSettings(s).password;
+const password = (s: UserStore) => currentSettings(s).keyVaults.password || '';
 
 const currentTTS = (s: UserStore) => merge(DEFAULT_TTS_CONFIG, currentSettings(s).tts);
 
@@ -30,30 +32,7 @@ const defaultAgentConfig = (s: UserStore) => merge(DEFAULT_AGENT_CONFIG, default
 
 const defaultAgentMeta = (s: UserStore) => merge(DEFAULT_AGENT_META, defaultAgent(s).meta);
 
-// TODO: Maybe we can also export settings difference
-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: UserStore) => {
-  const locale = currentSettings(s).language;
-
-  if (locale === 'auto') {
-    if (isOnServerSide) return DEFAULT_LANG;
-
-    return navigator.language as Locales;
-  }
-
-  return locale;
-};
-
-export const currentThemeMode = (s: UserStore) => {
-  const themeMode = currentSettings(s).themeMode;
-  return themeMode || 'auto';
-};
+const exportSettings = currentSettings;
 
 const dalleConfig = (s: UserStore) => currentSettings(s).tool?.dalle || {};
 const isDalleAutoGenerating = (s: UserStore) => currentSettings(s).tool?.dalle?.autoGenerate;
@@ -62,11 +41,9 @@ const currentSystemAgent = (s: UserStore) =>
   merge(DEFAULT_SYSTEM_AGENT_CONFIG, currentSettings(s).systemAgent);
 
 export const settingsSelectors = {
-  currentLanguage,
   currentSettings,
   currentSystemAgent,
   currentTTS,
-  currentThemeMode,
   dalleConfig,
   defaultAgent,
   defaultAgentConfig,

package/src/store/user/store.ts

@@ -1,10 +1,9 @@
-import { devtools, subscribeWithSelector } from 'zustand/middleware';
+import { 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 { createDevtools } from '../middleware/createDevtools';
 import { type UserState, initialState } from './initialState';
 import { type UserAuthAction, createAuthSlice } from './slices/auth/action';
 import { type CommonAction, createCommonSlice } from './slices/common/action';
@@ -35,11 +34,9 @@ const createStore: StateCreator<UserStore, [['zustand/devtools', never]]> = (...
 
 //  ===============  实装 useStore ============ //
 
+const devtools = createDevtools('user');
+
 export const useUserStore = createWithEqualityFn<UserStore>()(
-  subscribeWithSelector(
-    devtools(createStore, {
-      name: 'LobeChat_User' + (isDev ? '_DEV' : ''),
-    }),
-  ),
+  subscribeWithSelector(devtools(createStore)),
   shallow,
 );

package/src/types/exportConfig.ts

@@ -1,7 +1,7 @@
 import { ChatMessage } from '@/types/message';
 import { LobeSessions, SessionGroupItem } from '@/types/session';
-import { GlobalSettings } from '@/types/settings';
 import { ChatTopic } from '@/types/topic';
+import { UserSettings } from '@/types/user/settings';
 
 /**
  * 导出方式
@@ -69,7 +69,7 @@ export interface ConfigStateAgents {
  * 配置状态：设置
  */
 export interface ConfigStateSettings {
-  settings: GlobalSettings;
+  settings: UserSettings;
 }
 
 /**

package/src/types/serverConfig.ts

@@ -1,7 +1,7 @@
 import { DeepPartial } from 'utility-types';
 
 import { ChatModelCard } from '@/types/llm';
-import { GlobalDefaultAgent, GlobalLLMProviderKey } from '@/types/settings';
+import { UserDefaultAgent, GlobalLLMProviderKey } from '@/types/user/settings';
 
 export interface ServerModelProviderConfig {
   enabled?: boolean;
@@ -16,7 +16,7 @@ export interface ServerModelProviderConfig {
 export type ServerLanguageModel = Partial<Record<GlobalLLMProviderKey, ServerModelProviderConfig>>;
 
 export interface GlobalServerConfig {
-  defaultAgent?: DeepPartial<GlobalDefaultAgent>;
+  defaultAgent?: DeepPartial<UserDefaultAgent>;
   enableUploadFileToServer?: boolean;
   enabledAccessCode?: boolean;
   enabledOAuthSSO?: boolean;

package/src/types/user/index.ts

@@ -1,6 +1,6 @@
 import { DeepPartial } from 'utility-types';
 
-import { GlobalSettings } from '@/types/settings';
+import { UserSettings } from '@/types/user/settings';
 
 export interface LobeUser {
   avatar?: string;
@@ -39,6 +39,6 @@ export interface UserInitializationState {
   hasConversation?: boolean;
   isOnboard?: boolean;
   preference: UserPreference;
-  settings: DeepPartial<GlobalSettings>;
+  settings: DeepPartial<UserSettings>;
   userId?: string;
 }

package/src/types/{settings/base.ts → user/settings/general.ts}

@@ -3,10 +3,13 @@ import type { ThemeMode } from 'antd-style';
 
 import { LocaleMode } from '@/types/locale';
 
-export interface GlobalBaseSettings {
+export interface UserGeneralConfig {
   fontSize: number;
   language: LocaleMode;
   neutralColor?: NeutralColors;
+  /**
+   * @deprecated
+   */
   password: string;
   primaryColor?: PrimaryColors;
   themeMode: ThemeMode;

package/src/types/user/settings/index.ts

@@ -0,0 +1,32 @@
+import type { LobeAgentSettings } from '@/types/session';
+
+import { UserGeneralConfig } from './general';
+import { UserKeyVaults } from './keyVaults';
+import { UserModelProviderConfig } from './modelProvider';
+import { UserSyncSettings } from './sync';
+import { UserSystemAgentConfig } from './systemAgent';
+import { UserToolConfig } from './tool';
+import { UserTTSConfig } from './tts';
+
+export type UserDefaultAgent = LobeAgentSettings;
+
+export * from './general';
+export * from './keyVaults';
+export * from './modelProvider';
+export * from './sync';
+export * from './systemAgent';
+export * from './tts';
+
+/**
+ * 配置设置
+ */
+export interface UserSettings {
+  defaultAgent: UserDefaultAgent;
+  general: UserGeneralConfig;
+  keyVaults: UserKeyVaults;
+  languageModel: UserModelProviderConfig;
+  sync: UserSyncSettings;
+  systemAgent: UserSystemAgentConfig;
+  tool: UserToolConfig;
+  tts: UserTTSConfig;
+}

package/src/types/user/settings/keyVaults.ts

@@ -0,0 +1,36 @@
+export interface OpenAICompatibleKeyVault {
+  apiKey?: string;
+  baseURL?: string;
+}
+
+interface AzureOpenAIKeyVault {
+  apiKey?: string;
+  apiVersion?: string;
+  endpoint?: string;
+}
+
+export interface AWSBedrockKeyVault {
+  accessKeyId?: string;
+  region?: string;
+  secretAccessKey?: string;
+}
+
+export interface UserKeyVaults {
+  anthropic?: OpenAICompatibleKeyVault;
+  azure?: AzureOpenAIKeyVault;
+  bedrock?: AWSBedrockKeyVault;
+  deepseek?: OpenAICompatibleKeyVault;
+  google?: OpenAICompatibleKeyVault;
+  groq?: OpenAICompatibleKeyVault;
+  minimax?: OpenAICompatibleKeyVault;
+  mistral?: OpenAICompatibleKeyVault;
+  moonshot?: OpenAICompatibleKeyVault;
+  ollama?: OpenAICompatibleKeyVault;
+  openai?: OpenAICompatibleKeyVault;
+  openrouter?: OpenAICompatibleKeyVault;
+  password?: string;
+  perplexity?: OpenAICompatibleKeyVault;
+  togetherai?: OpenAICompatibleKeyVault;
+  zeroone?: OpenAICompatibleKeyVault;
+  zhipu?: OpenAICompatibleKeyVault;
+}

package/src/types/user/settings/modelProvider.ts

@@ -0,0 +1,34 @@
+import { ModelProviderKey } from '@/libs/agent-runtime';
+import { ChatModelCard } from '@/types/llm';
+
+export interface ProviderConfig {
+  /**
+   * whether to auto fetch model lists
+   */
+  autoFetchModelLists?: boolean;
+  /**
+   * user defined model cards
+   */
+  customModelCards?: ChatModelCard[];
+  enabled: boolean;
+  /**
+   * enabled models id
+   */
+  enabledModels?: string[] | null;
+  /**
+   * whether fetch on client
+   */
+  fetchOnClient?: boolean;
+  /**
+   * the latest fetch model list time
+   */
+  latestFetchTime?: number;
+  /**
+   * fetched models from provider side
+   */
+  remoteModelCards?: ChatModelCard[];
+}
+
+export type GlobalLLMProviderKey = ModelProviderKey;
+
+export type UserModelProviderConfig = Record<ModelProviderKey, ProviderConfig>;

package/src/types/{settings → user/settings}/sync.ts

@@ -4,7 +4,7 @@ export interface WebRTCSyncConfig {
   enabled: boolean;
   signaling?: string;
 }
-export interface GlobalSyncSettings {
+export interface UserSyncSettings {
   deviceName?: string;
   webrtc: WebRTCSyncConfig;
 }

package/src/types/{settings → user/settings}/systemAgent.ts

@@ -3,6 +3,6 @@ export interface GlobalTranslationConfig {
   provider: string;
 }
 
-export interface GlobalSystemAgentConfig {
+export interface UserSystemAgentConfig {
   translation: GlobalTranslationConfig;
 }

package/src/types/user/settings/tool.ts

@@ -0,0 +1,5 @@
+export interface UserToolConfig {
+  dalle: {
+    autoGenerate: boolean;
+  };
+}

package/src/types/{settings → user/settings}/tts.ts

@@ -1,6 +1,6 @@
 export type STTServer = 'openai' | 'browser';
 
-export interface GlobalTTSConfig {
+export interface UserTTSConfig {
   openAI: {
     sttModel: 'whisper-1';
     ttsModel: 'tts-1' | 'tts-1-hd';

package/src/types/settings/index.ts

@@ -1,33 +0,0 @@
-import type { LobeAgentSession } from '@/types/session';
-
-import { GlobalBaseSettings } from './base';
-import { GlobalLLMConfig } from './modelProvider';
-import { GlobalSyncSettings } from './sync';
-import { GlobalSystemAgentConfig } from './systemAgent';
-import { GlobalTTSConfig } from './tts';
-
-export type GlobalDefaultAgent = Pick<LobeAgentSession, 'config' | 'meta'>;
-
-export * from './base';
-export * from './modelProvider';
-export * from './sync';
-export * from './systemAgent';
-export * from './tts';
-
-export interface GlobalTool {
-  dalle: {
-    autoGenerate: boolean;
-  };
-}
-
-/**
- * 配置设置
- */
-export interface GlobalSettings extends GlobalBaseSettings {
-  defaultAgent: GlobalDefaultAgent;
-  languageModel: GlobalLLMConfig;
-  sync: GlobalSyncSettings;
-  systemAgent: GlobalSystemAgentConfig;
-  tool: GlobalTool;
-  tts: GlobalTTSConfig;
-}

package/src/types/settings/modelProvider.ts

@@ -1,62 +0,0 @@
-import { ChatModelCard } from '@/types/llm';
-
-export interface GeneralModelProviderConfig {
-  apiKey?: string;
-  /**
-   * whether to auto fetch model lists
-   */
-  autoFetchModelLists?: boolean;
-  /**
-   * user defined model cards
-   */
-  customModelCards?: ChatModelCard[];
-  enabled: boolean;
-  /**
-   * enabled models id
-   */
-  enabledModels?: string[] | null;
-  endpoint?: string;
-  /**
-   * whether fetch on client
-   */
-  fetchOnClient?: boolean;
-  /**
-   * the latest fetch model list time
-   */
-  latestFetchTime?: number;
-  /**
-   * fetched models from provider side
-   */
-  remoteModelCards?: ChatModelCard[];
-}
-
-export interface AzureOpenAIConfig extends GeneralModelProviderConfig {
-  apiVersion?: string;
-}
-
-export interface AWSBedrockConfig extends Omit<GeneralModelProviderConfig, 'apiKey' | 'endpoint'> {
-  accessKeyId?: string;
-  region?: string;
-  secretAccessKey?: string;
-}
-
-export interface GlobalLLMConfig {
-  anthropic: GeneralModelProviderConfig;
-  azure: AzureOpenAIConfig;
-  bedrock: AWSBedrockConfig;
-  deepseek: GeneralModelProviderConfig;
-  google: GeneralModelProviderConfig;
-  groq: GeneralModelProviderConfig;
-  minimax: GeneralModelProviderConfig;
-  mistral: GeneralModelProviderConfig;
-  moonshot: GeneralModelProviderConfig;
-  ollama: GeneralModelProviderConfig;
-  openai: GeneralModelProviderConfig;
-  openrouter: GeneralModelProviderConfig;
-  perplexity: GeneralModelProviderConfig;
-  togetherai: GeneralModelProviderConfig;
-  zeroone: GeneralModelProviderConfig;
-  zhipu: GeneralModelProviderConfig;
-}
-
-export type GlobalLLMProviderKey = keyof GlobalLLMConfig;