Show who is using the cluster and what they are running
The dashboard could say what the cluster was made of and not who was spending it. Usage was per key, which is the right unit for revoking something and the wrong one for the question actually being asked: one person holds a laptop key, a CI key and a notebook key, and adding three rows up by eye is a chore that gets skipped. Per person now, joined through the keys they own, and per model — counted by the model that answered rather than the one requested, since those differ whenever a fallback serves and what actually ran is the question. Headline figures are stat tiles with a sparkline: a single current value is a number, and plotting one is how a chart ends up with a single bar in it. The sparkline says only rising, falling or flat, which is the one thing the number cannot. Ranked horizontal bars, because the labels are email addresses and model names and the label is the point — the question is which person, not what shape the distribution has. Rotated or truncated axis labels say the chart matters more than reading it. Trimmed where drawn and complete on hover, so the plot keeps its geometry and a reader can still find out whose row it is. The palette is validated rather than chosen: every adjacent pair clears the colour-vision separation threshold, and the dark values are the same hues re-stepped for the dark surface instead of an automatic flip. Run through a validator, because that is the only way anyone can honestly claim a palette is colourblind-safe. Which turned up a bug in the existing chart code. cssVar is an allowlist of four names that silently returns --accent for anything else, and callers wrap it in var() themselves — so every new series would have rendered in one colour with accent-coloured text. Caught by a test written from the rule that chart text wears text tokens, never the series colour. A key with no owner is labelled "operator-issued keys" rather than unknown: it predates accounts and is doing its job, and "unknown" would imply something is wrong. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
28967edab3
commit
eb9e9b348c
9 files changed
+667
-1
No files matched your search
@@ -635,3 +635,109 @@ func (s *SQLite) UsageBuckets(ctx context.Context, since time.Time, width time.D
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// UserUsage is one person's consumption, across every key they hold.
|
||||
type UserUsage struct {
|
||||
UserID string
|
||||
Email string
|
||||
Name string
|
||||
Keys int64
|
||||
Requests int64
|
||||
Prompt int64
|
||||
Completion int64
|
||||
CostMicros int64
|
||||
Errors int64
|
||||
LastSeen time.Time
|
||||
}
|
||||
|
||||
// Tokens is what the person actually consumed, which is the figure they
|
||||
// recognise — prompt and completion together.
|
||||
func (u UserUsage) Tokens() int64 { return u.Prompt + u.Completion }
|
||||
|
||||
// UsageByUser aggregates usage per person rather than per key.
|
||||
//
|
||||
// Per key is the right unit for revoking something and the wrong one for
|
||||
// answering "who is using this cluster": one person holds a laptop key, a CI
|
||||
// key and a notebook key, and reading three rows to add them up is a chore that
|
||||
// gets skipped. Keys with no owner — issued by an operator before accounts
|
||||
// existed — are grouped under an empty user, which is honest rather than tidy.
|
||||
func (s *SQLite) UsageByUser(ctx context.Context, since time.Time) ([]UserUsage, error) {
|
||||
rows, err := s.db.QueryContext(ctx, `
|
||||
SELECT COALESCE(k.user_id, ''), COALESCE(us.email, ''), COALESCE(us.name, ''),
|
||||
COUNT(DISTINCT u.key_id),
|
||||
COUNT(*), SUM(u.prompt_tokens), SUM(u.completion_tokens),
|
||||
SUM(u.cost_micros),
|
||||
SUM(CASE WHEN u.status >= 400 THEN 1 ELSE 0 END),
|
||||
MAX(u.ts)
|
||||
FROM usage u
|
||||
LEFT JOIN api_keys k ON k.id = u.key_id
|
||||
LEFT JOIN users us ON us.id = k.user_id
|
||||
WHERE u.ts >= ?
|
||||
GROUP BY COALESCE(k.user_id, '')
|
||||
ORDER BY SUM(u.cost_micros) DESC, COUNT(*) DESC`, millis(since))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var out []UserUsage
|
||||
for rows.Next() {
|
||||
var u UserUsage
|
||||
var last int64
|
||||
if err := rows.Scan(&u.UserID, &u.Email, &u.Name, &u.Keys,
|
||||
&u.Requests, &u.Prompt, &u.Completion, &u.CostMicros, &u.Errors, &last); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
u.LastSeen = time.UnixMilli(last).UTC()
|
||||
out = append(out, u)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// ModelUsage is one model's share of the traffic.
|
||||
type ModelUsage struct {
|
||||
Model string
|
||||
Requests int64
|
||||
Prompt int64
|
||||
Completion int64
|
||||
CostMicros int64
|
||||
Errors int64
|
||||
AvgLatency float64
|
||||
}
|
||||
|
||||
// Tokens is prompt and completion together.
|
||||
func (m ModelUsage) Tokens() int64 { return m.Prompt + m.Completion }
|
||||
|
||||
// UsageByModel aggregates usage per model.
|
||||
//
|
||||
// By served_model rather than the requested name, because those differ whenever
|
||||
// a fallback answers — and "what actually ran" is the question being asked of a
|
||||
// cluster. The requested name is kept in the same table for anyone who needs to
|
||||
// ask the other question.
|
||||
func (s *SQLite) UsageByModel(ctx context.Context, since time.Time) ([]ModelUsage, error) {
|
||||
rows, err := s.db.QueryContext(ctx, `
|
||||
SELECT CASE WHEN served_model != '' THEN served_model ELSE model END,
|
||||
COUNT(*), SUM(prompt_tokens), SUM(completion_tokens),
|
||||
SUM(cost_micros),
|
||||
SUM(CASE WHEN status >= 400 THEN 1 ELSE 0 END),
|
||||
AVG(latency_ms)
|
||||
FROM usage WHERE ts >= ?
|
||||
GROUP BY 1 ORDER BY COUNT(*) DESC`, millis(since))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var out []ModelUsage
|
||||
for rows.Next() {
|
||||
var m ModelUsage
|
||||
var avg sql.NullFloat64
|
||||
if err := rows.Scan(&m.Model, &m.Requests, &m.Prompt, &m.Completion,
|
||||
&m.CostMicros, &m.Errors, &avg); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
m.AvgLatency = avg.Float64
|
||||
out = append(out, m)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
Reference in new issue
Block a user