From c5fa739a95d5cd42c433f7be1ae931c994589833 Mon Sep 17 00:00:00 2001
From: zhaoweijie <zwjCheer@163.com>
Date: Mon, 24 Feb 2025 10:10:21 +0800
Subject: [PATCH] feat: change token get

---
 src/components/Option/Metering/detail.tsx | 10 +++++-----
 src/hooks/useMessageOption.tsx            | 17 ++++++++++-------
 src/models/index.ts                       |  4 ++--
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/components/Option/Metering/detail.tsx b/src/components/Option/Metering/detail.tsx
index 8ce12e4..4709f80 100644
--- a/src/components/Option/Metering/detail.tsx
+++ b/src/components/Option/Metering/detail.tsx
@@ -6,10 +6,10 @@ import { formatDate } from "@/utils/date"
 
 const columns: TableProps<MeteringEntry>["columns"] = [
   {
-    title: "id",
-    dataIndex: "id",
-    key: "id",
-    width: "13%"
+    title: '序号',
+    key: 'index',
+    width: 100,
+    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>
     }
   },
   {
diff --git a/src/hooks/useMessageOption.tsx b/src/hooks/useMessageOption.tsx
index a75abca..aefd8ed 100644
--- a/src/hooks/useMessageOption.tsx
+++ b/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,
-        modelOutputTokenCount: generationInfo?.eval_count ?? 0,
-        model: generationInfo?.model ?? "",
+        modelInputTokenCount: prompt.length,
+        modelOutputTokenCount: fullText.length,
+        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,
diff --git a/src/models/index.ts b/src/models/index.ts
index b2b4d8f..ab9c77a 100644
--- a/src/models/index.ts
+++ b/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({