feat: change token get

src/components/Option/Metering/detail.tsx

@@ -6,10 +6,10 @@ import { formatDate } from "@/utils/date"
 
 const columns: TableProps<MeteringEntry>["columns"] = [
   {
-    title: "id",
+    title: '序号',
-    dataIndex: "id",
+    key: 'index',
-    key: "id",
+    width: 100,
-    width: "13%"
+    render: (_text, _record, index) => index + 1, // 索引从0开始，+1后从1显示
   },
   {
     title: "问题",
@@ -84,7 +84,7 @@ const columns: TableProps<MeteringEntry>["columns"] = [
     dataIndex: "date",
     key: "date",
     render: (date) => {
-      return <div>{formatDate(date)}</div>
+      return <div>{formatDate(date ?? new Date())}</div>
     }
   },
   {

src/hooks/useMessageOption.tsx

@@ -193,7 +193,8 @@ export const useMessageOption = () => {
     let generateMessageId = generateID()
     const meter: MeteringEntry = {
       id: generateMessageId,
-      queryContent: message
+      queryContent: message,
+      date: new Date()
     } as MeteringEntry
 
     if (!isRegenerate) {
@@ -488,18 +489,20 @@ export const useMessageOption = () => {
 
       // Save metering entry
       const { cot, content } = responseResolver(fullText)
-      setMeteringEntries([...meteringEntries, {
+      setMeteringEntries([ {
         ...meter,
-        modelInputTokenCount: generationInfo?.prompt_eval_count ?? 0,
+        modelInputTokenCount: prompt.length,
-        modelOutputTokenCount: generationInfo?.eval_count ?? 0,
+        modelOutputTokenCount: fullText.length,
-        model: generationInfo?.model ?? "",
+        model: ollama.modelName,
         relatedDataCount: iodData?.length ?? 0,
-        timeTaken: timetaken,
+        timeTaken: new Date().getTime() - meter.date.getTime(),
         date: chatStartTime,
         cot,
         responseContent: content,
         modelResponseContent: fullText,
-      }])
+      },
+        ...meteringEntries,
+      ])
     } catch (e) {
       const errorSave = await saveMessageOnError({
         e,

src/models/index.ts

@@ -72,7 +72,7 @@ export const pageAssistModel = async ({
         configuration: {
           apiKey: providerInfo.apiKey || "temp",
           baseURL: providerInfo.baseUrl || ""
-        }
+        },
       }) as any
     }
 
@@ -85,7 +85,7 @@ export const pageAssistModel = async ({
       configuration: {
         apiKey: providerInfo.apiKey || "temp",
         baseURL: providerInfo.baseUrl || ""
-      }
+      },
     }) as any
   }
   return new ChatOllama({