@lobehub/chat 1.40.0 → 1.40.2

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

@@ -82,6 +82,7 @@ exports[`parseModelString > only add the model 1`] = `
 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,
@@ -92,9 +93,9 @@ exports[`transformToChatModelCards > should have file with builtin models like g
       "input": 10,
       "output": 30,
     },
-    "tokens": 128000,
   },
   {
+    "contextWindowTokens": 128000,
     "description": "最新的 GPT-4 Turbo 模型具备视觉功能。现在，视觉请求可以使用 JSON 模式和函数调用。 GPT-4 Turbo 是一个增强版本，为多模态任务提供成本效益高的支持。它在准确性和效率之间找到平衡，适合需要进行实时交互的应用程序场景。",
     "displayName": "ChatGPT-4 Vision",
     "enabled": true,
@@ -105,7 +106,6 @@ exports[`transformToChatModelCards > should have file with builtin models like g
       "input": 10,
       "output": 30,
     },
-    "tokens": 128000,
     "vision": true,
   },
 ]

package/src/utils/genUserLLMConfig.test.ts

@@ -1,15 +1,15 @@
 import { describe, expect, it, vi } from 'vitest';
 
-import { genUserLLMConfig } from './genUserLLMConfig';
-
 import { ModelProviderCard } from '@/types/llm';
 
+import { genUserLLMConfig } from './genUserLLMConfig';
+
 // Mock ModelProvider enum
 vi.mock('@/libs/agent-runtime', () => ({
   ModelProvider: {
     Ollama: 'ollama',
     OpenAI: 'openai',
-  }
+  },
 }));
 
 // Mock ProviderCards and filterEnabledModels
@@ -27,7 +27,7 @@ describe('genUserLLMConfig', () => {
   it('should generate correct LLM config for Ollama and OpenAI', () => {
     const specificConfig = {
       ollama: { enabled: true, fetchOnClient: true },
-      openai: { enabled: true }
+      openai: { enabled: true },
     };
     const config = genUserLLMConfig(specificConfig);
 

package/src/utils/genUserLLMConfig.ts

@@ -1,20 +1,22 @@
 import * as ProviderCards from '@/config/modelProviders';
-
 import { ModelProvider } from '@/libs/agent-runtime';
-
 import { ModelProviderCard } from '@/types/llm';
 import { UserModelProviderConfig } from '@/types/user/settings';
 
 export const genUserLLMConfig = (specificConfig: Record<any, any>): UserModelProviderConfig => {
   return Object.keys(ModelProvider).reduce((config, providerKey) => {
     const provider = ModelProvider[providerKey as keyof typeof ModelProvider];
-    const providerCard = ProviderCards[`${providerKey}ProviderCard` as keyof typeof ProviderCards] as ModelProviderCard;
+    const providerCard = ProviderCards[
+      `${providerKey}ProviderCard` as keyof typeof ProviderCards
+    ] as ModelProviderCard;
     const providerConfig = specificConfig[provider as keyof typeof specificConfig] || {};
 
     config[provider] = {
       enabled: providerConfig.enabled !== undefined ? providerConfig.enabled : false,
       enabledModels: providerCard ? ProviderCards.filterEnabledModels(providerCard) : [],
-      ...(providerConfig.fetchOnClient !== undefined && { fetchOnClient: providerConfig.fetchOnClient }),
+      ...(providerConfig.fetchOnClient !== undefined && {
+        fetchOnClient: providerConfig.fetchOnClient,
+      }),
     };
 
     return config;

package/src/utils/parseModels.test.ts

@@ -37,7 +37,7 @@ describe('parseModelString', () => {
       expect(result.add[0]).toEqual({
         displayName: 'ChatGLM 6B',
         id: 'chatglm-6b',
-        tokens: 4096,
+        contextWindowTokens: 4096,
       });
     });
 
@@ -48,7 +48,7 @@ describe('parseModelString', () => {
         displayName: '讯飞星火 v3.5',
         functionCall: true,
         id: 'spark-v3.5',
-        tokens: 8192,
+        contextWindowTokens: 8192,
       });
     });
 
@@ -62,7 +62,7 @@ describe('parseModelString', () => {
           displayName: 'Gemini 1.5 Flash',
           vision: true,
           id: 'gemini-1.5-flash-latest',
-          tokens: 16000,
+          contextWindowTokens: 16000,
         },
         {
           displayName: 'ChatGPT Plus',
@@ -70,7 +70,7 @@ describe('parseModelString', () => {
           functionCall: true,
           files: true,
           id: 'gpt-4-all',
-          tokens: 128000,
+          contextWindowTokens: 128000,
         },
       ]);
     });
@@ -85,14 +85,14 @@ describe('parseModelString', () => {
           files: true,
           functionCall: true,
           id: 'gpt-4-0125-preview',
-          tokens: 128000,
+          contextWindowTokens: 128000,
         },
         {
           displayName: 'ChatGPT-4 Vision',
           files: true,
           functionCall: true,
           id: 'gpt-4-turbo-2024-04-09',
-          tokens: 128000,
+          contextWindowTokens: 128000,
           vision: true,
         },
       ]);
@@ -100,27 +100,27 @@ describe('parseModelString', () => {
 
     it('should handle empty extension capability value', () => {
       const result = parseModelString('model1<1024:>');
-      expect(result.add[0]).toEqual({ id: 'model1', tokens: 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', tokens: 1024, files: true });
+      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', tokens: 1024, vision: true });
+      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', tokens: 1024, files: true });
+      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', tokens: 1024, vision: true });
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024, vision: true });
     });
 
     it('should handle empty angle brackets', () => {
@@ -155,27 +155,27 @@ describe('parseModelString', () => {
 
     it('should handle digits followed by non-colon characters inside angle brackets', () => {
       const result = parseModelString('model1<1024abc>');
-      expect(result.add[0]).toEqual({ id: 'model1', tokens: 1024 });
+      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', tokens: 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', tokens: 1024 });
+      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', tokens: 1024 });
+      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', tokens: 1024 });
+      expect(result.add[0]).toEqual({ id: 'model1', contextWindowTokens: 1024 });
     });
   });
 

package/src/utils/parseModels.ts

@@ -56,7 +56,7 @@ export const parseModelString = (modelString: string = '', withDeploymentName =
 
     if (capabilities.length > 0) {
       const [maxTokenStr, ...capabilityList] = capabilities[0].replace('>', '').split(':');
-      model.tokens = parseInt(maxTokenStr, 10) || undefined;
+      model.contextWindowTokens = parseInt(maxTokenStr, 10) || undefined;
 
       for (const capability of capabilityList) {
         switch (capability) {

package/src/utils/server/jwt.ts

@@ -1,10 +1,6 @@
 import { importJWK, jwtVerify } from 'jose';
 
-import {
-  JWTPayload,
-  JWT_SECRET_KEY,
-  NON_HTTP_PREFIX,
-} from '@/const/auth';
+import { JWTPayload, JWT_SECRET_KEY, NON_HTTP_PREFIX } from '@/const/auth';
 
 export const getJWTPayload = async (token: string): Promise<JWTPayload> => {
   //如果是 HTTP 协议发起的请求，直接解析 token
@@ -29,4 +25,4 @@ export const getJWTPayload = async (token: string): Promise<JWTPayload> => {
   const { payload } = await jwtVerify(token, jwkSecretKey);
 
   return payload as JWTPayload;
-};
+};