@lobehub/chat 0.122.9 → 0.123.0

package/src/config/{server.ts → server/app.ts}

@@ -5,14 +5,6 @@ declare global {
   namespace NodeJS {
     interface ProcessEnv {
       ACCESS_CODE?: string;
-      CUSTOM_MODELS?: string;
-
-      OPENAI_API_KEY?: string;
-      OPENAI_PROXY_URL?: string;
-
-      AZURE_API_KEY?: string;
-      AZURE_API_VERSION?: string;
-      USE_AZURE_OPENAI?: string;
 
       IMGUR_CLIENT_ID?: string;
 
@@ -30,35 +22,20 @@ declare global {
 // refs: https://apidocs.imgur.com/
 const DEFAULT_IMAGUR_CLIENT_ID = 'e415f320d6e24f9';
 
-export const getServerConfig = () => {
+export const getAppConfig = () => {
   if (typeof process === 'undefined') {
     throw new Error('[Server Config] you are importing a server-only module outside of server');
   }
 
-  // region format: iad1,sfo1
-  let regions: string[] = [];
-  if (process.env.OPENAI_FUNCTION_REGIONS) {
-    regions = process.env.OPENAI_FUNCTION_REGIONS.split(',');
-  }
-
   const ACCESS_CODES = process.env.ACCESS_CODE?.split(',').filter(Boolean) || [];
 
   return {
     ACCESS_CODES,
-    CUSTOM_MODELS: process.env.CUSTOM_MODELS,
 
     SHOW_ACCESS_CODE_CONFIG: !!ACCESS_CODES.length,
 
-    OPENAI_API_KEY: process.env.OPENAI_API_KEY,
-    OPENAI_PROXY_URL: process.env.OPENAI_PROXY_URL,
-    OPENAI_FUNCTION_REGIONS: regions,
-
     METADATA_BASE_URL: process.env.METADATA_BASE_URL,
 
-    AZURE_API_KEY: process.env.AZURE_API_KEY,
-    AZURE_API_VERSION: process.env.AZURE_API_VERSION,
-    USE_AZURE_OPENAI: process.env.USE_AZURE_OPENAI === '1',
-
     IMGUR_CLIENT_ID: process.env.IMGUR_CLIENT_ID || DEFAULT_IMAGUR_CLIENT_ID,
 
     AGENTS_INDEX_URL: !!process.env.AGENTS_INDEX_URL

package/src/config/server/index.ts

@@ -0,0 +1,13 @@
+import { getAppConfig } from './app';
+import { getProviderConfig } from './provider';
+
+export const getServerConfig = () => {
+  if (typeof process === 'undefined') {
+    throw new Error('[Server Config] you are importing a server-only module outside of server');
+  }
+
+  const provider = getProviderConfig();
+  const app = getAppConfig();
+
+  return { ...provider, ...app };
+};

package/src/config/server/provider.ts

@@ -0,0 +1,78 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix , typescript-sort-keys/interface */
+
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace NodeJS {
+    interface ProcessEnv {
+      CUSTOM_MODELS?: string;
+
+      // OpenAI Provider
+      OPENAI_API_KEY?: string;
+      OPENAI_PROXY_URL?: string;
+      OPENAI_FUNCTION_REGIONS?: string;
+
+      // Azure OpenAI Provider
+      AZURE_API_KEY?: string;
+      AZURE_ENDPOINT?: string;
+      AZURE_API_VERSION?: string;
+      USE_AZURE_OPENAI?: string;
+
+      // ZhiPu Provider
+      ZHIPU_API_KEY?: string;
+      ZHIPU_PROXY_URL?: string;
+
+      // Google Provider
+      GOOGLE_API_KEY?: string;
+
+      // AWS Credentials
+      AWS_REGION?: string;
+      AWS_ACCESS_KEY_ID?: string;
+      AWS_SECRET_ACCESS_KEY?: string;
+
+      DEBUG_CHAT_COMPLETION?: string;
+    }
+  }
+}
+
+export const getProviderConfig = () => {
+  if (typeof process === 'undefined') {
+    throw new Error('[Server Config] you are importing a server-only module outside of server');
+  }
+
+  const ZHIPU_API_KEY = process.env.ZHIPU_API_KEY || '';
+  const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID || '';
+
+  const GOOGLE_API_KEY = process.env.GOOGLE_API_KEY || '';
+
+  // region format: iad1,sfo1
+  let regions: string[] = [];
+  if (process.env.OPENAI_FUNCTION_REGIONS) {
+    regions = process.env.OPENAI_FUNCTION_REGIONS.split(',');
+  }
+
+  return {
+    CUSTOM_MODELS: process.env.CUSTOM_MODELS,
+
+    OPENAI_API_KEY: process.env.OPENAI_API_KEY,
+    OPENAI_PROXY_URL: process.env.OPENAI_PROXY_URL,
+    OPENAI_FUNCTION_REGIONS: regions,
+
+    ENABLED_ZHIPU: !!ZHIPU_API_KEY,
+    ZHIPU_API_KEY,
+
+    ENABLED_GOOGLE: !!GOOGLE_API_KEY,
+    GOOGLE_API_KEY,
+
+    ENABLED_AWS_BEDROCK: !!AWS_ACCESS_KEY_ID,
+    AWS_REGION: process.env.AWS_REGION,
+    AWS_ACCESS_KEY_ID: AWS_ACCESS_KEY_ID,
+    AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY || '',
+
+    AZURE_API_KEY: process.env.AZURE_API_KEY,
+    AZURE_API_VERSION: process.env.AZURE_API_VERSION,
+    AZURE_ENDPOINT: process.env.AZURE_ENDPOINT,
+    USE_AZURE_OPENAI: process.env.USE_AZURE_OPENAI === '1',
+
+    DEBUG_CHAT_COMPLETION: process.env.DEBUG_CHAT_COMPLETION === '1',
+  };
+};

package/src/const/auth.ts

@@ -0,0 +1,30 @@
+export const LOBE_CHAT_AUTH_HEADER = 'X-lobe-chat-auth';
+
+export const JWT_SECRET_KEY = 'LobeHub · LobeChat';
+
+/* eslint-disable typescript-sort-keys/interface */
+export interface JWTPayload {
+  /**
+   * password
+   */
+  accessCode?: string;
+  /**
+   * Represents the user's API key
+   *
+   * If provider need multi keys like bedrock,
+   * this will be used as the checker whether to use frontend key
+   */
+  apiKey?: string;
+  /**
+   * Represents the endpoint of provider
+   */
+  endpoint?: string;
+
+  azureApiVersion?: string;
+  useAzure?: boolean;
+
+  awsAccessKeyId?: string;
+  awsRegion?: string;
+  awsSecretAccessKey?: string;
+}
+/* eslint-enable */

package/src/const/fetch.ts

@@ -7,6 +7,9 @@ export const AZURE_OPENAI_API_VERSION = 'X-azure-openai-api-version';
 
 export const LOBE_CHAT_ACCESS_CODE = 'X-lobe-chat-access-code';
 
+/**
+ * @deprecated
+ */
 export const getOpenAIAuthFromRequest = (req: Request) => {
   const apiKey = req.headers.get(OPENAI_API_KEY_HEADER_KEY);
   const endpoint = req.headers.get(OPENAI_END_POINT);

package/src/const/settings.ts

@@ -1,7 +1,6 @@
-import { DEFAULT_OPENAI_MODEL_LIST } from '@/const/llm';
 import { DEFAULT_AGENT_META } from '@/const/meta';
+import { ModelProvider } from '@/libs/agent-runtime';
 import { LobeAgentConfig, LobeAgentTTSConfig } from '@/types/agent';
-import { LanguageModel } from '@/types/llm';
 import {
   GlobalBaseSettings,
   GlobalDefaultAgent,
@@ -33,7 +32,7 @@ export const DEFAULT_AGENT_CONFIG: LobeAgentConfig = {
   displayMode: 'chat',
   enableAutoCreateTopic: true,
   historyCount: 1,
-  model: LanguageModel.GPT3_5,
+  model: 'gpt-3.5-turbo',
   params: {
     frequency_penalty: 0,
     presence_penalty: 0,
@@ -41,14 +40,35 @@ export const DEFAULT_AGENT_CONFIG: LobeAgentConfig = {
     top_p: 1,
   },
   plugins: [],
+  provider: ModelProvider.OpenAI,
   systemRole: '',
   tts: DEFAUTT_AGENT_TTS_CONFIG,
 };
 
 export const DEFAULT_LLM_CONFIG: GlobalLLMConfig = {
+  azure: {
+    apiKey: '',
+    deployments: '',
+    enabled: false,
+    endpoint: '',
+  },
+  bedrock: {
+    accessKeyId: '',
+    enabled: false,
+    region: 'us-east-1',
+    secretAccessKey: '',
+  },
+  google: {
+    apiKey: '',
+    enabled: false,
+  },
   openAI: {
     OPENAI_API_KEY: '',
-    models: DEFAULT_OPENAI_MODEL_LIST,
+    models: [],
+  },
+  zhipu: {
+    apiKey: '',
+    enabled: false,
   },
 };
 

package/src/database/core/migrations/migrateSettingsToUser/index.test.ts

@@ -2,7 +2,8 @@ import { describe, expect } from 'vitest';
 
 import input from './fixtures/input.json';
 import outputData from './fixtures/output.json';
-import { V4Settings, migrateSettingsToUser } from './index';
+import { migrateSettingsToUser } from './index';
+import { V4Settings } from './type';
 
 describe('migrateSettingsFromLocalStorage', () => {
   it('from localStorage to indexedDB', () => {

package/src/database/core/migrations/migrateSettingsToUser/index.ts

@@ -1,23 +1,6 @@
-import type { NeutralColors, PrimaryColors } from '@lobehub/ui';
-import type { ThemeMode } from 'antd-style';
-
 import { DB_Settings, DB_User } from '@/database/schemas/user';
-import { LocaleMode } from '@/types/locale';
-import { GlobalDefaultAgent, GlobalLLMConfig, GlobalTTSConfig, GlobalTool } from '@/types/settings';
 
-export interface V4Settings {
-  avatar: string;
-  defaultAgent: GlobalDefaultAgent;
-  fontSize: number;
-  language: LocaleMode;
-  languageModel: GlobalLLMConfig;
-  neutralColor?: NeutralColors;
-  password: string;
-  primaryColor?: PrimaryColors;
-  themeMode: ThemeMode;
-  tool: GlobalTool;
-  tts: GlobalTTSConfig;
-}
+import { V4Settings } from './type';
 
 export const migrateSettingsToUser = (settings: V4Settings): DB_User => {
   const dbSettings: DB_Settings = {

package/src/database/core/migrations/migrateSettingsToUser/type.ts

@@ -0,0 +1,100 @@
+import type { ThemeMode } from 'antd-style';
+
+import { LobeAgentTTSConfig } from '@/types/agent';
+import { FewShots, LLMParams } from '@/types/llm';
+import { MetaData } from '@/types/meta';
+import { STTServer } from '@/types/settings';
+
+interface V4LobeAgentConfig {
+  autoCreateTopicThreshold: number;
+  compressThreshold?: number;
+  displayMode?: 'chat' | 'docs';
+  enableAutoCreateTopic: boolean;
+  /**
+   * 历史消息长度压缩阈值
+   */
+  enableCompressThreshold?: boolean;
+  /**
+   * 开启历史记录条数
+   */
+  enableHistoryCount?: boolean;
+  enableMaxTokens?: boolean;
+
+  fewShots?: FewShots;
+  /**
+   * 历史消息条数
+   */
+  historyCount?: number;
+  inputTemplate?: string;
+  /**
+   * 角色所使用的语言模型
+   * @default gpt-3.5-turbo
+   */
+  model: string;
+  /**
+   * 语言模型参数
+   */
+  params: LLMParams;
+  /**
+   * 启用的插件
+   */
+  plugins?: string[];
+  /**
+   *  模型供应商
+   */
+  provider?: string;
+  /**
+   * 系统角色
+   */
+  systemRole: string;
+  /**
+   * 语音服务
+   */
+  tts: LobeAgentTTSConfig;
+}
+
+interface V4DefaultAgent {
+  config: V4LobeAgentConfig;
+  meta: MetaData;
+}
+
+interface V4OpenAIConfig {
+  OPENAI_API_KEY: string;
+  azureApiVersion?: string;
+  customModelName?: string;
+  endpoint?: string;
+  models?: string[];
+  useAzure?: boolean;
+}
+
+interface V4LLMConfig {
+  openAI: V4OpenAIConfig;
+}
+
+interface V4Tool {
+  dalle: {
+    autoGenerate: boolean;
+  };
+}
+interface V4TTSConfig {
+  openAI: {
+    sttModel: 'whisper-1';
+    ttsModel: 'tts-1' | 'tts-1-hd';
+  };
+  sttAutoStop: boolean;
+  sttServer: STTServer;
+}
+
+export interface V4Settings {
+  avatar: string;
+  defaultAgent: V4DefaultAgent;
+  fontSize: number;
+  language: string;
+  languageModel: V4LLMConfig;
+  neutralColor?: string;
+  password: string;
+  primaryColor?: string;
+  themeMode: ThemeMode;
+  tool: V4Tool;
+  tts: V4TTSConfig;
+}

package/src/database/models/message.ts

@@ -10,6 +10,7 @@ export interface CreateMessageParams
   extends Partial<Omit<ChatMessage, 'content' | 'role'>>,
     Pick<ChatMessage, 'content' | 'role'> {
   fromModel?: string;
+  fromProvider?: string;
   sessionId: string;
 }
 
@@ -215,13 +216,14 @@ class _MessageModel extends BaseModel {
 
   private mapToChatMessage = ({
     fromModel,
+    fromProvider,
     translate,
     tts,
     ...item
   }: DBModel<DB_Message>): ChatMessage => {
     return {
       ...item,
-      extra: { fromModel, translate, tts },
+      extra: { fromModel, fromProvider, translate, tts },
       meta: {},
       topicId: item.topicId ?? undefined,
     };

package/src/database/schemas/message.ts

@@ -24,6 +24,7 @@ export const DB_MessageSchema = z.object({
   plugin: PluginSchema.optional(),
   pluginState: z.any().optional(),
   fromModel: z.string().optional(),
+  fromProvider: z.string().optional(),
   translate: TranslateSchema.optional().or(z.literal(false)),
   tts: z.any().optional(),
 

package/src/database/schemas/session.ts

@@ -42,6 +42,7 @@ export const AgentSchema = z.object({
     top_p: z.number().default(1).optional(),
   }),
   plugins: z.array(z.string()).optional(),
+  provider: z.string().default('openai').optional(),
   systemRole: z.string().default(''),
   tts: ttsSchema.optional(),
 });

package/src/features/AgentSetting/AgentConfig/ModelSelect.tsx

@@ -0,0 +1,71 @@
+import { Select, SelectProps } from 'antd';
+import { createStyles } from 'antd-style';
+import isEqual from 'fast-deep-equal';
+import { memo, useMemo } from 'react';
+
+import { ModelItemRender, ProviderItemRender } from '@/components/ModelSelect';
+import { useGlobalStore } from '@/store/global';
+import { modelProviderSelectors } from '@/store/global/selectors';
+import { ModelProviderCard } from '@/types/llm';
+
+import { useStore } from '../store';
+
+const useStyles = createStyles(({ css, prefixCls }) => ({
+  select: css`
+    .${prefixCls}-select-dropdown .${prefixCls}-select-item-option-grouped {
+      padding-inline-start: 12px;
+    }
+  `,
+}));
+interface ModelOption {
+  label: any;
+  provider: string;
+  value: string;
+}
+
+const ModelSelect = memo(() => {
+  const [model, updateConfig] = useStore((s) => [s.config.model, s.setAgentConfig]);
+  const select = useGlobalStore(modelProviderSelectors.modelSelectList, isEqual);
+  const { styles } = useStyles();
+
+  const enabledList = select.filter((s) => s.enabled);
+
+  const options = useMemo<SelectProps['options']>(() => {
+    const getChatModels = (provider: ModelProviderCard) =>
+      provider.chatModels
+        .filter((c) => !c.hidden)
+        .map((model) => ({
+          label: <ModelItemRender {...model} />,
+          provider: provider.id,
+          value: model.id,
+        }));
+
+    if (enabledList.length === 1) {
+      const provider = enabledList[0];
+
+      return getChatModels(provider);
+    }
+
+    return enabledList.map((provider) => ({
+      label: <ProviderItemRender provider={provider.id} />,
+      options: getChatModels(provider),
+    }));
+  }, [enabledList]);
+
+  return (
+    <Select
+      className={styles.select}
+      onChange={(model, option) => {
+        updateConfig({
+          model,
+          provider: (option as unknown as ModelOption).provider,
+        });
+      }}
+      options={options}
+      popupMatchSelectWidth={false}
+      value={model}
+    />
+  );
+});
+
+export default ModelSelect;