mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-12 12:17:23 +00:00
Compare commits
14 Commits
release/v1
...
v1.9.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 28149bdd1a | |||
| 0cd1cd51f6 | |||
| 4b07be67b4 | |||
| 913974bb6c | |||
| ffb2b8f2f2 | |||
| 1fe379f630 | |||
| b03b12148f | |||
| a1d4365515 | |||
| 3548745f98 | |||
| 3fe0df5bf2 | |||
| 8ca59b4bb2 | |||
| 980408d045 | |||
| 4b37e1a0db | |||
| ebe60028f5 |
@ -445,15 +445,6 @@ func (g *Gateway) handleStatsAPI(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
out := g.stats.PeriodSnapshot(p, key, time.Now())
|
out := g.stats.PeriodSnapshot(p, key, time.Now())
|
||||||
// The dashboard paints its records table from this payload's `records`
|
|
||||||
// field (paintRecords(st.records)), so a period view that omits the key
|
|
||||||
// renders an empty table no matter how much traffic the window had. The
|
|
||||||
// aggregate above is period-scoped; the record list is the same
|
|
||||||
// newest-first page the scroll handler pulls from /api/stats/records,
|
|
||||||
// which is deliberately not period-filtered (the cursor, not a date
|
|
||||||
// range, is its state) — that asymmetry is what the paging code
|
|
||||||
// already assumes.
|
|
||||||
page := g.stats.AuditPage("", limit, key)
|
|
||||||
writeJSON(w, http.StatusOK, map[string]interface{}{
|
writeJSON(w, http.StatusOK, map[string]interface{}{
|
||||||
"period": out.Period,
|
"period": out.Period,
|
||||||
"from": out.From,
|
"from": out.From,
|
||||||
@ -464,14 +455,7 @@ func (g *Gateway) handleStatsAPI(w http.ResponseWriter, r *http.Request) {
|
|||||||
"by_status": out.Status,
|
"by_status": out.Status,
|
||||||
"buckets": out.Bucket,
|
"buckets": out.Bucket,
|
||||||
"truncated": out.Truncated,
|
"truncated": out.Truncated,
|
||||||
"records": page.Records,
|
"key_names": g.keyNamesFor(),
|
||||||
// The paging cursor has to travel with the first page, otherwise
|
|
||||||
// the scroll handler has nothing to page from and the table is
|
|
||||||
// stuck at one screen forever.
|
|
||||||
"next_cursor": page.Next,
|
|
||||||
"has_more": page.HasMore,
|
|
||||||
"rotated": page.Rotated,
|
|
||||||
"key_names": g.keyNamesFor(),
|
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -583,23 +567,6 @@ func (g *Gateway) handleStatsAPI(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
snap := g.stats.Snapshot(limit, key)
|
snap := g.stats.Snapshot(limit, key)
|
||||||
snap["key_names"] = g.keyNamesFor()
|
snap["key_names"] = g.keyNamesFor()
|
||||||
// Records come from the audit files via the same AuditPage the scroll
|
|
||||||
// handler uses, not from Snapshot's in-memory ring. Two reasons:
|
|
||||||
//
|
|
||||||
// - Ordering. The ring is oldest-first, AuditPage is newest-first. The
|
|
||||||
// first screen and the paged continuation have to agree, or scrolling
|
|
||||||
// splices new rows in above old ones.
|
|
||||||
// - Depth. The ring holds maxRecs entries (a few hundred); the audit
|
|
||||||
// files hold everything, so "all" actually means all and the cursor
|
|
||||||
// can keep paging.
|
|
||||||
//
|
|
||||||
// It also carries next_cursor, without which the table can never load a
|
|
||||||
// second page.
|
|
||||||
page := g.stats.AuditPage("", limit, key)
|
|
||||||
snap["records"] = page.Records
|
|
||||||
snap["next_cursor"] = page.Next
|
|
||||||
snap["has_more"] = page.HasMore
|
|
||||||
snap["rotated"] = page.Rotated
|
|
||||||
writeJSON(w, http.StatusOK, snap)
|
writeJSON(w, http.StatusOK, snap)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,159 +0,0 @@
|
|||||||
package gateway
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"net/url"
|
|
||||||
"path/filepath"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// The dashboard paints its records table from the `records` field of
|
|
||||||
// /api/stats (paintRecords(st.records)). The period branch of that handler
|
|
||||||
// used to hand-write a response map and simply omit the key, so switching the
|
|
||||||
// selector to day / week / month rendered an EMPTY table no matter how much
|
|
||||||
// traffic the window had — while the lifetime view worked, because it goes
|
|
||||||
// through Snapshot() which carries records.
|
|
||||||
//
|
|
||||||
// These tests pin the contract across every period: same records, same cursor.
|
|
||||||
func TestStatsPeriodViewsShipRecords(t *testing.T) {
|
|
||||||
td := t.TempDir()
|
|
||||||
g := newTestGateway(t)
|
|
||||||
|
|
||||||
// Write audit records the period aggregator and the record pager both read.
|
|
||||||
g.stats.auditPath = filepath.Join(td, "audit.jsonl")
|
|
||||||
now := time.Now().UnixMilli()
|
|
||||||
for i := 0; i < 5; i++ {
|
|
||||||
g.stats.Record(Req{
|
|
||||||
Time: now - int64(i)*1000, Type: "chat", OK: true,
|
|
||||||
Model: "m1", Source: "s1", Status: 200,
|
|
||||||
Prompt: 10, Compl: 2,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, p := range []string{"day", "week", "month", "all"} {
|
|
||||||
rr := doReq(t, g, "GET", "/api/stats?period="+p, "")
|
|
||||||
if rr.Code != 200 {
|
|
||||||
t.Fatalf("period=%s: HTTP %d: %s", p, rr.Code, rr.Body.String())
|
|
||||||
}
|
|
||||||
var st map[string]interface{}
|
|
||||||
if err := json.Unmarshal(rr.Body.Bytes(), &st); err != nil {
|
|
||||||
t.Fatalf("period=%s: %v", p, err)
|
|
||||||
}
|
|
||||||
recs, ok := st["records"].([]interface{})
|
|
||||||
if !ok {
|
|
||||||
t.Fatalf("period=%s: response has no `records` array — the dashboard "+
|
|
||||||
"records table renders empty for this view (keys: %v)", p, keysOf(st))
|
|
||||||
}
|
|
||||||
if len(recs) != 5 {
|
|
||||||
t.Fatalf("period=%s: got %d records, want 5", p, len(recs))
|
|
||||||
}
|
|
||||||
// The scroll handler pages from next_cursor; without it the table is
|
|
||||||
// stuck at one screen no matter how far the user scrolls.
|
|
||||||
if _, ok := st["next_cursor"]; !ok {
|
|
||||||
t.Fatalf("period=%s: no next_cursor — paging can never continue", p)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// The records shipped with a period view must be the newest-first page the
|
|
||||||
// paging endpoint would return, in the same order. If /api/stats and
|
|
||||||
// /api/stats/records disagreed, scrolling would duplicate or skip rows.
|
|
||||||
func TestStatsPeriodRecordsMatchPager(t *testing.T) {
|
|
||||||
td := t.TempDir()
|
|
||||||
g := newTestGateway(t)
|
|
||||||
g.stats.auditPath = filepath.Join(td, "audit.jsonl")
|
|
||||||
now := time.Now().UnixMilli()
|
|
||||||
for i := 0; i < 8; i++ {
|
|
||||||
g.stats.Record(Req{
|
|
||||||
Time: now - int64(i)*1000, Type: "chat", OK: true,
|
|
||||||
Model: "m1", Status: 200, Prompt: 5, Compl: 1,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
rr := doReq(t, g, "GET", "/api/stats?period=day&limit=100", "")
|
|
||||||
var st struct {
|
|
||||||
Records []struct {
|
|
||||||
Time int64 `json:"time"`
|
|
||||||
Model string `json:"model"`
|
|
||||||
} `json:"records"`
|
|
||||||
}
|
|
||||||
if err := json.Unmarshal(rr.Body.Bytes(), &st); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
rr2 := doReq(t, g, "GET", "/api/stats/records?limit=100", "")
|
|
||||||
var pg struct {
|
|
||||||
Records []struct {
|
|
||||||
Time int64 `json:"time"`
|
|
||||||
Model string `json:"model"`
|
|
||||||
} `json:"records"`
|
|
||||||
}
|
|
||||||
if err := json.Unmarshal(rr2.Body.Bytes(), &pg); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
if len(st.Records) != len(pg.Records) {
|
|
||||||
t.Fatalf("period view shipped %d records, pager returned %d — the two "+
|
|
||||||
"sources must agree or scrolling duplicates/skips rows",
|
|
||||||
len(st.Records), len(pg.Records))
|
|
||||||
}
|
|
||||||
for i := range st.Records {
|
|
||||||
if st.Records[i].Time != pg.Records[i].Time {
|
|
||||||
t.Fatalf("record %d differs: period view t=%d, pager t=%d",
|
|
||||||
i, st.Records[i].Time, pg.Records[i].Time)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// The two sources must agree on DIRECTION as well as content. Which
|
|
||||||
// direction that is depends on how many reverse-read chunks the audit file
|
|
||||||
// spans (a small file is read whole, a large one chunk-by-chunk), so the
|
|
||||||
// test asserts agreement rather than hard-coding newest-first — but they
|
|
||||||
// can never disagree, because the table interleaves both streams.
|
|
||||||
if len(st.Records) > 1 {
|
|
||||||
periodAsc := st.Records[1].Time > st.Records[0].Time
|
|
||||||
pagerAsc := pg.Records[1].Time > pg.Records[0].Time
|
|
||||||
if periodAsc != pagerAsc {
|
|
||||||
t.Fatalf("direction differs: period view %s, pager %s — the table "+
|
|
||||||
"would splice the two streams out of order",
|
|
||||||
map[bool]string{true: "oldest-first", false: "newest-first"}[periodAsc],
|
|
||||||
map[bool]string{true: "oldest-first", false: "newest-first"}[pagerAsc])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// A non-admin caller cannot widen their view by passing someone else's key in
|
|
||||||
// the query string: exportKey overrides ?key= with the caller's own masked id.
|
|
||||||
// This is a data-leak boundary, and it applies to the records the period view
|
|
||||||
// ships just as much as to the aggregates.
|
|
||||||
func TestStatsPeriodRecordsIgnoreForeignKeyForUsers(t *testing.T) {
|
|
||||||
td := t.TempDir()
|
|
||||||
g := newTestGateway(t)
|
|
||||||
g.stats.auditPath = filepath.Join(td, "audit.jsonl")
|
|
||||||
|
|
||||||
other := keyID("sk-gw-cccccccccccccccc")
|
|
||||||
own := keyID("sk-test")
|
|
||||||
now := time.Now().UnixMilli()
|
|
||||||
g.stats.Record(Req{Time: now, OK: true, Model: "m", Status: 200, Key: other})
|
|
||||||
g.stats.Record(Req{Time: now - 1000, OK: true, Model: "m", Status: 200, Key: own})
|
|
||||||
|
|
||||||
// sk-test authenticates as a non-admin (newTestGateway seeds it under
|
|
||||||
// gateway_keys, not keys), so ?key=<other> must be ignored and the caller
|
|
||||||
// sees only its own rows.
|
|
||||||
rr := doReq(t, g, "GET",
|
|
||||||
"/api/stats?period=day&key="+url.QueryEscape(other), "")
|
|
||||||
if rr.Code != 200 {
|
|
||||||
t.Fatalf("HTTP %d: %s", rr.Code, rr.Body.String())
|
|
||||||
}
|
|
||||||
var st struct {
|
|
||||||
Records []struct {
|
|
||||||
Key string `json:"key"`
|
|
||||||
} `json:"records"`
|
|
||||||
}
|
|
||||||
if err := json.Unmarshal(rr.Body.Bytes(), &st); err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
for _, r := range st.Records {
|
|
||||||
if r.Key == other {
|
|
||||||
t.Fatalf("another key's record leaked into a user view "+
|
|
||||||
"(caller=%s, requested=%s)", own, other)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -832,7 +832,7 @@
|
|||||||
kAutoChainSave: "保存",
|
kAutoChainSave: "保存",
|
||||||
kAutoChainTier: "层级",
|
kAutoChainTier: "层级",
|
||||||
kAutoChainEmpty: "该密钥使用全局 AUTO 链",
|
kAutoChainEmpty: "该密钥使用全局 AUTO 链",
|
||||||
kAutoChainBad: "已保存,但槽位无法解析(模型与源的组合不存在),AUTO 请求会失败",
|
kAutoChainBad: "槽位无法解析(模型或源不存在),保存后 AUTO 请求会失败",
|
||||||
kName: "名称",
|
kName: "名称",
|
||||||
kRole: "角色",
|
kRole: "角色",
|
||||||
kRoleAdmin: "管理员",
|
kRoleAdmin: "管理员",
|
||||||
@ -1103,7 +1103,7 @@
|
|||||||
kAutoChainSave: "Save",
|
kAutoChainSave: "Save",
|
||||||
kAutoChainTier: "Tier",
|
kAutoChainTier: "Tier",
|
||||||
kAutoChainEmpty: "This key uses the global AUTO chain",
|
kAutoChainEmpty: "This key uses the global AUTO chain",
|
||||||
kAutoChainBad: "Saved, but the slot does not resolve (no source serves that model); AUTO requests will fail",
|
kAutoChainBad: "Slot does not resolve (unknown model or source); AUTO requests would fail",
|
||||||
kName: "Name",
|
kName: "Name",
|
||||||
kRole: "Role",
|
kRole: "Role",
|
||||||
kRoleAdmin: "Admin",
|
kRoleAdmin: "Admin",
|
||||||
@ -2418,14 +2418,8 @@ const pnote = $("#period-note");
|
|||||||
function paintRecords(records, keyNames) {
|
function paintRecords(records, keyNames) {
|
||||||
const el = $("#tb-recs");
|
const el = $("#tb-recs");
|
||||||
if (!el) return;
|
if (!el) return;
|
||||||
recsState.keyNames = keyNames || {};
|
recsState.keyNames = keyNames || {};
|
||||||
// Newest-first, and that is now what BOTH sources send: /api/stats
|
const incoming = (records || []).slice().reverse(); // API sends oldest-first
|
||||||
// takes its first page from AuditPage and /api/stats/records pages
|
|
||||||
// the same walk. The .reverse() that used to live here was papering
|
|
||||||
// over the lifetime branch reading the in-memory ring (oldest-first)
|
|
||||||
// while the pager read the audit files (newest-first) — so scrolling
|
|
||||||
// spliced newer rows underneath older ones.
|
|
||||||
const incoming = records || [];
|
|
||||||
|
|
||||||
if (!recsState.built) {
|
if (!recsState.built) {
|
||||||
if (!incoming.length) {
|
if (!incoming.length) {
|
||||||
@ -3700,17 +3694,9 @@ recsState.keyNames = keyNames || {};
|
|||||||
// different id inside its modal, so both share one implementation
|
// different id inside its modal, so both share one implementation
|
||||||
// instead of a reduced second copy that would drift.
|
// instead of a reduced second copy that would drift.
|
||||||
function sortCanvasEl() {
|
function sortCanvasEl() {
|
||||||
// The modal editor is mounted on top of the settings tab, so BOTH
|
const own = document.getElementById("scr-canvas");
|
||||||
// canvases can be in the DOM at once — #scr-canvas belongs to the
|
if (own) return own;
|
||||||
// hidden tab behind it. Resolve by scope, not by document order: when
|
return document.getElementById("key-auto-canvas");
|
||||||
// sortState.scope names a key we are editing THAT key's chain, and
|
|
||||||
// painting into the background tab's canvas both shows an empty
|
|
||||||
// dialog and corrupts the global chain the user comes back to.
|
|
||||||
if (sortState.scope) {
|
|
||||||
const k = document.getElementById("key-auto-canvas");
|
|
||||||
if (k) return k;
|
|
||||||
}
|
|
||||||
return document.getElementById("scr-canvas");
|
|
||||||
}
|
}
|
||||||
function paintSort(affected) {
|
function paintSort(affected) {
|
||||||
const cv = sortCanvasEl();
|
const cv = sortCanvasEl();
|
||||||
@ -4133,25 +4119,6 @@ const cv = sortCanvasEl();
|
|||||||
// editor means a per-key chain gets exactly the features the global one
|
// editor means a per-key chain gets exactly the features the global one
|
||||||
// has (drag ordering, per-slot quota/period/hours) instead of a reduced
|
// has (drag ordering, per-slot quota/period/hours) instead of a reduced
|
||||||
// second implementation that would drift.
|
// second implementation that would drift.
|
||||||
// afterChainEdit is the single place an in-canvas edit decides whether to
|
|
||||||
// write through. On the GLOBAL page edits take effect immediately (that
|
|
||||||
// page has always behaved that way). In the per-key dialog they must NOT:
|
|
||||||
// that dialog has Save and Cancel, and auto-persisting meant a slot added
|
|
||||||
// (or dragged, or deleted) was already committed to the user's chain
|
|
||||||
// before Save — Cancel could not undo it, and the "Click Save for it to
|
|
||||||
// take effect" hint was a lie.
|
|
||||||
function afterChainEdit() {
|
|
||||||
// Every in-canvas edit lands here, so this is the one place that keeps
|
|
||||||
// the "uses the global chain" notice honest while the user works.
|
|
||||||
if (typeof keyAutoInheritNotice === "function") keyAutoInheritNotice();
|
|
||||||
if (sortState.scope) {
|
|
||||||
toast(t("sortHintSave"));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
persistAuto()
|
|
||||||
.then(() => toast(t("sortHintSave")))
|
|
||||||
.catch((e) => toast(e.message));
|
|
||||||
}
|
|
||||||
async function persistAuto() {
|
async function persistAuto() {
|
||||||
const rules = lanesToRules(sortState.lanes);
|
const rules = lanesToRules(sortState.lanes);
|
||||||
if (sortState.scope) {
|
if (sortState.scope) {
|
||||||
@ -4267,7 +4234,9 @@ function afterChainEdit() {
|
|||||||
if (btn) btn.closest("#modal-wrap")?.remove();
|
if (btn) btn.closest("#modal-wrap")?.remove();
|
||||||
else closeTopModal();
|
else closeTopModal();
|
||||||
paintSort([li]);
|
paintSort([li]);
|
||||||
afterChainEdit();
|
persistAuto()
|
||||||
|
.then(() => toast(t("sortHintSave")))
|
||||||
|
.catch((e) => toast(e.message));
|
||||||
}
|
}
|
||||||
function sortScopeSave(li, ji, btn) {
|
function sortScopeSave(li, ji, btn) {
|
||||||
const it = sortState.lanes[li].models[ji];
|
const it = sortState.lanes[li].models[ji];
|
||||||
@ -4280,7 +4249,9 @@ function afterChainEdit() {
|
|||||||
it.meta = { quota: q, period: p, hours: p || q ? h : 0 };
|
it.meta = { quota: q, period: p, hours: p || q ? h : 0 };
|
||||||
(btn ? btn.closest("#modal-wrap") : null) || closeTopModal();
|
(btn ? btn.closest("#modal-wrap") : null) || closeTopModal();
|
||||||
paintSort([li]);
|
paintSort([li]);
|
||||||
afterChainEdit();
|
persistAuto()
|
||||||
|
.then(() => toast(t("sortHintSave")))
|
||||||
|
.catch((e) => toast(e.message));
|
||||||
}
|
}
|
||||||
function scrCtx(e, li, ji) {
|
function scrCtx(e, li, ji) {
|
||||||
if (e.button === 2) {
|
if (e.button === 2) {
|
||||||
@ -4343,7 +4314,9 @@ function afterChainEdit() {
|
|||||||
meta: it.meta ? { ...it.meta } : null,
|
meta: it.meta ? { ...it.meta } : null,
|
||||||
});
|
});
|
||||||
paintSort([li]);
|
paintSort([li]);
|
||||||
afterChainEdit();
|
persistAuto()
|
||||||
|
.then(() => toast(t("sortHintSave")))
|
||||||
|
.catch((e) => toast(e.message));
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
@ -4354,7 +4327,9 @@ function afterChainEdit() {
|
|||||||
fn: () => {
|
fn: () => {
|
||||||
it.meta = null;
|
it.meta = null;
|
||||||
paintSort([li]);
|
paintSort([li]);
|
||||||
afterChainEdit();
|
persistAuto()
|
||||||
|
.then(() => toast(t("sortHintSave")))
|
||||||
|
.catch((e) => toast(e.message));
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
items.push({
|
items.push({
|
||||||
@ -4370,7 +4345,9 @@ function afterChainEdit() {
|
|||||||
if (!sortState.lanes[li].models.length && sortState.lanes.length > 1)
|
if (!sortState.lanes[li].models.length && sortState.lanes.length > 1)
|
||||||
sortState.lanes.splice(li, 1);
|
sortState.lanes.splice(li, 1);
|
||||||
paintSort([li]);
|
paintSort([li]);
|
||||||
afterChainEdit();
|
persistAuto()
|
||||||
|
.then(() => toast(t("sortHintSave")))
|
||||||
|
.catch((e) => toast(e.message));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------- adapters tab ---------- */
|
/* ---------- adapters tab ---------- */
|
||||||
@ -5222,16 +5199,8 @@ function afterChainEdit() {
|
|||||||
// /api/keys/{key}/auto instead of /api/auto. A separate reduced editor
|
// /api/keys/{key}/auto instead of /api/auto. A separate reduced editor
|
||||||
// would drift from the global one and lose features.
|
// would drift from the global one and lose features.
|
||||||
async function openKeyAutoModal(key, name) {
|
async function openKeyAutoModal(key, name) {
|
||||||
// This dialog deliberately does NOT reuse #modal-wrap. That id is
|
|
||||||
// shared by every dialog in the app and more than one can be open at
|
|
||||||
// once, so a lookup by id resolves to whichever comes first in the
|
|
||||||
// document — not the one the user is looking at. That is fine for
|
|
||||||
// handlers that can use `.closest()` from their own button, but this
|
|
||||||
// dialog also has to be found from the CANVAS side (sortCanvasEl,
|
|
||||||
// keyAutoClose, keyAutoInherit), so it needs an identity of its own.
|
|
||||||
document.getElementById("key-auto-modal")?.remove();
|
|
||||||
const wrap = document.createElement("div");
|
const wrap = document.createElement("div");
|
||||||
wrap.id = "key-auto-modal";
|
wrap.id = "modal-wrap";
|
||||||
wrap.style.cssText =
|
wrap.style.cssText =
|
||||||
"position:fixed;inset:0;background:rgba(15,22,44,.45);display:flex;align-items:flex-start;justify-content:center;overflow:auto;padding:48px 20px;z-index:50";
|
"position:fixed;inset:0;background:rgba(15,22,44,.45);display:flex;align-items:flex-start;justify-content:center;overflow:auto;padding:48px 20px;z-index:50";
|
||||||
wrap.innerHTML = `<div class="card" style="width:900px;max-width:100%">
|
wrap.innerHTML = `<div class="card" style="width:900px;max-width:100%">
|
||||||
@ -5253,45 +5222,25 @@ function afterChainEdit() {
|
|||||||
const cur = await api("/api/keys/" + encodeURIComponent(key) + "/auto");
|
const cur = await api("/api/keys/" + encodeURIComponent(key) + "/auto");
|
||||||
keyAutoState.key = key;
|
keyAutoState.key = key;
|
||||||
keyAutoState.inherits = !!cur.inherits;
|
keyAutoState.inherits = !!cur.inherits;
|
||||||
// A key with no own chain shows an EMPTY canvas, never the discovery
|
// A key with no own chain shows an empty canvas rather than the
|
||||||
// fallback buildLanes uses for an unconfigured global chain: that
|
// discovery fallback: filling it with every available slot would
|
||||||
// fallback fills every source's models (226 blocks on a real
|
// suggest those slots are already this user's chain.
|
||||||
// deployment), and showing them inside "this key's chain" dialog
|
|
||||||
// says they already belong to this user. They do not.
|
|
||||||
sortState.scope = key;
|
sortState.scope = key;
|
||||||
sortState.kind = "chat";
|
sortState.kind = "chat";
|
||||||
sortState.lanes =
|
sortState.lanes = buildLanes(idx, cur.auto || [], "chat");
|
||||||
cur.auto && cur.auto.length ? buildLanes(idx, cur.auto, "chat") : [];
|
|
||||||
sortState.origin = JSON.stringify(sortState.lanes);
|
sortState.origin = JSON.stringify(sortState.lanes);
|
||||||
await loadModelPairs();
|
await loadModelPairs();
|
||||||
renderSortEditor($("#ka-canvas-host"), { canvasId: "key-auto-canvas" });
|
renderSortEditor($("#ka-canvas-host"), { canvasId: "key-auto-canvas" });
|
||||||
// The notice is the only thing telling the user what an empty
|
|
||||||
// canvas means here. Without it the dialog is just a blank box and
|
|
||||||
// "Use global chain" looks like a button that already did
|
|
||||||
// something. It disappears as soon as the chain has slots of its
|
|
||||||
// own, which keyAutoSave's reload then confirms.
|
|
||||||
if (keyAutoState.inherits) keyAutoInheritNotice();
|
if (keyAutoState.inherits) keyAutoInheritNotice();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
toast(String(e));
|
toast(String(e));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const keyAutoState = { key: null, inherits: true };
|
const keyAutoState = { key: null, inherits: true };
|
||||||
// The notice describes what an EMPTY canvas means, so it must track the
|
function keyAutoInheritNotice() {
|
||||||
// canvas rather than the state the dialog opened with: adding the first
|
|
||||||
// slot makes "this key uses the global chain" false, and leaving it up
|
|
||||||
// reads as a contradiction right next to the slot the user just added.
|
|
||||||
function keyAutoInheritNotice(showing) {
|
|
||||||
const host = $("#ka-canvas-host");
|
const host = $("#ka-canvas-host");
|
||||||
if (!host) return;
|
if (!host) return;
|
||||||
let n = host.querySelector(".ka-inherit-note");
|
let n = host.querySelector(".ka-inherit-note");
|
||||||
const hasSlots = (sortState.lanes || []).some(
|
|
||||||
(l) => (l.models || []).length,
|
|
||||||
);
|
|
||||||
const want = showing === undefined ? !hasSlots : showing && !hasSlots;
|
|
||||||
if (!want) {
|
|
||||||
if (n) n.remove();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!n) {
|
if (!n) {
|
||||||
n = document.createElement("div");
|
n = document.createElement("div");
|
||||||
n.className = "muted ka-inherit-note";
|
n.className = "muted ka-inherit-note";
|
||||||
@ -5315,7 +5264,7 @@ function afterChainEdit() {
|
|||||||
keyAutoInheritNotice();
|
keyAutoInheritNotice();
|
||||||
}
|
}
|
||||||
function keyAutoClose() {
|
function keyAutoClose() {
|
||||||
const m = document.getElementById("key-auto-modal");
|
const m = document.getElementById("modal-wrap");
|
||||||
if (m) m.remove();
|
if (m) m.remove();
|
||||||
// Leaving scope set would make the global editor save to this key.
|
// Leaving scope set would make the global editor save to this key.
|
||||||
sortState.scope = null;
|
sortState.scope = null;
|
||||||
@ -5334,12 +5283,10 @@ function afterChainEdit() {
|
|||||||
body: JSON.stringify({ auto: lanesToRules(sortState.lanes) }),
|
body: JSON.stringify({ auto: lanesToRules(sortState.lanes) }),
|
||||||
});
|
});
|
||||||
if (j.inherits) {
|
if (j.inherits) {
|
||||||
toast(t("kAutoChainGlobal"));
|
toast(t("kAutoChainGlobal"));
|
||||||
} else if (!j.slots) {
|
} else if (!j.slots) {
|
||||||
// Persisted, but nothing resolves. Still close: the write
|
// Persisted, but nothing resolves — say so now instead of letting
|
||||||
// SUCCEEDED, and leaving the dialog open after a successful save
|
// the user meet it as a 503 on their next AUTO request.
|
||||||
// makes the user click Save repeatedly. The warning carries the
|
|
||||||
// real problem — the toast survives the modal closing.
|
|
||||||
toast(t("kAutoChainBad"));
|
toast(t("kAutoChainBad"));
|
||||||
} else {
|
} else {
|
||||||
toast(t("sortSaved") + " (" + j.slots + ")");
|
toast(t("sortSaved") + " (" + j.slots + ")");
|
||||||
|
|||||||
@ -124,145 +124,4 @@ func TestUIStatsShowsPeriodWindow(t *testing.T) {
|
|||||||
if n := strings.Count(src, "periodRange"); n < 2 {
|
if n := strings.Count(src, "periodRange"); n < 2 {
|
||||||
t.Fatalf("i18n key periodRange appears %d time(s), want both zh and en", n)
|
t.Fatalf("i18n key periodRange appears %d time(s), want both zh and en", n)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Both canvases can exist in the DOM at once: the modal is mounted on top of
|
|
||||||
// the settings tab, whose #scr-canvas stays alive behind it. Resolving the
|
|
||||||
// canvas by document order (whichever comes first) painted the per-key chain
|
|
||||||
// into the hidden background tab and left the dialog empty — and worse,
|
|
||||||
// overwrote the global chain the user returns to. The lookup must follow
|
|
||||||
// sortState.scope instead.
|
|
||||||
func TestUISortCanvasResolvesByScope(t *testing.T) {
|
|
||||||
src := uiSource(t)
|
|
||||||
el := readFuncBody(t, src, "sortCanvasEl")
|
|
||||||
if !strings.Contains(el, "if (sortState.scope)") {
|
|
||||||
t.Fatal("sortCanvasEl must branch on sortState.scope, not document order")
|
|
||||||
}
|
|
||||||
if strings.Contains(el, `getElementById("scr-canvas")`) &&
|
|
||||||
strings.Index(el, `getElementById("scr-canvas")`) < strings.Index(el, "sortState.scope") {
|
|
||||||
t.Fatal("sortCanvasEl returns #scr-canvas before checking scope — the " +
|
|
||||||
"per-key editor paints into the global canvas")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// A successful save must close the dialog even when the slots do not resolve.
|
|
||||||
// The write DID succeed; leaving the modal open makes the user click Save
|
|
||||||
// again and again. This regressed once: the !slots branch returned early.
|
|
||||||
func TestUIKeyAutoSaveClosesOnSuccess(t *testing.T) {
|
|
||||||
src := uiSource(t)
|
|
||||||
body := readFuncBody(t, src, "keyAutoSave")
|
|
||||||
// keyAutoClose() must be reached on every success path, not only in the
|
|
||||||
// happy branch.
|
|
||||||
iClose := strings.Index(body, "keyAutoClose()")
|
|
||||||
if iClose < 0 {
|
|
||||||
t.Fatal("keyAutoSave never calls keyAutoClose — the dialog would stay open")
|
|
||||||
}
|
|
||||||
iToast := strings.Index(body, "toast(")
|
|
||||||
if iToast >= 0 && iClose < iToast {
|
|
||||||
t.Fatal("keyAutoClose is called before the toast; the warning must be " +
|
|
||||||
"shown first or it is lost with the modal")
|
|
||||||
}
|
|
||||||
// An early `return` inside a branch bypasses keyAutoClose entirely, so
|
|
||||||
// merely finding the call is not enough: every `return` that sits between
|
|
||||||
// entering the try block and the close call is a path that leaves the
|
|
||||||
// dialog open after a successful write.
|
|
||||||
tryStart := strings.Index(body, "try {")
|
|
||||||
seg := body[tryStart:iClose]
|
|
||||||
for _, line := range strings.Split(seg, "\n") {
|
|
||||||
trimmed := strings.TrimSpace(line)
|
|
||||||
if trimmed == "return;" || strings.HasPrefix(trimmed, "return ") {
|
|
||||||
t.Fatal("a `return` before keyAutoClose leaves the dialog open after " +
|
|
||||||
"a successful save: " + trimmed)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// readFuncBody returns the source of a top-level function by name, using
|
|
||||||
// brace matching so nested blocks do not truncate it.
|
|
||||||
func readFuncBody(t *testing.T, src, name string) string {
|
|
||||||
t.Helper()
|
|
||||||
idx := strings.Index(src, "function "+name+"(")
|
|
||||||
if idx < 0 {
|
|
||||||
t.Fatalf("function %s not found", name)
|
|
||||||
}
|
|
||||||
start := strings.Index(src[idx:], "{")
|
|
||||||
if start < 0 {
|
|
||||||
t.Fatalf("function %s has no body", name)
|
|
||||||
}
|
|
||||||
i := idx + start
|
|
||||||
depth := 0
|
|
||||||
for j := i; j < len(src); j++ {
|
|
||||||
switch src[j] {
|
|
||||||
case '{':
|
|
||||||
depth++
|
|
||||||
case '}':
|
|
||||||
depth--
|
|
||||||
if depth == 0 {
|
|
||||||
return src[i : j+1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
t.Fatalf("function %s body is unterminated", name)
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// The per-key dialog must not share the app-wide #modal-wrap id.
|
|
||||||
//
|
|
||||||
// Every dialog in this file uses that id, and more than one can be open at
|
|
||||||
// once (the "add slot" picker opens ON TOP of this one). Handlers resolve
|
|
||||||
// their own dialog via `.closest()` from their button, which works — but this
|
|
||||||
// dialog is also looked up from the CANVAS side (sortCanvasEl, keyAutoClose,
|
|
||||||
// keyAutoInherit), where there is no button to walk up from.
|
|
||||||
// getElementById("#modal-wrap") then returns whichever dialog comes first in
|
|
||||||
// the document, i.e. not the one being edited: Cancel closed the wrong box and
|
|
||||||
// the canvas could resolve to the picker's.
|
|
||||||
func TestUIKeyAutoModalHasOwnID(t *testing.T) {
|
|
||||||
src := uiSource(t)
|
|
||||||
body := readFuncBody(t, src, "openKeyAutoModal")
|
|
||||||
if !strings.Contains(body, `wrap.id = "key-auto-modal"`) {
|
|
||||||
t.Fatal("openKeyAutoModal must give its dialog its own id, not the shared " +
|
|
||||||
"#modal-wrap (another dialog may be open on top of it)")
|
|
||||||
}
|
|
||||||
close := readFuncBody(t, src, "keyAutoClose")
|
|
||||||
if strings.Contains(close, `"modal-wrap"`) {
|
|
||||||
t.Fatal("keyAutoClose resolves the shared #modal-wrap; it would close " +
|
|
||||||
"whichever dialog comes first in the document")
|
|
||||||
}
|
|
||||||
if !strings.Contains(close, `"key-auto-modal"`) {
|
|
||||||
t.Fatal("keyAutoClose must resolve the per-key dialog by its own id")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Editing a chain inside the per-key dialog must NOT persist it. That dialog
|
|
||||||
// has Save and Cancel, so auto-writing on add/drag/delete meant the change was
|
|
||||||
// already committed before Save and Cancel could not undo it.
|
|
||||||
//
|
|
||||||
// The global page is the opposite: it has always applied edits immediately.
|
|
||||||
func TestUIKeyAutoEditsDoNotAutoPersist(t *testing.T) {
|
|
||||||
src := uiSource(t)
|
|
||||||
body := readFuncBody(t, src, "afterChainEdit")
|
|
||||||
if !strings.Contains(body, "if (sortState.scope)") {
|
|
||||||
t.Fatal("afterChainEdit must branch on sortState.scope")
|
|
||||||
}
|
|
||||||
// The scoped branch must return before reaching persistAuto.
|
|
||||||
iScope := strings.Index(body, "if (sortState.scope)")
|
|
||||||
iReturn := strings.Index(body[iScope:], "return")
|
|
||||||
iPersist := strings.Index(body, "persistAuto()")
|
|
||||||
if iScope < 0 || iReturn < 0 || iPersist < 0 {
|
|
||||||
t.Fatal("afterChainEdit no longer has the expected shape")
|
|
||||||
}
|
|
||||||
if iScope+iReturn > iPersist {
|
|
||||||
t.Fatal("the scoped branch reaches persistAuto() — a per-key edit would " +
|
|
||||||
"be written before Save")
|
|
||||||
}
|
|
||||||
// And it must not call itself (a regex-driven rewrite did exactly that).
|
|
||||||
if strings.Contains(body, "afterChainEdit()") {
|
|
||||||
t.Fatal("afterChainEdit calls itself: infinite recursion")
|
|
||||||
}
|
|
||||||
// Every in-canvas edit goes through it, so none of them bypass the check.
|
|
||||||
for _, fn := range []string{"scrAddFromForm", "sortScopeSave", "scrDelSlot"} {
|
|
||||||
b := readFuncBody(t, src, fn)
|
|
||||||
if strings.Contains(b, "persistAuto()") {
|
|
||||||
t.Fatalf("%s calls persistAuto() directly, bypassing afterChainEdit", fn)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user