@lobehub/chat 1.45.4 → 1.45.6

package/src/server/globalConfig/index.ts

@@ -6,19 +6,41 @@ import { enableNextAuth } from '@/const/auth';
 import { parseSystemAgent } from '@/server/globalConfig/parseSystemAgent';
 import { GlobalServerConfig } from '@/types/serverConfig';
 
-import { genServerLLMConfig } from './genServerLLMConfig';
+import { genServerLLMConfig } from './_deprecated';
+import { genServerAiProvidersConfig } from './genServerAiProviderConfig';
 import { parseAgentConfig } from './parseDefaultAgent';
 
 export const getServerGlobalConfig = () => {
   const { ACCESS_CODES, DEFAULT_AGENT_CONFIG } = getAppConfig();
 
   const config: GlobalServerConfig = {
+    aiProvider: genServerAiProvidersConfig({
+      azure: {
+        enabledKey: 'ENABLED_AZURE_OPENAI',
+        withDeploymentName: true,
+      },
+      bedrock: {
+        enabledKey: 'ENABLED_AWS_BEDROCK',
+        modelListKey: 'AWS_BEDROCK_MODEL_LIST',
+      },
+      giteeai: {
+        enabledKey: 'ENABLED_GITEE_AI',
+        modelListKey: 'GITEE_AI_MODEL_LIST',
+      },
+      ollama: {
+        fetchOnClient: !process.env.OLLAMA_PROXY_URL,
+      },
+    }),
     defaultAgent: {
       config: parseAgentConfig(DEFAULT_AGENT_CONFIG),
     },
     enableUploadFileToServer: !!fileEnv.S3_SECRET_ACCESS_KEY,
     enabledAccessCode: ACCESS_CODES?.length > 0,
+
     enabledOAuthSSO: enableNextAuth,
+    /**
+     * @deprecated
+     */
     languageModel: genServerLLMConfig({
       azure: {
         enabledKey: 'ENABLED_AZURE_OPENAI',

package/src/server/routers/lambda/aiModel.ts

@@ -19,14 +19,14 @@ const aiModelProcedure = authedProcedure.use(async (opts) => {
   const { ctx } = opts;
 
   const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
-  const { languageModel } = getServerGlobalConfig();
+  const { aiProvider } = getServerGlobalConfig();
 
   return opts.next({
     ctx: {
       aiInfraRepos: new AiInfraRepos(
         serverDB,
         ctx.userId,
-        languageModel as Record<string, ProviderConfig>,
+        aiProvider as Record<string, ProviderConfig>,
       ),
       aiModelModel: new AiModelModel(serverDB, ctx.userId),
       gateKeeper,

package/src/server/routers/lambda/aiProvider.ts

@@ -18,7 +18,7 @@ import { ProviderConfig } from '@/types/user/settings';
 const aiProviderProcedure = authedProcedure.use(async (opts) => {
   const { ctx } = opts;
 
-  const { languageModel } = getServerGlobalConfig();
+  const { aiProvider } = getServerGlobalConfig();
 
   const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
   return opts.next({
@@ -26,7 +26,7 @@ const aiProviderProcedure = authedProcedure.use(async (opts) => {
       aiInfraRepos: new AiInfraRepos(
         serverDB,
         ctx.userId,
-        languageModel as Record<string, ProviderConfig>,
+        aiProvider as Record<string, ProviderConfig>,
       ),
       aiProviderModel: new AiProviderModel(serverDB, ctx.userId),
       gateKeeper,

package/src/types/aiModel.ts

@@ -230,6 +230,7 @@ export interface AIRealtimeModelCard extends AIBaseModelCard {
 
 export interface AiFullModelCard extends AIBaseModelCard {
   abilities?: ModelAbilities;
+  config?: AiModelConfig;
   contextWindowTokens?: number;
   displayName?: string;
   id: string;

package/src/types/serverConfig.ts

@@ -20,6 +20,7 @@ export interface ServerModelProviderConfig {
 export type ServerLanguageModel = Partial<Record<GlobalLLMProviderKey, ServerModelProviderConfig>>;
 
 export interface GlobalServerConfig {
+  aiProvider?: ServerLanguageModel;
   defaultAgent?: DeepPartial<UserDefaultAgent>;
   enableUploadFileToServer?: boolean;
   enabledAccessCode?: boolean;

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

@@ -1,4 +1,5 @@
 import { ModelProviderKey } from '@/libs/agent-runtime';
+import { AiFullModelCard } from '@/types/aiModel';
 import { ChatModelCard } from '@/types/llm';
 
 export interface ProviderConfig {
@@ -27,6 +28,7 @@ export interface ProviderConfig {
    * fetched models from provider side
    */
   remoteModelCards?: ChatModelCard[];
+  serverModelLists?: AiFullModelCard[];
 }
 
 export type GlobalLLMProviderKey = ModelProviderKey;

package/src/utils/__snapshots__/parseModels.test.ts.snap

@@ -4,16 +4,22 @@ exports[`parseModelString > custom deletion, addition, and renaming of models 1`
 {
   "add": [
     {
+      "abilities": {},
       "displayName": undefined,
       "id": "llama",
+      "type": "chat",
     },
     {
+      "abilities": {},
       "displayName": undefined,
       "id": "claude-2",
+      "type": "chat",
     },
     {
+      "abilities": {},
       "displayName": "gpt-4-32k",
       "id": "gpt-4-1106-preview",
+      "type": "chat",
     },
   ],
   "removeAll": true,
@@ -28,8 +34,10 @@ exports[`parseModelString > duplicate naming model 1`] = `
 {
   "add": [
     {
+      "abilities": {},
       "displayName": "gpt-4-32k",
       "id": "gpt-4-1106-preview",
+      "type": "chat",
     },
   ],
   "removeAll": false,
@@ -41,12 +49,16 @@ exports[`parseModelString > empty string model 1`] = `
 {
   "add": [
     {
+      "abilities": {},
       "displayName": "gpt-4-turbo",
       "id": "gpt-4-1106-preview",
+      "type": "chat",
     },
     {
+      "abilities": {},
       "displayName": undefined,
       "id": "claude-2",
+      "type": "chat",
     },
   ],
   "removeAll": false,
@@ -58,20 +70,28 @@ exports[`parseModelString > only add the model 1`] = `
 {
   "add": [
     {
+      "abilities": {},
       "displayName": undefined,
       "id": "model1",
+      "type": "chat",
     },
     {
+      "abilities": {},
       "displayName": undefined,
       "id": "model2",
+      "type": "chat",
     },
     {
+      "abilities": {},
       "displayName": undefined,
       "id": "model3",
+      "type": "chat",
     },
     {
+      "abilities": {},
       "displayName": undefined,
       "id": "model4",
+      "type": "chat",
     },
   ],
   "removeAll": false,
@@ -82,31 +102,43 @@ exports[`parseModelString > only add the model 1`] = `
 exports[`transformToChatModelCards > should have file with builtin models like gpt-4-0125-preview 1`] = `
 [
   {
+    "abilities": {
+      "files": true,
+      "functionCall": true,
+    },
     "contextWindowTokens": 128000,
     "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
     "displayName": "ChatGPT-4",
     "enabled": true,
-    "files": true,
-    "functionCall": true,
     "id": "gpt-4-0125-preview",
     "pricing": {
       "input": 10,
       "output": 30,
     },
+    "providerId": "openai",
+    "releasedAt": "2024-01-25",
+    "source": "builtin",
+    "type": "chat",
   },
   {
+    "abilities": {
+      "files": true,
+      "functionCall": true,
+      "vision": true,
+    },
     "contextWindowTokens": 128000,
     "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
     "displayName": "ChatGPT-4 Vision",
     "enabled": true,
-    "files": true,
-    "functionCall": true,
     "id": "gpt-4-turbo-2024-04-09",
     "pricing": {
       "input": 10,
       "output": 30,
     },
-    "vision": true,
+    "providerId": "openai",
+    "releasedAt": "2024-04-09",
+    "source": "builtin",
+    "type": "chat",
   },
 ]
 `;

package/src/utils/_deprecated/__snapshots__/parseModels.test.ts.snap

@@ -0,0 +1,112 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`parseModelString > custom deletion, addition, and renaming of models 1`] = `
+{
+  "add": [
+    {
+      "displayName": undefined,
+      "id": "llama",
+    },
+    {
+      "displayName": undefined,
+      "id": "claude-2",
+    },
+    {
+      "displayName": "gpt-4-32k",
+      "id": "gpt-4-1106-preview",
+    },
+  ],
+  "removeAll": true,
+  "removed": [
+    "all",
+    "gpt-3.5-turbo",
+  ],
+}
+`;
+
+exports[`parseModelString > duplicate naming model 1`] = `
+{
+  "add": [
+    {
+      "displayName": "gpt-4-32k",
+      "id": "gpt-4-1106-preview",
+    },
+  ],
+  "removeAll": false,
+  "removed": [],
+}
+`;
+
+exports[`parseModelString > empty string model 1`] = `
+{
+  "add": [
+    {
+      "displayName": "gpt-4-turbo",
+      "id": "gpt-4-1106-preview",
+    },
+    {
+      "displayName": undefined,
+      "id": "claude-2",
+    },
+  ],
+  "removeAll": false,
+  "removed": [],
+}
+`;
+
+exports[`parseModelString > only add the model 1`] = `
+{
+  "add": [
+    {
+      "displayName": undefined,
+      "id": "model1",
+    },
+    {
+      "displayName": undefined,
+      "id": "model2",
+    },
+    {
+      "displayName": undefined,
+      "id": "model3",
+    },
+    {
+      "displayName": undefined,
+      "id": "model4",
+    },
+  ],
+  "removeAll": false,
+  "removed": [],
+}
+`;
+
+exports[`transformToChatModelCards > should have file with builtin models like gpt-4-0125-preview 1`] = `
+[
+  {
+    "contextWindowTokens": 128000,
+    "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
+    "displayName": "ChatGPT-4",
+    "enabled": true,
+    "files": true,
+    "functionCall": true,
+    "id": "gpt-4-0125-preview",
+    "pricing": {
+      "input": 10,
+      "output": 30,
+    },
+  },
+  {
+    "contextWindowTokens": 128000,
+    "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
+    "displayName": "ChatGPT-4 Vision",
+    "enabled": true,
+    "files": true,
+    "functionCall": true,
+    "id": "gpt-4-turbo-2024-04-09",
+    "pricing": {
+      "input": 10,
+      "output": 30,
+    },
+    "vision": true,
+  },
+]
+`;

package/src/utils/_deprecated/parseModels.test.ts

@@ -0,0 +1,276 @@
+import { describe, expect, it } from 'vitest';
+
+import { LOBE_DEFAULT_MODEL_LIST, OpenAIProviderCard } from '@/config/modelProviders';
+import { ChatModelCard } from '@/types/llm';
+
+import { parseModelString, transformToChatModelCards } from './parseModels';
+
+describe('parseModelString', () => {
+  it('custom deletion, addition, and renaming of models', () => {
+    const result = parseModelString(
+      '-all,+llama,+claude-2，-gpt-3.5-turbo,gpt-4-1106-preview=gpt-4-turbo,gpt-4-1106-preview=gpt-4-32k',
+    );
+
+    expect(result).toMatchSnapshot();
+  });
+
+  it('duplicate naming model', () => {
+    const result = parseModelString('gpt-4-1106-preview=gpt-4-turbo，gpt-4-1106-preview=gpt-4-32k');
+    expect(result).toMatchSnapshot();
+  });
+
+  it('only add the model', () => {
+    const result = parseModelString('model1,model2,model3，model4');
+
+    expect(result).toMatchSnapshot();
+  });
+
+  it('empty string model', () => {
+    const result = parseModelString('gpt-4-1106-preview=gpt-4-turbo,,  ,\n  ，+claude-2');
+    expect(result).toMatchSnapshot();
+  });
+
+  describe('extension capabilities', () => {
+    it('with token', () => {
+      const result = parseModelString('chatglm-6b=ChatGLM 6B<4096>');
+
+      expect(result.add[0]).toEqual({
+        displayName: 'ChatGLM 6B',
+        id: 'chatglm-6b',
+        contextWindowTokens: 4096,
+      });
+    });
+
+    it('token and function calling', () => {
+      const result = parseModelString('spark-v3.5=讯飞星火 v3.5<8192:fc>');
+
+      expect(result.add[0]).toEqual({
+        displayName: '讯飞星火 v3.5',
+        functionCall: true,
+        id: 'spark-v3.5',
+        contextWindowTokens: 8192,
+      });
+    });
+
+    it('multi models', () => {
+      const result = parseModelString(
+        'gemini-1.5-flash-latest=Gemini 1.5 Flash<16000:vision>,gpt-4-all=ChatGPT Plus<128000:fc:vision:file>',
+      );
+
+      expect(result.add).toEqual([
+        {
+          displayName: 'Gemini 1.5 Flash',
+          vision: true,
+          id: 'gemini-1.5-flash-latest',
+          contextWindowTokens: 16000,
+        },
+        {
+          displayName: 'ChatGPT Plus',
+          vision: true,
+          functionCall: true,
+          files: true,
+          id: 'gpt-4-all',
+          contextWindowTokens: 128000,
+        },
+      ]);
+    });
+
+    it('should have file with builtin models like gpt-4-0125-preview', () => {
+      const result = parseModelString(
+        '-all,+gpt-4-0125-preview=ChatGPT-4<128000:fc:file>,+gpt-4-turbo-2024-04-09=ChatGPT-4 Vision<128000:fc:vision:file>',
+      );
+      expect(result.add).toEqual([
+        {
+          displayName: 'ChatGPT-4',
+          files: true,
+          functionCall: true,
+          id: 'gpt-4-0125-preview',
+          contextWindowTokens: 128000,
+        },
+        {
+          displayName: 'ChatGPT-4 Vision',
+          files: true,
+          functionCall: true,
+          id: 'gpt-4-turbo-2024-04-09',
+          contextWindowTokens: 128000,
+          vision: true,
+        },
+      ]);
+    });
+
+    it('should handle empty extension capability value', () => {
+      const result = parseModelString('model1<1024:>');
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024 });
+    });
+
+    it('should handle empty extension capability name', () => {
+      const result = parseModelString('model1<1024::file>');
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024, files: true });
+    });
+
+    it('should handle duplicate extension capabilities', () => {
+      const result = parseModelString('model1<1024:vision:vision>');
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024, vision: true });
+    });
+
+    it('should handle case-sensitive extension capability names', () => {
+      const result = parseModelString('model1<1024:VISION:FC:file>');
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024, files: true });
+    });
+
+    it('should handle case-sensitive extension capability values', () => {
+      const result = parseModelString('model1<1024:vision:Fc:File>');
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024, vision: true });
+    });
+
+    it('should handle empty angle brackets', () => {
+      const result = parseModelString('model1<>');
+      expect(result.add[0]).toEqual({ id: 'model1' });
+    });
+
+    it('should handle not close angle brackets', () => {
+      const result = parseModelString('model1<,model2');
+      expect(result.add).toEqual([{ id: 'model1' }, { id: 'model2' }]);
+    });
+
+    it('should handle multi close angle brackets', () => {
+      const result = parseModelString('model1<>>,model2');
+      expect(result.add).toEqual([{ id: 'model1' }, { id: 'model2' }]);
+    });
+
+    it('should handle only colon inside angle brackets', () => {
+      const result = parseModelString('model1<:>');
+      expect(result.add[0]).toEqual({ id: 'model1' });
+    });
+
+    it('should handle only non-digit characters inside angle brackets', () => {
+      const result = parseModelString('model1<abc>');
+      expect(result.add[0]).toEqual({ id: 'model1' });
+    });
+
+    it('should handle non-digit characters followed by digits inside angle brackets', () => {
+      const result = parseModelString('model1<abc123>');
+      expect(result.add[0]).toEqual({ id: 'model1' });
+    });
+
+    it('should handle digits followed by non-colon characters inside angle brackets', () => {
+      const result = parseModelString('model1<1024abc>');
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024 });
+    });
+
+    it('should handle digits followed by multiple colons inside angle brackets', () => {
+      const result = parseModelString('model1<1024::>');
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024 });
+    });
+
+    it('should handle digits followed by a colon and non-letter characters inside angle brackets', () => {
+      const result = parseModelString('model1<1024:123>');
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024 });
+    });
+
+    it('should handle digits followed by a colon and spaces inside angle brackets', () => {
+      const result = parseModelString('model1<1024: vision>');
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024 });
+    });
+
+    it('should handle digits followed by multiple colons and spaces inside angle brackets', () => {
+      const result = parseModelString('model1<1024: : vision>');
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024 });
+    });
+  });
+
+  describe('deployment name', () => {
+    it('should have same deployment name as id', () => {
+      const result = parseModelString('model1=Model 1', true);
+      expect(result.add[0]).toEqual({
+        id: 'model1',
+        displayName: 'Model 1',
+        deploymentName: 'model1',
+      });
+    });
+
+    it('should have diff deployment name as id', () => {
+      const result = parseModelString('gpt-35-turbo->my-deploy=GPT 3.5 Turbo', true);
+      expect(result.add[0]).toEqual({
+        id: 'gpt-35-turbo',
+        displayName: 'GPT 3.5 Turbo',
+        deploymentName: 'my-deploy',
+      });
+    });
+  });
+});
+
+describe('transformToChatModelCards', () => {
+  const defaultChatModels: ChatModelCard[] = [
+    { id: 'model1', displayName: 'Model 1', enabled: true },
+    { id: 'model2', displayName: 'Model 2', enabled: false },
+  ];
+
+  it('should return undefined when modelString is empty', () => {
+    const result = transformToChatModelCards({
+      modelString: '',
+      defaultChatModels,
+    });
+    expect(result).toBeUndefined();
+  });
+
+  it('should remove all models when removeAll is true', () => {
+    const result = transformToChatModelCards({
+      modelString: '-all',
+      defaultChatModels,
+    });
+    expect(result).toEqual([]);
+  });
+
+  it('should remove specified models', () => {
+    const result = transformToChatModelCards({
+      modelString: '-model1',
+      defaultChatModels,
+    });
+    expect(result).toEqual([{ id: 'model2', displayName: 'Model 2', enabled: false }]);
+  });
+
+  it('should add a new known model', () => {
+    const knownModel = LOBE_DEFAULT_MODEL_LIST[0];
+    const result = transformToChatModelCards({
+      modelString: `${knownModel.id}`,
+      defaultChatModels,
+    });
+    expect(result).toContainEqual({
+      ...knownModel,
+      displayName: knownModel.displayName || knownModel.id,
+      enabled: true,
+    });
+  });
+
+  it('should update an existing known model', () => {
+    const knownModel = LOBE_DEFAULT_MODEL_LIST[0];
+    const result = transformToChatModelCards({
+      modelString: `+${knownModel.id}=Updated Model`,
+      defaultChatModels: [knownModel],
+    });
+    expect(result![0]).toEqual({ ...knownModel, displayName: 'Updated Model', enabled: true });
+  });
+
+  it('should add a new custom model', () => {
+    const result = transformToChatModelCards({
+      modelString: '+custom_model=Custom Model',
+      defaultChatModels,
+    });
+    expect(result).toContainEqual({
+      id: 'custom_model',
+      displayName: 'Custom Model',
+      enabled: true,
+    });
+  });
+
+  it('should have file with builtin models like gpt-4-0125-preview', () => {
+    const result = transformToChatModelCards({
+      modelString:
+        '-all,+gpt-4-0125-preview=ChatGPT-4<128000:fc:file>,+gpt-4-turbo-2024-04-09=ChatGPT-4 Vision<128000:fc:vision:file>',
+      defaultChatModels: OpenAIProviderCard.chatModels,
+    });
+
+    expect(result).toMatchSnapshot();
+  });
+});