@lobehub/chat 1.68.3 → 1.68.5

package/src/types/message/base.ts

@@ -13,6 +13,23 @@ export interface ModelReasoning {
   signature?: string;
 }
 
+export interface ModelTokensUsage {
+  acceptedPredictionTokens?: number;
+  cachedTokens?: number;
+  inputAudioTokens?: number;
+  inputCacheMissTokens?: number;
+  inputTokens?: number;
+  outputAudioTokens?: number;
+  outputTokens?: number;
+  reasoningTokens?: number;
+  rejectedPredictionTokens?: number;
+  totalTokens?: number;
+}
+
+export interface MessageMetadata extends ModelTokensUsage {
+  tps?: number;
+}
+
 export type MessageRoleType = 'user' | 'system' | 'assistant' | 'tool';
 
 export interface MessageItem {
@@ -23,6 +40,7 @@ export interface MessageItem {
   error: any | null;
   favorite: boolean | null;
   id: string;
+  metadata?: MessageMetadata | null;
   model: string | null;
   observationId: string | null;
   parentId: string | null;

package/src/types/message/chat.ts

@@ -6,7 +6,7 @@ import { MetaData } from '@/types/meta';
 import { MessageSemanticSearchChunk } from '@/types/rag';
 import { GroundingSearch } from '@/types/search';
 
-import { MessageRoleType, ModelReasoning } from './base';
+import { MessageMetadata, MessageRoleType, ModelReasoning } from './base';
 import { ChatPluginPayload, ChatToolPayload } from './tools';
 import { Translate } from './translate';
 
@@ -82,15 +82,16 @@ export interface ChatMessage {
   imageList?: ChatImageItem[];
   meta: MetaData;
 
+  metadata?: MessageMetadata | null;
   /**
    * observation id
    */
   observationId?: string;
+
   /**
    * parent message id
    */
   parentId?: string;
-
   plugin?: ChatPluginPayload;
   pluginError?: any;
   pluginState?: any;
@@ -100,8 +101,8 @@ export interface ChatMessage {
   quotaId?: string;
   ragQuery?: string | null;
   ragQueryId?: string | null;
-  ragRawQuery?: string | null;
 
+  ragRawQuery?: string | null;
   reasoning?: ModelReasoning | null;
   /**
    * message role type

package/src/utils/fetch/fetchSSE.ts

@@ -10,6 +10,7 @@ import {
   MessageToolCallChunk,
   MessageToolCallSchema,
   ModelReasoning,
+  ModelTokensUsage,
 } from '@/types/message';
 import { GroundingSearch } from '@/types/search';
 
@@ -28,9 +29,15 @@ export type OnFinishHandler = (
     toolCalls?: MessageToolCall[];
     traceId?: string | null;
     type?: SSEFinishType;
+    usage?: ModelTokensUsage;
   },
 ) => Promise<void>;
 
+export interface MessageUsageChunk {
+  type: 'usage';
+  usage: ModelTokensUsage;
+}
+
 export interface MessageTextChunk {
   text: string;
   type: 'text';
@@ -59,7 +66,12 @@ export interface FetchSSEOptions {
   onErrorHandle?: (error: ChatMessageError) => void;
   onFinish?: OnFinishHandler;
   onMessageHandle?: (
-    chunk: MessageTextChunk | MessageToolCallsChunk | MessageReasoningChunk | MessageGroundingChunk,
+    chunk:
+      | MessageTextChunk
+      | MessageToolCallsChunk
+      | MessageReasoningChunk
+      | MessageGroundingChunk
+      | MessageUsageChunk,
   ) => void;
   smoothing?: SmoothingParams | boolean;
 }
@@ -317,6 +329,7 @@ export const fetchSSE = async (url: string, options: RequestInit & FetchSSEOptio
   });
 
   let grounding: GroundingSearch | undefined = undefined;
+  let usage: ModelTokensUsage | undefined = undefined;
   await fetchEventSource(url, {
     body: options.body,
     fetch: options?.fetcher,
@@ -377,6 +390,9 @@ export const fetchSSE = async (url: string, options: RequestInit & FetchSSEOptio
         }
 
         case 'text': {
+          // skip empty text
+          if (!data) break;
+
           if (textSmoothing) {
             textController.pushToQueue(data);
 
@@ -389,6 +405,12 @@ export const fetchSSE = async (url: string, options: RequestInit & FetchSSEOptio
           break;
         }
 
+        case 'usage': {
+          usage = data;
+          options.onMessageHandle?.({ type: 'usage', usage: data });
+          break;
+        }
+
         case 'grounding': {
           grounding = data;
           options.onMessageHandle?.({ grounding: data, type: 'grounding' });
@@ -475,6 +497,7 @@ export const fetchSSE = async (url: string, options: RequestInit & FetchSSEOptio
         toolCalls,
         traceId,
         type: finishedType,
+        usage,
       });
     }
   }

package/src/utils/format.ts

@@ -116,7 +116,9 @@ export const formatPrice = (price: number, fractionDigits: number = 2) => {
   return `${numeral(a).format('0,0')}.${b}`;
 };
 
-export const formatPriceByCurrency = (price: number, currency?: ModelPriceCurrency) => {
+export const formatPriceByCurrency = (price?: number, currency?: ModelPriceCurrency) => {
+  if (!price) return '-';
+
   if (currency === 'CNY') {
     return formatPrice(price / USD_TO_CNY);
   }