API:/api/v1/usage/logs 与 /api/v1/admin/usage 返回 cache_creation_tokens、 reasoning_tokens、cache_write_1h_tokens、served_model(types.ts 同步可选字段)。 前端: - 模型列在被模型映射/聚合商改写时显示「→ 上游实际模型」,长名截断并可悬浮看全; - 表格里 Token 列第二行显示缓存读/写(与成本直接相关),1h 缓存写与思考 token 放悬浮提示——两者直接上表格会把 Token 列撑到 255px,1280 宽下把「时间/原始」 挤出视野(实测 1146px vs 容器 1006px);移动卡两行都显示; - 用量表协议列由 chat/completions 简化为 chat(表头已标明「API 格式」), 时间列改月-日 时:分、完整时间进 title;调整后桌面端表格宽度 1006px, 与容器一致、无横向滚动; - 顺带修复控制台用量页 Button 未导入(上一页/下一页此前渲染不出来)。 验证:本地 mock 上游 + 临时 sqlite 实例与真实数据实测;1280 桌面与 390 窄屏 截图核对(表格 tableW == 容器宽度);vue-tsc、vitest、eslint、vite build 与 go vet、go test ./... 全绿。
117 lines
4.2 KiB
Go
117 lines
4.2 KiB
Go
package api
|
|
|
|
import (
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/openteam/server/internal/pkg/resp"
|
|
"github.com/openteam/server/internal/store"
|
|
)
|
|
|
|
// UsageSummary GET /api/v1/usage/summary — 今日/本月汇总。
|
|
func (h *Handler) UsageSummary(c *gin.Context) {
|
|
u, _ := userFromContext(c)
|
|
now := time.Now().UTC()
|
|
today := now.Format("2006-01-02")
|
|
month := now.Format("2006-01")
|
|
|
|
var todayReq, monthReq int64
|
|
var todayTok, monthTok int64
|
|
var todayCost, monthCost float64
|
|
h.a.DB.Model(&store.UsageDaily{}).Where("user_id = ? AND date = ?", u.ID, today).
|
|
Select("COALESCE(SUM(requests),0), COALESCE(SUM(input_tokens+output_tokens+cache_read_tokens),0), COALESCE(SUM(cost),0)").
|
|
Row().Scan(&todayReq, &todayTok, &todayCost)
|
|
h.a.DB.Model(&store.UsageDaily{}).Where("user_id = ? AND date LIKE ?", u.ID, month+"%").
|
|
Select("COALESCE(SUM(requests),0), COALESCE(SUM(input_tokens+output_tokens+cache_read_tokens),0), COALESCE(SUM(cost),0)").
|
|
Row().Scan(&monthReq, &monthTok, &monthCost)
|
|
resp.OK(c, gin.H{
|
|
"today": gin.H{"requests": todayReq, "tokens": todayTok, "cost": todayCost},
|
|
"month": gin.H{"requests": monthReq, "tokens": monthTok, "cost": monthCost},
|
|
})
|
|
}
|
|
|
|
// UsageStats GET /api/v1/usage/stats?from&to&group=day|model
|
|
func (h *Handler) UsageStats(c *gin.Context) {
|
|
u, _ := userFromContext(c)
|
|
// usage_daily 的 date 键与 UsageLog 的 created_at 都是 UTC:默认窗口必须用 UTC,
|
|
// 否则非 UTC 服务器上(本地日期 ≠ UTC 日期)图表窗口整体偏移一天
|
|
from := c.DefaultQuery("from", time.Now().UTC().Add(-30*24*time.Hour).Format("2006-01-02"))
|
|
to := c.DefaultQuery("to", time.Now().UTC().Format("2006-01-02"))
|
|
group := c.DefaultQuery("group", "day")
|
|
|
|
q := h.a.DB.Model(&store.UsageDaily{}).Where("user_id = ? AND date BETWEEN ? AND ?", u.ID, from, to)
|
|
out := make([]gin.H, 0, 64)
|
|
if group == "model" {
|
|
var rows []struct {
|
|
ModelID uint64
|
|
Requests int64
|
|
Tokens int64
|
|
Cost float64
|
|
}
|
|
q.Select("model_id, SUM(requests) requests, SUM(input_tokens+output_tokens+cache_read_tokens) tokens, SUM(cost) cost").
|
|
Group("model_id").Scan(&rows)
|
|
for _, r := range rows {
|
|
var m store.Model
|
|
name := strconv.FormatUint(r.ModelID, 10)
|
|
if h.a.DB.First(&m, r.ModelID).Error == nil {
|
|
name = m.Name
|
|
}
|
|
out = append(out, gin.H{"model": name, "requests": r.Requests, "tokens": r.Tokens, "cost": r.Cost})
|
|
}
|
|
} else {
|
|
var rows []struct {
|
|
Date string
|
|
Requests int64
|
|
Tokens int64
|
|
Cost float64
|
|
}
|
|
q.Select("date, SUM(requests) requests, SUM(input_tokens+output_tokens+cache_read_tokens) tokens, SUM(cost) cost").
|
|
Group("date").Order("date").Scan(&rows)
|
|
for _, r := range rows {
|
|
out = append(out, gin.H{"date": r.Date, "requests": r.Requests, "tokens": r.Tokens, "cost": r.Cost})
|
|
}
|
|
}
|
|
resp.OK(c, gin.H{"items": out})
|
|
}
|
|
|
|
// UsageLogs GET /api/v1/usage/logs?from&to&page&page_size&model
|
|
func (h *Handler) UsageLogs(c *gin.Context) {
|
|
u, _ := userFromContext(c)
|
|
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
|
|
size, _ := strconv.Atoi(c.DefaultQuery("page_size", "20"))
|
|
if page < 1 {
|
|
page = 1
|
|
}
|
|
if size < 1 || size > 100 {
|
|
size = 20
|
|
}
|
|
q := h.a.DB.Model(&store.UsageLog{}).Where("user_id = ?", u.ID)
|
|
if from := c.Query("from"); from != "" {
|
|
q = q.Where("created_at >= ?", from+" 00:00:00")
|
|
}
|
|
if to := c.Query("to"); to != "" {
|
|
q = q.Where("created_at <= ?", to+" 23:59:59")
|
|
}
|
|
if model := c.Query("model"); model != "" {
|
|
q = q.Where("model_name = ?", model)
|
|
}
|
|
var total int64
|
|
q.Count(&total)
|
|
var logs []store.UsageLog
|
|
q.Order("id DESC").Offset((page - 1) * size).Limit(size).Find(&logs)
|
|
out := make([]gin.H, 0, len(logs))
|
|
for _, l := range logs {
|
|
out = append(out, gin.H{
|
|
"id": l.ID, "request_id": l.RequestID, "model": l.ModelName, "protocol": l.Protocol,
|
|
"input_tokens": l.InputTokens, "output_tokens": l.OutputTokens,
|
|
"cache_read_tokens": l.CacheReadTokens, "cache_creation_tokens": l.CacheCreationTokens,
|
|
"reasoning_tokens": l.ReasoningTokens, "cache_write_1h_tokens": l.CacheWrite1hTokens,
|
|
"served_model": l.ServedModel, "cost": l.Cost,
|
|
"latency_ms": l.LatencyMS, "status": l.Status, "error_code": l.ErrorCode,
|
|
"created_at": l.CreatedAt,
|
|
})
|
|
}
|
|
resp.OK(c, gin.H{"items": out, "total": total, "page": page, "page_size": size})
|
|
}
|