@lobehub/chat 1.60.0 → 1.60.2

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 1.60.2](https://github.com/lobehub/lobe-chat/compare/v1.60.1...v1.60.2)
+
+<sup>Released on **2025-02-17**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix model list issue in client mode.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix model list issue in client mode, closes [#6240](https://github.com/lobehub/lobe-chat/issues/6240) ([d6c6cda](https://github.com/lobehub/lobe-chat/commit/d6c6cda))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.60.1](https://github.com/lobehub/lobe-chat/compare/v1.60.0...v1.60.1)
+
+<sup>Released on **2025-02-17**</sup>
+
+#### 💄 Styles
+
+- **misc**: Update Jina AI Provider name & model info.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Update Jina AI Provider name & model info, closes [#6243](https://github.com/lobehub/lobe-chat/issues/6243) ([ddbe482](https://github.com/lobehub/lobe-chat/commit/ddbe482))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 1.60.0](https://github.com/lobehub/lobe-chat/compare/v1.59.0...v1.60.0)
 
 <sup>Released on **2025-02-17**</sup>

package/changelog/v1.json

@@ -1,4 +1,22 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "Fix model list issue in client mode."
+      ]
+    },
+    "date": "2025-02-17",
+    "version": "1.60.2"
+  },
+  {
+    "children": {
+      "improvements": [
+        "Update Jina AI Provider name & model info."
+      ]
+    },
+    "date": "2025-02-17",
+    "version": "1.60.1"
+  },
   {
     "children": {
       "features": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.60.0",
+  "version": "1.60.2",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/[variants]/(main)/settings/provider/(detail)/[id]/page.tsx

@@ -24,7 +24,7 @@ const Page = async (props: PagePropsWithId) => {
   if (isServerMode) {
     const { userId } = await getUserAuth();
 
-    const { aiProvider } = getServerGlobalConfig();
+    const { aiProvider } = await getServerGlobalConfig();
     const aiInfraRepos = new AiInfraRepos(
       serverDB,
       userId!,

package/src/config/aiModels/azure.ts

@@ -4,31 +4,84 @@ const azureChatModels: AIChatModelCard[] = [
   {
     abilities: {
       functionCall: true,
+      reasoning: true,
     },
     config: {
-      deploymentName: 'gpt-35-turbo',
+      deploymentName: 'o3-mini',
     },
-    contextWindowTokens: 16_385,
+    contextWindowTokens: 200_000,
     description:
-      'GPT 3.5 Turbo，OpenAI提供的高效模型，适用于聊天和文本生成任务，支持并行函数调用。',
-    displayName: 'GPT 3.5 Turbo',
+      'o3-mini 是我们最新的小型推理模型，在与 o1-mini 相同的成本和延迟目标下提供高智能。',
+    displayName: 'OpenAI o3-mini',
+    id: 'o3-mini',
+    maxOutput: 100_000,
+    pricing: {
+      input: 1.1,
+      output: 4.4,
+    },
+    releasedAt: '2025-01-31',
+    type: 'chat',
+  },
+  {
+    abilities: {
+      reasoning: true,
+    },
+    config: {
+      deploymentName: 'o1-mini',
+    },
+    contextWindowTokens: 128_000,
+    description:
+      'o1-mini是一款针对编程、数学和科学应用场景而设计的快速、经济高效的推理模型。该模型具有128K上下文和2023年10月的知识截止日期。',
+    displayName: 'OpenAI o1-mini',
     enabled: true,
-    id: 'gpt-3.5-turbo',
-    maxOutput: 4096,
+    id: 'o1-mini',
+    maxOutput: 65_536,
+    pricing: {
+      input: 1.1,
+      output: 4.4,
+    },
+    releasedAt: '2024-09-12',
     type: 'chat',
   },
   {
     abilities: {
-      functionCall: true,
+      reasoning: true,
     },
     config: {
-      deploymentName: 'gpt-35-turbo-16k',
+      deploymentName: 'o1',
     },
-    contextWindowTokens: 16_384,
-    description: 'GPT 3.5 Turbo 16k，高容量文本生成模型，适合复杂任务。',
-    displayName: 'GPT 3.5 Turbo',
-    id: 'gpt-3.5-turbo-16k',
-    maxOutput: 4096,
+    contextWindowTokens: 200_000,
+    description:
+      'o1是OpenAI新的推理模型，支持图文输入并输出文本，适用于需要广泛通用知识的复杂任务。该模型具有200K上下文和2023年10月的知识截止日期。',
+    displayName: 'OpenAI o1',
+    enabled: true,
+    id: 'o1',
+    maxOutput: 100_000,
+    pricing: {
+      input: 15,
+      output: 60,
+    },
+    releasedAt: '2024-12-17',
+    type: 'chat',
+  },
+  {
+    abilities: {
+      reasoning: true,
+    },
+    config: {
+      deploymentName: 'o1-preview',
+    },
+    contextWindowTokens: 128_000,
+    description:
+      'o1是OpenAI新的推理模型，适用于需要广泛通用知识的复杂任务。该模型具有128K上下文和2023年10月的知识截止日期。',
+    displayName: 'OpenAI o1-preview',
+    id: 'o1-preview',
+    maxOutput: 32_768,
+    pricing: {
+      input: 15,
+      output: 60,
+    },
+    releasedAt: '2024-09-12',
     type: 'chat',
   },
   {
@@ -37,29 +90,34 @@ const azureChatModels: AIChatModelCard[] = [
       vision: true,
     },
     config: {
-      deploymentName: 'gpt-4-turbo',
+      deploymentName: 'gpt-4o',
     },
     contextWindowTokens: 128_000,
-    description: 'GPT 4 Turbo，多模态模型，提供杰出的语言理解和生成能力，同时支持图像输入。',
-    displayName: 'GPT 4 Turbo',
+    description:
+      'ChatGPT-4o 是一款动态模型，实时更新以保持当前最新版本。它结合了强大的语言理解与生成能力，适合于大规模应用场景，包括客户服务、教育和技术支持。',
+    displayName: 'GPT-4o',
     enabled: true,
-    id: 'gpt-4',
-    maxOutput: 4096,
+    id: 'gpt-4o',
+    pricing: {
+      input: 2.5,
+      output: 10,
+    },
+    releasedAt: '2024-05-13',
     type: 'chat',
   },
+
   {
     abilities: {
       functionCall: true,
       vision: true,
     },
     config: {
-      deploymentName: 'gpt-4o-mini',
+      deploymentName: 'gpt-4-turbo',
     },
     contextWindowTokens: 128_000,
-    description: 'GPT-4o Mini，小型高效模型，具备与GPT-4o相似的卓越性能。',
-    displayName: 'GPT 4o Mini',
-    enabled: true,
-    id: 'gpt-4o-mini',
+    description: 'GPT 4 Turbo，多模态模型，提供杰出的语言理解和生成能力，同时支持图像输入。',
+    displayName: 'GPT 4 Turbo',
+    id: 'gpt-4',
     maxOutput: 4096,
     type: 'chat',
   },
@@ -69,13 +127,13 @@ const azureChatModels: AIChatModelCard[] = [
       vision: true,
     },
     config: {
-      deploymentName: 'gpt-4o',
+      deploymentName: 'gpt-4o-mini',
     },
     contextWindowTokens: 128_000,
-    description: 'GPT-4o 是最新的多模态模型，结合高级文本和图像处理能力。',
-    displayName: 'GPT 4o',
+    description: 'GPT-4o Mini，小型高效模型，具备与GPT-4o相似的卓越性能。',
+    displayName: 'GPT 4o Mini',
     enabled: true,
-    id: 'gpt-4o',
+    id: 'gpt-4o-mini',
     maxOutput: 4096,
     type: 'chat',
   },

package/src/config/aiModels/jina.ts

@@ -5,7 +5,7 @@ const jinaChatModels: AIChatModelCard[] = [
     abilities: {
       reasoning: true,
     },
-    contextWindowTokens: 64_000,
+    contextWindowTokens: 1_000_000,
     description: '深度搜索结合了网络搜索、阅读和推理，可进行全面调查。您可以将其视为一个代理，接受您的研究任务 - 它会进行广泛搜索并经过多次迭代，然后才能给出答案。这个过程涉及持续的研究、推理和从各个角度解决问题。这与直接从预训练数据生成答案的标准大模型以及依赖一次性表面搜索的传统 RAG 系统有着根本的不同。',
     displayName: 'Jina DeepSearch v1',
     enabled: true,

package/src/config/modelProviders/jina.ts

@@ -7,7 +7,7 @@ const Jina: ModelProviderCard = {
   id: 'jina',
   modelList: { showModelFetcher: true },
   modelsUrl: 'https://jina.ai/models',
-  name: 'Jina',
+  name: 'Jina AI',
   settings: {
     proxyUrl: {
       placeholder: 'https://deepsearch.jina.ai/v1',

package/src/database/repositories/aiInfra/index.ts

@@ -22,7 +22,7 @@ export class AiInfraRepos {
   private userId: string;
   private db: LobeChatDatabase;
   aiProviderModel: AiProviderModel;
-  private providerConfigs: Record<string, ProviderConfig>;
+  private readonly providerConfigs: Record<string, ProviderConfig>;
   aiModelModel: AiModelModel;
 
   constructor(
@@ -66,6 +66,9 @@ export class AiInfraRepos {
     });
   };
 
+  /**
+   * used in the chat page. to show the enabled providers
+   */
   getUserEnabledProviderList = async () => {
     const list = await this.getAiProviderList();
     return list
@@ -81,6 +84,9 @@ export class AiInfraRepos {
       );
   };
 
+  /**
+   * used in the chat page. to show the enabled models
+   */
   getEnabledModels = async () => {
     const providers = await this.getAiProviderList();
     const enabledProviders = providers.filter((item) => item.enabled);
@@ -129,15 +135,6 @@ export class AiInfraRepos {
     ) as EnabledAiModel[];
   };
 
-  getAiProviderModelList = async (providerId: string) => {
-    const aiModels = await this.aiModelModel.getModelListByProviderId(providerId);
-
-    const defaultModels: AiProviderModelListItem[] =
-      (await this.fetchBuiltinModels(providerId)) || [];
-
-    return mergeArrayById(defaultModels, aiModels) as AiProviderModelListItem[];
-  };
-
   getAiProviderRuntimeState = async (
     decryptor?: DecryptUserKeyVaults,
   ): Promise<AiProviderRuntimeState> => {
@@ -156,6 +153,18 @@ export class AiInfraRepos {
     return { enabledAiModels, enabledAiProviders, runtimeConfig };
   };
 
+  getAiProviderModelList = async (providerId: string) => {
+    const aiModels = await this.aiModelModel.getModelListByProviderId(providerId);
+
+    const defaultModels: AiProviderModelListItem[] =
+      (await this.fetchBuiltinModels(providerId)) || [];
+
+    return mergeArrayById(defaultModels, aiModels) as AiProviderModelListItem[];
+  };
+
+  /**
+   * use in the `/settings/provider/[id]` page
+   */
   getAiProviderDetail = async (id: string, decryptor?: DecryptUserKeyVaults) => {
     const config = await this.aiProviderModel.getAiProviderById(id, decryptor);
 
@@ -171,6 +180,7 @@ export class AiInfraRepos {
     try {
       const { default: providerModels } = await import(`@/config/aiModels/${providerId}`);
 
+      // use the serverModelLists as the defined server model list
       const presetList = this.providerConfigs[providerId]?.serverModelLists || providerModels;
       return (presetList as AIChatModelCard[]).map<AiProviderModelListItem>((m) => ({
         ...m,

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

@@ -22,8 +22,8 @@ exports[`LobeOpenAI > models > should get models 1`] = `
   },
   {
     "contextWindowTokens": 16385,
-    "displayName": "GPT 3.5 Turbo",
-    "enabled": true,
+    "displayName": "GPT-3.5 Turbo",
+    "enabled": false,
     "functionCall": true,
     "id": "gpt-3.5-turbo",
     "reasoning": false,
@@ -39,8 +39,8 @@ exports[`LobeOpenAI > models > should get models 1`] = `
     "vision": false,
   },
   {
-    "contextWindowTokens": 16384,
-    "displayName": "GPT 3.5 Turbo",
+    "contextWindowTokens": undefined,
+    "displayName": undefined,
     "enabled": false,
     "functionCall": true,
     "id": "gpt-3.5-turbo-16k",
@@ -221,7 +221,7 @@ exports[`LobeOpenAI > models > should get models 1`] = `
   {
     "contextWindowTokens": 128000,
     "displayName": "GPT 4 Turbo",
-    "enabled": true,
+    "enabled": false,
     "functionCall": true,
     "id": "gpt-4",
     "reasoning": false,

package/src/server/globalConfig/index.ts

@@ -12,7 +12,7 @@ import { genServerAiProvidersConfig } from './genServerAiProviderConfig';
 import { parseAgentConfig } from './parseDefaultAgent';
 import { parseFilesConfig } from './parseFilesConfig';
 
-export const getServerGlobalConfig = () => {
+export const getServerGlobalConfig = async () => {
   const { ACCESS_CODES, DEFAULT_AGENT_CONFIG } = getAppConfig();
 
   const config: GlobalServerConfig = {
@@ -38,6 +38,9 @@ export const getServerGlobalConfig = () => {
       ollama: {
         fetchOnClient: !process.env.OLLAMA_PROXY_URL,
       },
+      volcengine: {
+        withDeploymentName: true,
+      },
     }),
     defaultAgent: {
       config: parseAgentConfig(DEFAULT_AGENT_CONFIG),

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

@@ -19,7 +19,7 @@ const aiModelProcedure = authedProcedure.use(async (opts) => {
   const { ctx } = opts;
 
   const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
-  const { aiProvider } = getServerGlobalConfig();
+  const { aiProvider } = await getServerGlobalConfig();
 
   return opts.next({
     ctx: {

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

@@ -19,7 +19,7 @@ import { ProviderConfig } from '@/types/user/settings';
 const aiProviderProcedure = authedProcedure.use(async (opts) => {
   const { ctx } = opts;
 
-  const { aiProvider } = getServerGlobalConfig();
+  const { aiProvider } = await getServerGlobalConfig();
 
   const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
   return opts.next({

package/src/services/aiModel/client.ts

@@ -10,7 +10,13 @@ export class ClientService extends BaseClientService implements IAiModelService
     return new AiModelModel(clientDB as any, this.userId);
   }
   private get aiInfraRepos(): AiInfraRepos {
-    return new AiInfraRepos(clientDB as any, this.userId, {});
+    let config = {};
+
+    if (typeof window !== 'undefined') {
+      config = window.global_serverConfigStore.getState().serverConfig.aiProvider || {};
+    }
+
+    return new AiInfraRepos(clientDB as any, this.userId, config);
   }
 
   createAiModel: IAiModelService['createAiModel'] = async (params) => {

package/src/utils/merge.test.ts

@@ -101,4 +101,241 @@ describe('mergeArrayById', () => {
       },
     ]);
   });
+
+  describe('empty array handling', () => {
+    it('should return empty array when both inputs are empty', () => {
+      const result = mergeArrayById([], []);
+      expect(result).toEqual([]);
+    });
+
+    it('should return all default items when user items is empty', () => {
+      const defaultItems = [
+        { id: '1', name: 'Default 1', value: 100 },
+        { id: '2', name: 'Default 2', value: 200 },
+      ];
+
+      const result = mergeArrayById(defaultItems, []);
+      expect(result).toEqual(defaultItems);
+    });
+
+    it('should return all user items when default items is empty', () => {
+      const userItems = [
+        { id: '1', name: 'User 1', value: 300 },
+        { id: '2', name: 'User 2', value: 400 },
+      ];
+
+      const result = mergeArrayById([], userItems);
+      expect(result).toEqual(userItems);
+    });
+  });
+
+  describe('ID matching scenarios', () => {
+    it('should handle user items with IDs not in default items', () => {
+      const defaultItems = [{ id: '1', name: 'Default 1', value: 100 }];
+      const userItems = [
+        { id: '1', name: 'User 1', value: 200 },
+        { id: '2', name: 'User 2', value: 300 }, // New ID
+      ];
+
+      const result = mergeArrayById(defaultItems, userItems);
+      expect(result).toHaveLength(2);
+      expect(result).toContainEqual({ id: '1', name: 'User 1', value: 200 });
+      expect(result).toContainEqual({ id: '2', name: 'User 2', value: 300 });
+    });
+
+    it('should merge multiple items correctly', () => {
+      const defaultItems = [
+        { id: '1', name: 'Default 1', value: 100, meta: { key: 'value' } },
+        { id: '2', name: 'Default 2', value: 200, meta: { key: 'value' } },
+      ];
+
+      const userItems = [
+        { id: '2', name: 'User 2', value: 300 },
+        { id: '1', name: 'User 1', value: 400 },
+      ];
+
+      const result = mergeArrayById(defaultItems, userItems);
+
+      expect(result).toHaveLength(2);
+      expect(result).toContainEqual({
+        id: '1',
+        name: 'User 1',
+        value: 400,
+        meta: { key: 'value' },
+      });
+      expect(result).toContainEqual({
+        id: '2',
+        name: 'User 2',
+        value: 300,
+        meta: { key: 'value' },
+      });
+    });
+  });
+
+  describe('special value handling', () => {
+    it('should handle undefined values by keeping default values', () => {
+      const defaultItems = [{ id: '1', name: 'Default', value: 100, meta: { key: 'value' } }];
+
+      const userItems = [{ id: '1', name: undefined, value: 200, meta: undefined }];
+
+      const result = mergeArrayById(defaultItems, userItems as any);
+
+      expect(result).toEqual([{ id: '1', name: 'Default', value: 200, meta: { key: 'value' } }]);
+    });
+
+    it('should handle nested objects correctly', () => {
+      const defaultItems = [
+        {
+          id: '1',
+          config: {
+            deep: {
+              value: 100,
+              keep: true,
+            },
+            surface: 'default',
+          },
+        },
+      ];
+
+      const userItems = [
+        {
+          id: '1',
+          config: {
+            deep: {
+              value: 200,
+            },
+            surface: 'changed',
+          },
+        },
+      ];
+
+      const result = mergeArrayById(defaultItems, userItems);
+
+      expect(result[0].config).toEqual({
+        deep: {
+          value: 200,
+          keep: true,
+        },
+        surface: 'changed',
+      });
+    });
+  });
+
+  describe('edge cases', () => {
+    it('should handle objects missing id property', () => {
+      const defaultItems = [{ id: '1', name: 'Default' }];
+
+      const userItems = [{ name: 'Invalid' }];
+
+      expect(mergeArrayById(defaultItems, userItems as any)).toEqual([
+        { name: 'Invalid' },
+        { id: '1', name: 'Default' },
+      ]);
+    });
+
+    it('should preserve the source objects (no mutation)', () => {
+      const defaultItems = [{ id: '1', name: 'Default', meta: { key: 'value' } }];
+      const userItems = [{ id: '1', name: 'User' }];
+
+      const defaultItemsClone = JSON.parse(JSON.stringify(defaultItems));
+      const userItemsClone = JSON.parse(JSON.stringify(userItems));
+
+      mergeArrayById(defaultItems, userItems);
+
+      expect(defaultItems).toEqual(defaultItemsClone);
+      expect(userItems).toEqual(userItemsClone);
+    });
+
+    it('should handle duplicate IDs in user items by using the last occurrence', () => {
+      const defaultItems = [{ id: '1', name: 'Default', value: 100 }];
+      const userItems = [
+        { id: '1', name: 'User 1', value: 200 },
+        { id: '1', name: 'User 2', value: 300 }, // Duplicate ID
+      ];
+
+      const result = mergeArrayById(defaultItems, userItems);
+
+      expect(result).toHaveLength(1);
+      expect(result[0]).toEqual({
+        id: '1',
+        name: 'User 2',
+        value: 300,
+      });
+    });
+  });
+
+  it('should merge data with not empty objects', () => {
+    const data = mergeArrayById(
+      [
+        {
+          abilities: {
+            reasoning: true,
+            functionCalling: true,
+          },
+          config: {
+            deploymentName: 'o1',
+          },
+          contextWindowTokens: 200000,
+          description:
+            'o1是OpenAI新的推理模型，支持图文输入并输出文本，适用于需要广泛通用知识的复杂任务。该模型具有200K上下文和2023年10月的知识截止日期。',
+          displayName: 'OpenAI o1',
+          enabled: true,
+          id: 'o1',
+          maxOutput: 100000,
+          pricing: {
+            input: 15,
+            output: 60,
+          },
+          releasedAt: '2024-12-17',
+          type: 'chat',
+          source: 'builtin',
+        },
+      ],
+      [
+        {
+          abilities: {
+            reasoning: true,
+          },
+          config: {
+            deploymentName: 'ddd',
+          },
+          contextWindowTokens: 200000,
+          description:
+            'o1是OpenAI新的推理模型，支持图文输入并输出文本，适用于需要广泛通用知识的复杂任务。该模型具有200K上下文和2023年10月的知识截止日期。',
+          displayName: 'OpenAI o1',
+          enabled: true,
+          id: 'o1',
+          maxOutput: 100000,
+          releasedAt: '2024-12-17',
+          type: 'chat',
+        },
+      ],
+    );
+
+    expect(data).toEqual([
+      {
+        abilities: {
+          functionCalling: true,
+          reasoning: true,
+        },
+        config: {
+          deploymentName: 'ddd',
+        },
+        contextWindowTokens: 200000,
+        description:
+          'o1是OpenAI新的推理模型，支持图文输入并输出文本，适用于需要广泛通用知识的复杂任务。该模型具有200K上下文和2023年10月的知识截止日期。',
+        displayName: 'OpenAI o1',
+        enabled: true,
+        id: 'o1',
+        pricing: {
+          input: 15,
+          output: 60,
+        },
+        source: 'builtin',
+        maxOutput: 100000,
+        releasedAt: '2024-12-17',
+        type: 'chat',
+      },
+    ]);
+  });
 });

package/src/utils/merge.ts

@@ -24,28 +24,39 @@ export const mergeArrayById = <T extends MergeableItem>(defaultItems: T[], userI
   // Create a map of default items for faster lookup
   const defaultItemsMap = new Map(defaultItems.map((item) => [item.id, item]));
 
+  // 使用 Map 存储合并结果，这样重复 ID 的后项会自然覆盖前项
+  const mergedItemsMap = new Map<string, T>();
+
   // Process user items with default metadata
-  const mergedItems = userItems.map((userItem) => {
+  userItems.forEach((userItem) => {
     const defaultItem = defaultItemsMap.get(userItem.id);
-    if (!defaultItem) return userItem;
+    if (!defaultItem) {
+      mergedItemsMap.set(userItem.id, userItem);
+      return;
+    }
 
-    // Merge strategy: use default value when user value is null or undefined
     const mergedItem: T = { ...defaultItem };
     Object.entries(userItem).forEach(([key, value]) => {
-      // Only use user value if it's not null and not undefined
-      // and not empty object
       if (value !== null && value !== undefined && !(typeof value === 'object' && isEmpty(value))) {
         // @ts-expect-error
         mergedItem[key] = value;
       }
+
+      if (typeof value === 'object' && !isEmpty(value)) {
+        // @ts-expect-error
+        mergedItem[key] = merge(defaultItem[key], value);
+      }
     });
 
-    return mergedItem;
+    mergedItemsMap.set(userItem.id, mergedItem);
   });
 
-  // Add items that only exist in default configuration
-  const userItemIds = new Set(userItems.map((item) => item.id));
-  const onlyInDefaultItems = defaultItems.filter((item) => !userItemIds.has(item.id));
+  // 添加只在默认配置中存在的项
+  defaultItems.forEach((item) => {
+    if (!mergedItemsMap.has(item.id)) {
+      mergedItemsMap.set(item.id, item);
+    }
+  });
 
-  return [...mergedItems, ...onlyInDefaultItems];
+  return Array.from(mergedItemsMap.values());
 };

package/src/utils/parseModels.test.ts

@@ -301,6 +301,36 @@ describe('parseModelString', () => {
         },
       });
     });
+
+    it('should handle with multi deployName', () => {
+      const result = parseModelString(
+        'gpt-4o->id1=GPT-4o,gpt-4o-mini->id2=gpt-4o-mini,o1-mini->id3=O1 mini',
+        true,
+      );
+      expect(result.add).toEqual([
+        {
+          abilities: {},
+          displayName: 'GPT-4o',
+          id: 'gpt-4o',
+          type: 'chat',
+          config: { deploymentName: 'id1' },
+        },
+        {
+          abilities: {},
+          displayName: 'gpt-4o-mini',
+          id: 'gpt-4o-mini',
+          type: 'chat',
+          config: { deploymentName: 'id2' },
+        },
+        {
+          abilities: {},
+          displayName: 'O1 mini',
+          id: 'o1-mini',
+          type: 'chat',
+          config: { deploymentName: 'id3' },
+        },
+      ]);
+    });
   });
 });
 
@@ -394,4 +424,154 @@ describe('transformToChatModelCards', () => {
 
     expect(result).toMatchSnapshot();
   });
+
+  it('should handle azure real case', () => {
+    const defaultChatModels = [
+      {
+        abilities: { functionCall: true, reasoning: true },
+        config: { deploymentName: 'o3-mini' },
+        contextWindowTokens: 200000,
+        description:
+          'o3-mini 是我们最新的小型推理模型，在与 o1-mini 相同的成本和延迟目标下提供高智能。',
+        displayName: 'OpenAI o3-mini',
+        id: 'o3-mini',
+        maxOutput: 100000,
+        pricing: { input: 1.1, output: 4.4 },
+        releasedAt: '2025-01-31',
+        type: 'chat',
+      },
+      {
+        abilities: { reasoning: true },
+        config: { deploymentName: 'o1-mini' },
+        contextWindowTokens: 128000,
+        description:
+          'o1-mini是一款针对编程、数学和科学应用场景而设计的快速、经济高效的推理模型。该模型具有128K上下文和2023年10月的知识截止日期。',
+        displayName: 'OpenAI o1-mini',
+        enabled: true,
+        id: 'o1-mini',
+        maxOutput: 65536,
+        pricing: { input: 1.1, output: 4.4 },
+        releasedAt: '2024-09-12',
+        type: 'chat',
+      },
+      {
+        abilities: { reasoning: true },
+        config: { deploymentName: 'o1' },
+        contextWindowTokens: 200000,
+        description:
+          'o1是OpenAI新的推理模型，支持图文输入并输出文本，适用于需要广泛通用知识的复杂任务。该模型具有200K上下文和2023年10月的知识截止日期。',
+        displayName: 'OpenAI o1',
+        enabled: true,
+        id: 'o1',
+        maxOutput: 100000,
+        pricing: { input: 15, output: 60 },
+        releasedAt: '2024-12-17',
+        type: 'chat',
+      },
+      {
+        abilities: { reasoning: true },
+        config: { deploymentName: 'o1-preview' },
+        contextWindowTokens: 128000,
+        description:
+          'o1是OpenAI新的推理模型，适用于需要广泛通用知识的复杂任务。该模型具有128K上下文和2023年10月的知识截止日期。',
+        displayName: 'OpenAI o1-preview',
+        id: 'o1-preview',
+        maxOutput: 32768,
+        pricing: { input: 15, output: 60 },
+        releasedAt: '2024-09-12',
+        type: 'chat',
+      },
+      {
+        abilities: { functionCall: true, vision: true },
+        config: { deploymentName: 'gpt-4o' },
+        contextWindowTokens: 128000,
+        description:
+          'ChatGPT-4o 是一款动态模型，实时更新以保持当前最新版本。它结合了强大的语言理解与生成能力，适合于大规模应用场景，包括客户服务、教育和技术支持。',
+        displayName: 'GPT-4o',
+        enabled: true,
+        id: 'gpt-4o',
+        pricing: { input: 2.5, output: 10 },
+        releasedAt: '2024-05-13',
+        type: 'chat',
+      },
+      {
+        abilities: { functionCall: true, vision: true },
+        config: { deploymentName: 'gpt-4-turbo' },
+        contextWindowTokens: 128000,
+        description: 'GPT 4 Turbo，多模态模型，提供杰出的语言理解和生成能力，同时支持图像输入。',
+        displayName: 'GPT 4 Turbo',
+        id: 'gpt-4',
+        maxOutput: 4096,
+        type: 'chat',
+      },
+      {
+        abilities: { functionCall: true, vision: true },
+        config: { deploymentName: 'gpt-4o-mini' },
+        contextWindowTokens: 128000,
+        description: 'GPT-4o Mini，小型高效模型，具备与GPT-4o相似的卓越性能。',
+        displayName: 'GPT 4o Mini',
+        enabled: true,
+        id: 'gpt-4o-mini',
+        maxOutput: 4096,
+        type: 'chat',
+      },
+    ] as AiFullModelCard[];
+
+    const modelString =
+      '-all,gpt-4o->id1=GPT-4o,gpt-4o-mini->id2=GPT 4o Mini,o1-mini->id3=OpenAI o1-mini';
+
+    const data = transformToAiChatModelList({
+      modelString,
+      defaultChatModels,
+      providerId: 'azure',
+      withDeploymentName: true,
+    });
+
+    expect(data).toEqual([
+      {
+        abilities: { functionCall: true, vision: true },
+        config: { deploymentName: 'id1' },
+        contextWindowTokens: 128000,
+        description:
+          'ChatGPT-4o 是一款动态模型，实时更新以保持当前最新版本。它结合了强大的语言理解与生成能力，适合于大规模应用场景，包括客户服务、教育和技术支持。',
+        displayName: 'GPT-4o',
+        enabled: true,
+        id: 'gpt-4o',
+        pricing: { input: 2.5, output: 10 },
+        providerId: 'azure',
+        releasedAt: '2024-05-13',
+        source: 'builtin',
+        type: 'chat',
+      },
+      {
+        abilities: { functionCall: true, vision: true },
+        config: { deploymentName: 'id2' },
+        contextWindowTokens: 128000,
+        description: 'GPT-4o Mini，小型高效模型，具备与GPT-4o相似的卓越性能。',
+        displayName: 'GPT 4o Mini',
+        providerId: 'azure',
+        source: 'builtin',
+        enabled: true,
+        id: 'gpt-4o-mini',
+        maxOutput: 4096,
+        type: 'chat',
+      },
+      {
+        abilities: { reasoning: true },
+        config: { deploymentName: 'id3' },
+        contextWindowTokens: 128000,
+        description:
+          'o1-mini是一款针对编程、数学和科学应用场景而设计的快速、经济高效的推理模型。该模型具有128K上下文和2023年10月的知识截止日期。',
+        displayName: 'OpenAI o1-mini',
+        enabled: true,
+        providerId: 'azure',
+        source: 'builtin',
+        id: 'o1-mini',
+        maxOutput: 65536,
+        pricing: { input: 1.1, output: 4.4 },
+        releasedAt: '2024-09-12',
+        type: 'chat',
+      },
+    ]);
+  });
 });