From 7d9a757a266ff512f6e48c04028c357b54b51023 Mon Sep 17 00:00:00 2001 From: shaw Date: Wed, 24 Dec 2025 10:24:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(dashboard):=20=E6=B7=BB=E5=8A=A0=20RPM/TPM?= =?UTF-8?q?=20=E6=80=A7=E8=83=BD=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 Dashboard 中用 RPM/TPM 卡片替换原来的"今日缓存"卡片， 实时显示最近1分钟的请求数和 Token 吞吐量。 --- .../pkg/usagestats/usage_log_types.go | 8 +++++ backend/internal/repository/usage_log_repo.go | 29 +++++++++++++++++++ frontend/src/api/usage.ts | 2 ++ frontend/src/i18n/locales/en.ts | 2 ++ frontend/src/i18n/locales/zh.ts | 2 ++ frontend/src/types/index.ts | 4 +++ frontend/src/views/admin/DashboardView.vue | 27 ++++++++++------- frontend/src/views/user/DashboardView.vue | 27 ++++++++++------- 8 files changed, 79 insertions(+), 22 deletions(-) diff --git a/backend/internal/pkg/usagestats/usage_log_types.go b/backend/internal/pkg/usagestats/usage_log_types.go index 9a9be5d2..eaef0ab1 100644 --- a/backend/internal/pkg/usagestats/usage_log_types.go +++ b/backend/internal/pkg/usagestats/usage_log_types.go @@ -42,6 +42,10 @@ type DashboardStats struct { // 系统运行统计 AverageDurationMs float64 `json:"average_duration_ms"` // 平均响应时间 + + // 性能指标 + Rpm int64 `json:"rpm"` // 最近1分钟的请求数 + Tpm int64 `json:"tpm"` // 最近1分钟的Token数 } // TrendDataPoint represents a single point in trend data @@ -115,6 +119,10 @@ type UserDashboardStats struct { // 性能统计 AverageDurationMs float64 `json:"average_duration_ms"` + + // 性能指标 + Rpm int64 `json:"rpm"` // 最近1分钟的请求数 + Tpm int64 `json:"tpm"` // 最近1分钟的Token数 } // UsageLogFilters represents filters for usage log queries diff --git a/backend/internal/repository/usage_log_repo.go b/backend/internal/repository/usage_log_repo.go index 3aafc92c..8997c6d0 100644 --- a/backend/internal/repository/usage_log_repo.go +++ b/backend/internal/repository/usage_log_repo.go @@ -19,6 +19,29 @@ func NewUsageLogRepository(db *gorm.DB) *UsageLogRepository { return &UsageLogRepository{db: db} } +// getPerformanceStats 获取 RPM 和 TPM（可选按用户过滤） +func (r *UsageLogRepository) getPerformanceStats(ctx context.Context, userID int64) (rpm, tpm int64) { + oneMinuteAgo := time.Now().Add(-1 * time.Minute) + var perfStats struct { + RequestCount int64 `gorm:"column:request_count"` + TokenCount int64 `gorm:"column:token_count"` + } + + db := r.db.WithContext(ctx).Model(&model.UsageLog{}). + Select(` + COUNT(*) as request_count, + COALESCE(SUM(input_tokens + output_tokens), 0) as token_count + `). + Where("created_at >= ?", oneMinuteAgo) + + if userID > 0 { + db = db.Where("user_id = ?", userID) + } + + db.Scan(&perfStats) + return perfStats.RequestCount, perfStats.TokenCount +} + func (r *UsageLogRepository) Create(ctx context.Context, log *model.UsageLog) error { return r.db.WithContext(ctx).Create(log).Error } @@ -230,6 +253,9 @@ func (r *UsageLogRepository) GetDashboardStats(ctx context.Context) (*DashboardS stats.TodayCost = todayStats.TodayCost stats.TodayActualCost = todayStats.TodayActualCost + // 性能指标：RPM 和 TPM（最近1分钟，全局） + stats.Rpm, stats.Tpm = r.getPerformanceStats(ctx, 0) + return &stats, nil } @@ -544,6 +570,9 @@ func (r *UsageLogRepository) GetUserDashboardStats(ctx context.Context, userID i stats.TodayCost = todayStats.TodayCost stats.TodayActualCost = todayStats.TodayActualCost + // 性能指标：RPM 和 TPM（最近1分钟，仅统计该用户的请求） + stats.Rpm, stats.Tpm = r.getPerformanceStats(ctx, userID) + return &stats, nil } diff --git a/frontend/src/api/usage.ts b/frontend/src/api/usage.ts index 7eafcd5b..84f58f61 100644 --- a/frontend/src/api/usage.ts +++ b/frontend/src/api/usage.ts @@ -35,6 +35,8 @@ export interface UserDashboardStats { today_cost: number; // 今日标准计费 today_actual_cost: number; // 今日实际扣除 average_duration_ms: number; + rpm: number; // 最近1分钟的请求数 + tpm: number; // 最近1分钟的Token数 } export interface TrendParams { diff --git a/frontend/src/i18n/locales/en.ts b/frontend/src/i18n/locales/en.ts index 9189234e..a81f6706 100644 --- a/frontend/src/i18n/locales/en.ts +++ b/frontend/src/i18n/locales/en.ts @@ -151,6 +151,7 @@ export default { todayTokens: 'Today Tokens', totalTokens: 'Total Tokens', cacheToday: 'Cache (Today)', + performance: 'Performance', avgResponse: 'Avg Response', averageTime: 'Average time', timeRange: 'Time Range', @@ -420,6 +421,7 @@ export default { todayTokens: 'Today Tokens', totalTokens: 'Total Tokens', cacheToday: 'Cache (Today)', + performance: 'Performance', avgResponse: 'Avg Response', active: 'active', ok: 'ok', diff --git a/frontend/src/i18n/locales/zh.ts b/frontend/src/i18n/locales/zh.ts index c4d92501..4cd4214b 100644 --- a/frontend/src/i18n/locales/zh.ts +++ b/frontend/src/i18n/locales/zh.ts @@ -151,6 +151,7 @@ export default { todayTokens: '今日 Token', totalTokens: '累计 Token', cacheToday: '今日缓存', + performance: '性能指标', avgResponse: '平均响应', averageTime: '平均时间', timeRange: '时间范围', @@ -432,6 +433,7 @@ export default { input: '输入', output: '输出', cacheToday: '今日缓存', + performance: '性能指标', avgResponse: '平均响应', averageTime: '平均时间', timeRange: '时间范围', diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts index e3168863..7fea7ad9 100644 --- a/frontend/src/types/index.ts +++ b/frontend/src/types/index.ts @@ -517,6 +517,10 @@ export interface DashboardStats { // 系统运行统计 average_duration_ms: number; // 平均响应时间 uptime: number; // 系统运行时间(秒) + + // 性能指标 + rpm: number; // 最近1分钟的请求数 + tpm: number; // 最近1分钟的Token数 } export interface UsageStatsResponse { diff --git a/frontend/src/views/admin/DashboardView.vue b/frontend/src/views/admin/DashboardView.vue index 8f186c29..2102a007 100644 --- a/frontend/src/views/admin/DashboardView.vue +++ b/frontend/src/views/admin/DashboardView.vue @@ -117,20 +117,24 @@ - +
-
- - +
+ +
-
-

{{ t('admin.dashboard.cacheToday') }}

-

{{ formatTokens(stats.today_cache_read_tokens) }}

-

- {{ t('common.create') }}: {{ formatTokens(stats.today_cache_creation_tokens) }} -

+
+

{{ t('admin.dashboard.performance') }}

+
+

{{ formatTokens(stats.rpm) }}

+ RPM +
+
+

{{ formatTokens(stats.tpm) }}

+ TPM +
@@ -378,7 +382,8 @@ const userTrendChartData = computed(() => { }) // Format helpers -const formatTokens = (value: number): string => { +const formatTokens = (value: number | undefined): string => { + if (value === undefined || value === null) return '0' if (value >= 1_000_000_000) { return `${(value / 1_000_000_000).toFixed(2)}B` } else if (value >= 1_000_000) { diff --git a/frontend/src/views/user/DashboardView.vue b/frontend/src/views/user/DashboardView.vue index 5bf86a86..1371f0f9 100644 --- a/frontend/src/views/user/DashboardView.vue +++ b/frontend/src/views/user/DashboardView.vue @@ -119,20 +119,24 @@
- +
-
- - +
+ +
-
-

{{ t('dashboard.cacheToday') }}

-

{{ formatTokens(stats.today_cache_read_tokens) }}

-

- {{ t('common.create') }}: {{ formatTokens(stats.today_cache_creation_tokens) }} -

+
+

{{ t('dashboard.performance') }}

+
+

{{ formatTokens(stats.rpm) }}

+ RPM +
+
+

{{ formatTokens(stats.tpm) }}

+ TPM +
@@ -584,7 +588,8 @@ const trendChartData = computed(() => { }) // Format helpers -const formatTokens = (value: number): string => { +const formatTokens = (value: number | undefined): string => { + if (value === undefined || value === null) return '0' if (value >= 1_000_000_000) { return `${(value / 1_000_000_000).toFixed(2)}B` } else if (value >= 1_000_000) {