* feat(gui): show and filter usage for each API key * feat(gateway): issue per-user caller keys and attribute usage * feat(gui): manage gateway users and filter caller-key usage * test: verify caller-key failover and document user management * refactor(gateway): use named caller keys without user accounts * feat(gui): manage named caller keys with existing account styles * fix: remove user breakdown from CLI and leftover gateway styling * fix(usage): drop stale user field from request response * feat(gateway): authenticate LAN calls with named caller keys * fix(gateway): preserve LAN key rotation in the named caller store * fix(gui): retain native LAN key copy and rotation controls * fix(gui): inherit the global theme for API key inputs * fix(usage): show client API keys using the existing terminology * fix(gateway): rotate named keys without changing usage identity * fix(gui): unify gateway keys and selectable connection examples Keep sharing controls in Settings and manage credentials only in Gateway. Refresh the named-key list on navigation, ignore stale reads after key actions, and generate all API examples from the selected address and enabled key. * fix(gui): keep caller key names literal in connection menus * fix(access): use Magpie as default key and drop user migration * refactor(gui): name caller key source and tests consistently * refactor(usage): split provider-key accounting out of caller-key PR * fix(gateway): preserve LAN compatibility and add headless key management * fix(gui): clarify gateway keys and confirm destructive actions * test(gateway): guard caller attribution under 120 concurrent requests * fix(gateway): keep open access, tolerate migration errors and revoke legacy keys * fix(backup): preserve named gateway keys and honor no-keys restores * fix(gui): keep local API-key semantics and disambiguate shared credentials * docs(gateway): keep review scope focused and append browser test documentation * fix(backup): retain existing default keys when old backups lack their store * fix(gateway): attribute video creation usage to the caller key * fix(access): explain default key revocation blocked by read-only settings * test(usage): preserve provider and caller identities after rebase * test(gui): reconcile caller key fixtures with merged main * docs(usage): clarify caller coverage and independent provider accounting * fix(gui): initialize fast members for model-shortcut groups Latest main introduced fast-member arrays but omitted the model shortcut's draft. The existing unlisted-models browser regression fails unchanged on main. Initialize fast to an empty list and assert a standard-speed group is saved, without relaxing existing assertions. * fix(access): retain legacy LAN access when the key store cannot be created Allow only the configured legacy credential before either migration marker exists. Refuse revoked mirrors, disabled matches and unreadable stores; keep the fallback's caller identity stable when migration later succeeds. Cover read-only configuration directories, remote credential transports and revocation. * fix(backup): save settings before replacing gateway credentials Leave the key store untouched when settings validation or writes fail. Restore the previous settings association when the key store refuses its write, and report a rollback failure separately. Cover invalid settings and read-only settings/store failures. * fix(gui): reset missing caller filters and focus key controls without scrolling * test(provider): synchronize Zhipu quota fixture observations
210 lines
5.7 KiB
Go
210 lines
5.7 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"slices"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/yetone/magpie/internal/agent"
|
|
"github.com/yetone/magpie/internal/fx"
|
|
"github.com/yetone/magpie/internal/settings"
|
|
stats "github.com/yetone/magpie/internal/usage"
|
|
)
|
|
|
|
// costCurrency and costRate are cost's currency and, for cny, the
|
|
// CNY-per-USD rate to show it at — loadCostCurrency sets them once at a
|
|
// command's start, not again for every row it prints.
|
|
var (
|
|
costCurrency = "usd"
|
|
costRate float64
|
|
)
|
|
|
|
// loadCostCurrency reads Settings' currency choice and, only for cny, the
|
|
// exchange rate (internal/fx, its own 12h cache — this asks the network
|
|
// only when that's stale).
|
|
func loadCostCurrency() {
|
|
costCurrency = settings.Load().Currency
|
|
costRate = 0
|
|
if costCurrency == "cny" {
|
|
ctx, cancel := context.WithTimeout(context.Background(), 4*time.Second)
|
|
costRate = fx.Get(ctx).CNYPerUSD
|
|
cancel()
|
|
}
|
|
}
|
|
|
|
// usageCmd: `magpie usage [today|7d|30d|all]` — tokens and cost per agent,
|
|
// model and session; with --csv, every request of the period as CSV, one
|
|
// row each, to set beside a vendor's bill
|
|
func usageCmd(args []string) error {
|
|
return usageTo(os.Stdout, args)
|
|
}
|
|
|
|
func usageTo(out io.Writer, args []string) error {
|
|
asCSV := false
|
|
if i := slices.Index(args, "--csv"); i > 0 {
|
|
asCSV, args = true, slices.Delete(slices.Clone(args), i, i+1)
|
|
}
|
|
if len(args) > 2 {
|
|
return fmt.Errorf("usage: magpie usage [--csv] [today|7d|30d|all]")
|
|
}
|
|
period := stats.Month
|
|
if len(args) > 1 {
|
|
switch strings.ToLower(args[1]) {
|
|
case "today", "day":
|
|
period = stats.Today
|
|
case "7d", "week":
|
|
period = stats.Week
|
|
case "30d", "month":
|
|
period = stats.Month
|
|
case "all":
|
|
period = stats.All
|
|
default:
|
|
return fmt.Errorf("usage: magpie usage [--csv] [today|7d|30d|all]")
|
|
}
|
|
}
|
|
if asCSV {
|
|
rows, _, _ := stats.Ledger(period, stats.Filter{})
|
|
return stats.WriteCSV(out, rows)
|
|
}
|
|
loadCostCurrency()
|
|
s := stats.Summarize(period)
|
|
title := map[stats.Period]string{stats.Today: "today", stats.Week: "last 7 days", stats.Month: "last 30 days", stats.All: "all time"}[s.Period]
|
|
if s.Calls == 0 {
|
|
fmt.Println(muted.Render("no calls "+title+" ·"), "route an agent through magpie and its usage shows up here")
|
|
fmt.Println(faint.Render(" " + stats.Path()))
|
|
return nil
|
|
}
|
|
fmt.Println(bold.Render(fmtTokens(s.Tokens())+" tokens"), muted.Render(title+" ·"), plural(s.Calls, "call"), muted.Render("·"), cost(s.Totals))
|
|
fmt.Println(muted.Render(" in "+fmtTokens(s.Input)+" out "+fmtTokens(s.Output)+" cache read "+fmtTokens(s.CacheRead)+" cache write "+fmtTokens(s.CacheWrite)+" reasoning "+fmtTokens(s.Reasoning)),
|
|
func() string {
|
|
if s.Errors > 0 {
|
|
return muted.Render(" · ") + plural(s.Errors, "error")
|
|
}
|
|
return ""
|
|
}())
|
|
|
|
names := map[string]string{}
|
|
for _, a := range agent.All() {
|
|
names[a.ID] = a.Name
|
|
}
|
|
table := func(head string, gs []stats.Group, name func(stats.Group) string) {
|
|
fmt.Println()
|
|
fmt.Println(faint.Render(" " + head))
|
|
w := 0
|
|
for _, g := range gs {
|
|
w = max(w, len(name(g)))
|
|
}
|
|
for _, g := range gs {
|
|
share := ""
|
|
if s.Tokens() > 0 {
|
|
share = fmt.Sprintf("%3.0f%%", 100*float64(g.Tokens())/float64(s.Tokens()))
|
|
}
|
|
fmt.Println(" "+pad(name(g), w), muted.Render(share), pad(fmtTokens(g.Tokens()), 7), faint.Render(pad(plural(g.Calls, "call"), 10)), cost(g.Totals), faint.Render(speed(g.Totals)))
|
|
}
|
|
}
|
|
table("agents", s.Agents, func(g stats.Group) string {
|
|
if n := names[g.ID]; n != "" {
|
|
return n
|
|
}
|
|
return g.ID
|
|
})
|
|
table("models", s.Models, func(g stats.Group) string { return g.ID })
|
|
if len(s.ProviderKeys) > 0 {
|
|
table("upstream provider keys", s.ProviderKeys, func(g stats.Group) string {
|
|
name := g.ProviderKeyName
|
|
if name == "" {
|
|
name = g.ProviderKeyID
|
|
}
|
|
if name == "" {
|
|
name = "key not recorded"
|
|
}
|
|
return g.Provider + " / " + name
|
|
})
|
|
}
|
|
if len(s.CallerKeys) > 0 {
|
|
table("gateway keys", s.CallerKeys, func(g stats.Group) string {
|
|
if g.CallerKeyName != "" {
|
|
return g.CallerKeyName
|
|
}
|
|
return g.CallerKeyID
|
|
})
|
|
}
|
|
if len(s.Sessions) > 0 {
|
|
top := s.Sessions[:min(len(s.Sessions), 10)]
|
|
head := "sessions"
|
|
if len(s.Sessions) > len(top) {
|
|
head = fmt.Sprintf("sessions · top %d of %d", len(top), len(s.Sessions))
|
|
}
|
|
table(head, top, func(g stats.Group) string {
|
|
n := names[g.Agent]
|
|
if n == "" {
|
|
n = g.Agent
|
|
}
|
|
return n + " " + g.ID
|
|
})
|
|
}
|
|
fmt.Println(faint.Render(" " + stats.Path()))
|
|
return nil
|
|
}
|
|
|
|
// speed is how long the timed calls took to their first token, and how
|
|
// fast they wrote after it (#196); "" when none was timed.
|
|
func speed(t stats.Totals) string {
|
|
if t.Timed == 0 {
|
|
return ""
|
|
}
|
|
out := "ttft " + fmtMs(t.MeanTTFT())
|
|
if v := t.Speed(); v > 0 {
|
|
out += fmt.Sprintf(" · %.0f tok/s", v)
|
|
}
|
|
return out
|
|
}
|
|
|
|
func fmtMs(ms int64) string {
|
|
if ms < 1000 {
|
|
return fmt.Sprintf("%d ms", ms)
|
|
}
|
|
return fmt.Sprintf("%.1f s", float64(ms)/1000)
|
|
}
|
|
|
|
func plural(n int, unit string) string {
|
|
if n == 1 {
|
|
return "1 " + unit
|
|
}
|
|
return fmt.Sprintf("%d %ss", n, unit)
|
|
}
|
|
|
|
func fmtTokens(n int) string {
|
|
switch {
|
|
case n >= 1_000_000_000:
|
|
return fmt.Sprintf("%.2fB", float64(n)/1e9)
|
|
case n >= 10_000_000:
|
|
return fmt.Sprintf("%.0fM", float64(n)/1e6)
|
|
case n >= 1_000_000:
|
|
return fmt.Sprintf("%.1fM", float64(n)/1e6)
|
|
case n >= 100_000:
|
|
return fmt.Sprintf("%.0fK", float64(n)/1e3)
|
|
case n >= 1_000:
|
|
return fmt.Sprintf("%.1fK", float64(n)/1e3)
|
|
}
|
|
return fmt.Sprint(n)
|
|
}
|
|
|
|
// cost renders list-price cost, saying when some calls could not be
|
|
// priced, in costCurrency at costRate (set once per command by
|
|
// loadCostCurrency).
|
|
func cost(t stats.Totals) string {
|
|
if t.Cost == 0 && t.Unpriced > 0 {
|
|
return faint.Render("no price")
|
|
}
|
|
s := stats.FormatCost(t.Cost, costCurrency, costRate)
|
|
if t.Unpriced > 0 {
|
|
s += muted.Render("+")
|
|
}
|
|
return green.Render("≈" + s)
|
|
}
|