@lobehub/chat 1.45.5 → 1.45.7

package/src/features/Conversation/Messages/Assistant/FileChunks/index.tsx

@@ -65,7 +65,7 @@ const FileChunks = memo<FileChunksProps>(({ data }) => {
       {showDetail && (
         <Flexbox gap={8} horizontal wrap={'wrap'}>
           {data.map((item, index) => {
-            return <ChunkItem index={index} key={item.id} {...item}></ChunkItem>;
+            return <ChunkItem index={index} key={item.id} {...item} />;
           })}
         </Flexbox>
       )}

package/src/features/Conversation/components/History/index.tsx

@@ -57,7 +57,7 @@ const History = memo(() => {
           </Flexbox>
           <Flexbox align={'flex-start'} gap={8} horizontal>
             <Flexbox align={'center'} padding={8} width={20}>
-              <div className={styles.line}></div>
+              <div className={styles.line} />
             </Flexbox>
             <Markdown className={styles.content} variant={'chat'}>
               {content}

package/src/features/InitClientDB/PGliteIcon.tsx

@@ -20,7 +20,7 @@ const PGliteIcon: IconType = forwardRef(({ size = '1em', style, ...rest }, ref)
       <path
         clip-rule="evenodd"
         d="M941.581 335.737v460.806c0 15.926-12.913 28.836-28.832 28.818l-115.283-.137c-15.243-.018-27.706-11.88-28.703-26.877.011-.569.018-1.138.018-1.711l-.004-172.904c0-47.745-38.736-86.451-86.454-86.451-46.245 0-84.052-36.359-86.342-82.068V191.496l201.708.149c79.484.058 143.892 64.553 143.892 144.092zm-576-144.281v201.818c0 47.746 38.682 86.456 86.4 86.456h86.4v-5.796c0 66.816 54.13 120.98 120.902 120.98 28.617 0 51.815 23.213 51.815 51.848v149.644c0 .688.011 1.372.025 2.057-.943 15.065-13.453 26.992-28.746 26.992l-144.982-.007.986-201.586c.079-15.915-12.755-28.88-28.66-28.959-15.904-.079-28.861 12.763-28.94 28.678l-.986 201.741v.118l-172.174-.01V623.722c0-15.915-12.895-28.819-28.8-28.819-15.906 0-28.8 12.904-28.8 28.819v201.704l-143.642-.007c-15.905-.004-28.798-12.904-28.798-28.819V335.547c0-79.58 64.471-144.093 144.001-144.092l143.999.001zm446.544 173.693c0-23.874-19.343-43.228-43.2-43.228-23.861 0-43.2 19.354-43.2 43.228 0 23.875 19.339 43.226 43.2 43.226 23.857 0 43.2-19.351 43.2-43.226z"
-      ></path>
+      />
     </svg>
   );
 });

package/src/libs/agent-runtime/openai/__snapshots__/index.test.ts.snap

@@ -16,15 +16,19 @@ exports[`LobeOpenAI > models > should get models 1`] = `
   },
   {
     "id": "gpt-3.5-turbo-16k",
+    "releasedAt": "2023-05-10",
   },
   {
     "id": "gpt-3.5-turbo-16k-0613",
+    "releasedAt": "2023-05-30",
   },
   {
     "id": "gpt-4-1106-vision-preview",
+    "releasedAt": "2024-03-26",
   },
   {
     "id": "gpt-3.5-turbo-instruct-0914",
+    "releasedAt": "2023-09-07",
   },
   {
     "contextWindowTokens": 128000,
@@ -63,9 +67,11 @@ exports[`LobeOpenAI > models > should get models 1`] = `
   },
   {
     "id": "gpt-3.5-turbo-0301",
+    "releasedAt": "2023-03-01",
   },
   {
     "id": "gpt-3.5-turbo-0613",
+    "releasedAt": "2023-06-12",
   },
   {
     "contextWindowTokens": 16385,

package/src/libs/agent-runtime/utils/openaiCompatibleFactory/index.test.ts

@@ -1,7 +1,6 @@
 // @vitest-environment node
 import OpenAI from 'openai';
 import type { Stream } from 'openai/streaming';
-
 import { Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import {
@@ -11,6 +10,7 @@ import {
   LobeOpenAICompatibleRuntime,
   ModelProvider,
 } from '@/libs/agent-runtime';
+import officalOpenAIModels from '@/libs/agent-runtime/openai/fixtures/openai-models.json';
 import { sleep } from '@/utils/sleep';
 
 import * as debugStreamModule from '../debugStream';
@@ -802,26 +802,29 @@ describe('LobeOpenAICompatibleFactory', () => {
 
     it('should use custom stream handler when provided', async () => {
       // Create a custom stream handler that handles both ReadableStream and OpenAI Stream
-      const customStreamHandler = vi.fn((stream: ReadableStream | Stream<OpenAI.ChatCompletionChunk>) => {
-        const readableStream = stream instanceof ReadableStream ? stream : stream.toReadableStream();
-        return new ReadableStream({
-          start(controller) {
-            const reader = readableStream.getReader();
-            const process = async () => {
-              try {
-                while (true) {
-                  const { done, value } = await reader.read();
-                  if (done) break;
-                  controller.enqueue(value);
+      const customStreamHandler = vi.fn(
+        (stream: ReadableStream | Stream<OpenAI.ChatCompletionChunk>) => {
+          const readableStream =
+            stream instanceof ReadableStream ? stream : stream.toReadableStream();
+          return new ReadableStream({
+            start(controller) {
+              const reader = readableStream.getReader();
+              const process = async () => {
+                try {
+                  while (true) {
+                    const { done, value } = await reader.read();
+                    if (done) break;
+                    controller.enqueue(value);
+                  }
+                } finally {
+                  controller.close();
                 }
-              } finally {
-                controller.close();
-              }
-            };
-            process();
-          },
-        });
-      });
+              };
+              process();
+            },
+          });
+        },
+      );
 
       const LobeMockProvider = LobeOpenAICompatibleFactory({
         baseURL: 'https://api.test.com/v1',
@@ -897,10 +900,10 @@ describe('LobeOpenAICompatibleFactory', () => {
         choices: [
           {
             index: 0,
-            message: { 
-              role: 'assistant', 
+            message: {
+              role: 'assistant',
               content: 'Test response',
-              refusal: null
+              refusal: null,
             },
             logprobs: null,
             finish_reason: 'stop',
@@ -969,4 +972,72 @@ describe('LobeOpenAICompatibleFactory', () => {
       });
     });
   });
+
+  describe('models', () => {
+    it('should get models with third party model list', async () => {
+      vi.spyOn(instance['client'].models, 'list').mockResolvedValue({
+        data: [
+          { id: 'gpt-4o', object: 'model', created: 1698218177 },
+          { id: 'claude-3-haiku-20240307', object: 'model' },
+          { id: 'gpt-4o-mini', object: 'model', created: 1698318177 * 1000 },
+          { id: 'gemini', object: 'model', created: 1736499509125 },
+        ],
+      } as any);
+
+      const list = await instance.models();
+
+      expect(list).toEqual([
+        {
+          contextWindowTokens: 128000,
+          releasedAt: '2023-10-25',
+          description:
+            'ChatGPT-4o 是一款动态模型，实时更新以保持当前最新版本。它结合了强大的语言理解与生成能力，适合于大规模应用场景，包括客户服务、教育和技术支持。',
+          displayName: 'GPT-4o',
+          enabled: true,
+          functionCall: true,
+          id: 'gpt-4o',
+          pricing: {
+            input: 2.5,
+            output: 10,
+          },
+          vision: true,
+        },
+        {
+          contextWindowTokens: 200000,
+          description:
+            'Claude 3 Haiku 是 Anthropic 的最快且最紧凑的模型，旨在实现近乎即时的响应。它具有快速且准确的定向性能。',
+          displayName: 'Claude 3 Haiku',
+          functionCall: true,
+          id: 'claude-3-haiku-20240307',
+          maxOutput: 4096,
+          pricing: {
+            input: 0.25,
+            output: 1.25,
+          },
+          releasedAt: '2024-03-07',
+          vision: true,
+        },
+        {
+          contextWindowTokens: 128000,
+          description:
+            'GPT-4o mini是OpenAI在GPT-4 Omni之后推出的最新模型，支持图文输入并输出文本。作为他们最先进的小型模型，它比其他近期的前沿模型便宜很多，并且比GPT-3.5 Turbo便宜超过60%。它保持了最先进的智能，同时具有显著的性价比。GPT-4o mini在MMLU测试中获得了 82% 的得分，目前在聊天偏好上排名高于 GPT-4。',
+          displayName: 'GPT-4o mini',
+          enabled: true,
+          functionCall: true,
+          id: 'gpt-4o-mini',
+          maxOutput: 16385,
+          pricing: {
+            input: 0.15,
+            output: 0.6,
+          },
+          releasedAt: '2023-10-26',
+          vision: true,
+        },
+        {
+          id: 'gemini',
+          releasedAt: '2025-01-10',
+        },
+      ]);
+    });
+  });
 });

package/src/libs/agent-runtime/utils/openaiCompatibleFactory/index.ts

@@ -279,19 +279,34 @@ export const LobeOpenAICompatibleFactory = <T extends Record<string, any> = any>
             return models.transformModel(item);
           }
 
+          const toReleasedAt = () => {
+            if (!item.created) return;
+
+            // guarantee item.created in Date String format
+            if (
+              typeof (item.created as any) === 'string' ||
+              // or in milliseconds
+              item.created.toFixed(0).length === 13
+            ) {
+              return dayjs.utc(item.created).format('YYYY-MM-DD');
+            }
+
+            // by default, the created time is in seconds
+            return dayjs.utc(item.created * 1000).format('YYYY-MM-DD');
+          };
+
+          // TODO: should refactor after remove v1 user/modelList code
           const knownModel = LOBE_DEFAULT_MODEL_LIST.find((model) => model.id === item.id);
 
           if (knownModel) {
             dayjs.extend(utc);
 
-            return {
-              ...knownModel,
-              releasedAt:
-                knownModel.releasedAt ?? dayjs.utc(item.created * 1000).format('YYYY-MM-DD'),
-            };
+            const releasedAt = knownModel.releasedAt ?? toReleasedAt();
+
+            return { ...knownModel, releasedAt };
           }
 
-          return { id: item.id };
+          return { id: item.id, releasedAt: toReleasedAt() };
         })
 
         .filter(Boolean) as ChatModelCard[];

package/src/locales/default/modelProvider.ts

@@ -80,7 +80,7 @@ export default {
     },
     id: {
       desc: '作为服务商唯一标识，创建后将不可修改',
-      format: '只能包含小写字母、连字符（-）和下划线（_）',
+      format: '只能包含数字、小写字母、连字符（-）和下划线（_）',
       placeholder: '例如 openai、gemini 等',
       required: '请填写服务商 ID',
       title: '服务商 ID',
@@ -152,7 +152,7 @@ export default {
       title: '正在下载模型 {{model}} ',
     },
     endpoint: {
-      desc: '填入 Ollama 接口代理地址，本地未额外指定可留空',
+      desc: '必须包含http(s)://，本地未额外指定可留空',
       title: 'Ollama 服务地址',
     },
     setup: {

package/src/migrations/FromV3ToV4/index.ts

@@ -1,5 +1,5 @@
 import type { Migration, MigrationData } from '@/migrations/VersionController';
-import { transformToChatModelCards } from '@/utils/parseModels';
+import { transformToChatModelCards } from '@/utils/_deprecated/parseModels';
 
 import { V3ConfigState, V3LegacyConfig, V3OpenAIConfig, V3Settings } from './types/v3';
 import { V4AzureOpenAIConfig, V4ConfigState, V4ProviderConfig, V4Settings } from './types/v4';

package/src/server/globalConfig/{genServerLLMConfig.test.ts → _deprecated.test.ts}

@@ -1,8 +1,6 @@
 import { describe, expect, it, vi } from 'vitest';
 
-import { getLLMConfig } from '@/config/llm';
-
-import { genServerLLMConfig } from './genServerLLMConfig';
+import { genServerLLMConfig } from './_deprecated';
 
 // Mock ModelProvider enum
 vi.mock('@/libs/agent-runtime', () => ({
@@ -40,7 +38,7 @@ vi.mock('@/config/llm', () => ({
 }));
 
 // Mock parse models utils
-vi.mock('@/utils/parseModels', () => ({
+vi.mock('@/utils/_deprecated/parseModels', () => ({
   extractEnabledModels: (modelString: string, withDeploymentName?: boolean) => {
     // Returns different format if withDeploymentName is true
     return withDeploymentName ? [`${modelString}_withDeployment`] : [modelString];

package/src/server/globalConfig/{genServerLLMConfig.ts → _deprecated.ts}

@@ -2,7 +2,7 @@ import { getLLMConfig } from '@/config/llm';
 import * as ProviderCards from '@/config/modelProviders';
 import { ModelProvider } from '@/libs/agent-runtime';
 import { ModelProviderCard } from '@/types/llm';
-import { extractEnabledModels, transformToChatModelCards } from '@/utils/parseModels';
+import { extractEnabledModels, transformToChatModelCards } from '@/utils/_deprecated/parseModels';
 
 export const genServerLLMConfig = (specificConfig: Record<any, any>) => {
   const llmConfig = getLLMConfig() as Record<string, any>;

package/src/server/globalConfig/genServerAiProviderConfig.ts

@@ -0,0 +1,42 @@
+import * as AiModels from '@/config/aiModels';
+import { getLLMConfig } from '@/config/llm';
+import { ModelProvider } from '@/libs/agent-runtime';
+import { AiFullModelCard } from '@/types/aiModel';
+import { ProviderConfig } from '@/types/user/settings';
+import { extractEnabledModels, transformToAiChatModelList } from '@/utils/parseModels';
+
+export const genServerAiProvidersConfig = (specificConfig: Record<any, any>) => {
+  const llmConfig = getLLMConfig() as Record<string, any>;
+
+  return Object.values(ModelProvider).reduce(
+    (config, provider) => {
+      const providerUpperCase = provider.toUpperCase();
+      const providerCard = AiModels[provider] as AiFullModelCard[];
+      const providerConfig = specificConfig[provider as keyof typeof specificConfig] || {};
+      const providerModelList =
+        process.env[providerConfig.modelListKey ?? `${providerUpperCase}_MODEL_LIST`];
+
+      const defaultChatModels = providerCard.filter((c) => c.type === 'chat');
+
+      config[provider] = {
+        enabled: llmConfig[providerConfig.enabledKey || `ENABLED_${providerUpperCase}`],
+        enabledModels: extractEnabledModels(
+          providerModelList,
+          providerConfig.withDeploymentName || false,
+        ),
+        serverModelLists: transformToAiChatModelList({
+          defaultChatModels: defaultChatModels || [],
+          modelString: providerModelList,
+          providerId: provider,
+          withDeploymentName: providerConfig.withDeploymentName || false,
+        }),
+        ...(providerConfig.fetchOnClient !== undefined && {
+          fetchOnClient: providerConfig.fetchOnClient,
+        }),
+      };
+
+      return config;
+    },
+    {} as Record<string, ProviderConfig>,
+  );
+};

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",
   },
 ]
 `;