@lobehub/chat 0.161.22 → 0.161.23

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

@@ -1,18 +1,17 @@
-import type { NeutralColors, PrimaryColors } from '@lobehub/ui';
-import type { ThemeMode } from 'antd-style';
-
-import { LocaleMode } from '@/types/locale';
-import type { LobeAgentSession } from '@/types/session';
+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 = Pick<LobeAgentSession, 'config' | 'meta'>;
+export type UserDefaultAgent = LobeAgentSettings;
 
 export * from './general';
+export * from './keyVaults';
 export * from './modelProvider';
 export * from './sync';
 export * from './systemAgent';
@@ -23,32 +22,11 @@ export * from './tts';
  */
 export interface UserSettings {
   defaultAgent: UserDefaultAgent;
-  /**
-   * @deprecated
-   */
-  fontSize: number;
-  /**
-   * @deprecated
-   */
-  language: LocaleMode;
+  general: UserGeneralConfig;
+  keyVaults: UserKeyVaults;
   languageModel: UserModelProviderConfig;
-  /**
-   * @deprecated
-   */
-  neutralColor?: NeutralColors;
-
-  password: string;
-
-  /**
-   * @deprecated
-   */
-  primaryColor?: PrimaryColors;
   sync: UserSyncSettings;
   systemAgent: UserSystemAgentConfig;
-  /**
-   * @deprecated
-   */
-  themeMode: ThemeMode;
   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

@@ -1,10 +1,7 @@
+import { ModelProviderKey } from '@/libs/agent-runtime';
 import { ChatModelCard } from '@/types/llm';
 
-export interface OpenAICompatibleProviderConfig {
-  /**
-   * @deprecated
-   */
-  apiKey?: string;
+export interface ProviderConfig {
   /**
    * whether to auto fetch model lists
    */
@@ -18,10 +15,6 @@ export interface OpenAICompatibleProviderConfig {
    * enabled models id
    */
   enabledModels?: string[] | null;
-  /**
-   * @deprecated
-   */
-  endpoint?: string;
   /**
    * whether fetch on client
    */
@@ -36,35 +29,6 @@ export interface OpenAICompatibleProviderConfig {
   remoteModelCards?: ChatModelCard[];
 }
 
-export interface AzureOpenAIConfig extends Omit<OpenAICompatibleProviderConfig, 'endpoint'> {
-  apiVersion?: string;
-  endpoint?: string;
-}
-
-export interface AWSBedrockConfig
-  extends Omit<OpenAICompatibleProviderConfig, 'apiKey' | 'endpoint'> {
-  accessKeyId?: string;
-  region?: string;
-  secretAccessKey?: string;
-}
-
-export interface UserModelProviderConfig {
-  anthropic: OpenAICompatibleProviderConfig;
-  azure: AzureOpenAIConfig;
-  bedrock: AWSBedrockConfig;
-  deepseek: OpenAICompatibleProviderConfig;
-  google: OpenAICompatibleProviderConfig;
-  groq: OpenAICompatibleProviderConfig;
-  minimax: OpenAICompatibleProviderConfig;
-  mistral: OpenAICompatibleProviderConfig;
-  moonshot: OpenAICompatibleProviderConfig;
-  ollama: OpenAICompatibleProviderConfig;
-  openai: OpenAICompatibleProviderConfig;
-  openrouter: OpenAICompatibleProviderConfig;
-  perplexity: OpenAICompatibleProviderConfig;
-  togetherai: OpenAICompatibleProviderConfig;
-  zeroone: OpenAICompatibleProviderConfig;
-  zhipu: OpenAICompatibleProviderConfig;
-}
+export type GlobalLLMProviderKey = ModelProviderKey;
 
-export type GlobalLLMProviderKey = keyof UserModelProviderConfig;
+export type UserModelProviderConfig = Record<ModelProviderKey, ProviderConfig>;