@lobehub/chat 1.50.4 → 1.51.0

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

@@ -52,6 +52,17 @@ describe('parseModelString', () => {
       });
     });
 
+    it('token and reasoning', () => {
+      const result = parseModelString('deepseek-r1=Deepseek R1<65536:reasoning>');
+
+      expect(result.add[0]).toEqual({
+        displayName: 'Deepseek R1',
+        reasoning: true,
+        id: 'deepseek-r1',
+        contextWindowTokens: 65_536,
+      });
+    });
+
     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>',

package/src/utils/_deprecated/parseModels.ts

@@ -60,6 +60,10 @@ export const parseModelString = (modelString: string = '', withDeploymentName =
 
       for (const capability of capabilityList) {
         switch (capability) {
+          case 'reasoning': {
+            model.reasoning = true;
+            break;
+          }
           case 'vision': {
             model.vision = true;
             break;

package/src/utils/merge.test.ts

@@ -45,4 +45,60 @@ describe('mergeArrayById', () => {
       },
     ]);
   });
+
+  it('should merge data with objects', () => {
+    const data = mergeArrayById(
+      [
+        {
+          contextWindowTokens: 128_000,
+          description:
+            'o1-mini是一款针对编程、数学和科学应用场景而设计的快速、经济高效的推理模型。该模型具有128K上下文和2023年10月的知识截止日期。',
+          displayName: 'OpenAI o1-mini',
+          enabled: true,
+          id: 'o3-mini',
+          abilities: {
+            functionCall: true,
+          },
+          maxOutput: 65_536,
+          pricing: {
+            input: 3,
+            output: 12,
+          },
+          releasedAt: '2024-09-12',
+          type: 'chat',
+        },
+      ],
+      [
+        {
+          id: 'o3-mini',
+          contextWindowTokens: null,
+          displayName: 'OpenAI o1-mini ABC',
+          type: 'chat',
+          abilities: {},
+          enabled: false,
+        },
+      ],
+    );
+
+    expect(data).toEqual([
+      {
+        contextWindowTokens: 128_000,
+        description:
+          'o1-mini是一款针对编程、数学和科学应用场景而设计的快速、经济高效的推理模型。该模型具有128K上下文和2023年10月的知识截止日期。',
+        displayName: 'OpenAI o1-mini ABC',
+        enabled: false,
+        id: 'o3-mini',
+        maxOutput: 65_536,
+        pricing: {
+          input: 3,
+          output: 12,
+        },
+        abilities: {
+          functionCall: true,
+        },
+        releasedAt: '2024-09-12',
+        type: 'chat',
+      },
+    ]);
+  });
 });

package/src/utils/merge.ts

@@ -1,4 +1,4 @@
-import { merge as _merge, mergeWith } from 'lodash-es';
+import { merge as _merge, isEmpty, mergeWith } from 'lodash-es';
 
 /**
  * 用于合并对象，如果是数组则直接替换
@@ -33,7 +33,8 @@ export const mergeArrayById = <T extends MergeableItem>(defaultItems: T[], userI
     const mergedItem: T = { ...defaultItem };
     Object.entries(userItem).forEach(([key, value]) => {
       // Only use user value if it's not null and not undefined
-      if (value !== null && value !== undefined) {
+      // and not empty object
+      if (value !== null && value !== undefined && !(typeof value === 'object' && isEmpty(value))) {
         // @ts-expect-error
         mergedItem[key] = value;
       }

package/src/utils/parseModels.test.ts

@@ -58,6 +58,20 @@ describe('parseModelString', () => {
       });
     });
 
+    it('token and reasoning', () => {
+      const result = parseModelString('deepseek-r1=Deepseek R1<65536:reasoning>');
+
+      expect(result.add[0]).toEqual({
+        displayName: 'Deepseek R1',
+        abilities: {
+          reasoning: true,
+        },
+        id: 'deepseek-r1',
+        contextWindowTokens: 65_536,
+        type: 'chat',
+      });
+    });
+
     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>',

package/src/utils/parseModels.ts

@@ -64,6 +64,10 @@ export const parseModelString = (modelString: string = '', withDeploymentName =
 
       for (const capability of capabilityList) {
         switch (capability) {
+          case 'reasoning': {
+            model.abilities!.reasoning = true;
+            break;
+          }
           case 'vision': {
             model.abilities!.vision = true;
             break;