From ea0721d525b797b4400bc88995d6d5f7f0684d19 Mon Sep 17 00:00:00 2001
From: JustSong <quanpengsong@gmail.com>
Date: Fri, 31 Jan 2025 18:15:43 +0800
Subject: [PATCH] feat: update log content format

---
 relay/billing/billing.go                | 3 ++-
 relay/controller/helper.go              | 6 ++++--
 relay/controller/image.go               | 3 ++-
 web/default/src/components/LogsTable.js | 7 +++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/relay/billing/billing.go b/relay/billing/billing.go
index a99d37ee..f1bf197a 100644
--- a/relay/billing/billing.go
+++ b/relay/billing/billing.go
@@ -3,6 +3,7 @@ package billing
 import (
 	"context"
 	"fmt"
+
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/model"
 )
@@ -31,7 +32,7 @@ func PostConsumeQuota(ctx context.Context, tokenId int, quotaDelta int64, totalQ
 	}
 	// totalQuota is total quota consumed
 	if totalQuota != 0 {
-		logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f", modelRatio, groupRatio)
+		logContent := fmt.Sprintf("%.2f × %.2f", modelRatio, groupRatio)
 		model.RecordConsumeLog(ctx, userId, channelId, int(totalQuota), 0, modelName, tokenName, totalQuota, logContent)
 		model.UpdateUserUsedQuotaAndRequestCount(userId, totalQuota)
 		model.UpdateChannelUsedQuota(channelId, totalQuota)
diff --git a/relay/controller/helper.go b/relay/controller/helper.go
index 5f5fc90c..2b83c3d9 100644
--- a/relay/controller/helper.go
+++ b/relay/controller/helper.go
@@ -4,12 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/songquanpeng/one-api/relay/constant/role"
 	"math"
 	"net/http"
 	"strings"
 
+	"github.com/songquanpeng/one-api/relay/constant/role"
+
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
@@ -123,7 +125,7 @@ func postConsumeQuota(ctx context.Context, usage *relaymodel.Usage, meta *meta.M
 	if systemPromptReset {
 		extraLog = " （注意系统提示词已被重置）"
 	}
-	logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f，补全倍率 %.2f%s", modelRatio, groupRatio, completionRatio, extraLog)
+	logContent := fmt.Sprintf("%.2f × %.2f × %.2f%s", modelRatio, groupRatio, completionRatio, extraLog)
 	model.RecordConsumeLog(ctx, meta.UserId, meta.ChannelId, promptTokens, completionTokens, textRequest.Model, meta.TokenName, quota, logContent)
 	model.UpdateUserUsedQuotaAndRequestCount(meta.UserId, quota)
 	model.UpdateChannelUsedQuota(meta.ChannelId, quota)
diff --git a/relay/controller/image.go b/relay/controller/image.go
index 1b69d97d..468da566 100644
--- a/relay/controller/image.go
+++ b/relay/controller/image.go
@@ -10,6 +10,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/common/logger"
@@ -209,7 +210,7 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
 		}
 		if quota != 0 {
 			tokenName := c.GetString(ctxkey.TokenName)
-			logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f", modelRatio, groupRatio)
+			logContent := fmt.Sprintf("%.2f × %.2f", modelRatio, groupRatio)
 			model.RecordConsumeLog(ctx, meta.UserId, meta.ChannelId, 0, 0, imageRequest.Model, tokenName, quota, logContent)
 			model.UpdateUserUsedQuotaAndRequestCount(meta.UserId, quota)
 			channelId := c.GetInt(ctxkey.ChannelId)
diff --git a/web/default/src/components/LogsTable.js b/web/default/src/components/LogsTable.js
index e266d79a..8b4cda7b 100644
--- a/web/default/src/components/LogsTable.js
+++ b/web/default/src/components/LogsTable.js
@@ -328,7 +328,7 @@ const LogsTable = () => {
                 }}
                 width={isAdminUser ? 4 : 6}
               >
-                详情
+                详情（模型倍率 × 分组倍率 × 补全倍率）
               </Table.HeaderCell>
             </Table.Row>
           </Table.Header>
@@ -360,7 +360,10 @@ const LogsTable = () => {
                     <Table.Cell>{log.prompt_tokens ? log.prompt_tokens : ''}</Table.Cell>
                     <Table.Cell>{log.completion_tokens ? log.completion_tokens : ''}</Table.Cell>
                     <Table.Cell>{log.quota ? renderQuota(log.quota, 6) : ''}</Table.Cell>
-                    <Table.Cell>{log.content}</Table.Cell>
+                    <Table.Cell>{log.content}{<>
+                      <br/>
+                      <code>{log.request_id}</code>
+                    </>}</Table.Cell>
                   </Table.Row>
                 );
               })}