Name people and projects in usage reports, and total a usage legend
The cluster page's usage table showed session:usr-... and proj-... ids; it now shows the person's email, whether it came through a key or the chat page, and the project's path or "personal". Times read "3 hours ago" rather than "3h7m25s ago", everywhere. The usage page's legend gave each line's latest slice, which was 0 beside a table of hundreds; it gives the window's total, and the table's numbers are right-aligned like everywhere else. The PostgreSQL placeholder rewriting skips line comments. An apostrophe in one opened a string that swallowed every placeholder after it. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
ff86e52126
commit
9b663eb23c
10 files changed
+180
-33
No files matched your search
@@ -44,6 +44,18 @@ func (d Dialect) rebind(query string) string {
|
||||
inSingle, inDouble := false, false
|
||||
for i := 0; i < len(query); i++ {
|
||||
c := query[i]
|
||||
// A line comment is copied as it is. Read as SQL, the apostrophe in
|
||||
// "-- the key's owner" opened a string that swallowed every
|
||||
// placeholder after it, and PostgreSQL refused the query.
|
||||
if c == '-' && !inSingle && !inDouble && i+1 < len(query) && query[i+1] == '-' {
|
||||
end := strings.IndexByte(query[i:], '\n')
|
||||
if end < 0 {
|
||||
end = len(query) - i
|
||||
}
|
||||
b.WriteString(query[i : i+end])
|
||||
i += end - 1
|
||||
continue
|
||||
}
|
||||
switch {
|
||||
case c == '\'' && !inDouble:
|
||||
inSingle = !inSingle
|
||||
|
||||
@@ -42,3 +42,17 @@ func TestAQueryWithNoPlaceholdersIsUntouched(t *testing.T) {
|
||||
t.Errorf("rebind = %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestACommentDoesNotOpenAString(t *testing.T) {
|
||||
// An apostrophe in a comment is not a quote. Read as one, it swallowed
|
||||
// every placeholder after it.
|
||||
got := PostgresDialect.rebind("SELECT a -- the key's owner\nFROM t WHERE x = ? AND y = ?")
|
||||
want := "SELECT a -- the key's owner\nFROM t WHERE x = $1 AND y = $2"
|
||||
if got != want {
|
||||
t.Errorf("got %q", got)
|
||||
}
|
||||
// A comment's own question mark is not a placeholder either.
|
||||
if got := PostgresDialect.rebind("SELECT 1 -- why?\nWHERE x = ?"); got != "SELECT 1 -- why?\nWHERE x = $1" {
|
||||
t.Errorf("got %q", got)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"context"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// checkUsageNamesWhoAndWhere is run against both dialects: a report that
|
||||
// named people by id and projects by id was a table nobody could read.
|
||||
func checkUsageNamesWhoAndWhere(t *testing.T, s *DB) {
|
||||
t.Helper()
|
||||
ctx := context.Background()
|
||||
must := func(err error) {
|
||||
t.Helper()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
must(s.PutOrg(ctx, Org{ID: "o", Name: "Acme"}))
|
||||
must(s.PutTeam(ctx, Team{ID: "t", OrgID: "o", Name: "ml"}))
|
||||
must(s.PutProject(ctx, Project{ID: "p", TeamID: "t", Name: "training"}))
|
||||
must(s.CreateUser(ctx, User{ID: "usr-1", Email: "ada@example.com", CreatedAt: time.Now()}))
|
||||
now := time.Now()
|
||||
must(s.WriteUsage(ctx, []Usage{
|
||||
{At: now, KeyID: "session:usr-1", UserID: "usr-1", ProjectID: "p", Model: "m", ServedModel: "m", Status: 200},
|
||||
{At: now, KeyID: "session:usr-1", UserID: "usr-1", Model: "m", ServedModel: "m", Status: 200},
|
||||
}))
|
||||
|
||||
rows, err := s.UsageSince(ctx, now.Add(-time.Hour))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(rows) != 2 {
|
||||
t.Fatalf("expected two rows, got %+v", rows)
|
||||
}
|
||||
places := map[string]bool{}
|
||||
for _, r := range rows {
|
||||
if r.Email != "ada@example.com" || !r.Chat() {
|
||||
t.Errorf("row %+v should name ada and read as the chat page", r)
|
||||
}
|
||||
places[r.ProjectPath] = true
|
||||
}
|
||||
if !places["Acme / ml / training"] || !places[""] {
|
||||
t.Errorf("places = %v, expected the project's path and personal", places)
|
||||
}
|
||||
}
|
||||
|
||||
func TestUsageNamesWhoAndWhere(t *testing.T) {
|
||||
s, err := OpenSQLite(context.Background(), filepath.Join(t.TempDir(), "u.db"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { _ = s.Close() })
|
||||
checkUsageNamesWhoAndWhere(t, s)
|
||||
}
|
||||
|
||||
func TestPostgresUsageNamesWhoAndWhere(t *testing.T) {
|
||||
checkUsageNamesWhoAndWhere(t, openPG(t))
|
||||
}
|
||||
@@ -621,21 +621,30 @@ func (s *DB) UsageSince(ctx context.Context, since time.Time) ([]KeyUsage, error
|
||||
return queryAll(ctx, s.db, `
|
||||
SELECT u.key_id,
|
||||
COALESCE(k.name, ''), COALESCE(k.key_prefix, ''), u.project_id,
|
||||
COALESCE(us.email, ''),
|
||||
COALESCE(o.name || ' / ' || t.name || ' / ' || p.name, ''),
|
||||
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
|
||||
-- Who, as recorded with the spend; the owner of the key for rows
|
||||
-- written before the person was.
|
||||
LEFT JOIN users us ON us.id = COALESCE(NULLIF(u.user_id, ''), k.user_id)
|
||||
LEFT JOIN projects p ON p.id = NULLIF(u.project_id, '')
|
||||
LEFT JOIN teams t ON t.id = p.team_id
|
||||
LEFT JOIN organizations o ON o.id = t.org_id
|
||||
WHERE u.ts >= ?
|
||||
-- k.name and k.key_prefix are selected, so PostgreSQL wants them
|
||||
-- grouped. Both are determined by the key id already in the list.
|
||||
GROUP BY u.key_id, u.project_id, k.name, k.key_prefix
|
||||
-- Everything selected beside the sums is grouped, which PostgreSQL
|
||||
-- wants; each is determined by the key and project already there.
|
||||
GROUP BY u.key_id, u.project_id, k.name, k.key_prefix, us.email, o.name, t.name, p.name
|
||||
ORDER BY SUM(u.cost_micros) DESC, COUNT(*) DESC`,
|
||||
[]any{millis(since)}, func(rows *sql.Rows) (KeyUsage, error) {
|
||||
var k KeyUsage
|
||||
var last int64
|
||||
err := rows.Scan(&k.KeyID, &k.KeyName, &k.KeyPrefix, &k.ProjectID,
|
||||
&k.Email, &k.ProjectPath,
|
||||
&k.Requests, &k.Prompt, &k.Completion, &k.CostMicros, &k.Errors, &last)
|
||||
k.LastAt = fromMillis(last)
|
||||
return k, err
|
||||
|
||||
+18
-10
@@ -17,6 +17,7 @@ package store
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -292,18 +293,25 @@ type Store interface {
|
||||
// KeyUsage summarizes one key's activity in a period, for the dashboard and
|
||||
// `ctl`. It is a reporting query and never runs on the request path.
|
||||
type KeyUsage struct {
|
||||
KeyID string
|
||||
KeyName string
|
||||
KeyPrefix string
|
||||
ProjectID string
|
||||
Requests int64
|
||||
Prompt int64
|
||||
Completion int64
|
||||
CostMicros int64
|
||||
Errors int64
|
||||
LastAt time.Time
|
||||
KeyID string
|
||||
KeyName string
|
||||
KeyPrefix string
|
||||
ProjectID string
|
||||
// Who spent it and where, as names: the person's email, and the
|
||||
// project's path. Empty for a key with no owner, and for personal use.
|
||||
Email string
|
||||
ProjectPath string
|
||||
Requests int64
|
||||
Prompt int64
|
||||
Completion int64
|
||||
CostMicros int64
|
||||
Errors int64
|
||||
LastAt time.Time
|
||||
}
|
||||
|
||||
// Chat reports whether this is the chat page's traffic, which has no key.
|
||||
func (k KeyUsage) Chat() bool { return strings.HasPrefix(k.KeyID, "session:") }
|
||||
|
||||
// Bucket is one time slice of usage, for the dashboard's charts.
|
||||
type Bucket struct {
|
||||
Start time.Time
|
||||
|
||||
Reference in new issue
Block a user