@lobehub/chat 1.111.1 → 1.111.2

package/src/config/modelProviders/zhipu.ts

@@ -10,11 +10,6 @@ const ZhiPu: ModelProviderCard = {
       description: 'GLM-Zero-Preview具备强大的复杂推理能力，在逻辑推理、数学、编程等领域表现优异。',
       displayName: 'GLM-Zero-Preview',
       id: 'glm-zero-preview',
-      pricing: {
-        currency: 'CNY',
-        input: 10,
-        output: 10,
-      },
     },
     {
       contextWindowTokens: 128_000,
@@ -23,11 +18,6 @@ const ZhiPu: ModelProviderCard = {
       enabled: true,
       functionCall: true,
       id: 'glm-4-flash',
-      pricing: {
-        currency: 'CNY',
-        input: 0,
-        output: 0,
-      },
     },
     {
       contextWindowTokens: 128_000,
@@ -36,11 +26,6 @@ const ZhiPu: ModelProviderCard = {
       enabled: true,
       functionCall: true,
       id: 'glm-4-flashx',
-      pricing: {
-        currency: 'CNY',
-        input: 0.1,
-        output: 0.1,
-      },
     },
     {
       contextWindowTokens: 1_024_000,
@@ -48,11 +33,6 @@ const ZhiPu: ModelProviderCard = {
       displayName: 'GLM-4-Long',
       functionCall: true,
       id: 'glm-4-long',
-      pricing: {
-        currency: 'CNY',
-        input: 1,
-        output: 1,
-      },
     },
     {
       contextWindowTokens: 128_000,
@@ -61,11 +41,6 @@ const ZhiPu: ModelProviderCard = {
       enabled: true,
       functionCall: true,
       id: 'glm-4-air',
-      pricing: {
-        currency: 'CNY',
-        input: 1,
-        output: 1,
-      },
     },
     {
       contextWindowTokens: 8192,
@@ -74,11 +49,6 @@ const ZhiPu: ModelProviderCard = {
       enabled: true,
       functionCall: true,
       id: 'glm-4-airx',
-      pricing: {
-        currency: 'CNY',
-        input: 10,
-        output: 10,
-      },
     },
     {
       contextWindowTokens: 128_000,
@@ -87,11 +57,6 @@ const ZhiPu: ModelProviderCard = {
       displayName: 'GLM-4-AllTools',
       functionCall: true,
       id: 'glm-4-alltools',
-      pricing: {
-        currency: 'CNY',
-        input: 100,
-        output: 100,
-      },
     },
     {
       contextWindowTokens: 128_000,
@@ -101,11 +66,6 @@ const ZhiPu: ModelProviderCard = {
       enabled: true,
       functionCall: true,
       id: 'glm-4-plus',
-      pricing: {
-        currency: 'CNY',
-        input: 50,
-        output: 50,
-      },
     },
     {
       contextWindowTokens: 128_000,
@@ -113,11 +73,6 @@ const ZhiPu: ModelProviderCard = {
       displayName: 'GLM-4-0520',
       functionCall: true,
       id: 'glm-4-0520',
-      pricing: {
-        currency: 'CNY',
-        input: 100,
-        output: 100,
-      },
     },
     {
       contextWindowTokens: 128_000,
@@ -125,11 +80,6 @@ const ZhiPu: ModelProviderCard = {
       displayName: 'GLM-4',
       functionCall: true,
       id: 'glm-4',
-      pricing: {
-        currency: 'CNY',
-        input: 100,
-        output: 100,
-      },
     },
     {
       contextWindowTokens: 8192,
@@ -138,11 +88,6 @@ const ZhiPu: ModelProviderCard = {
       displayName: 'GLM-4V-Flash',
       enabled: true,
       id: 'glm-4v-flash',
-      pricing: {
-        currency: 'CNY',
-        input: 0,
-        output: 0,
-      },
       releasedAt: '2024-12-09',
       vision: true,
     },
@@ -152,11 +97,6 @@ const ZhiPu: ModelProviderCard = {
       displayName: 'GLM-4V-Plus',
       enabled: true,
       id: 'glm-4v-plus',
-      pricing: {
-        currency: 'CNY',
-        input: 10,
-        output: 10,
-      },
       vision: true,
     },
     {
@@ -164,11 +104,6 @@ const ZhiPu: ModelProviderCard = {
       description: 'GLM-4V 提供强大的图像理解与推理能力，支持多种视觉任务。',
       displayName: 'GLM-4V',
       id: 'glm-4v',
-      pricing: {
-        currency: 'CNY',
-        input: 50,
-        output: 50,
-      },
       vision: true,
     },
     {
@@ -177,33 +112,18 @@ const ZhiPu: ModelProviderCard = {
         'CodeGeeX-4 是强大的AI编程助手，支持多种编程语言的智能问答与代码补全，提升开发效率。',
       displayName: 'CodeGeeX-4',
       id: 'codegeex-4',
-      pricing: {
-        currency: 'CNY',
-        input: 0.1,
-        output: 0.1,
-      },
     },
     {
       contextWindowTokens: 4096,
       description: 'CharGLM-3 专为角色扮演与情感陪伴设计，支持超长多轮记忆与个性化对话，应用广泛。',
       displayName: 'CharGLM-3',
       id: 'charglm-3',
-      pricing: {
-        currency: 'CNY',
-        input: 15,
-        output: 15,
-      },
     },
     {
       contextWindowTokens: 8192,
       description: 'Emohaa 是心理模型，具备专业咨询能力，帮助用户理解情感问题。',
       displayName: 'Emohaa',
       id: 'emohaa',
-      pricing: {
-        currency: 'CNY',
-        input: 15,
-        output: 15,
-      },
     },
   ],
   checkModel: 'glm-4-flash-250414',

package/src/features/Conversation/Extras/Usage/UsageDetail/ModelCard.tsx

@@ -10,6 +10,7 @@ import { getPrice } from '@/features/Conversation/Extras/Usage/UsageDetail/prici
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
 import { LobeDefaultAiModelListItem } from '@/types/aiModel';
+import { getCachedTextInputUnitRate, getWriteCacheInputUnitRate } from '@/utils/pricing';
 
 export const useStyles = createStyles(({ css, token }) => {
   return {
@@ -38,7 +39,7 @@ const ModelCard = memo<ModelCardProps>(({ pricing, id, provider, displayName })
   const isShowCredit = useGlobalStore(systemStatusSelectors.isShowCredit) && !!pricing;
   const updateSystemStatus = useGlobalStore((s) => s.updateSystemStatus);
 
-  const formatPrice = getPrice(pricing || {});
+  const formatPrice = getPrice(pricing || { units: [] });
 
   return (
     <Flexbox gap={8}>
@@ -87,7 +88,7 @@ const ModelCard = memo<ModelCardProps>(({ pricing, id, provider, displayName })
           <div />
           <Flexbox align={'center'} className={styles.pricing} gap={8} horizontal>
             {t('messages.modelCard.creditPricing')}:
-            {pricing?.cachedInput && (
+            {getCachedTextInputUnitRate(pricing) && (
               <Tooltip
                 title={t('messages.modelCard.pricing.inputCachedTokens', {
                   amount: formatPrice.cachedInput,
@@ -99,7 +100,7 @@ const ModelCard = memo<ModelCardProps>(({ pricing, id, provider, displayName })
                 </Flexbox>
               </Tooltip>
             )}
-            {pricing?.writeCacheInput && (
+            {getWriteCacheInputUnitRate(pricing) && (
               <Tooltip
                 title={t('messages.modelCard.pricing.writeCacheInputTokens', {
                   amount: formatPrice.writeCacheInput,

package/src/features/Conversation/Extras/Usage/UsageDetail/pricing.ts

@@ -1,21 +1,31 @@
-import { ChatModelPricing } from '@/types/aiModel';
+import { Pricing } from '@/types/aiModel';
 import { ModelPriceCurrency } from '@/types/llm';
 import { formatPriceByCurrency } from '@/utils/format';
+import {
+  getCachedTextInputUnitRate,
+  getTextInputUnitRate,
+  getTextOutputUnitRate,
+  getWriteCacheInputUnitRate,
+} from '@/utils/pricing';
 
-export const getPrice = (pricing: ChatModelPricing) => {
-  const inputPrice = formatPriceByCurrency(pricing?.input, pricing?.currency as ModelPriceCurrency);
-  const cachedInputPrice = formatPriceByCurrency(
-    pricing?.cachedInput,
-    pricing?.currency as ModelPriceCurrency,
-  );
-  const writeCacheInputPrice = formatPriceByCurrency(
-    pricing?.writeCacheInput,
-    pricing?.currency as ModelPriceCurrency,
-  );
-  const outputPrice = formatPriceByCurrency(
-    pricing?.output,
-    pricing?.currency as ModelPriceCurrency,
-  );
+export const getPrice = (pricing: Pricing) => {
+  const inputRate = getTextInputUnitRate(pricing);
+  const outputRate = getTextOutputUnitRate(pricing);
+  const cachedInputRate = getCachedTextInputUnitRate(pricing);
+  const writeCacheInputRate = getWriteCacheInputUnitRate(pricing);
+
+  const inputPrice = inputRate
+    ? formatPriceByCurrency(inputRate, pricing?.currency as ModelPriceCurrency)
+    : '0';
+  const cachedInputPrice = cachedInputRate
+    ? formatPriceByCurrency(cachedInputRate, pricing?.currency as ModelPriceCurrency)
+    : '0';
+  const writeCacheInputPrice = writeCacheInputRate
+    ? formatPriceByCurrency(writeCacheInputRate, pricing?.currency as ModelPriceCurrency)
+    : '0';
+  const outputPrice = outputRate
+    ? formatPriceByCurrency(outputRate, pricing?.currency as ModelPriceCurrency)
+    : '0';
 
   return {
     cachedInput: Number(cachedInputPrice),

package/src/features/Conversation/Extras/Usage/UsageDetail/tokens.test.ts

@@ -9,11 +9,13 @@ describe('getDetailsToken', () => {
   // 基本测试数据
   const mockModelCard: LobeDefaultAiModelListItem = {
     pricing: {
-      input: 0.01,
-      output: 0.02,
-      cachedInput: 0.005,
-      audioInput: 0.03,
-      audioOutput: 0.04,
+      units: [
+        { name: 'textInput', unit: 'millionTokens', strategy: 'fixed', rate: 0.01 },
+        { name: 'textOutput', unit: 'millionTokens', strategy: 'fixed', rate: 0.02 },
+        { name: 'textInput_cacheRead', unit: 'millionTokens', strategy: 'fixed', rate: 0.005 },
+        { name: 'audioInput', unit: 'millionTokens', strategy: 'fixed', rate: 0.03 },
+        { name: 'audioOutput', unit: 'millionTokens', strategy: 'fixed', rate: 0.04 },
+      ],
     },
   } as LobeDefaultAiModelListItem;
 

package/src/features/Conversation/Extras/Usage/UsageDetail/tokens.ts

@@ -1,5 +1,6 @@
-import { ChatModelPricing, LobeDefaultAiModelListItem } from '@/types/aiModel';
+import { LobeDefaultAiModelListItem } from '@/types/aiModel';
 import { ModelTokensUsage } from '@/types/message';
+import { getAudioInputUnitRate, getAudioOutputUnitRate } from '@/utils/pricing';
 
 import { getPrice } from './pricing';
 
@@ -32,7 +33,7 @@ export const getDetailsToken = (
     : totalInputTokens - (inputCacheTokens || 0);
 
   // Pricing
-  const formatPrice = getPrice(modelCard?.pricing as ChatModelPricing);
+  const formatPrice = getPrice(modelCard?.pricing || { units: [] });
 
   const inputCacheMissCredit = (
     !!inputCacheMissTokens ? calcCredit(inputCacheMissTokens, formatPrice.input) : 0
@@ -50,7 +51,7 @@ export const getDetailsToken = (
     !!totalOutputTokens ? calcCredit(totalOutputTokens, formatPrice.output) : 0
   ) as number;
   const totalInputCredit = (
-    !!totalInputTokens ? calcCredit(totalInputTokens, formatPrice.output) : 0
+    !!totalInputTokens ? calcCredit(totalInputTokens, formatPrice.input) : 0
   ) as number;
 
   const totalCredit =
@@ -59,7 +60,7 @@ export const getDetailsToken = (
   return {
     inputAudio: !!usage.inputAudioTokens
       ? {
-          credit: calcCredit(usage.inputAudioTokens, modelCard?.pricing?.audioInput),
+          credit: calcCredit(usage.inputAudioTokens, getAudioInputUnitRate(modelCard?.pricing)),
           token: usage.inputAudioTokens,
         }
       : undefined,
@@ -87,7 +88,7 @@ export const getDetailsToken = (
 
     outputAudio: !!usage.outputAudioTokens
       ? {
-          credit: calcCredit(usage.outputAudioTokens, modelCard?.pricing?.audioOutput),
+          credit: calcCredit(usage.outputAudioTokens, getAudioOutputUnitRate(modelCard?.pricing)),
           id: 'outputAudio',
           token: usage.outputAudioTokens,
         }

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

@@ -1352,9 +1352,26 @@ describe('LobeOpenAICompatibleFactory', () => {
           id: 'gpt-4o',
           maxOutput: 4096,
           pricing: {
-            cachedInput: 1.25,
-            input: 2.5,
-            output: 10,
+            units: [
+              {
+                name: 'textInput_cacheRead',
+                rate: 1.25,
+                strategy: 'fixed',
+                unit: 'millionTokens',
+              },
+              {
+                name: 'textInput',
+                rate: 2.5,
+                strategy: 'fixed',
+                unit: 'millionTokens',
+              },
+              {
+                name: 'textOutput',
+                rate: 10,
+                strategy: 'fixed',
+                unit: 'millionTokens',
+              },
+            ],
           },
           providerId: 'azure',
           releasedAt: '2024-05-13',
@@ -1374,8 +1391,20 @@ describe('LobeOpenAICompatibleFactory', () => {
           id: 'claude-3-haiku-20240307',
           maxOutput: 4096,
           pricing: {
-            input: 0.25,
-            output: 1.25,
+            units: [
+              {
+                name: 'textInput',
+                rate: 0.25,
+                strategy: 'fixed',
+                unit: 'millionTokens',
+              },
+              {
+                name: 'textOutput',
+                rate: 1.25,
+                strategy: 'fixed',
+                unit: 'millionTokens',
+              },
+            ],
           },
           providerId: 'anthropic',
           releasedAt: '2024-03-07',
@@ -1400,9 +1429,26 @@ describe('LobeOpenAICompatibleFactory', () => {
           id: 'gpt-4o-mini',
           maxOutput: 4096,
           pricing: {
-            cachedInput: 0.075,
-            input: 0.15,
-            output: 0.6,
+            units: [
+              {
+                name: 'textInput_cacheRead',
+                rate: 0.075,
+                strategy: 'fixed',
+                unit: 'millionTokens',
+              },
+              {
+                name: 'textInput',
+                rate: 0.15,
+                strategy: 'fixed',
+                unit: 'millionTokens',
+              },
+              {
+                name: 'textOutput',
+                rate: 0.6,
+                strategy: 'fixed',
+                unit: 'millionTokens',
+              },
+            ],
           },
           providerId: 'azure',
           releasedAt: '2023-10-26',

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

@@ -93,8 +93,8 @@ export const agentRouter = router({
           const user = await UserModel.findById(ctx.serverDB, ctx.userId);
           if (!user) return DEFAULT_AGENT_CONFIG;
 
-          await ctx.agentService.createInbox();
-          pino.info('create inbox session');
+          const res = await ctx.agentService.createInbox();
+          pino.info({ res }, 'create inbox session');
         }
       }
 

package/src/server/routers/lambda/config/__snapshots__/index.test.ts.snap

@@ -26,10 +26,6 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
       "enabled": true,
       "functionCall": true,
       "id": "gpt-4-0125-preview",
-      "pricing": {
-        "input": 10,
-        "output": 30,
-      },
     },
   ],
 }
@@ -44,10 +40,6 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
     "enabled": true,
     "functionCall": true,
     "id": "gpt-3.5-turbo-1106",
-    "pricing": {
-      "input": 1,
-      "output": 2,
-    },
   },
   {
     "contextWindowTokens": 16385,
@@ -56,10 +48,6 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
     "enabled": true,
     "functionCall": true,
     "id": "gpt-3.5-turbo",
-    "pricing": {
-      "input": 0.5,
-      "output": 1.5,
-    },
   },
   {
     "contextWindowTokens": 8192,
@@ -68,10 +56,6 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
     "enabled": true,
     "functionCall": true,
     "id": "gpt-4",
-    "pricing": {
-      "input": 30,
-      "output": 60,
-    },
   },
   {
     "contextWindowTokens": 32768,
@@ -80,10 +64,6 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
     "enabled": true,
     "functionCall": true,
     "id": "gpt-4-32k",
-    "pricing": {
-      "input": 60,
-      "output": 120,
-    },
   },
   {
     "contextWindowTokens": 128000,
@@ -92,10 +72,6 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
     "enabled": true,
     "functionCall": true,
     "id": "gpt-4-1106-preview",
-    "pricing": {
-      "input": 10,
-      "output": 30,
-    },
   },
   {
     "displayName": "gpt-4-vision",
@@ -113,10 +89,6 @@ exports[`configRouter > getGlobalConfig > Model Provider env > OPENAI_MODEL_LIST
   "enabled": true,
   "functionCall": true,
   "id": "gpt-4-1106-preview",
-  "pricing": {
-    "input": 10,
-    "output": 30,
-  },
 }
 `;
 

package/src/server/services/discover/index.ts

@@ -43,6 +43,7 @@ import {
   ProviderQueryParams,
   ProviderSorts,
 } from '@/types/discover';
+import { getAudioInputUnitRate, getTextInputUnitRate, getTextOutputUnitRate } from '@/utils/pricing';
 
 const log = debug('lobe-server:discover');
 
@@ -1142,13 +1143,13 @@ export class DiscoverService {
           list = list.sort((a, b) => {
             if (order === 'asc') {
               return (
-                (a.pricing?.input || a.pricing?.audioInput || 0) -
-                (b.pricing?.input || b.pricing?.audioInput || 0)
+                (getTextInputUnitRate(a.pricing) || getAudioInputUnitRate(a.pricing) || 0) -
+                (getTextInputUnitRate(b.pricing) || getAudioInputUnitRate(b.pricing) || 0)
               );
             } else {
               return (
-                (b.pricing?.input || b.pricing?.audioInput || 0) -
-                (a.pricing?.input || a.pricing?.audioInput || 0)
+                (getTextInputUnitRate(b.pricing) || getAudioInputUnitRate(b.pricing) || 0) -
+                (getTextInputUnitRate(a.pricing) || getAudioInputUnitRate(a.pricing) || 0)
               );
             }
           });
@@ -1157,9 +1158,9 @@ export class DiscoverService {
         case ModelSorts.OutputPrice: {
           list = list.sort((a, b) => {
             if (order === 'asc') {
-              return (a.pricing?.output || 0) - (b.pricing?.output || 0);
+              return (getTextOutputUnitRate(a.pricing) || 0) - (getTextOutputUnitRate(b.pricing) || 0);
             } else {
-              return (b.pricing?.output || 0) - (a.pricing?.output || 0);
+              return (getTextOutputUnitRate(b.pricing) || 0) - (getTextOutputUnitRate(a.pricing) || 0);
             }
           });
           break;

package/src/server/services/user/index.ts

@@ -125,8 +125,7 @@ export class UserService {
       }
       return Buffer.from(file);
     } catch (error) {
-      // @ts-expect-error 这里很奇怪，升级了 pino 就报错，我怀疑是 pino 的问题
-      pino.error('Failed to get user avatar:', error);
+      pino.error({ error }, 'Failed to get user avatar');
     }
   };
 }

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

@@ -112,8 +112,20 @@ exports[`transformToChatModelCards > should have file with builtin models like g
     "enabled": true,
     "id": "gpt-4-0125-preview",
     "pricing": {
-      "input": 10,
-      "output": 30,
+      "units": [
+        {
+          "name": "textInput",
+          "rate": 10,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+        {
+          "name": "textOutput",
+          "rate": 30,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+      ],
     },
     "providerId": "openai",
     "releasedAt": "2024-01-25",
@@ -132,8 +144,20 @@ exports[`transformToChatModelCards > should have file with builtin models like g
     "enabled": true,
     "id": "gpt-4-turbo-2024-04-09",
     "pricing": {
-      "input": 10,
-      "output": 30,
+      "units": [
+        {
+          "name": "textInput",
+          "rate": 10,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+        {
+          "name": "textOutput",
+          "rate": 30,
+          "strategy": "fixed",
+          "unit": "millionTokens",
+        },
+      ],
     },
     "providerId": "openai",
     "releasedAt": "2024-04-09",

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

@@ -89,10 +89,6 @@ exports[`transformToChatModelCards > should have file with builtin models like g
     "files": true,
     "functionCall": true,
     "id": "gpt-4-0125-preview",
-    "pricing": {
-      "input": 10,
-      "output": 30,
-    },
   },
   {
     "contextWindowTokens": 128000,
@@ -102,10 +98,6 @@ exports[`transformToChatModelCards > should have file with builtin models like g
     "files": true,
     "functionCall": true,
     "id": "gpt-4-turbo-2024-04-09",
-    "pricing": {
-      "input": 10,
-      "output": 30,
-    },
     "vision": true,
   },
 ]