@lobehub/chat 1.111.1 → 1.111.2

package/packages/types/src/aiModel.ts

@@ -107,6 +107,65 @@ export interface ChatModelPricing extends BasicModelPricing {
   writeCacheInput?: number;
 }
 
+// New pricing system types
+export type PricingUnitName =
+  // Text-based pricing units
+  | 'textInput' // corresponds to ChatModelPricing.input
+  | 'textOutput' // corresponds to ChatModelPricing.output
+  | 'textInput_cacheRead' // corresponds to ChatModelPricing.cachedInput
+  | 'textInput_cacheWrite' // corresponds to ChatModelPricing.writeCacheInput
+
+  // Audio-based pricing units
+  | 'audioInput' // corresponds to ChatModelPricing.audioInput
+  | 'audioOutput' // corresponds to ChatModelPricing.audioOutput
+  | 'audioInput_cacheRead' // corresponds to ChatModelPricing.cachedAudioInput
+
+  // Image-based pricing units
+  | 'imageGeneration'; // for image generation models
+
+export type PricingUnitType =
+  | 'millionTokens' // per 1M tokens
+  | 'millionCharacters' // per 1M characters
+  | 'image' // per image
+  | 'megapixel' // per megapixel
+  | 'second'; // per second
+
+export type PricingStrategy = 'fixed' | 'tiered' | 'lookup';
+
+export interface PricingUnitBase {
+  name: PricingUnitName;
+  strategy: PricingStrategy;
+  unit: PricingUnitType;
+}
+
+export interface FixedPricingUnit extends PricingUnitBase {
+  rate: number;
+  strategy: 'fixed';
+}
+
+export interface TieredPricingUnit extends PricingUnitBase {
+  strategy: 'tiered';
+  tiers: Array<{
+    rate: number;
+    upTo: number | 'infinity';
+  }>;
+}
+
+export interface LookupPricingUnit extends PricingUnitBase {
+  lookup: {
+    prices: Record<string, number>;
+    pricingParams: string[];
+  };
+  strategy: 'lookup';
+}
+
+export type PricingUnit = FixedPricingUnit | TieredPricingUnit | LookupPricingUnit;
+
+export interface Pricing {
+  currency?: ModelPriceCurrency;
+  units: PricingUnit[];
+}
+
 export interface AIBaseModelCard {
   /**
    * the context window (or input + output tokens limit)
@@ -167,69 +226,31 @@ export interface AIChatModelCard extends AIBaseModelCard {
   abilities?: ModelAbilities;
   config?: AiModelConfig;
   maxOutput?: number;
-  pricing?: ChatModelPricing;
+  pricing?: Pricing;
   settings?: AiModelSettings;
   type: 'chat';
 }
 
 export interface AIEmbeddingModelCard extends AIBaseModelCard {
   maxDimension: number;
-  pricing?: {
-    /**
-     * the currency of the pricing
-     * @default USD
-     */
-    currency?: ModelPriceCurrency;
-    /**
-     * the input pricing, e.g. $1 / 1M tokens
-     */
-    input?: number;
-  };
+  pricing?: Pricing;
   type: 'embedding';
 }
 
 export interface AIImageModelCard extends AIBaseModelCard {
   parameters?: ModelParamsSchema;
-  pricing?: {
-    /**
-     * the currency of the pricing
-     * @default USD
-     */
-    currency?: ModelPriceCurrency;
-  } & Record<string, number>;
+  pricing?: Pricing;
   resolutions?: string[];
   type: 'image';
 }
 
 export interface AITTSModelCard extends AIBaseModelCard {
-  pricing?: {
-    /**
-     * the currency of the pricing
-     * @default USD
-     */
-    currency?: ModelPriceCurrency;
-    /**
-     * the input pricing, e.g. $1 / 1M tokens
-     */
-    input?: number;
-    output?: number;
-  };
+  pricing?: Pricing;
   type: 'tts';
 }
 
 export interface AISTTModelCard extends AIBaseModelCard {
-  pricing?: {
-    /**
-     * the currency of the pricing
-     * @default USD
-     */
-    currency?: ModelPriceCurrency;
-    /**
-     * the input pricing, e.g. $1 / 1M tokens
-     */
-    input?: number;
-    output?: number;
-  };
+  pricing?: Pricing;
   type: 'stt';
 }
 
