diff --git a/internal/web/admin_mirror_test.go b/internal/web/admin_mirror_test.go index 1716461f..3b0f5b02 100644 --- a/internal/web/admin_mirror_test.go +++ b/internal/web/admin_mirror_test.go @@ -557,7 +557,7 @@ func TestAHeldVersionIsOneLineAndSaysWhoUsesIt(t *testing.T) { if !strings.Contains(body, `data-url="http://mirror:8081/big/v1/"`) { t.Error("a set's address is its directory, trailing slash included") } - if !strings.Contains(body, ">small-chat<") { + if !strings.Contains(body, ">as small-chat<") { t.Error("the model serving a file should be named on its row") } // Already served: offering to serve it again invites a second catalog @@ -585,7 +585,7 @@ func TestHowAModelRunsIsChangedWhereItsFileIsShown(t *testing.T) { t.Error("the running model's mode is not shown as chosen") } // Declared in server.yaml: shown, not offered, since it would revert. - if !strings.Contains(body, "on demand · set in server.yaml") { + if !strings.Contains(body, "on demand
set in server.yaml") { t.Error("a declared model should say where its mode is set") } if strings.Count(body, `name="mode" class="mode"`) != 1 { diff --git a/internal/web/static/base.css b/internal/web/static/base.css index 1781add6..870406a4 100644 --- a/internal/web/static/base.css +++ b/internal/web/static/base.css @@ -445,5 +445,11 @@ h3.limits-for { font-size: .92rem; margin: 1rem 0 .4rem; } table.narrow-table { max-width: 30rem; } .q-act a + a { margin-left: .8rem; } .chip-role { font-size: .68rem; font-weight: 600; color: var(--accent); text-transform: uppercase; letter-spacing: .04em; } -table.held .use { display: flex; align-items: center; gap: .4rem; flex-wrap: wrap; margin: .1rem 0; } -table.held select.mode { padding: .1rem .3rem; font-size: .8rem; } +/* Runs: one fixed-width selector per model, so they line up down the column + whatever the names; a catalog name differing from the mirror's sits above. */ +table.held .use { width: 9.5rem; margin: .1rem 0; } +table.held .use .as { display: block; font-size: .72rem; color: var(--muted); + overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +table.held .use .opt { font-size: .75rem; line-height: 1.3; } +table.held td.num { white-space: nowrap; } +table.held select.mode { width: 100%; padding: .15rem .3rem; font-size: .8rem; } diff --git a/internal/web/templates/admin_mirror.html b/internal/web/templates/admin_mirror.html index 4d825bd3..b54392b6 100644 --- a/internal/web/templates/admin_mirror.html +++ b/internal/web/templates/admin_mirror.html @@ -31,7 +31,7 @@ reachable from this machine.

What the mirror holds

{{if .Rows}} - + {{range .Rows}}{{end}}
ModelFilesSizeIn use
ModelFilesSizeRuns
{{.Model}} {{.Version}} @@ -49,9 +49,11 @@ reachable from this machine.

{{if eq (printf "%s" .State) "fetching"}}downloading {{else if eq (printf "%s" .State) "failed"}}failed - {{else if .UsedBy}}{{range .UsedBy}}
- {{.Name}} - {{if .Declared}}{{if eq .Mode "always"}}always on{{else if eq .Mode "ondemand"}}on demand{{else}}stopped{{end}} · set in server.yaml + {{else if .UsedBy}}{{$row := .}}{{range .UsedBy}}
+ {{/* Named only when the catalog calls it something other than the + mirror does; otherwise it is the model column again. */}} + {{if ne .Name $row.Model}}as {{.Name}}{{end}} + {{if .Declared}}{{if eq .Mode "always"}}always on{{else if eq .Mode "ondemand"}}on demand{{else}}stopped{{end}}
set in server.yaml
{{else}} {{/* Submitted on change: the choice is the action, and a second click to confirm it would only be a way to forget to. */}} @@ -223,6 +225,11 @@ directory, or give the mirror a token.

{{bytes .Bytes}} {{with .SHA256}}{{slice . 0 12}}{{else}}—{{end}} + {{if not .Verdict.Servable}} + cannot be served +
{{.Verdict.Reason}}
+ {{else}} + {{if .Verdict.Architecture}}{{.Verdict.Architecture}}{{if .Verdict.Checked}} ✓{{end}}{{end}}
{{range .Sources}} @@ -232,6 +239,7 @@ directory, or give the mirror a token.

+ {{end}}
@@ -263,6 +271,8 @@ computes once it has it.

+

The mirror answers as soon as the download is under way, not when