@@ -257,7 +278,7 @@ export interface AIRealtimeModelCard extends AIBaseModelCard {
    */
   deploymentName?: string;
   maxOutput?: number;
-  pricing?: ChatModelPricing;
+  pricing?: Pricing;
   type: 'realtime';
 }
 
@@ -269,7 +290,7 @@ export interface AiFullModelCard extends AIBaseModelCard {
   id: string;
   maxDimension?: number;
   parameters?: ModelParamsSchema;
-  pricing?: ChatModelPricing;
+  pricing?: Pricing;
   type: AiModelType;
 }
 
@@ -304,7 +325,7 @@ export interface AiProviderModelListItem {
   enabled: boolean;
   id: string;
   parameters?: Record<string, any>;
-  pricing?: ChatModelPricing;
+  pricing?: Pricing;
   releasedAt?: string;
   settings?: AiModelSettings;
   source?: AiModelSourceType;

package/packages/types/src/llm.ts

@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 
-import { AiModelType, ChatModelPricing } from './aiModel';
-import { AiProviderSettings } from './aiProvider';
+import { AiModelType, Pricing } from '@/types/aiModel';
+import { AiProviderSettings } from '@/types/aiProvider';
 
 export type ModelPriceCurrency = 'CNY' | 'USD';
 
@@ -41,7 +41,7 @@ export interface ChatModelCard {
    */
   legacy?: boolean;
   maxOutput?: number;
-  pricing?: ChatModelPricing;
+  pricing?: Pricing;
 
   /**
    *  whether model supports reasoning

package/src/app/[variants]/(main)/discover/(detail)/model/[...slugs]/features/Details/Overview/ProviderList/index.tsx

@@ -14,6 +14,7 @@ import InlineTable from '@/components/InlineTable';
 import { ModelInfoTags } from '@/components/ModelSelect';
 import { BASE_PROVIDER_DOC_URL } from '@/const/url';
 import { formatPriceByCurrency, formatTokenNumber } from '@/utils/format';
+import { getTextInputUnitRate, getTextOutputUnitRate } from '@/utils/pricing';
 
 import { useDetailContext } from '../../../DetailProvider';
 
@@ -89,12 +90,17 @@ const ProviderList = memo(() => {
           {
             dataIndex: 'model.inputPrice',
             key: 'inputPrice',
-            render: (_, record) =>
-              record.model?.pricing?.input
-                ? '$' +
-                  formatPriceByCurrency(record.model.pricing.input, record.model.pricing?.currency)
-                : '--',
-            sorter: (a, b) => (a.model?.pricing?.input || 0) - (b.model?.pricing?.input || 0),
+            render: (_, record) => {
+              const inputRate = getTextInputUnitRate(record.model?.pricing);
+              return inputRate
+                ? '$' + formatPriceByCurrency(inputRate, record.model.pricing?.currency)
+                : '--';
+            },
+            sorter: (a, b) => {
+              const aRate = getTextInputUnitRate(a.model?.pricing) || 0;
+              const bRate = getTextInputUnitRate(b.model?.pricing) || 0;
+              return aRate - bRate;
+            },
             title: (
               <Tooltip title={t('models.providerInfo.inputTooltip')}>
                 {t('models.providerInfo.input')}
@@ -105,12 +111,17 @@ const ProviderList = memo(() => {
           {
             dataIndex: 'model.outputPrice',
             key: 'outputPrice',
-            render: (_, record) =>
-              record.model?.pricing?.output
-                ? '$' +
-                  formatPriceByCurrency(record.model.pricing.output, record.model.pricing?.currency)
-                : '--',
-            sorter: (a, b) => (a.model?.pricing?.output || 0) - (b.model?.pricing?.output || 0),
+            render: (_, record) => {
+              const outputRate = getTextOutputUnitRate(record.model?.pricing);
+              return outputRate
+                ? '$' + formatPriceByCurrency(outputRate, record.model.pricing?.currency)
+                : '--';
+            },
+            sorter: (a, b) => {
+              const aRate = getTextOutputUnitRate(a.model?.pricing) || 0;
+              const bRate = getTextOutputUnitRate(b.model?.pricing) || 0;
+              return aRate - bRate;
+            },
             title: (
               <Tooltip title={t('models.providerInfo.outputTooltip')}>
                 {t('models.providerInfo.output')}

package/src/app/[variants]/(main)/discover/(detail)/provider/[...slugs]/features/Details/Overview/ModelList/index.tsx

@@ -13,6 +13,7 @@ import urlJoin from 'url-join';
 import InlineTable from '@/components/InlineTable';
 import { ModelInfoTags } from '@/components/ModelSelect';
 import { formatPriceByCurrency, formatTokenNumber } from '@/utils/format';
+import { getTextInputUnitRate, getTextOutputUnitRate } from '@/utils/pricing';
 
 import { useDetailContext } from '../../../DetailProvider';
 
@@ -82,11 +83,17 @@ const ModelList = memo(() => {
           {
             dataIndex: 'inputPrice',
             key: 'inputPrice',
-            render: (_, record) =>
-              record.pricing?.input
-                ? '$' + formatPriceByCurrency(record.pricing.input, record.pricing?.currency)
-                : '--',
-            sorter: (a, b) => (a.pricing?.input || 0) - (b.pricing?.input || 0),
+            render: (_, record) => {
+              const inputRate = getTextInputUnitRate(record.pricing);
+              return inputRate
+                ? '$' + formatPriceByCurrency(inputRate, record.pricing?.currency)
+                : '--';
+            },
+            sorter: (a, b) => {
+              const aRate = getTextInputUnitRate(a.pricing) || 0;
+              const bRate = getTextInputUnitRate(b.pricing) || 0;
+              return aRate - bRate;
+            },
             title: (
               <Tooltip title={t('models.providerInfo.inputTooltip')}>
                 {t('models.providerInfo.input')}
@@ -97,11 +104,17 @@ const ModelList = memo(() => {
           {
             dataIndex: 'outputPrice',
             key: 'outputPrice',
-            render: (_, record) =>
-              record.pricing?.output
-                ? '$' + formatPriceByCurrency(record.pricing.output, record.pricing?.currency)
-                : '--',
-            sorter: (a, b) => (a.pricing?.output || 0) - (b.pricing?.output || 0),
+            render: (_, record) => {
+              const outputRate = getTextOutputUnitRate(record.pricing);
+              return outputRate
+                ? '$' + formatPriceByCurrency(outputRate, record.pricing?.currency)
+                : '--';
+            },
+            sorter: (a, b) => {
+              const aRate = getTextOutputUnitRate(a.pricing) || 0;
+              const bRate = getTextOutputUnitRate(b.pricing) || 0;
+              return aRate - bRate;
+            },
             title: (
               <Tooltip title={t('models.providerInfo.outputTooltip')}>
                 {t('models.providerInfo.output')}

package/src/app/[variants]/(main)/settings/provider/features/ModelList/ModelItem.tsx

@@ -10,8 +10,13 @@ import { Flexbox } from 'react-layout-kit';
 import { ModelInfoTags } from '@/components/ModelSelect';
 import { useIsMobile } from '@/hooks/useIsMobile';
 import { aiModelSelectors, useAiInfraStore } from '@/store/aiInfra';
-import { AiModelSourceEnum, AiProviderModelListItem, ChatModelPricing } from '@/types/aiModel';
+import { AiModelSourceEnum, AiProviderModelListItem } from '@/types/aiModel';
 import { formatPriceByCurrency } from '@/utils/format';
+import {
+  getAudioInputUnitRate,
+  getTextInputUnitRate,
+  getTextOutputUnitRate,
+} from '@/utils/pricing';
 
 import ModelConfigModal from './ModelConfigModal';
 import { ProviderSettingsContext } from './ProviderSettingsContext';
@@ -54,7 +59,6 @@ interface ModelItemProps extends AiProviderModelListItem {
   enabled: boolean;
   id: string;
   isAzure?: boolean;
-  pricing?: ChatModelPricing;
   releasedAt?: string;
   removed?: boolean;
 }
@@ -94,38 +98,43 @@ const ModelItem = memo<ModelItemProps>(
 
       switch (type) {
         case 'chat': {
+          const inputRate = getTextInputUnitRate(pricing);
+          const outputRate = getTextOutputUnitRate(pricing);
           return [
-            typeof pricing.input === 'number' &&
+            typeof inputRate === 'number' &&
               t('providerModels.item.pricing.inputTokens', {
-                amount: formatPriceByCurrency(pricing.input, pricing?.currency),
+                amount: formatPriceByCurrency(inputRate, pricing?.currency),
               }),
-            typeof pricing.output === 'number' &&
+            typeof outputRate === 'number' &&
               t('providerModels.item.pricing.outputTokens', {
-                amount: formatPriceByCurrency(pricing.output, pricing?.currency),
+                amount: formatPriceByCurrency(outputRate, pricing?.currency),
               }),
           ].filter(Boolean) as string[];
         }
         case 'embedding': {
+          const inputRate = getTextInputUnitRate(pricing);
           return [
-            typeof pricing.input === 'number' &&
+            typeof inputRate === 'number' &&
               t('providerModels.item.pricing.inputTokens', {
-                amount: formatPriceByCurrency(pricing.input, pricing?.currency),
+                amount: formatPriceByCurrency(inputRate, pricing?.currency),
               }),
           ].filter(Boolean) as string[];
         }
         case 'tts': {
+          const inputRate = getAudioInputUnitRate(pricing);
           return [
-            typeof pricing.input === 'number' &&
+            typeof inputRate === 'number' &&
               t('providerModels.item.pricing.inputCharts', {
-                amount: formatPriceByCurrency(pricing.input, pricing?.currency),
+                amount: formatPriceByCurrency(inputRate, pricing?.currency),
               }),
           ].filter(Boolean) as string[];
         }
         case 'stt': {
+          const inputRate = getAudioInputUnitRate(pricing);
           return [
-            typeof pricing.input === 'number' &&
+            typeof inputRate === 'number' &&
               t('providerModels.item.pricing.inputMinutes', {
-                amount: formatPriceByCurrency(pricing.input, pricing?.currency),
+                amount: formatPriceByCurrency(inputRate, pricing?.currency),
               }),
           ].filter(Boolean) as string[];
         }

package/src/config/aiModels/ai21.ts

@@ -11,8 +11,10 @@ const ai21ChatModels: AIChatModelCard[] = [
     enabled: true,
     id: 'jamba-mini',
     pricing: {
-      input: 0.2,
-      output: 0.4,
+      units: [
+        { name: 'textInput', rate: 0.2, strategy: 'fixed', unit: 'millionTokens' },
+        { name: 'textOutput', rate: 0.4, strategy: 'fixed', unit: 'millionTokens' },
+      ],
     },
     releasedAt: '2025-03-06',
     type: 'chat',
@@ -27,8 +29,10 @@ const ai21ChatModels: AIChatModelCard[] = [
     enabled: true,
     id: 'jamba-large',
     pricing: {
-      input: 2,
-      output: 8,
+      units: [
+        { name: 'textInput', rate: 2, strategy: 'fixed', unit: 'millionTokens' },
+        { name: 'textOutput', rate: 8, strategy: 'fixed', unit: 'millionTokens' },
+      ],
     },
     releasedAt: '2025-03-06',
     type: 'chat',

package/src/config/aiModels/ai360.ts

@@ -13,8 +13,10 @@ const ai360ChatModels: AIChatModelCard[] = [
     id: '360zhinao2-o1',
     pricing: {
       currency: 'CNY',
-      input: 4,
-      output: 10,
+      units: [
+        { name: 'textInput', rate: 4, strategy: 'fixed', unit: 'millionTokens' },
+        { name: 'textOutput', rate: 10, strategy: 'fixed', unit: 'millionTokens' },
+      ],
     },
     type: 'chat',
   },
@@ -29,8 +31,10 @@ const ai360ChatModels: AIChatModelCard[] = [
     id: '360gpt2-o1',
     pricing: {
       currency: 'CNY',
-      input: 4,
-      output: 10,
+      units: [
+        { name: 'textInput', rate: 4, strategy: 'fixed', unit: 'millionTokens' },
+        { name: 'textOutput', rate: 10, strategy: 'fixed', unit: 'millionTokens' },
+      ],
     },
     type: 'chat',
   },
@@ -46,8 +50,10 @@ const ai360ChatModels: AIChatModelCard[] = [
     id: '360gpt2-pro',
     pricing: {
       currency: 'CNY',
-      input: 2,
-      output: 5,
+      units: [
+        { name: 'textInput', rate: 2, strategy: 'fixed', unit: 'millionTokens' },
+        { name: 'textOutput', rate: 5, strategy: 'fixed', unit: 'millionTokens' },
+      ],
     },
     settings: {
       searchImpl: 'params',
@@ -65,8 +71,10 @@ const ai360ChatModels: AIChatModelCard[] = [
     id: '360gpt-pro',
     pricing: {
       currency: 'CNY',
-      input: 2,
-      output: 5,
+      units: [
+        { name: 'textInput', rate: 2, strategy: 'fixed', unit: 'millionTokens' },
+        { name: 'textOutput', rate: 5, strategy: 'fixed', unit: 'millionTokens' },
+      ],
     },
     settings: {
       searchImpl: 'params',
@@ -80,8 +88,10 @@ const ai360ChatModels: AIChatModelCard[] = [
     id: '360gpt-pro-trans',
     pricing: {
       currency: 'CNY',
-      input: 2,
-      output: 5,
+      units: [
+        { name: 'textInput', rate: 2, strategy: 'fixed', unit: 'millionTokens' },
+        { name: 'textOutput', rate: 5, strategy: 'fixed', unit: 'millionTokens' },
+      ],
     },
     type: 'chat',
   },
@@ -93,8 +103,10 @@ const ai360ChatModels: AIChatModelCard[] = [
     id: '360gpt-turbo',
     pricing: {
       currency: 'CNY',
-      input: 1,
-      output: 2,
+      units: [
+        { name: 'textInput', rate: 1, strategy: 'fixed', unit: 'millionTokens' },
+        { name: 'textOutput', rate: 2, strategy: 'fixed', unit: 'millionTokens' },
+      ],
     },
     type: 'chat',
   },
@@ -109,8 +121,10 @@ const ai360ChatModels: AIChatModelCard[] = [
     id: '360/deepseek-r1',
     pricing: {
       currency: 'CNY',
-      input: 4,
-      output: 16,
+      units: [
+        { name: 'textInput', rate: 4, strategy: 'fixed', unit: 'millionTokens' },
+        { name: 'textOutput', rate: 16, strategy: 'fixed', unit: 'millionTokens' },
+      ],
     },
     type: 'chat',
   },