3 Commits
Author SHA1 Message Date
HomerandClaude Opus 5 ab32c68a8f A crowd you can find, and a phone 65px too narrow
Two reports against 1.6.0 and 1.7.0, both correct.

The crowd worked end to end and was, in practice, not there: the picker was
behind the ⋯ menu of a chat that already existed, and the switch was a card on
the Agents page, which made it read as an agent-chat feature. The picker is now
a button in the composer toolbar on both screens that include it, and on the
new-chat screen the choice rides along with the first message, so a chat can
start as a crowd instead of having to be converted into one. The instance
switch has its own page.

The width bug was the suggestion cards, exactly as reported. `.suggestions`
rendered 455px inside a 366px column, and the tree's standing rule applied on
its own made it worse -- 428px to 455px. A grid item carries `min-width: auto`,
which is a min-content floor, and a floor beats `width: 100%`; the floor is
measured while the percentage is indefinite, so `min(100%, …)` alone sends the
track to a card's max-content. Both halves now go on all four auto-fit grids,
and a test refuses either alone.

It survived four releases of narrow-width checking because the harness never
rendered that screen: `TestClient(app)` runs no lifespan outside a `with` block,
so the startup-seeded cards were missing from every shot ever taken of it. And
its overflow check skipped anything inside a scroller -- right for a table in
its own scroller, blind to the scroller itself, which `overflow-y: auto` makes
scroll sideways too. Both fixed; it now names the box and the child to blame.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-26 20:08:10 +00:00
HomerandClaude Opus 5 a16510aba8 The interface speaks Slovak
969 strings, an instance default and a per-person choice, and no half-done corner:
the admin prose is translated too. Design and reasoning: LLeMbas.wiki/Translations.

KEYED BY THE ENGLISH SENTENCE

A missing entry renders the key, which is the English -- so an untranslated string
looks as it always did, an English instance is byte-for-byte 1.6.0, and a
half-finished catalogue is a half-translated page rather than a page of dotted key
names. The cost is that editing an English sentence orphans its translation
silently, which is what tests/test_translations.py asserts in both directions.

No gettext: .po -> .mo is a build step and this project does not have one.

A JINJA GLOBAL, AND THEREFORE A CONTEXTVAR

`t()` is a global for the reason `brand` already documents -- render() is bypassed
by 25 TemplateResponse calls and 8 get_template().render() calls, the latter being
the SSE frames, which have no Request at all. A global is bound once at import and
the language is per person, so the active language is a ContextVar set per request.

🚨 `get_current_user` had to become `async def`. FastAPI runs a sync dependency in a
threadpool, and anyio copies the context in and discards it on the way out -- so
the language was set where nothing could see it and every page rendered in the
instance's language whatever anybody had chosen, with no error anywhere.

NOT TRANSLATED, ON PURPOSE

Everything a model reads: the 60 prompt fragments, and the dates in harness.py,
schedule/runner.py and schedule/compile.py. Only `i18n.stamp` is localised, and
only where a person reads it -- with the *format* translatable as well as the
words, because "26. septembra 2026" is a different pattern rather than the same one
with different words in it. A process locale is not an option: global, not
thread-safe, two people's pages at once.

A second fragment telling models to answer in the reader's language was written
during this work and removed: `core.style` has said it since long before, and
test_an_empty_override_turns_a_fragment_off caught the duplicate.

THE BULK PASS

1213 sites wrapped by a one-off script that only touched patterns it could not
misread. It got three wrong in a way that mattered -- `t('…')` inside `attr="…"`
where the sentence held an apostrophe, closing the Jinja string and 500ing two
pages whose partials no test renders. tests/test_translations.py now compiles all
110 templates. It also wrapped the product's own name, an SSH key header, a
keystroke hint and an example URL, all taken back out: a string is not
translatable just because it is a string.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-26 14:46:33 +00:00
HomerandClaude Opus 5 da0797ccad A crowd in one chat
The chat's own model answers, then each other member in order, then the order runs
backwards asking each whether it disagrees, ending at the main model, which either
closes or sends them round again. Design and reasoning: LLeMbas.wiki/Crowd-chats.

THE SPEAKER SEAM, WHICH IS ALSO A BUG FIX

`chat_service.speaker_for` makes the *message* name the answering model and the
chat only the default. That closes a live half-wired feature -- `wake_chat` takes a
model override and `schedule/runner` passes one, and it reached the row and never
the request, so a schedule naming another model got the chat's model wearing the
other one's name.

The seam is wider than `build_request`: `{{model_name}}`, the authored prompt's
model layer, `vision` (where a wrong answer makes the endpoint reject the whole
request), the effort vocabulary (which raises inside the model's own chat template,
and whose refusal narrows every Model row sharing the id), `resolve_tools`,
`context_length` -> `_too_big`, and `ToolContext.model_id`. `resolve_endpoint` may
now only write back `chat.connection_id` when the speaker *is* the chat's model.

WHY N CHAINED REPLIES

`Generation` is one reply's state and `_follow` streams per message, so one
generation cannot stream into nine bubbles and `ensure` would not know which of the
nine it was after a restart. A subagent per speaker cannot work either: its answer
comes back as a tool result and tool results are never replayed, so speaker 3 could
not see speaker 2 -- which is the whole point. Chained, exactly one incomplete row
exists at a time, and `tests/test_crowd_chain.py` asserts that at every
observation.

The round lives on `Message.crowd_json`, not on the chat: the row is the authority,
and chat-level state would describe turns a rewind or a restart had removed.
`crowd.next_turn` is pure, so all eight refusals are tested with no endpoint.

THREE RULES, EACH A BUG WRITTEN THE OTHER WAY ROUND

- `if not _advance_crowd(g): _drain(g)` -- advancing must *suppress* draining, or a
  queued human turn puts a second incomplete row beside the next speaker's.
- `_advance_crowd` refuses unless the finishing row is the newest, or regenerating
  member 2 creates a second member 3 and two chains race down one turn.
- an error skips one speaker and two in a row end the round: the usual failure is a
  small member's window overflowing, and `_drain`'s stop-on-error would kill every
  crowd at whichever member is smallest.

Each other speaker's turn is relabelled as attributed user content, which is both
how a model can disagree with words it did not write and how the history keeps
alternating. The per-speaker instruction is payload-only -- as a row it could be
dropped from the request by a `created_at` tie, and every later speaker would answer
it. Compaction, titling and the notification are gated to once per turn; `_inject`
is off during a round; the way back gets no tools and a member is treated as
unattended.

Membership stores the model as text with no foreign key: "Test & refresh" deletes
and recreates Model rows, and a cascade would empty the crowd out of every chat.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-26 13:38:52 +00:00
129 changed files with 7377 additions and 1819 deletions
+101
View File
@@ -16,6 +16,107 @@ for 1.0.0 have something to be assembled from.
## Unreleased ## Unreleased
## 1.8.0
- **The crowd is where you would look for it.** In 1.6.0 the only way to add a
model to a chat was the Chat settings panel — behind the ⋯ menu, inside a chat
that already existed — and the switch that turns the feature on was a card on
the Agents page. Somebody who enabled it went looking and found nothing, which
is the correct outcome of that arrangement.
Now there is a **crowd button in the composer**, beside the attachment and
scope buttons, on both the chat screen and Messages. It carries a count when
the chat has a crowd, it lists the models you can reach, and it says what the
turn will cost before you tick anything. On the new-chat screen the choice
**rides along with the first message**, so a chat can start as a crowd rather
than having to be converted into one.
The instance switch and its bounds have moved to their own page, **Admin →
Crowd**.
- Fixed: **the new-chat screen was wider than a phone.** Before the first
message, the suggestion cards pushed the conversation 65px past the edge of a
390px screen and it could be dragged sideways; after the first message it
looked right, because the cards were gone. Reported from a phone.
Two things were true at once. The cards' grid asked for a minimum column width
it could not give up — the ordinary version of this bug — and it was *also* a
grid item, which means it carried a min-content floor that beats `width: 100%`
outright. Fixing only the first made it 27px worse. Both are fixed, on all four
grids in the stylesheets that could have it, and a test now refuses either half
of the pair on its own.
The reason this survived four releases of narrow-width checking is worth
recording: the screenshot harness built its client without running the
application's startup, so the suggestion cards were **absent from every shot
ever taken of that screen**, and its overflow check deliberately ignored
anything inside a scrolling box — correct for a wide table in its own scroller,
blind to a box that scrolls sideways when nobody asked it to. Both are fixed,
and the harness now names the offending element and the child responsible.
## 1.7.0
- **The interface speaks Slovak.** Pick a language under **Appearance** in your
own settings, or set what everybody else gets under Admin → General. Your own
choice wins over the instance's, it is saved to your account rather than to one
browser, and `<html lang>` finally says what the page is actually in.
All 969 translatable strings are translated, including the long explanatory
paragraphs on the admin pages — there is no half-done corner where a Slovak
instance falls back to English. Dates follow too: a month name is a month name
in the language you are reading, which `strftime` cannot do without a process
locale that this application must not set.
**What is deliberately still in English**: everything a *model* reads. The
prompt fragments under Admin → Prompts are instructions written for models, and
translating them would change what the models are told rather than what you
see. Models answer in whatever language you write to them in — they already
did, and that line is editable where all the others are.
An English instance is byte-for-byte what shipped in 1.6.0. That is a property
of the design rather than a claim: a string with no translation renders the
English it was written in, so a language added later cannot leave holes in a
page.
- Fixed: **every page was rendered in the instance's language, whatever anybody
had chosen.** Found while building the above and worth naming because it would
have been invisible: the language was resolved in a dependency that FastAPI runs
in a threadpool, and the context it was set in is discarded on the way out. Now
it is resolved in the request's own task.
## 1.6.0
- **A chat can have a crowd.** Switch it on under Admin → Agents, and each chat's
settings panel offers the other models. The chat's own model answers first, then
each of the others in turn; then the order runs **backwards**, each one asked
whether it disagrees with anything said; and it ends back at the first model,
which either writes the final answer or sends them round again. Every
contribution is its own bubble with its own avatar, its own metrics and a chip
saying which speaker it is and which pass it belongs to.
What it costs is stated where you turn it on and again where you pick the
models, because it is easy to underestimate: one turn is **models × rounds ×
2 − 1** replies, so four models over two rounds is fifteen. On a single local
endpoint every change of speaker also loads a different model. Your own warning
is built into the defaults — larger crowds start going round in circles — so the
round limit is two, and it is a limit ordinary work will reach rather than a
runaway backstop.
Details worth knowing: each model sees the others' answers **quoted and
attributed**, never as its own words, so it can actually disagree with them; a
member you can no longer reach is skipped and said so rather than silently
dropped; a member whose endpoint fails is skipped, and two failures in a row end
the round; **Stop ends the round**, not just the model writing at the time; and
a message typed during a round waits for the round rather than interleaving with
it. Every sentence a crowd sends is editable under Admin → Prompts.
- Fixed: **a schedule that named its own model was ignored.** It was written on
the reply and never sent, so the bubble showed the model you chose while the
answer came from the chat's model. The same fix makes the crowd possible: the
reply itself now says which model is answering, rather than the conversation
deciding for all of them. Regenerating somebody's turn in a crowd keeps that
model rather than silently switching to the chat's.
## 1.5.0 ## 1.5.0
- **A model's personality is now yours, not the instance's.** Each account gets - **A model's personality is now yours, not the instance's.** Each account gets
+7
View File
@@ -81,6 +81,13 @@ src = ["src", "tests"]
select = ["E", "F", "I", "UP", "B", "SIM", "C4"] select = ["E", "F", "I", "UP", "B", "SIM", "C4"]
ignore = ["B008"] # FastAPI Depends() in defaults is idiomatic ignore = ["B008"] # FastAPI Depends() in defaults is idiomatic
[tool.ruff.lint.per-file-ignores]
# A translation catalogue is keyed by the English sentence, and a sentence cannot
# be rewrapped without becoming a different key. Wrapping them would mean every
# key spelled as an implicit concatenation, which is both unreadable and one
# stray space away from a silent miss.
"src/lembas/web/i18n/*.py" = ["E501"]
[tool.pytest.ini_options] [tool.pytest.ini_options]
testpaths = ["tests"] testpaths = ["tests"]
# Registered so `-m "not slow"` works and an unknown-marker warning does not # Registered so `-m "not slow"` works and an unknown-marker warning does not
+156
View File
@@ -0,0 +1,156 @@
"""Find every translatable string, and say what the catalogues are missing.
Run it:
python scripts/i18n_extract.py # a report
python scripts/i18n_extract.py --write sk # fill sk.py with what is missing
A development instrument, like `shoot.py` and `fetch_vendor.py`: nothing in `src/`
imports it. What it knows is the one thing a catalogue keyed on source text cannot
know for itself -- that an English sentence has been edited, leaving its
translation stranded under the old wording. `tests/test_translations.py` asserts
the same property from the other side, so a catalogue cannot rot quietly.
The scan is deliberately simple: `t("…")` and `t('…')`, in templates and in
Python. A string built by concatenation or an f-string is not found, and that is
the point -- a sentence assembled from pieces cannot be translated, because the
order of the pieces is not the same in every language. Use `t("… %(name)s …",
name=…)`.
"""
from __future__ import annotations
import re
import sys
from pathlib import Path
REPO = Path(__file__).resolve().parent.parent
SRC = REPO / "src/lembas"
TEMPLATES = SRC / "web/templates"
CATALOGUES = SRC / "web/i18n"
# `t("…")` with either quote, allowing escaped quotes inside. Multi-line, because
# a paragraph in a template is wrapped for the width of the file.
CALL = re.compile(r"""\bt\(\s*(?P<q>["'])(?P<text>(?:\\.|(?!\1).)*?)\1""", re.S)
# `i18n.stamp(value, "%d %B %Y")` -- the *format* is translated too, so a language
# that puts the day first, or wants a full stop after it, says so in the
# catalogue. A second pattern rather than a looser first one: widening `t(` to
# "any call with a string in it" would sweep up every `select("…")` in the
# codebase.
STAMP = re.compile(
# One level of nesting allowed in the first argument, because it is usually a
# call: `stamp(clock.now_for(user), "…")`.
r"""\bstamp\((?:[^()"']|\([^()]*\))*,\s*(?P<q>["'])(?P<text>(?:\\.|(?!\1).)*?)\1""",
re.S,
)
def normalise(text: str) -> str:
"""The key: whitespace collapsed, escapes resolved.
A template wraps one sentence across three lines, and the same sentence in a
Python file across two. Keying on the exact bytes would need an entry per
wrapping, so the key is the text with its runs of whitespace flattened -- which
is exactly what `i18n.translate` looks up.
"""
text = text.replace('\\"', '"').replace("\\'", "'").replace("\\n", " ")
return " ".join(text.split())
def sources() -> list[Path]:
files = sorted(TEMPLATES.rglob("*.html"))
files += [
path
for path in sorted(SRC.rglob("*.py"))
if "web/i18n" not in str(path) and "__pycache__" not in str(path)
]
return files
JINJA_COMMENT = re.compile(r"\{#.*?#\}", re.S)
PY_COMMENT = re.compile(r"^[ \t]*#.*$", re.M)
def strip_comments(path: Path, text: str) -> str:
"""Comments are not strings. This file's own docstrings quote `t("Save")`, and
so does `web/templating.py`'s comment explaining the global -- both would
otherwise arrive in the catalogue as things to translate."""
if path.suffix == ".html":
return JINJA_COMMENT.sub("", text)
return PY_COMMENT.sub("", text)
def found() -> dict[str, list[str]]:
"""Every string, with the files it appears in."""
out: dict[str, list[str]] = {}
for path in sources():
text = strip_comments(path, path.read_text(encoding="utf-8"))
for match in list(CALL.finditer(text)) + list(STAMP.finditer(text)):
key = normalise(match.group("text"))
if not key:
continue
out.setdefault(key, [])
where = str(path.relative_to(REPO))
if where not in out[key]:
out[key].append(where)
return out
def catalogue(code: str) -> dict[str, str]:
path = CATALOGUES / f"{code}.py"
if not path.exists():
return {}
namespace: dict[str, object] = {}
exec(compile(path.read_text(encoding="utf-8"), str(path), "exec"), namespace)
return dict(namespace.get("MESSAGES", {})) # type: ignore[arg-type]
def report() -> int:
strings = found()
print(f"{len(strings)} translatable strings in {len(sources())} files")
for code in ("sk",):
have = catalogue(code)
missing = [key for key in strings if key not in have]
orphans = [key for key in have if key not in strings]
done = len(strings) - len(missing)
print(
f" {code}: {done}/{len(strings)} translated"
f" ({len(missing)} missing, {len(orphans)} orphaned)"
)
for key in orphans[:10]:
print(f" orphan: {key[:80]!r}")
return 0
def write(code: str) -> int:
"""Append the missing keys to a catalogue, each mapped to itself.
Mapped to the English rather than to "" on purpose: an empty translation would
render as an empty paragraph, while the English renders as what it already
said. A catalogue half-filled is a page half-translated, never a page with
holes in it.
"""
strings = found()
have = catalogue(code)
missing = [key for key in strings if key not in have]
if not missing:
print(f"{code}: nothing missing")
return 0
path = CATALOGUES / f"{code}.py"
with path.open("a", encoding="utf-8") as handle:
handle.write(f"\n# --- {len(missing)} added by scripts/i18n_extract.py ---\n")
for key in missing:
handle.write(f"MESSAGES[{key!r}] = {key!r}\n")
print(f"{code}: added {len(missing)} keys to {path.relative_to(REPO)}")
return 0
def main() -> int:
if "--write" in sys.argv:
return write(sys.argv[sys.argv.index("--write") + 1])
return report()
if __name__ == "__main__":
raise SystemExit(main())
+129 -2
View File
@@ -26,6 +26,7 @@ import shutil
import subprocess import subprocess
import sys import sys
import tempfile import tempfile
from functools import cache
from pathlib import Path from pathlib import Path
REPO = Path(__file__).resolve().parent.parent REPO = Path(__file__).resolve().parent.parent
@@ -128,8 +129,65 @@ window.__measure = function () {
return found.sort(function (a, b) { return b.over - a.over; }).slice(0, 8); return found.sort(function (a, b) { return b.over - a.over; }).slice(0, 8);
} }
/* --- A box that scrolls sideways when nobody asked it to -----------------
The blind spot that hid the suggestions bug through forty measurements.
`.suggestions` rendered 455px wide inside a 390px `.thread-scroll`, and
every check above looked straight past it: `culprits('x')` skips anything
with a scrollable ancestor -- correct for a table inside its own scroller,
wrong for the scroller itself -- and `scrollsSideways` stayed false because
`.thread-scroll` absorbed the overflow instead of the document.
"Authored" is the distinction that makes this reportable rather than noise.
The tree's rule is that anything wide gets its OWN scroller, so a wrapper
carrying `overflow-x: auto` in a stylesheet is right. A box given only
`overflow-y: auto` scrolls sideways as well, because the other axis then
computes to `auto` -- and that is always a bug. Computed style cannot tell
those apart, both being `auto`, so the rules that say it are read off the
stylesheets -- in Python, by `authored_sideways()` below, and not from the
CSSOM here: a stylesheet loaded over `file://` is a foreign origin for
`cssRules` even with `--allow-file-access-from-files`, and every sheet
throws. That silently found *nothing authored*, which turns this check into
"every vertical scroller is a bug" -- so the list arriving empty is a hard
error rather than a clean run. */
var sidewaysAuthors = __SIDEWAYS_AUTHORS__;
function authoredSideways(el) {
if (el.style.overflowX || el.style.overflow) return true;
for (var i = 0; i < sidewaysAuthors.length; i++) {
try { if (el.matches(sidewaysAuthors[i])) return true; } catch (e) { /* :has() etc */ }
}
return false;
}
var sideways = [];
document.querySelectorAll('body, body *').forEach(function (el) {
var ox = getComputedStyle(el).overflowX;
if (ox !== 'auto' && ox !== 'scroll') return;
if (el.scrollWidth <= el.clientWidth + 1) return;
if (authoredSideways(el)) return;
/* Which child is doing it. "`.thread-scroll` scrolls sideways" is not
actionable; "`.suggestions` is 455px inside its 390px" is. */
var worst = null;
el.querySelectorAll('*').forEach(function (kid) {
var over = kid.getBoundingClientRect().width - el.clientWidth;
if (over > 1 && (!worst || over > worst.over)) {
worst = {tag: kid.tagName.toLowerCase(),
cls: (kid.className && kid.className.toString().slice(0, 50)) || '',
w: Math.round(kid.getBoundingClientRect().width),
over: Math.round(over)};
}
});
sideways.push({tag: el.tagName.toLowerCase(),
cls: (el.className && el.className.toString().slice(0, 50)) || '',
scrollW: el.scrollWidth, clientW: el.clientWidth,
widest: worst});
});
var shell = document.querySelector('.shell'); var shell = document.querySelector('.shell');
return { return {
sidewaysScrollers: sideways.slice(0, 8),
sidewaysCount: sideways.length,
docScrollH: de.scrollHeight, docScrollH: de.scrollHeight,
innerH: window.innerHeight, innerH: window.innerHeight,
docScrollW: de.scrollWidth, docScrollW: de.scrollWidth,
@@ -167,6 +225,42 @@ window.__measure = function () {
""" """
@cache
def authored_sideways() -> tuple[str, ...]:
"""Selectors whose rules really do ask for horizontal scrolling.
The tree's rule is that anything wide gets its own scroller, so these are
the correct ones: a table wrapper, a code block, the tab bar. Everything
else that scrolls sideways is `overflow-y: auto` dragging the other axis
along with it, which is always a bug and is what `.suggestions` did.
"""
selectors: list[str] = []
for path in sorted((STATIC / "css").glob("*.css")):
text = re.sub(r"/\*.*?\*/", "", path.read_text(), flags=re.S)
# Innermost blocks only: `[^{}]*` cannot cross a brace, so an `@media`
# prelude never matches and the rules inside it do.
for prelude, body in re.findall(r"([^{}]*)\{([^{}]*)\}", text):
wants = False
for declaration in body.split(";"):
name, _, value = declaration.partition(":")
name, value = name.strip().lower(), value.strip().lower()
if name not in ("overflow", "overflow-x") or not value:
continue
# `overflow: hidden auto` is x then y, so the first word is ours;
# `overflow: auto` is both.
wants = wants or value.split()[0] in ("auto", "scroll")
if not wants:
continue
selectors += [
part.strip()
for part in prelude.split(",")
if part.strip() and not part.strip().startswith("@")
]
if not selectors:
raise SystemExit("read no horizontal-overflow rules -- the sideways check would cry wolf")
return tuple(selectors)
def build_client(): def build_client():
import lembas.config as config_mod import lembas.config as config_mod
@@ -198,6 +292,17 @@ def build_client():
db.flush() db.flush()
for name in ("gemma4-moe", "qwen3-coder"): for name in ("gemma4-moe", "qwen3-coder"):
db.add(Model(connection_id=connection.id, model_id=name, display_name=name)) db.add(Model(connection_id=connection.id, model_id=name, display_name=name))
# 🚨 The suggestion cards are seeded by the startup hook, and `TestClient(app)`
# runs a lifespan only inside a `with` block -- so every shot of the new-chat
# screen ever taken by this script was of a page with its cards missing. That
# is how a grid 65px wider than a phone survived forty measurements. Seeded
# here rather than by entering the lifespan, which would also start the
# schedule ticker and rehydrate background jobs inside a screenshot run.
from lembas.services.suggestions import seed_defaults as seed_suggestions
with session_scope() as db:
seed_suggestions(db)
return client return client
@@ -219,6 +324,20 @@ def rewrite(html: str, client, assets: Path) -> str:
html, html,
) )
# Anything else the *application* serves rather than mounts. Model avatars live
# under `/uploads/models/…`, which is a route behind auth -- so they cannot be
# pointed at a file on disk and have to be fetched through the client like
# `/branding.css` above. A real instance has them and a fixture does not, which
# is exactly the difference that makes a page measured here unlike the page
# somebody is looking at.
for url in sorted({*re.findall(r'\bsrc="(/(?:uploads|branding)/[^"?]+)"', html)}):
response = client.get(url)
if response.status_code != 200:
continue
name = "fetched-" + url.strip("/").replace("/", "-")
(assets / name).write_bytes(response.content)
html = html.replace(f'src="{url}"', f'src="file://{assets}/{name}"')
# Fail loudly, and only about things that decide how the page LOOKS: every # Fail loudly, and only about things that decide how the page LOOKS: every
# `src`, and `href` on a <link>. An `href` on an anchor is a destination, # `src`, and `href` on a <link>. An `href` on an anchor is a destination,
# not an asset -- flagging those makes the guard cry wolf on every page and # not an asset -- flagging those makes the guard cry wolf on every page and
@@ -249,14 +368,15 @@ def rewrite(html: str, client, assets: Path) -> str:
if missing: if missing:
raise SystemExit(f"REWRITTEN TO NOTHING -- still an unstyled document: {missing[:5]}") raise SystemExit(f"REWRITTEN TO NOTHING -- still an unstyled document: {missing[:5]}")
# The one-time notifications offer is a modal over the very page we came # The one-time notifications offer is a modal over the very page we came
# to measure, and it is gated on a localStorage key. Set it in the head, so # to measure, and it is gated on a localStorage key. Set it in the head, so
# it runs before the deferred script that reads it. # it runs before the deferred script that reads it.
quiet = ( quiet = (
"<script>try{localStorage.setItem('lembas-notifications-asked','1');}" "<script>try{localStorage.setItem('lembas-notifications-asked','1');}"
"catch(e){}</script>" "catch(e){}</script>"
) )
return html.replace("</head>", quiet + MEASURE + "</head>", 1) measure = MEASURE.replace("__SIDEWAYS_AUTHORS__", json.dumps(list(authored_sideways())))
return html.replace("</head>", quiet + measure + "</head>", 1)
def shoot(client, path: str, width: int, height: int, theme: str, outdir: Path) -> dict: def shoot(client, path: str, width: int, height: int, theme: str, outdir: Path) -> dict:
@@ -391,6 +511,13 @@ def main() -> None:
flags.append(f"DOC-SCROLLS({r['docScrollH']}>{r['innerH']})") flags.append(f"DOC-SCROLLS({r['docScrollH']}>{r['innerH']})")
if r["scrollsSideways"]: if r["scrollsSideways"]:
flags.append(f"SIDEWAYS({r['docScrollW']}>{r['innerW']})") flags.append(f"SIDEWAYS({r['docScrollW']}>{r['innerW']})")
for s in r.get("sidewaysScrollers", []):
widest = s["widest"]
blame = f"<{widest['tag']}.{widest['cls']} {widest['w']}px" if widest else ""
flags.append(
f"SCROLLER-SIDEWAYS({s['tag']}.{s['cls']} "
f"{s['scrollW']}>{s['clientW']}{blame})"
)
if r["overflowCount"]: if r["overflowCount"]:
flags.append(f"overflow:{r['overflowCount']}") flags.append(f"overflow:{r['overflowCount']}")
if r["smallCount"]: if r["smallCount"]:
+1 -1
View File
@@ -1,3 +1,3 @@
"""LLeMbas - a Middle-earth themed web UI for OpenAI-compatible LLM endpoints.""" """LLeMbas - a Middle-earth themed web UI for OpenAI-compatible LLM endpoints."""
__version__ = "1.5.0" __version__ = "1.8.0"
+9
View File
@@ -16,6 +16,7 @@ from lembas.db.models import Connection, Model, User
from lembas.services import settings_store from lembas.services import settings_store
from lembas.services.crypto import UNCHANGED_SENTINEL, decrypt, encrypt, mask from lembas.services.crypto import UNCHANGED_SENTINEL, decrypt, encrypt, mask
from lembas.services.llm.openai_client import Endpoint, LLMError, context_from, list_models from lembas.services.llm.openai_client import Endpoint, LLMError, context_from, list_models
from lembas.web import i18n
from lembas.web.templating import render from lembas.web.templating import render
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@@ -46,6 +47,7 @@ async def general_page(request: Request, db: Db, user: AdminUser, saved: bool =
"admin/general.html", "admin/general.html",
{ {
"values": settings_store.get_group(db), "values": settings_store.get_group(db),
"languages": i18n.LANGUAGES,
"saved": saved, "saved": saved,
"user_count": db.scalar(select(func.count()).select_from(User)), "user_count": db.scalar(select(func.count()).select_from(User)),
}, },
@@ -57,6 +59,7 @@ async def save_general(
db: Db, db: Db,
user: AdminUser, user: AdminUser,
allow_signup: bool = Form(False), allow_signup: bool = Form(False),
language: str = Form(""),
system_prompt: str = Form(""), system_prompt: str = Form(""),
compact_threshold: int = Form(95), compact_threshold: int = Form(95),
max_chat_rounds: int = Form(5), max_chat_rounds: int = Form(5),
@@ -70,6 +73,9 @@ async def save_general(
db, db,
{ {
"allow_signup": allow_signup, "allow_signup": allow_signup,
# Validated rather than trusted: a code this release does not have
# would leave every page in a language nobody chose.
"language": i18n.known(language),
"system_prompt": system_prompt.strip()[:8000], "system_prompt": system_prompt.strip()[:8000],
# 0 is "never"; anything else is clamped into a band where it can # 0 is "never"; anything else is clamped into a band where it can
# do some good. 100 is useless -- you cannot compact after # do some good. 100 is useless -- you cannot compact after
@@ -82,6 +88,9 @@ async def save_general(
"max_chat_rounds": min(max(max_chat_rounds, 0), 100), "max_chat_rounds": min(max(max_chat_rounds, 0), 100),
}, },
) )
# The instance default is cached at process level, exactly as branding is, so
# the one module that writes it is the one that drops the cache.
i18n.forget()
log.info("registration %s by %s", "opened" if allow_signup else "closed", user.email) log.info("registration %s by %s", "opened" if allow_signup else "closed", user.email)
return RedirectResponse("/admin/general?saved=1", status_code=status.HTTP_303_SEE_OTHER) return RedirectResponse("/admin/general?saved=1", status_code=status.HTTP_303_SEE_OTHER)
+68
View File
@@ -0,0 +1,68 @@
"""The crowd: several models answering one turn, in any chat.
Its own module because it is its own page, and it is its own page because as a card
on `/admin/agents` it read as an agent-chat feature. It is not one: a crowd works in
an ordinary conversation, and the owner reasonably concluded otherwise from where
the switch was sitting.
"""
from __future__ import annotations
import logging
from fastapi import APIRouter, Form, Request, Response, status
from fastapi.responses import RedirectResponse
from lembas.api.deps import AdminUser, Db
from lembas.services import settings_store
from lembas.web.templating import render
log = logging.getLogger(__name__)
router = APIRouter(prefix="/admin/crowd", tags=["admin-crowd"])
@router.get("")
async def crowd_page(request: Request, db: Db, user: AdminUser, saved: str = ""):
"""Its own page, for the reason its template records: as a card on the Agents
screen it read as an agent-chat feature, which it is not."""
return render(
request,
"admin/crowd.html",
{"crowd": settings_store.crowd(db), "saved": saved},
)
@router.post("")
async def save_crowd(
db: Db,
user: AdminUser,
enabled: bool = Form(False),
max_models: int = Form(4),
max_rounds: int = Form(2),
wall_seconds: int = Form(900),
collapse_agreement: bool = Form(False),
) -> Response:
"""One group, one form, one route.
The bounds are clamped here as well as in `settings_store.crowd`, which is the
same belt-and-braces `save_subagents` in `admin_agents.py` uses: a value posted
past this route -- by an older page, or by hand -- still reads back sane.
"""
settings_store.update(
db,
{
"enabled": enabled,
# Every floor is one: a zero would be the feature switched off
# wearing the switch's clothes.
"max_models": min(max(max_models, 1), 8),
"max_rounds": min(max(max_rounds, 1), 5),
"wall_seconds": min(max(wall_seconds, 60), 7200),
"collapse_agreement": collapse_agreement,
},
key=settings_store.CROWD,
)
log.info("crowd %s by %s", "enabled" if enabled else "disabled", user.email)
return RedirectResponse("/admin/crowd?saved=1", status_code=status.HTTP_303_SEE_OTHER)
+85 -1
View File
@@ -296,6 +296,11 @@ async def start_chat(
scope_on: list[str] = Form(default=[]), scope_on: list[str] = Form(default=[]),
scope_skill_all: list[str] = Form(default=[]), scope_skill_all: list[str] = Form(default=[]),
scope_skill_on: list[str] = Form(default=[]), scope_skill_on: list[str] = Form(default=[]),
# Who else answers, as the crowd menu stood before the first word. There is no
# chat row yet to attach members to, so the choice rides along with the message
# -- the same mechanism the scope switches above use, and the reason the control
# lives inside the composer's form rather than in the topbar.
crowd_model_ids: list[str] = Form(default=[]),
) -> Response: ) -> Response:
"""Create a chat from its first message. """Create a chat from its first message.
@@ -329,6 +334,8 @@ async def start_chat(
skills_off=frozenset(scope_skill_all) - frozenset(scope_skill_on), skills_off=frozenset(scope_skill_all) - frozenset(scope_skill_on),
) )
_apply_crowd(db, chat, user, crowd_model_ids)
_adopt_draft(db, user, draft_id, chat) _adopt_draft(db, user, draft_id, chat)
user_message = chat_service.create_message(db, chat, ROLE_USER, content) user_message = chat_service.create_message(db, chat, ROLE_USER, content)
@@ -1453,6 +1460,32 @@ def _queue_frames(
+ "</div>" + "</div>"
) )
# The next speaker of a crowd round, on the same frame and by the same
# mechanism -- an incomplete assistant bubble carries `sse-connect`, so htmx
# opens the next stream itself and there is no new streaming machinery here at
# all.
#
# Its own branch and not the one above, deliberately. That one also re-renders
# "the last user turn at or before this bubble" to take Send now and Discard
# off it, and a crowd has no queued user turn: the swap would either re-render
# a node that was already correct or target one that is not in the document,
# where htmx silently does nothing. A branch that sometimes does nothing is a
# branch nobody can reason about.
if getattr(generation, "crowded", False):
following = list(
db.scalars(
select(Message)
.where(Message.chat_id == chat.id, Message.complete.is_(False))
.order_by(Message.created_at, Message.id)
)
)
for speaker_row in following:
out_of_band.append(
'<div hx-swap-oob="beforeend:#thread">'
+ _render_bubble(db, chat, owner, speaker_row)
+ "</div>"
)
return "".join(moved), "".join(out_of_band) return "".join(moved), "".join(out_of_band)
@@ -1484,6 +1517,45 @@ def _thread_context(db: DBSession, chat: Chat, user: User) -> dict:
} }
def _apply_crowd(db: DBSession, chat: Chat, user: User, values: list[str]) -> None:
"""Replace a chat's crowd with the models named, in the order named.
One implementation for both the composer (where the choice rides along with
the first message) and the settings panel, because two would be two places to
forget a rule -- and there are three:
* **Checked against what this person can reach**, never against what exists.
A control checked only in the template is advisory, and a crafted request
walks past it. Same reasoning as the model branch in `update_chat`.
* **Never the chat's own model**, which would answer twice in a row.
* **Capped by `crowd.max_models`**, on the way in as well as on the way out.
The connection is stored beside the id because `Model` is unique on the pair,
and a model offered by two connections is two rows with different capabilities.
"""
from lembas.db.models import CrowdMember
settings = settings_store.crowd(db)
reachable = {
model.model_id: model for model in chat_service.available_models(db, user)
}
wanted: list[str] = []
for value in values:
value = str(value).strip()
if value and value in reachable and value != chat.model_id and value not in wanted:
wanted.append(value)
wanted = wanted[: int(settings["max_models"])]
chat.crowd = [
CrowdMember(
model_id=model_id,
connection_id=reachable[model_id].connection_id,
position=index,
)
for index, model_id in enumerate(wanted)
]
def _messages_after(db: DBSession, message: Message) -> list[Message]: def _messages_after(db: DBSession, message: Message) -> list[Message]:
"""Everything later in this chat than one message. """Everything later in this chat than one message.
@@ -2089,6 +2161,11 @@ async def update_chat(request: Request, db: Db, user: RequiredUser, chat_id: str
else [] else []
) )
if "crowd_model_ids" in form:
# The same shape as the bases above: one field always sent, so clearing
# every box clears the crowd.
_apply_crowd(db, chat, user, form.getlist("crowd_model_ids"))
submitted_params = {name: form[name] for name in _PARAM_RANGES if name in form} submitted_params = {name: form[name] for name in _PARAM_RANGES if name in form}
if submitted_params: if submitted_params:
if not allowed.get("chat.params"): if not allowed.get("chat.params"):
@@ -2228,7 +2305,14 @@ async def regenerate(
message.content = "" message.content = ""
message.error = "" message.error = ""
message.complete = False message.complete = False
message.model_id = chat.model_id # Whose reply this was stays whose reply it is, unless the chat's model has
# been changed since -- in which case regenerating is how somebody asks for
# the new one. Before 1.6.0 this always reset to the chat's model, which was
# merely a wrong label; now that the row *is* the model that answers, it would
# silently regenerate somebody else's turn as the chat's model.
if not (message.model_id or "").strip():
message.model_id = chat.model_id
message.connection_id = chat.connection_id
_note_rewind(chat) _note_rewind(chat)
db.commit() db.commit()
# restart, not ensure: this is the one caller that reuses a Message row, and # restart, not ensure: this is the one caller that reuses a Message row, and
+19 -1
View File
@@ -13,6 +13,7 @@ from starlette.requests import HTTPConnection
from lembas.db.models import User from lembas.db.models import User
from lembas.db.session import get_session_factory from lembas.db.session import get_session_factory
from lembas.security.sessions import COOKIE_NAME, resolve_session from lembas.security.sessions import COOKIE_NAME, resolve_session
from lembas.web import i18n
def get_db() -> Iterator[DBSession]: def get_db() -> Iterator[DBSession]:
@@ -27,9 +28,21 @@ def get_db() -> Iterator[DBSession]:
Db = Annotated[DBSession, Depends(get_db)] Db = Annotated[DBSession, Depends(get_db)]
def get_current_user(conn: HTTPConnection, db: Db) -> User | None: async def get_current_user(conn: HTTPConnection, db: Db) -> User | None:
"""Resolve the session cookie to a user, or None when signed out. """Resolve the session cookie to a user, or None when signed out.
⚠ `async def`, and that is load-bearing rather than tidy. FastAPI runs a
*sync* dependency in a threadpool, and `i18n.activate` below sets a
`ContextVar` -- which anyio copies **into** the thread and discards on the way
out, so the language was set in a context nothing else could see and every
page rendered in English however anybody's preference was stored. An async
dependency is awaited in the request's own task, where the value survives to
the render.
What it costs is one indexed SELECT on the event loop rather than in a
thread, which is what every route in this application already does with its
session.
Cached on the connection's state so several dependencies in one request do Cached on the connection's state so several dependencies in one request do
not each hit the sessions table. not each hit the sessions table.
@@ -44,6 +57,11 @@ def get_current_user(conn: HTTPConnection, db: Db) -> User | None:
return cached return cached
user = resolve_session(db, conn.cookies.get(COOKIE_NAME)) user = resolve_session(db, conn.cookies.get(COOKIE_NAME))
conn.state.user = user conn.state.user = user
# The language this request renders in, set here because this is where the
# person is already known -- no second session and no second cookie read. A
# request that never resolves a user keeps whatever `LanguageMiddleware` set,
# which is the instance default.
i18n.activate(i18n.for_user(user))
return user return user
+66 -1
View File
@@ -33,6 +33,7 @@ from lembas.services import settings_store
from lembas.services import suggestions as suggestions_service from lembas.services import suggestions as suggestions_service
from lembas.services.library import documents as documents_service from lembas.services.library import documents as documents_service
from lembas.services.schedule import clock from lembas.services.schedule import clock
from lembas.web import i18n
from lembas.web.templating import STATIC_DIR, render from lembas.web.templating import STATIC_DIR, render
router = APIRouter(tags=["pages"]) router = APIRouter(tags=["pages"])
@@ -82,6 +83,9 @@ def _chat_context(db: DBSession, user: User, chat: Chat | None) -> dict:
else [] else []
), ),
"attached_base_ids": [base.id for base in chat.knowledge_bases] if chat else [], "attached_base_ids": [base.id for base in chat.knowledge_bases] if chat else [],
**_crowd_context(
db, user, chat, models, current.model_id if current is not None else ""
),
# What *this* model takes, not the three every model used to be assumed # What *this* model takes, not the three every model used to be assumed
# to take. The vocabulary is per model -- gpt-oss has no `xhigh` and # to take. The vocabulary is per model -- gpt-oss has no `xhigh` and
# Bonsai has no `high`, and sending the wrong one does not degrade, it # Bonsai has no `high`, and sending the wrong one does not degrade, it
@@ -195,6 +199,57 @@ def _scope_context(db: DBSession, user: User, chat: Chat | None) -> dict:
} }
def _crowd_context(
db: DBSession, user: User, chat: Chat | None, models: list, default_model_id: str = ""
) -> dict:
"""Who else could answer in this chat, and what that would cost.
Offered on the **new-chat screen as well**, where there is no chat row yet: the
choice rides along with the first message, the way the scope switches do. The
first version of this was per-chat only and therefore invisible to anybody
setting a conversation up — which is how the feature shipped switched on and
unreachable. Empty only when the feature is off or there is nobody else to add,
and then the control is absent rather than being an empty menu.
The cost is spelled out because it is the thing somebody will not have thought
about: a turn is `speakers x rounds x 2 - 1` replies, and on one local endpoint
each change of speaker is also a model load.
"""
from lembas.services import crowd as crowd_service
settings = settings_store.crowd(db)
if not settings["enabled"]:
return {"crowd_available": [], "crowd_member_ids": [], "crowd_skipped": []}
# On the new-chat screen the "own" model is whichever one the picker is
# showing, so the list excludes it for the same reason it does in a chat:
# adding it would have it answer twice in a row.
own = chat.model_id if chat is not None else default_model_id
others = [model for model in models if model.model_id != own]
members = (
[
row.model_id
for row in sorted(chat.crowd, key=lambda row: (row.position, row.model_id))
]
if chat is not None
else []
)
reachable = {model.model_id for model in others}
speakers = 1 + len([model_id for model_id in members if model_id in reachable])
rounds = int(settings["max_rounds"])
return {
"crowd_available": others,
"crowd_member_ids": [model_id for model_id in members if model_id in reachable],
"crowd_skipped": (
crowd_service.unreachable_members(db, chat, user) if chat is not None else []
),
# One round is out and back: everybody answers, everybody but the last is
# asked whether they disagree, and the main model closes.
"crowd_replies": max(1, speakers * 2 - 1),
"crowd_rounds": rounds,
}
# What a gate is called in the menu. A gate covers several tools, so no single # What a gate is called in the menu. A gate covers several tools, so no single
# tool's label is the right name for it. # tool's label is the right name for it.
_GATE_LABELS = { _GATE_LABELS = {
@@ -872,10 +927,20 @@ async def settings_page(
"impressions": personas_service.impressions_for(db, user), "impressions": personas_service.impressions_for(db, user),
# Sorted rather than left in set order, because a list of six # Sorted rather than left in set order, because a list of six
# hundred zones that is not alphabetical is one nobody can use. # hundred zones that is not alphabetical is one nobody can use.
"languages": i18n.LANGUAGES,
# Their own choice, and what "follow the instance" currently means --
# named rather than left blank, because "follow the instance" is only a
# useful option if you can see what you would be following.
"chosen_language": str((user.settings_json or {}).get("language") or ""),
"instance_language": dict(i18n.LANGUAGES).get(
i18n.instance_default(), i18n.instance_default()
),
"timezones": sorted(available_timezones()), "timezones": sorted(available_timezones()),
"timezone": clock.name_for(user), "timezone": clock.name_for(user),
"server_timezone": str(clock.server_zone()), "server_timezone": str(clock.server_zone()),
"local_now": clock.now_for(user).strftime("%H:%M on %A %-d %B"), # Through `i18n.stamp`, not `strftime`: `%A` and `%B` are C-locale
# English whatever the page is in, and this one is read by a person.
"local_now": i18n.stamp(clock.now_for(user), "%H:%M on %A %-d %B"),
**context, **context,
**sidebar_context(db, user), **sidebar_context(db, user),
}, },
+24
View File
@@ -13,6 +13,7 @@ from lembas.config import settings
from lembas.security.passwords import hash_password, validate_password, verify_password from lembas.security.passwords import hash_password, validate_password, verify_password
from lembas.security.sessions import COOKIE_NAME, create_session, revoke_all_for_user from lembas.security.sessions import COOKIE_NAME, create_session, revoke_all_for_user
from lembas.services.schedule import clock from lembas.services.schedule import clock
from lembas.web import i18n
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@@ -66,6 +67,29 @@ async def set_timezone(db: Db, user: RequiredUser, timezone: str = Form("")) ->
return RedirectResponse("/settings?saved=timezone", status_code=status.HTTP_303_SEE_OTHER) return RedirectResponse("/settings?saved=timezone", status_code=status.HTTP_303_SEE_OTHER)
@router.post("/language")
async def set_language(db: Db, user: RequiredUser, language: str = Form("")) -> Response:
"""Which language this person sees the interface in.
Empty is a real answer -- "whatever the instance is set to" -- rather than an
unset field, which is why it is stored as "" rather than removed. The same
shape the timezone above uses, and for the same reason: absent and "follow the
default" are different states, and a form cannot tell them apart otherwise.
Unlike the theme and the layout this needs no `localStorage` tier. Those two
exist there because a paint that starts in the wrong theme flashes; text is
rendered on the server and cannot.
"""
chosen = (language or "").strip().lower()
if chosen and chosen not in i18n.LANGUAGE_IDS:
return RedirectResponse(
"/settings?error=language", status_code=status.HTTP_303_SEE_OTHER
)
user.settings_json = {**(user.settings_json or {}), "language": chosen}
db.commit()
return RedirectResponse("/settings?saved=language", status_code=status.HTTP_303_SEE_OTHER)
# Which CSS variables a browser is allowed to set from here, and how far. An # Which CSS variables a browser is allowed to set from here, and how far. An
# open dict would let a page store anything under somebody's account and have # open dict would let a page store anything under somebody's account and have
# it read back on every load; a width outside these bounds would hand them a # it read back on every load; a width outside these bounds would hand them a
+2
View File
@@ -31,6 +31,7 @@ from lembas.db.models.chat import (
ROLE_TOOL, ROLE_TOOL,
ROLE_USER, ROLE_USER,
Chat, Chat,
CrowdMember,
Folder, Folder,
Message, Message,
) )
@@ -163,6 +164,7 @@ __all__ = [
"Report", "Report",
"Schedule", "Schedule",
"Chat", "Chat",
"CrowdMember",
"Job", "Job",
"Connection", "Connection",
"CustomTool", "CustomTool",
+91 -1
View File
@@ -5,7 +5,15 @@ from __future__ import annotations
from datetime import datetime from datetime import datetime
from typing import TYPE_CHECKING, Any from typing import TYPE_CHECKING, Any
from sqlalchemy import Boolean, DateTime, ForeignKey, Integer, String, Text from sqlalchemy import (
Boolean,
DateTime,
ForeignKey,
Integer,
String,
Text,
UniqueConstraint,
)
from sqlalchemy.orm import Mapped, mapped_column, relationship from sqlalchemy.orm import Mapped, mapped_column, relationship
from lembas.db.base import Base, Timestamps, UUIDPrimaryKey from lembas.db.base import Base, Timestamps, UUIDPrimaryKey
@@ -309,10 +317,60 @@ class Chat(UUIDPrimaryKey, Timestamps, Base):
"KnowledgeBase", secondary="chat_knowledge_bases" "KnowledgeBase", secondary="chat_knowledge_bases"
) )
# The other models answering in this chat, in the order they speak. Empty is
# every chat that has ever existed: one model, answering on its own.
crowd: Mapped[list[CrowdMember]] = relationship(
back_populates="chat",
cascade="all, delete-orphan",
order_by="CrowdMember.position",
)
def __repr__(self) -> str: def __repr__(self) -> str:
return f"<Chat {self.title!r}>" return f"<Chat {self.title!r}>"
class CrowdMember(UUIDPrimaryKey, Timestamps, Base):
"""One extra model answering in a chat, and where it sits in the order.
A row rather than an association table because it carries an order and has
nothing to associate *to*:
🚨 **the model is stored as text, with no foreign key to `models`.** "Test &
refresh" on the connection screen deletes every model the endpoint has
stopped listing and creates it again when it comes back, so a foreign key
with `ON DELETE CASCADE` -- which is what copying `chat_knowledge_bases`
would have given -- means one refresh taken while an endpoint happened to be
loading something else silently empties the crowd out of every chat, with no
row left to explain it. This is the reasoning `Chat.model_id`,
`ssh_profile_id` and `compacted_through_id` all carry, and the same trap that
lost the image reviewer its model in 1.4.x.
A member that no longer resolves is therefore skipped at send time and shown
struck through, rather than being deleted by something nobody asked.
`connection_id` is nullable and usually empty, meaning "resolve it from the
id"; it matters only where two connections offer the same model, since their
capabilities and effort lists are separate rows.
"""
__tablename__ = "chat_crowd"
__table_args__ = (UniqueConstraint("chat_id", "model_id"),)
chat_id: Mapped[str] = mapped_column(
String(32), ForeignKey("chats.id", ondelete="CASCADE"), nullable=False, index=True
)
model_id: Mapped[str] = mapped_column(String(300), nullable=False)
connection_id: Mapped[str | None] = mapped_column(String(32), nullable=True)
# Where this member speaks. The chat's own model is always first and is not a
# row here, so these start at 1 in spirit and are only ever compared.
position: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
chat: Mapped[Chat] = relationship(back_populates="crowd")
def __repr__(self) -> str:
return f"<CrowdMember {self.model_id} at {self.position}>"
class Message(UUIDPrimaryKey, Timestamps, Base): class Message(UUIDPrimaryKey, Timestamps, Base):
__tablename__ = "messages" __tablename__ = "messages"
@@ -340,14 +398,46 @@ class Message(UUIDPrimaryKey, Timestamps, Base):
# Milliseconds spent producing the reasoning, for the "Thought for Xs" label. # Milliseconds spent producing the reasoning, for the "Thought for Xs" label.
reasoning_ms: Mapped[int] = mapped_column(Integer, default=0, nullable=False) reasoning_ms: Mapped[int] = mapped_column(Integer, default=0, nullable=False)
# Which model wrote this, or is about to. Written on every assistant
# placeholder at creation and, from 1.6.0, **read back as the model that
# answers** -- `chat_service.speaker_for`. Before that it was a display
# snapshot only, and the two could disagree: `wake_chat` accepts a model
# override that reached this column and never reached the request, so a
# schedule naming another model got the chat's model wearing this label.
model_id: Mapped[str] = mapped_column(String(300), default="") model_id: Mapped[str] = mapped_column(String(300), default="")
# Which connection that model was reached through. Nullable and usually
# empty, meaning "resolve it from the model id as this application always
# has"; it matters only where the same id is offered by two connections,
# since `Model` is unique on the pair and their capabilities, context lengths
# and effort lists are separate rows.
#
# No foreign key, deliberately, and the same reasoning `Chat.model_id`
# carries: a transcript has to survive an administrator deleting a
# connection, and `migrations.py` compiles only the column type -- so a
# REFERENCES clause would exist on a fresh database and not on an upgraded
# one. Validated on read instead.
connection_id: Mapped[str | None] = mapped_column(String(32), nullable=True)
# What the model did before answering: one entry per tool call, with its # What the model did before answering: one entry per tool call, with its
# arguments and results. Shown in the transcript so the sources behind an # arguments and results. Shown in the transcript so the sources behind an
# answer stay visible, and deliberately NOT replayed as context on the next # answer stay visible, and deliberately NOT replayed as context on the next
# turn -- see services/generation.py for why. # turn -- see services/generation.py for why.
tool_calls_json: Mapped[list[Any]] = mapped_column(JSONList, default=list) tool_calls_json: Mapped[list[Any]] = mapped_column(JSONList, default=list)
# Where this message sits in a crowd round: the turn it belongs to, the
# round, the phase, and which speaker it is. NULL on every message that is
# not part of one, which is every message this application has ever written
# before 1.6.0.
#
# On the row and not on the chat, deliberately. "The row is the authority,
# not the registry" is the rule the reload story was won with, and round
# state on the chat reintroduces the split it was won against: a restart
# between speakers, or a rewind that deletes these rows, would leave
# chat-level state describing turns that no longer exist -- which is the
# problem `compacted_through_id` already documents.
crowd_json: Mapped[dict[str, Any] | None] = mapped_column(JSONDict, nullable=True)
# Where each round's contribution ended, so `content`, `reasoning` and # Where each round's contribution ended, so `content`, `reasoning` and
# `tool_calls_json` can be shown as the one sequence they actually were # `tool_calls_json` can be shown as the one sequence they actually were
# rather than as three stacked zones. One entry per closed step, holding the # rather than as three stacked zones. One entry per closed step, holding the
+12
View File
@@ -17,6 +17,7 @@ from lembas.api import (
admin_agents, admin_agents,
admin_audio, admin_audio,
admin_branding, admin_branding,
admin_crowd,
admin_extraction, admin_extraction,
admin_images, admin_images,
admin_models, admin_models,
@@ -49,6 +50,7 @@ from lembas.api.deps import RedirectToLogin, is_htmx, login_redirect
from lembas.config import settings from lembas.config import settings
from lembas.db.session import init_db from lembas.db.session import init_db
from lembas.services.library import indexing from lembas.services.library import indexing
from lembas.web import i18n
from lembas.web.templating import STATIC_DIR, render from lembas.web.templating import STATIC_DIR, render
log = logging.getLogger("lembas") log = logging.getLogger("lembas")
@@ -177,6 +179,15 @@ def create_app() -> FastAPI:
app.mount("/static", StaticFiles(directory=str(STATIC_DIR)), name="static") app.mount("/static", StaticFiles(directory=str(STATIC_DIR)), name="static")
# The language every request starts in. A `ContextVar` is per task, and a task
# is reused between requests -- so without resetting it here, a signed-out page
# would inherit whichever person was served last on that worker. The user's own
# choice is applied later, by `get_current_user`, where they are already known.
@app.middleware("http")
async def _language(request, call_next):
i18n.activate(i18n.instance_default())
return await call_next(request)
# One place that notices a library record changing, rather than a call in # One place that notices a library record changing, rather than a call in
# each of the ten writers that touch those tables. Idempotent, because the # each of the ten writers that touch those tables. Idempotent, because the
# factory is called per test. See services/library/indexing.py:install. # factory is called per test. See services/library/indexing.py:install.
@@ -211,6 +222,7 @@ def create_app() -> FastAPI:
app.include_router(admin_suggestions.router) app.include_router(admin_suggestions.router)
app.include_router(admin_tools.router) app.include_router(admin_tools.router)
app.include_router(admin_agents.router) app.include_router(admin_agents.router)
app.include_router(admin_crowd.router)
app.include_router(push.router) app.include_router(push.router)
app.include_router(branding.router) app.include_router(branding.router)
+287 -31
View File
@@ -4,6 +4,7 @@ from __future__ import annotations
import logging import logging
import re import re
from dataclasses import dataclass
from datetime import UTC, datetime, timedelta from datetime import UTC, datetime, timedelta
from typing import Any from typing import Any
@@ -46,19 +47,71 @@ TITLE_MAX_TOKENS = 512
TEMPORARY_LIFETIME = timedelta(hours=24) TEMPORARY_LIFETIME = timedelta(hours=24)
def resolve_endpoint(db: DBSession, chat: Chat) -> tuple[Endpoint, str]: @dataclass(frozen=True)
"""Find the connection and model a chat should use. class Speaker:
"""Which model is answering one reply, and through which connection.
The pair and not the id, because `Model` is unique on
`(connection_id, model_id)`: the same name can live behind two endpoints and
an id alone does not say which. `images/tool.py:_reviewer` already resolves a
model this way.
Frozen, and passed rather than re-derived, for the reason `Endpoint` is a
snapshot: a generation outlives the request that started it, and "who is
answering" must not be able to change underneath a reply that is already
streaming.
"""
model_id: str
connection_id: str | None = None
def speaker_for(db: DBSession, chat: Chat, message: Message | None = None) -> Speaker:
"""Who is answering: the message being written into, or else the chat.
**The row names the model and the chat is only the default.** Until 1.6.0 the
answering model was `chat.model_id` and nothing else, while `Message.model_id`
was written on every placeholder and read only for display -- so the bubble's
avatar and the request could disagree, and did: `wake_chat` accepts a
`model_id` override and `schedule/runner` passes `schedule.model_id or
chat.model_id`, which reached the row and never reached the request. A
schedule naming another model got the chat's model wearing the other one's
name.
Reading it off the row is also what makes a reply survive a restart, because
`_follow` calls `ensure`, which starts a *new* generation against the same
row -- so anything the request depends on has to be durable, and the registry
is not. This is the rule the reload story was won with: the row is the
authority.
"""
if message is not None and (message.model_id or "").strip():
return Speaker(message.model_id, getattr(message, "connection_id", None) or None)
return Speaker(chat.model_id, chat.connection_id)
def resolve_endpoint(
db: DBSession, chat: Chat, speaker: Speaker | None = None
) -> tuple[Endpoint, str]:
"""Find the connection and model a reply should use.
Chats store the model id as text rather than a foreign key so history Chats store the model id as text rather than a foreign key so history
survives an admin deleting a connection, which means the mapping back to a survives an admin deleting a connection, which means the mapping back to a
live connection has to be resolved at send time and can legitimately fail. live connection has to be resolved at send time and can legitimately fail.
`speaker` defaults to the chat's own model, so every existing caller behaves
exactly as it did.
""" """
if not chat.model_id: speaker = speaker or speaker_for(db, chat)
if not speaker.model_id:
raise LLMError("This chat has no model selected.") raise LLMError("This chat has no model selected.")
# Whether resolving a fallback may be *written back* to the chat. It may only
# when the speaker is the chat's own model: a crowd member or a schedule's
# model finding its way to another connection must not repoint the chat.
speaks_for_chat = speaker.model_id == chat.model_id
connection: Connection | None = None connection: Connection | None = None
if chat.connection_id: if speaker.connection_id:
connection = db.get(Connection, chat.connection_id) connection = db.get(Connection, speaker.connection_id)
if connection is None or not connection.enabled: if connection is None or not connection.enabled:
# The original connection is gone or disabled. Any enabled connection # The original connection is gone or disabled. Any enabled connection
@@ -67,7 +120,7 @@ def resolve_endpoint(db: DBSession, chat: Chat) -> tuple[Endpoint, str]:
select(Model) select(Model)
.join(Connection) .join(Connection)
.where( .where(
Model.model_id == chat.model_id, Model.model_id == speaker.model_id,
Model.enabled.is_(True), Model.enabled.is_(True),
Connection.enabled.is_(True), Connection.enabled.is_(True),
) )
@@ -76,13 +129,14 @@ def resolve_endpoint(db: DBSession, chat: Chat) -> tuple[Endpoint, str]:
if model is None: if model is None:
raise LLMError( raise LLMError(
f"No enabled connection currently offers the model " f"No enabled connection currently offers the model "
f"'{chat.model_id}'. Pick another model for this chat." f"'{speaker.model_id}'. Pick another model for this chat."
) )
connection = model.connection connection = model.connection
chat.connection_id = connection.id if speaks_for_chat:
db.commit() chat.connection_id = connection.id
db.commit()
return Endpoint.from_connection(connection), chat.model_id return Endpoint.from_connection(connection), speaker.model_id
def document_context(message: Message) -> str: def document_context(message: Message) -> str:
@@ -190,7 +244,9 @@ def folder_system_prompt(db: DBSession, chat: Chat) -> str:
return "" return ""
def effective_system_prompt(db: DBSession, chat: Chat) -> str: def effective_system_prompt(
db: DBSession, chat: Chat, speaker: Speaker | None = None
) -> str:
"""The system prompt a chat actually runs with. """The system prompt a chat actually runs with.
Four layers, most specific wins outright: Four layers, most specific wins outright:
@@ -214,9 +270,9 @@ def effective_system_prompt(db: DBSession, chat: Chat) -> str:
if inherited := folder_system_prompt(db, chat): if inherited := folder_system_prompt(db, chat):
return inherited return inherited
model = db.scalar( # The *answering* model's layer, which is not always the chat's: a crowd
select(Model).where(Model.model_id == chat.model_id).order_by(Model.position) # member speaking in somebody else's chat brings its own prompt with it.
) model = model_row(db, speaker or Speaker(chat.model_id, chat.connection_id))
if model is not None and (model.system_prompt or "").strip(): if model is not None and (model.system_prompt or "").strip():
return model.system_prompt.strip() return model.system_prompt.strip()
@@ -230,6 +286,7 @@ def build_messages(
upto: Message | None = None, upto: Message | None = None,
vision: bool = False, vision: bool = False,
system_prompt: str | None = None, system_prompt: str | None = None,
speaker: Speaker | None = None,
) -> list[dict]: ) -> list[dict]:
"""Assemble the message list to send upstream. """Assemble the message list to send upstream.
@@ -302,24 +359,196 @@ def build_messages(
continue continue
payload.append(message_payload(message, vision=vision)) payload.append(message_payload(message, vision=vision))
if speaker is not None:
payload = _as_one_speaker_sees_it(db, payload, history, speaker, upto=upto)
return payload return payload
def model_for(db: DBSession, chat: Chat) -> Model | None: def _as_one_speaker_sees_it(
"""The Model row a chat is using, or None if it has gone. db: DBSession,
payload: list[dict[str, Any]],
history: list[Message],
speaker: Speaker,
*,
upto: Message | None = None,
) -> list[dict[str, Any]]:
"""Rewrite a crowd transcript from one speaker's point of view.
Two problems, one pass.
**Another speaker's reply must not arrive as this one's own prior turn.** Sent
verbatim, every assistant message in the payload reads as something *this*
model said -- so it defends sentences it never wrote, and cannot disagree with
them, which is the whole point of the backward pass. Each other speaker's turn
is therefore relabelled as user content behind a fragment-driven "«Label»
said:".
**Consecutive assistant turns break strict-alternation chat templates**, which
this project already knows: `task.compact_ack` exists so a compacted history
still alternates, and several templates reject one that does not. Relabelling
fixes that by construction, and the adjacent user turns it creates are merged.
⚠ The relabelled entry is built here rather than by calling `message_payload`
with a swapped role. That function attaches image parts when the role is
`user` and the model has vision, so a swapped assistant turn carrying a
generated image would silently become a multimodal list -- and an endpoint
that rejects one rejects every later turn with it.
"""
from lembas.services import prompts as prompts_service
# Nothing to do for the ordinary case: one model, and every assistant turn in
# the payload is its own.
others = {
message.model_id
for message in history
if message.role == ROLE_ASSISTANT
and (message.model_id or "")
and message.model_id != speaker.model_id
}
if not others:
return payload
labels = {
model_id: (row.label if (row := model_row(db, Speaker(model_id))) else model_id)
for model_id in others
}
template = prompts_service.resolve(db, "crowd.said") or "{{crowd_speaker}} answered:"
# The payload and the history line up only over the message rows: the system
# turn and a compaction pair come first and belong to nobody. Walking from the
# end is what pairs them without counting.
rows = [
message
for message in history
if not (upto is not None and message.id == upto.id)
]
rewritten: list[dict[str, Any]] = []
for index, entry in enumerate(payload):
row = None
offset = index - (len(payload) - len(rows))
if 0 <= offset < len(rows):
row = rows[offset]
if (
row is not None
and entry.get("role") == ROLE_ASSISTANT
and (row.model_id or "") in others
):
lead = template.replace("{{crowd_speaker}}", labels[row.model_id])
body = entry.get("content")
rewritten.append(
{"role": ROLE_USER, "content": f"{lead}\n\n{body if isinstance(body, str) else ''}"}
)
continue
rewritten.append(entry)
return _merge_user_turns(rewritten)
def _with_crowd_instruction(
db: DBSession, payload: list[dict[str, Any]], turn, *, again: bool
) -> list[dict[str, Any]]:
"""Append what this speaker has been asked to do, as the closing user turn.
🚨 **Payload only. No row is written for it.** Writing the instruction into the
transcript the way `wake_chat` writes a background job's turn was the first
design and is wrong three times over. `build_messages` orders history by
`created_at` alone and `break`s at the placeholder, so on a shared microsecond
the placeholder sorts first and the instruction is dropped from the request
entirely -- the hazard `thread_tail` already carries an explicit tiebreak for.
It would double the rows in a turn, all of them bubbles somebody has to scroll
past. And every later speaker would read the previous speaker's instruction as
an ordinary user turn and answer that too.
The compaction summary is inserted the same way and for the same reason: a
turn in the payload with nothing behind it (`build_messages`).
"""
from lembas.services import crowd as crowd_service
from lembas.services import prompts as prompts_service
if turn.phase == crowd_service.PHASE_OUT:
key = "crowd.turn"
elif turn.phase == crowd_service.PHASE_BACK:
key = "crowd.disagree"
else:
# Two fragments, not one with a clause in it: inviting a choice the model
# cannot express is worse than not offering it, and a model without the
# tools capability has no `crowd_again` to call.
key = "crowd.close" if again else "crowd.close_final"
text = (prompts_service.resolve(db, key) or "").strip()
if not text:
# Cleared on purpose is the administrator switching this wording off, and
# an empty user turn is not a thing to send.
return payload
return _merge_user_turns([*payload, {"role": ROLE_USER, "content": text}])
def _merge_user_turns(payload: list[dict[str, Any]]) -> list[dict[str, Any]]:
"""Fold adjacent user turns into one, so the history still alternates.
Only where both are plain strings: a turn carrying content parts is a
multimodal message and joining one to a string would destroy it.
"""
merged: list[dict[str, Any]] = []
for entry in payload:
last = merged[-1] if merged else None
if (
last is not None
and last.get("role") == ROLE_USER
and entry.get("role") == ROLE_USER
and isinstance(last.get("content"), str)
and isinstance(entry.get("content"), str)
):
merged[-1] = {
**last,
"content": f"{last['content']}\n\n{entry['content']}",
}
continue
merged.append(entry)
return merged
def model_row(db: DBSession, speaker: Speaker) -> Model | None:
"""The Model row a speaker names, or None if it has gone.
Looked up by id rather than held as a foreign key, for the same reason Looked up by id rather than held as a foreign key, for the same reason
resolve_endpoint does: chats store the model as text so history survives an resolve_endpoint does: chats store the model as text so history survives an
administrator deleting a connection. administrator deleting a connection. The connection narrows it when one is
named, because two connections may offer the same id and their capabilities,
context length and effort lists are separate rows.
""" """
if not speaker.model_id:
return None
if speaker.connection_id:
exact = db.scalar(
select(Model).where(
Model.model_id == speaker.model_id,
Model.connection_id == speaker.connection_id,
)
)
if exact is not None:
return exact
return db.scalar( return db.scalar(
select(Model).where(Model.model_id == chat.model_id).order_by(Model.position) select(Model).where(Model.model_id == speaker.model_id).order_by(Model.position)
) )
def model_supports(db: DBSession, chat: Chat, capability: str) -> bool: def model_for(db: DBSession, chat: Chat) -> Model | None:
"""Whether the chat's current model is marked as having a capability.""" """The Model row a chat is using. The display answer; see `model_row`."""
model = model_for(db, chat) return model_row(db, Speaker(chat.model_id, chat.connection_id))
def model_supports(
db: DBSession, chat: Chat, capability: str, speaker: Speaker | None = None
) -> bool:
"""Whether the answering model is marked as having a capability.
⚠ Worth getting right per speaker rather than per chat: `vision` decides
whether image parts go into the body, and an endpoint sent an image by a
model that cannot take one rejects **the whole request**, not the image.
"""
model = model_row(db, speaker) if speaker is not None else model_for(db, chat)
return bool(model and (model.capabilities_json or {}).get(capability)) return bool(model and (model.capabilities_json or {}).get(capability))
@@ -331,12 +560,21 @@ def build_request(
tools: list[dict[str, Any]] | None = None, tools: list[dict[str, Any]] | None = None,
user=None, user=None,
force_tool: str = "", force_tool: str = "",
speaker: Speaker | None = None,
crowd_turn=None,
crowd_again: bool = False,
) -> dict[str, Any]: ) -> dict[str, Any]:
"""The whole request body, tools and harness included. """The whole request body, tools and harness included.
Composed here rather than in the generation loop so that "what gets sent" Composed here rather than in the generation loop so that "what gets sent"
has one answer, and so the harness cannot be forgotten by a future caller has one answer, and so the harness cannot be forgotten by a future caller
that offers tools. that offers tools.
`speaker` is who is answering; it defaults to the chat's own model, so a
caller that does not care behaves exactly as it did. Everything that differs
per model is resolved from it and not from the chat: the model name sent, the
vision decision, the authored prompt's model layer, `{{model_name}}`, the
personality, and the reasoning-effort vocabulary.
""" """
from lembas.services import harness as harness_service from lembas.services import harness as harness_service
from lembas.services import prompts as prompts_service from lembas.services import prompts as prompts_service
@@ -346,10 +584,15 @@ def build_request(
for key, value in (chat.params_json or {}).items() for key, value in (chat.params_json or {}).items()
if key in FORWARDED_PARAMS and value not in (None, "") if key in FORWARDED_PARAMS and value not in (None, "")
} }
speaker = speaker or speaker_for(db, chat, upto)
if crowd_turn is None and upto is not None:
from lembas.services import crowd as crowd_service
crowd_turn = crowd_service.state_of(upto)
# Images are only sent to a model an administrator has marked as having # Images are only sent to a model an administrator has marked as having
# vision. Sending them to one that has not is not a graceful degradation: # vision. Sending them to one that has not is not a graceful degradation:
# most endpoints reject the whole request. # most endpoints reject the whole request.
vision = model_supports(db, chat, "vision") vision = model_supports(db, chat, "vision", speaker=speaker)
if user is None: if user is None:
from lembas.db.models import User from lembas.db.models import User
@@ -360,18 +603,23 @@ def build_request(
# behaviour. See services/harness.py for why these are joined rather than # behaviour. See services/harness.py for why these are joined rather than
# being two competing layers. # being two competing layers.
system = harness_service.join( system = harness_service.join(
harness_service.compose(db, user, tools, chat), harness_service.compose(db, user, tools, chat, speaker=speaker),
effective_system_prompt(db, chat), effective_system_prompt(db, chat, speaker),
lead=prompts_service.render(db, "seam.authored_lead", {}), lead=prompts_service.render(db, "seam.authored_lead", {}),
) )
body: dict[str, Any] = { body: dict[str, Any] = {
"model": chat.model_id, "model": speaker.model_id,
"messages": build_messages( "messages": build_messages(
db, chat, upto=upto, vision=vision, system_prompt=system db, chat, upto=upto, vision=vision, system_prompt=system, speaker=speaker
), ),
**params, **params,
} }
if crowd_turn is not None:
body["messages"] = _with_crowd_instruction(
db, body["messages"], crowd_turn, again=crowd_again
)
if tools: if tools:
body["tools"] = tools body["tools"] = tools
# Making the model call one particular tool, for `/image` -- the whole # Making the model call one particular tool, for `/image` -- the whole
@@ -388,14 +636,22 @@ def build_request(
): ):
body["tool_choice"] = {"type": "function", "function": {"name": force_tool}} body["tool_choice"] = {"type": "function", "function": {"name": force_tool}}
# The model's own vocabulary, looked up here rather than passed in: every # The *answering* model's own vocabulary, looked up here rather than passed
# caller of `build_request` would otherwise have to remember, which is the # in: every caller of `build_request` would otherwise have to remember, which
# trap `audio_service.template_flags` fell into. # is the trap `audio_service.template_flags` fell into.
chat_model = model_for(db, chat) #
# ⚠ Per speaker and not per chat, and this one is not cosmetic: the
# vocabularies genuinely differ -- gpt-oss takes low/medium/high, a Bonsai
# takes low/medium/xhigh and *raises inside its chat template* on high -- so
# a chat's effort handed to another model fails the whole reply rather than
# being ignored. `_learn_refused_effort` then narrows every Model row sharing
# that id, so getting this wrong would also corrupt other models' lists as a
# side effect.
speaking_model = model_row(db, speaker)
apply_effort( apply_effort(
body, body,
(chat.params_json or {}).get("reasoning_effort"), (chat.params_json or {}).get("reasoning_effort"),
efforts_for(chat_model) if chat_model is not None else None, efforts_for(speaking_model) if speaking_model is not None else None,
) )
return body return body
+383
View File
@@ -0,0 +1,383 @@
"""Several models answering one turn, in order, then again in reverse.
The shape the owner asked for: the chat's own model answers, then each other
member in order; then the order runs **backwards**, each member asked whether it
disagrees with anything; and it ends at the main model, which decides whether to
go round again or stop.
## Why N chained replies and not one clever one
One `Generation` per speaker, one `Message` per speaker, chained where `_drain`
already chains a queued turn. That is not the cheapest shape, it is the only one
in which every existing invariant keeps holding for the reason it already holds:
* `Generation` is **one reply's** state and `_follow` streams **per message**,
keyed on `generation.message_id`. One generation cannot stream into nine
bubbles without a second streaming protocol, and `ensure(chat_id, message_id)`
would have no answer to "which of the nine am I" after a restart.
* Exactly one incomplete assistant row exists at any moment, so
`_reply_in_flight` needs no teaching and the composer queues for the whole
round.
* Each speaker gets its own `steps_json`, `usage_json` and `model_id`, so the
avatar, the metrics chip and the regenerate button are per speaker with no new
rendering.
A subagent per speaker was rejected outright: a helper is handed a *serialisation*
of the conversation, its answer comes back as a tool result, and tool results are
never replayed -- so speaker 3 could not see speaker 2, which is the entire point
of a crowd. That feature already exists and is called `ask_friend`.
## Where the round lives
On the **message row**, in `Message.crowd_json`, and not on the chat. "The row is
the authority, not the registry" is the rule the reload story was won with, and
round state on the chat reintroduces exactly the split it was won against: a
restart between speakers, or a rewind that deletes the rows, would leave
chat-level state describing turns that no longer exist -- which is the problem
`Chat.compacted_through_id` already documents.
`Message.parent_id` is **not** used for grouping. It is reserved for conversation
branching and says so in its own comment.
## The scheduler is a pure function
`next_turn` takes numbers and returns numbers. Every refusal -- out of rounds, out
of time, nobody to ask, not the newest message -- is therefore testable without an
endpoint, which matters because the refusals are the interesting half.
"""
from __future__ import annotations
import logging
from dataclasses import dataclass, replace
from datetime import UTC, datetime
from typing import Any
from sqlalchemy import select
from sqlalchemy.orm import Session as DBSession
from lembas.db.models import Chat, Message
log = logging.getLogger(__name__)
# The forward pass: everybody answers in order.
PHASE_OUT = "out"
# The way back: each member is asked whether it disagrees, in reverse order,
# stopping one short of the main model.
PHASE_BACK = "back"
# The main model's last word, where it decides whether to go round again.
PHASE_CLOSE = "close"
PHASES = (PHASE_OUT, PHASE_BACK, PHASE_CLOSE)
# Why a round ended, when it ended for a reason rather than by finishing.
STOPPED_ROUNDS = "rounds"
STOPPED_TIME = "time"
STOPPED_ERRORS = "errors"
# How many speaker errors in a row end the round. One is skipped: the commonest
# failure in a crowd is not a dead endpoint but a small member's context window
# overflowing on a transcript several models have been writing into, and killing
# the round at whichever member is smallest is the wrong answer. Two in a row is
# an endpoint that has actually gone, which is what `_drain`'s refusal protects
# against and is worth keeping.
MAX_CONSECUTIVE_ERRORS = 2
@dataclass(frozen=True)
class Turn:
"""Where one crowd round has got to, as it is stored on a message."""
turn: str
round: int
phase: str
index: int
of: int
started_at: str
errors: int = 0
stopped: str = ""
def as_json(self) -> dict[str, Any]:
return {
"turn": self.turn,
"round": self.round,
"phase": self.phase,
"index": self.index,
"of": self.of,
"started_at": self.started_at,
"errors": self.errors,
"stopped": self.stopped,
}
@property
def is_main(self) -> bool:
return self.index == 0
def state_of(message: Message | None) -> Turn | None:
"""The round state on a message, or None if it is not part of one."""
raw = getattr(message, "crowd_json", None) or None
if not raw or not isinstance(raw, dict):
return None
try:
return Turn(
turn=str(raw.get("turn") or ""),
round=int(raw.get("round") or 1),
phase=str(raw.get("phase") or PHASE_OUT),
index=int(raw.get("index") or 0),
of=int(raw.get("of") or 1),
started_at=str(raw.get("started_at") or ""),
errors=int(raw.get("errors") or 0),
stopped=str(raw.get("stopped") or ""),
)
except (TypeError, ValueError): # pragma: no cover - a hand-edited row
return None
def now_stamp() -> str:
return datetime.now(UTC).isoformat()
def elapsed(started_at: str) -> float:
"""Seconds since a round began, or 0.0 if the stamp is unreadable.
Unreadable reads as "no time has passed" rather than as "out of time": a
round abandoned because of a bad timestamp would be a feature failing for a
reason nobody could see.
"""
try:
began = datetime.fromisoformat(started_at)
except (TypeError, ValueError):
return 0.0
if began.tzinfo is None:
began = began.replace(tzinfo=UTC)
return max(0.0, (datetime.now(UTC) - began).total_seconds())
def next_turn(
*,
speakers: int,
state: Turn | None,
turn_id: str,
again: bool = False,
errored: bool = False,
max_rounds: int = 2,
wall_seconds: int = 900,
) -> Turn | None:
"""Who speaks next, or None when the round is over.
Pure: numbers in, numbers out, no session and no clock beyond the stamp it is
handed. `speakers` counts the main model as one of them.
`state=None` means the reply that has just finished was the ordinary first
one, started by the composer as it always is -- so this is where a round
begins rather than continues.
"""
if speakers < 2:
return None
if state is None:
return Turn(
turn=turn_id,
round=1,
phase=PHASE_OUT,
index=1,
of=speakers,
started_at=now_stamp(),
)
# Errors are counted consecutively, so one member timing out is skipped and
# an endpoint that has gone ends the round.
errors = state.errors + 1 if errored else 0
if errors >= MAX_CONSECUTIVE_ERRORS:
return replace(state, stopped=STOPPED_ERRORS)
if wall_seconds and elapsed(state.started_at) >= wall_seconds:
return replace(state, errors=errors, stopped=STOPPED_TIME)
carry = {
"turn": state.turn,
"of": speakers,
"started_at": state.started_at,
"errors": errors,
}
if state.phase == PHASE_OUT:
if state.index + 1 <= speakers - 1:
return Turn(round=state.round, phase=PHASE_OUT, index=state.index + 1, **carry)
# The forward pass is done. The way back starts one short of the speaker
# that has just finished -- asking it whether it disagrees with itself is
# a round spent on nothing.
if speakers - 2 >= 1:
return Turn(round=state.round, phase=PHASE_BACK, index=speakers - 2, **carry)
return Turn(round=state.round, phase=PHASE_CLOSE, index=0, **carry)
if state.phase == PHASE_BACK:
if state.index - 1 >= 1:
return Turn(round=state.round, phase=PHASE_BACK, index=state.index - 1, **carry)
return Turn(round=state.round, phase=PHASE_CLOSE, index=0, **carry)
# The main model has had its last word. Another round only if it asked for
# one *and* there is one left.
if not again:
return None
if state.round + 1 > max_rounds:
return replace(state, errors=errors, stopped=STOPPED_ROUNDS)
return Turn(round=state.round + 1, phase=PHASE_OUT, index=1, **carry)
# --- Resolving the membership --------------------------------------------------
def member_speakers(db: DBSession, chat: Chat, user=None) -> list:
"""Every member that can actually be reached, in order, main model first.
Filtered through `permissions.models_visible_to` by way of
`chat_service.roster_models`, so a member whose access has been revoked, whose
model has been disabled, or whose row has gone is skipped rather than
attempted -- and the skip is visible in the transcript rather than silent.
Deduplicated against the main model: adding the chat's own model to the crowd
would have it answer twice in a row, which is not what anybody meant by it.
"""
from lembas.services import chat as chat_service
reachable = {
model.model_id: model for model in chat_service.roster_models(db, user, exclude="")
}
speakers = [chat_service.Speaker(chat.model_id, chat.connection_id)]
seen = {chat.model_id}
for member in sorted(chat.crowd, key=lambda row: (row.position, row.model_id)):
if member.model_id in seen or member.model_id not in reachable:
continue
seen.add(member.model_id)
speakers.append(chat_service.Speaker(member.model_id, member.connection_id))
return speakers
def unreachable_members(db: DBSession, chat: Chat, user=None) -> list[str]:
"""Members that will be skipped, so a screen can say so rather than lie."""
from lembas.services import chat as chat_service
reachable = {
model.model_id for model in chat_service.roster_models(db, user, exclude="")
}
return [
member.model_id
for member in chat.crowd
if member.model_id not in reachable or member.model_id == chat.model_id
]
def is_newest(db: DBSession, message: Message) -> bool:
"""Whether this is the last message in its chat.
The guard that stops a regenerate from forking the round. `restart` re-runs
`_run`, whose `finally` advances the crowd again -- and speakers further down
already exist, so without this, regenerating member 2 creates a second member
3 and two chains race down one turn. `_drain` never needed it, because a
queued row only ever exists *forward* of the reply.
"""
latest = db.scalars(
select(Message)
.where(Message.chat_id == message.chat_id)
.order_by(Message.created_at.desc(), Message.id.desc())
.limit(1)
).first()
return latest is not None and latest.id == message.id
# --- Asking for another round ---------------------------------------------------
async def _run_crowd_again(context, args: dict[str, Any]):
"""Record that the main model wants the crowd to go round again.
Written onto the running `Generation` rather than onto the row, because it is
a fact about *this* reply and dies with it -- and onto a field rather than
parsed back out of the prose, for the reason `plan_json` exists: a sentinel
phrase in an answer is a decision nobody can see and a wording nobody can
change.
Offered only on the main model's closing turn and only while a round is left,
so a call arriving anywhere else is a call that was never on the table.
"""
from lembas.services import generation as generation_service
from lembas.services.tools import ToolOutcome
reason = str(args.get("focus") or "").strip()
running = generation_service.running_for(context.chat_id) if context.chat_id else None
if running is None:
return ToolOutcome(
"There is no round to continue.",
{"name": "crowd_again", "status": "error", "error": "no round"},
)
running.crowd_again = True
return ToolOutcome(
"The others will answer again."
+ (f" You have asked them to focus on: {reason}" if reason else "")
+ " Finish your answer now: what you write is what the person reads for "
"this round.",
{
"name": "crowd_again",
"status": "ok",
"query": reason[:160],
"detail": "another round",
},
)
def tool_defs() -> list:
"""The one tool, offered only to the closing speaker of a crowd round."""
from lembas.services.tools import FAMILY_CROWD, RISK_READ, ToolDef
return [
ToolDef(
name="crowd_again",
family=FAMILY_CROWD,
description=(
"Send the other models round again, because the disagreement is "
"real and another pass would settle it. Say what they should focus "
"on. Use it sparingly: every round costs the person another wait, "
"and a crowd asked to go round because the discussion was "
"interesting will keep finding things to discuss. If the answers "
"have converged, or the disagreement is a matter of taste, or "
"nobody has said anything new on the way back, do not call this -- "
"write the answer instead."
),
parameters={
"type": "object",
"properties": {
"focus": {
"type": "string",
"description": (
"What the next round should settle, in one sentence."
),
}
},
"required": [],
},
run=_run_crowd_again,
# It changes nothing in the world; what it costs is more replies, and
# that is bounded by `crowd.max_rounds` rather than by an approval.
risk=RISK_READ,
),
]
__all__ = [
"MAX_CONSECUTIVE_ERRORS",
"PHASES",
"PHASE_BACK",
"PHASE_CLOSE",
"PHASE_OUT",
"STOPPED_ERRORS",
"STOPPED_ROUNDS",
"STOPPED_TIME",
"Turn",
"elapsed",
"is_newest",
"member_speakers",
"next_turn",
"now_stamp",
"state_of",
"tool_defs",
"unreachable_members",
]
+248 -10
View File
@@ -33,6 +33,7 @@ from lembas.security import permissions
from lembas.services import canvas as canvas_service from lembas.services import canvas as canvas_service
from lembas.services import chat as chat_service from lembas.services import chat as chat_service
from lembas.services import compaction as compaction_service from lembas.services import compaction as compaction_service
from lembas.services import crowd as crowd_service
from lembas.services import interaction, settings_store, tokens, tool_labels from lembas.services import interaction, settings_store, tokens, tool_labels
from lembas.services import metrics as metrics_service from lembas.services import metrics as metrics_service
from lembas.services import prompts as prompts_service from lembas.services import prompts as prompts_service
@@ -222,6 +223,15 @@ class Generation:
# -- the one frame that reaches a browser after a reply is over. # -- the one frame that reaches a browser after a reply is over.
drained: bool = False drained: bool = False
injected_ids: list[str] = field(default_factory=list) injected_ids: list[str] = field(default_factory=list)
# A crowd round, seen from one speaker's side. `crowded` says this reply's
# ending handed the turn to the next speaker -- read by `_follow`, exactly as
# `drained` is, to put the next bubble on the `done` frame. `crowd_again` is
# the main model having called `crowd_again` on its closing turn: a field
# rather than a parse of the prose, for the reason `plan_json` exists, and
# on the generation rather than the row because it is a fact about this reply
# and dies with it.
crowded: bool = False
crowd_again: bool = False
# Images this reply produced, waiting to be bound to its message row. The # Images this reply produced, waiting to be bound to its message row. The
# runner writes the file and the `Attachment`; only `_persist` may say which # runner writes the file and the `Attachment`; only `_persist` may say which
# turn it belongs to, which is the same division of labour `canvas` above # turn it belongs to, which is the same division of labour `canvas` above
@@ -599,7 +609,16 @@ async def _run(generation: Generation) -> None:
# assembly path. Here rather than in post_message because that route's # assembly path. Here rather than in post_message because that route's
# whole contract is to return immediately, and a three-second # whole contract is to return immediately, and a three-second
# summarisation in front of it would break exactly that. # summarisation in front of it would break exactly that.
await _maybe_compact(generation) # Once per turn, on the reply that opens it. Three reasons, and the
# first is the one that bites: `should_compact` reads `context_limit` off
# the *last complete* assistant turn's usage, which mid-crowd is the
# previous **speaker** -- so an 8k member at position three tells a 128k
# member at position four to compact. `last_complete`'s own promise that
# the cut lands on a reply and therefore leaves a history starting on a
# user turn is also false mid-round. And compacting during a round would
# ask the way back whether it disagrees with a summary of itself.
if _opens_the_turn_id(generation):
await _maybe_compact(generation)
# Before the session opens, for the same reason compaction is: the # Before the session opens, for the same reason compaction is: the
# listing is an SSH round trip, and holding a database session across # listing is an SSH round trip, and holding a database session across
@@ -614,7 +633,14 @@ async def _run(generation: Generation) -> None:
generation.error = "That chat no longer exists." generation.error = "That chat no longer exists."
return return
endpoint, model_id = chat_service.resolve_endpoint(db, chat) # Who is answering, from the row being written into rather than
# from the chat. The row is durable and this generation is not: a
# restart turns `_follow` into `ensure`, which starts a brand new
# `_run` against the same message, and everything the request depends
# on has to survive that. It is also the only thing that can make the
# bubble's avatar and the model actually asked agree.
speaker = chat_service.speaker_for(db, chat, message)
endpoint, model_id = chat_service.resolve_endpoint(db, chat, speaker)
owner = db.get(User, chat.user_id) owner = db.get(User, chat.user_id)
# Before the request is built, not while it streams. Every other # Before the request is built, not while it streams. Every other
@@ -631,13 +657,42 @@ async def _run(generation: Generation) -> None:
# Resolved once, so that what the loop is allowed to *run* is the # Resolved once, so that what the loop is allowed to *run* is the
# same set the endpoint was *offered* -- not whatever happens to # same set the endpoint was *offered* -- not whatever happens to
# exist by the time a call comes back. # exist by the time a call comes back.
toolset = tools_service.resolve_tools(db, chat, owner) # Where this speaker sits in a crowd round, if it is in one. Read
# once, here, and used for three decisions: which tools it may have,
# which instruction closes its request, and whether it may ask for
# another round.
crowd_state = crowd_service.state_of(message)
crowd_settings = settings_store.crowd(db)
may_ask_again = bool(
crowd_state is not None
and crowd_state.phase == crowd_service.PHASE_CLOSE
and crowd_state.round < int(crowd_settings["max_rounds"])
)
toolset = tools_service.resolve_tools(
db, chat, owner, speaker, crowd_turn=crowd_state, crowd_again=may_ask_again
)
offered = toolset.schemas offered = toolset.schemas
payload = chat_service.build_request( payload = chat_service.build_request(
db, chat, upto=message, tools=offered, user=owner, force_tool=generation.force_tool db,
chat,
upto=message,
tools=offered,
user=owner,
force_tool=generation.force_tool,
speaker=speaker,
crowd_turn=crowd_state,
# Asked of the resolved set rather than of the settings: a model
# without the tools capability gets no tools at all, so inviting it
# to call `crowd_again` would be offering a choice it cannot
# express -- and `crowd.close_final` is the wording for that.
crowd_again="crowd_again" in toolset.by_name,
) )
question = _question_from(payload) question = _question_from(payload)
needs_title = not chat.title_generated # Once per turn. A crowd member titling the chat would name it after
# `_question_from`'s last user turn, which under the crowd relabelling
# is another model's quoted answer -- so the chat gets called after a
# quotation. The main model's first reply is the one that titles.
needs_title = not chat.title_generated and _opens_the_turn(message)
# An agent chat is titled from its opening words and never costs a # An agent chat is titled from its opening words and never costs a
# model call for it. That prompt is a good title already -- somebody # model call for it. That prompt is a good title already -- somebody
# starting one states an objective, not a topic -- while an ordinary # starting one states an objective, not a topic -- while an ordinary
@@ -654,16 +709,22 @@ async def _run(generation: Generation) -> None:
# Read here, with the rest, because titling happens after this # Read here, with the rest, because titling happens after this
# session has closed and must not open another one. # session has closed and must not open another one.
title_prompt = prompts_service.resolve(db, "task.title") title_prompt = prompts_service.resolve(db, "task.title")
tool_context = tools_service.context_for(db, owner, chat, tools=toolset) tool_context = tools_service.context_for(
db, owner, chat, tools=toolset, speaker=speaker
)
model = chat_service.model_for(db, chat) # The answering model's window, not the chat's. `_too_big` is the one
# budget that stops a reply dead rather than asking it to wrap up, so
# judging a small model's request against a large model's ceiling is
# how a reply fails with no explanation in it.
model = chat_service.model_row(db, speaker)
generation.context_limit = model.context_length if model is not None else 0 generation.context_limit = model.context_length if model is not None else 0
# Kept for `_inject`, which builds a user turn after this session # Kept for `_inject`, which builds a user turn after this session
# has closed. A turn taken in mid-reply has to be shaped exactly as # has closed. A turn taken in mid-reply has to be shaped exactly as
# the same words typed a moment later would have been -- images to a # the same words typed a moment later would have been -- images to a
# vision model, a plain string to anything else, or the endpoint # vision model, a plain string to anything else, or the endpoint
# rejects the whole request. # rejects the whole request.
vision = chat_service.model_supports(db, chat, "vision") vision = chat_service.model_supports(db, chat, "vision", speaker=speaker)
# Resolved while the session is open, like everything else here. # Resolved while the session is open, like everything else here.
# Empty for an admin and for a user in no group, which is every # Empty for an admin and for a user in no group, which is every
# instance that has not set one -- see permissions.limits_for. # instance that has not set one -- see permissions.limits_for.
@@ -1082,7 +1143,18 @@ async def _run(generation: Generation) -> None:
# `_persist` is: `_follow` breaks the instant it sees that flag, and the # `_persist` is: `_follow` breaks the instant it sees that flag, and the
# frame it then sends is the one that has to carry the next turn's # frame it then sends is the one that has to carry the next turn's
# bubbles. There is no push channel that outlives a single reply. # bubbles. There is no push channel that outlives a single reply.
_drain(generation) #
# 🚨 Advancing a crowd round *suppresses* the drain, and the order of this
# sentence is the whole of it. Written the other way round -- advance, then
# drain -- a queued human turn typed during a round would create a second
# incomplete assistant row beside the next speaker's, which is two
# generations in one chat: the state `_reply_in_flight`, `_too_many_replies`,
# `wake.lock_for` and the superseded guards in `_persist`/`_drain` all exist
# to make unreachable, and whose symptom is a Stop button pointing at
# whichever bubble comes first in the document. The queue waits for the
# round; that is what a queue is for.
if not _advance_crowd(generation):
_drain(generation)
generation.done = True generation.done = True
generation.finished_at = datetime.now(UTC) generation.finished_at = datetime.now(UTC)
generation.touch() generation.touch()
@@ -2112,9 +2184,166 @@ def _drain(generation: Generation) -> None:
generation.drained = True generation.drained = True
def _advance_crowd(generation: Generation) -> bool:
"""Start the next speaker of a crowd round. True if one was started.
The imperative shell around `crowd.next_turn`, which is pure -- so everything
interesting about this (the eight ways a round declines to continue) is tested
without an endpoint, and what is left here is reading rows and writing one.
Three refusals of its own, and each is a bug if it is left out:
* **Superseded.** The same guard `_persist` and `_drain` carry: this reply is
no longer the one registered for its message.
* **Stopped.** A person pressing Stop ends the round, not just the speaker
writing at the time. `_drain` refuses after a stop for the same reason and
it is the same reason here -- somebody asked for it to end.
* **Not the newest message.** `regenerate` calls `restart`, whose `finally`
runs this again -- and the speakers after it already exist. Without this,
regenerating member 2 creates a second member 3 and two chains race down one
turn. `_drain` never needed the guard because a queued row only ever exists
*forward* of the reply.
An **error** does not end the round: `crowd.next_turn` counts consecutive
failures and abandons after two, because the commonest failure in a crowd is a
small member's context window overflowing rather than a dead endpoint, and
ending the round there would kill every crowd at whichever member is smallest.
"""
owner = _RUNNING.get(generation.message_id)
if owner is not None and owner is not generation:
return False
if generation.stopped:
return False
try:
with session_scope() as db:
chat = db.get(Chat, generation.chat_id)
message = db.get(Message, generation.message_id)
if chat is None or message is None:
return False
settings = settings_store.crowd(db)
if not settings["enabled"] or not chat.crowd:
return False
if not crowd_service.is_newest(db, message):
return False
owner_user = db.get(User, chat.user_id)
speakers = crowd_service.member_speakers(db, chat, owner_user)
speakers = speakers[: int(settings["max_models"]) + 1]
state = crowd_service.state_of(message)
# The turn a round belongs to: the user message this all answers.
turn_id = state.turn if state is not None else _turn_anchor(db, message)
following = crowd_service.next_turn(
speakers=len(speakers),
state=state,
turn_id=turn_id,
again=generation.crowd_again,
errored=bool(generation.error),
max_rounds=int(settings["max_rounds"]),
wall_seconds=int(settings["wall_seconds"]),
)
if following is None:
return False
if following.stopped:
# Recorded on the row that ended it, so the transcript can say
# why a round stopped rather than simply stopping. Nothing else
# needs writing: there is no next speaker.
message.crowd_json = following.as_json()
db.commit()
return False
speaker = speakers[following.index]
placeholder = chat_service.create_message(
db,
chat,
ROLE_ASSISTANT,
"",
complete_=False,
model_id=speaker.model_id,
)
placeholder.connection_id = speaker.connection_id
placeholder.crowd_json = following.as_json()
db.commit()
chat_id, next_id = chat.id, placeholder.id
except Exception: # noqa: BLE001 - the reply is over either way
log.exception("could not advance the crowd in chat %s", generation.chat_id)
return False
# Outside the session, like `_drain`: this starts a task.
ensure(chat_id, next_id)
generation.crowded = True
return True
def _opens_the_turn(message: Message) -> bool:
"""Whether this reply is the first one answering a question.
True for every ordinary reply, and for a crowd only for the main model's
opening turn -- which is the one with no crowd state on it at all, because a
round begins when that reply *finishes*.
"""
return crowd_service.state_of(message) is None
def _opens_the_turn_id(generation: Generation) -> bool:
"""`_opens_the_turn` before the session is open, by message id.
`_maybe_compact` runs before `_run` reads anything, so this opens its own
session -- one primary-key lookup, and only on a chat that has a crowd.
"""
try:
with session_scope() as db:
message = db.get(Message, generation.message_id)
return message is None or _opens_the_turn(message)
except Exception: # noqa: BLE001 - compaction is best-effort anyway
return True
def _ends_the_turn(message: Message) -> bool:
"""Whether this reply is the last one the person is waiting for.
True for every ordinary reply, and for a crowd only on the main model's
closing turn. What is gated on it is everything that should happen once per
question rather than once per speaker: the unread dot, the web push, and the
chat's title.
"""
state = crowd_service.state_of(message)
if state is None:
return True
return state.phase == crowd_service.PHASE_CLOSE
def _turn_anchor(db, message: Message) -> str:
"""The user turn a round answers, for a round that is only now beginning.
The last user message at or before this reply. Only read once per round -- it
is carried on every later turn's state -- and it exists so a rewind can tell
which rows belonged to which question.
"""
row = db.scalars(
select(Message)
.where(
Message.chat_id == message.chat_id,
Message.role == ROLE_USER,
Message.created_at <= message.created_at,
)
.order_by(Message.created_at.desc(), Message.id.desc())
.limit(1)
).first()
return row.id if row is not None else ""
def _inject(generation: Generation, chat_id: str, vision: bool) -> dict | None: def _inject(generation: Generation, chat_id: str, vision: bool) -> dict | None:
"""Take the oldest waiting prompt into this reply, between two rounds. """Take the oldest waiting prompt into this reply, between two rounds.
⚠ Never during a crowd round. This restamps the placeholder's `created_at` so
the reply sorts after the prompt it answers, which mid-round reorders the
speakers underneath themselves -- and the round's own bookkeeping counts an
anchor that has moved. The turn stays queued and arrives after the round as a
clean new question with a round of its own, which is what `_drain` is for.
Marked delivered and committed *before* the request goes out, so this is Marked delivered and committed *before* the request goes out, so this is
at-most-once. A crash in between loses the turn, which is recoverable -- at-most-once. A crash in between loses the turn, which is recoverable --
the words are still in the transcript with Send now beside them. The other the words are still in the transcript with Send now beside them. The other
@@ -2132,6 +2361,9 @@ def _inject(generation: Generation, chat_id: str, vision: bool) -> dict | None:
""" """
try: try:
with session_scope() as db: with session_scope() as db:
message = db.get(Message, generation.message_id)
if crowd_service.state_of(message) is not None:
return None
waiting = _next_waiting(db, chat_id) waiting = _next_waiting(db, chat_id)
if waiting is None: if waiting is None:
return None return None
@@ -2265,7 +2497,13 @@ def _persist(generation: Generation, title: str, elapsed: float) -> None:
# clears this when it is next opened. Not for a temporary chat: # clears this when it is next opened. Not for a temporary chat:
# there is no sidebar row for the dot, and the toast would name a # there is no sidebar row for the dot, and the toast would name a
# chat nobody can navigate to. # chat nobody can navigate to.
if generation.followers == 0 and not chat.temporary: # 🚨 Once per *turn*, not once per speaker. `announce_later` has no
# dedupe of its own -- its docstring says so, because every site that
# calls it runs once per arrival -- so a five-model crowd with nobody
# watching would be nine web pushes and nine sidebar toasts for one
# question. The closing speaker is the arrival; everybody before it is
# the middle of one.
if generation.followers == 0 and not chat.temporary and _ends_the_turn(message):
chat.unread = True chat.unread = True
chat.unread_notified = False chat.unread_notified = False
# And out to any browser that asked to be told, which is the # And out to any browser that asked to be told, which is the
+11 -5
View File
@@ -166,6 +166,7 @@ def context_variables(
user: User | None, user: User | None,
tools: list[dict[str, Any]] | None, tools: list[dict[str, Any]] | None,
chat=None, chat=None,
speaker=None,
) -> dict[str, str]: ) -> dict[str, str]:
"""What every ``{{name}}`` in a fragment resolves to for this request. """What every ``{{name}}`` in a fragment resolves to for this request.
@@ -294,8 +295,12 @@ def context_variables(
from lembas.services import chat as chat_service from lembas.services import chat as chat_service
from lembas.services.subagent import ROLE_FRIEND from lembas.services.subagent import ROLE_FRIEND
model = chat_service.model_for(db, chat) # The *answering* model, not the chat's: telling a crowd member it is the
values["model_name"] = model.label if model is not None else chat.model_id # main model is a lie it will then reason from, and its personality is
# keyed on whichever model is speaking.
speaking = speaker or chat_service.speaker_for(db, chat)
model = chat_service.model_row(db, speaking)
values["model_name"] = model.label if model is not None else speaking.model_id
# Naming the bases a chat is scoped to matters: without it the model # Naming the bases a chat is scoped to matters: without it the model
# cannot tell "there is nothing about this" from "I am only allowed to # cannot tell "there is nothing about this" from "I am only allowed to
# see the contracts folder", and phrases a miss as the former. # see the contracts folder", and phrases a miss as the former.
@@ -333,7 +338,7 @@ def context_variables(
# reason the roster and the tool are one checkbox rather than two. # reason the roster and the tool are one checkbox rather than two.
if "friend" in families: if "friend" in families:
values["model_roster"] = chat_service.roster_block( values["model_roster"] = chat_service.roster_block(
db, user, exclude=chat.model_id db, user, exclude=speaking.model_id
) )
if "persona" in families: if "persona" in families:
@@ -341,7 +346,7 @@ def context_variables(
# administrator's default until the model has written one with them; # administrator's default until the model has written one with them;
# and this model's impression of them, which has no default and never # and this model's impression of them, which has no default and never
# could. # could.
key = chat.model_id key = speaking.model_id
values["persona"] = personas_service.block(db, key, user) values["persona"] = personas_service.block(db, key, user)
values["person_view"] = personas_service.view_block(db, key, user) values["person_view"] = personas_service.view_block(db, key, user)
@@ -512,12 +517,13 @@ def compose(
user: User | None, user: User | None,
tools: list[dict[str, Any]] | None, tools: list[dict[str, Any]] | None,
chat=None, chat=None,
speaker=None,
) -> str: ) -> str:
"""The operational preamble for this request, or "" when there is nothing to say.""" """The operational preamble for this request, or "" when there is nothing to say."""
offered = tools or [] offered = tools or []
return compose_from( return compose_from(
db, db,
variables=context_variables(db, user, offered, chat), variables=context_variables(db, user, offered, chat, speaker),
families=_families(db, offered), families=_families(db, offered),
has_tools=bool(offered), has_tools=bool(offered),
) )
+108
View File
@@ -182,6 +182,14 @@ VARIABLES: tuple[Variable, ...] = (
"Per model and per person, so two models may hold different views and " "Per model and per person, so two models may hold different views and "
"nobody sees anybody else's. The person can read and delete it.", "nobody sees anybody else's. The person can read and delete it.",
), ),
Variable(
"crowd_speaker",
"The model being quoted",
"Inside the crowd fragments only: the name of the model whose words "
"follow, or whose turn it is. Blank everywhere else, because it is a "
"property of one quotation rather than of a request — which is why the "
"legend cannot show you a value for it.",
),
Variable( Variable(
"timezone", "timezone",
"Timezone", "Timezone",
@@ -1995,6 +2003,106 @@ BUILTIN: tuple[Fragment, ...] = (
"{{transcript}}" "{{transcript}}"
), ),
), ),
Fragment(
key="crowd.said",
label="Quoting another model in a crowd",
group=GROUP_TASKS,
order=450,
variables=("crowd_speaker",),
hint="What another speaker's answer is labelled as when it reaches this "
"one. It matters more than it looks: sent unlabelled, every earlier reply "
"arrives as something *this* model said, so it defends sentences it never "
"wrote and cannot disagree with them — which is the whole point of the "
"way back. Relabelling is also what keeps the history alternating, which "
"several chat templates require.",
default="{{crowd_speaker}} answered:",
),
Fragment(
key="crowd.turn",
label="A crowd member's turn on the way out",
group=GROUP_TASKS,
order=451,
hint="Added as the last turn when a member speaks on the forward pass. "
"The failure to word against is a member that repeats what has already "
"been said in different words, which is what makes a crowd feel like an "
"echo rather than a second opinion.",
default=(
"You are one of several models answering this. The answers above are "
"quoted with the name of whoever wrote them; yours comes next.\n"
"\n"
"Add what is missing, correct what is wrong, and say what you would "
"have done differently. Do not restate what has already been said to "
"show that you agree with it — if you have nothing to add, say so in "
"one line and stop. Be brief: somebody is reading all of these."
),
),
Fragment(
key="crowd.disagree",
label="A crowd member's turn on the way back",
group=GROUP_TASKS,
order=452,
hint="Added as the last turn on the backward pass, which is where the "
"value of a crowd actually is: everybody has now been heard, and this is "
"the chance to object. Worded to ask for disagreement rather than for a "
"summary, because a model asked to review will produce a review whether "
"it has one or not.",
default=(
"Everybody has now answered. Read the whole exchange again.\n"
"\n"
"Do you disagree with anything said above — a claim that is wrong, a "
"risk nobody named, an answer to the wrong question? Say so plainly, "
"and say which part you mean. **If you have no disagreement, reply "
"with one short sentence saying so and nothing else.** Do not "
"summarise, do not praise the other answers, and do not repeat your "
"own."
),
),
Fragment(
key="crowd.close",
label="The main model's last word, with another round available",
group=GROUP_TASKS,
order=453,
hint="The main model's closing turn when it can still ask for another "
"round. Its own fragment rather than a sentence inside the one below, "
"because inviting a choice a model cannot express is worse than not "
"offering it: on a model without the tools capability there is no "
"crowd_again to call, and that is the case the next fragment covers.",
default=(
"You opened this and you are closing it. The others have answered and "
"have had the chance to disagree.\n"
"\n"
"Write the answer the person actually asked for. Take what the others "
"got right, say where you disagree with them and why, and name "
"anything still unresolved rather than papering over it. Attribute "
"what you took from whom.\n"
"\n"
"If the disagreement is real and another round would settle it, call "
"crowd_again and say what you want them to address. Do not call it "
"because the discussion was interesting — every round costs the person "
"another wait."
),
),
Fragment(
key="crowd.close_final",
label="The main model's last word, with no round left",
group=GROUP_TASKS,
order=454,
hint="The same turn when another round is not on offer — the round limit "
"is reached, or this model has no tools and so cannot ask. It says the "
"answer has to be final rather than inviting a choice that would be "
"ignored, which is the difference between a feature and a feature that "
"looks like one.",
default=(
"You opened this and you are closing it, and this is the last turn: "
"there will be no further round.\n"
"\n"
"Write the answer the person actually asked for. Take what the others "
"got right, say where you disagree with them and why, and attribute "
"what you took from whom. Where the disagreement is unresolved, say so "
"and say what would settle it — that is more useful than a confident "
"answer papered over the top of it."
),
),
Fragment( Fragment(
key="task.compact_lead", key="task.compact_lead",
label="How a summary is introduced", label="How a summary is introduced",
+58
View File
@@ -32,6 +32,7 @@ AGENTS = "agents"
IMAGES = "images" IMAGES = "images"
SCHEDULES = "schedules" SCHEDULES = "schedules"
SUBAGENTS = "subagents" SUBAGENTS = "subagents"
CROWD = "crowd"
BRANDING = "branding" BRANDING = "branding"
EXTRACTION = "extraction" EXTRACTION = "extraction"
@@ -39,6 +40,11 @@ EXTRACTION = "extraction"
def _general_defaults() -> dict[str, Any]: def _general_defaults() -> dict[str, Any]:
return { return {
"allow_signup": env_settings.allow_signup, "allow_signup": env_settings.allow_signup,
# What the interface is rendered in when a person has not chosen. Empty
# and "en" mean the same thing; `web/i18n.known` is what decides, so a
# value from a release that offered more languages than this one cannot
# leave somebody with a page nobody can read.
"language": "",
# When on, new accounts land in the `pending` role and cannot sign in # When on, new accounts land in the `pending` role and cannot sign in
# until an administrator approves them. Reserved for the users pass. # until an administrator approves them. Reserved for the users pass.
"require_approval": False, "require_approval": False,
@@ -343,6 +349,41 @@ def _schedules_defaults() -> dict[str, Any]:
} }
def _crowd_defaults() -> dict[str, Any]:
"""Several models answering one turn, in order, then again in reverse.
Off until an administrator turns it on, and the reason is arithmetic: one
turn costs **models x rounds x 2 - 1** replies, so four models over two
rounds is fifteen. On a single local endpoint every change of speaker is also
a model load, because llama-swap holds one at a time.
The owner's own warning, recorded because it is the failure this feature
actually has: *larger crowds of smaller models -- and sometimes of bigger
ones -- start cycling, or never stop.* So the numbers below are a ceiling
reached by ordinary work, not a runaway backstop, which is the opposite of
how `subagents.max_rounds` is set and is deliberate: a round of a crowd is a
visible, expensive thing somebody is waiting through.
"""
return {
"enabled": False,
# Besides the chat's own model. Four speakers is already eight replies a
# turn at one round each.
"max_models": 4,
# One round is out-and-back: everyone answers, then everyone is asked
# whether they disagree, ending at the main model. Two is one chance to
# change its mind after hearing the objections, which is the whole point;
# three is where cycling starts.
"max_rounds": 2,
# The whole turn, across every speaker, so a member whose endpoint has
# stalled cannot hold a round open all afternoon.
"wall_seconds": 900,
# Whether a short "I agree" on the way back is collapsed in the
# transcript. On by default: N-1 bubbles saying nothing is what makes
# somebody switch the feature off, and the disagreements are the point.
"collapse_agreement": True,
}
def _subagents_defaults() -> dict[str, Any]: def _subagents_defaults() -> dict[str, Any]:
"""Delegating a piece of a reply to a second, unattended model. """Delegating a piece of a reply to a second, unattended model.
@@ -389,6 +430,7 @@ _DEFAULTS: dict[str, Any] = {
IMAGES: _images_defaults, IMAGES: _images_defaults,
SCHEDULES: _schedules_defaults, SCHEDULES: _schedules_defaults,
SUBAGENTS: _subagents_defaults, SUBAGENTS: _subagents_defaults,
CROWD: _crowd_defaults,
# Whose instance this is. The defaults live in `services/branding.py` # Whose instance this is. The defaults live in `services/branding.py`
# beside the code that reads them, because every one of them is paired with # beside the code that reads them, because every one of them is paired with
# a label and a hint for the admin page and splitting the three across two # a label and a hint for the admin page and splitting the three across two
@@ -668,6 +710,22 @@ def subagents(db: DBSession) -> dict[str, Any]:
return values return values
def crowd(db: DBSession) -> dict[str, Any]:
"""Crowd settings, clamped on read for the reason `agents` gives.
Every bound has a floor of one: a `max_models` of zero is the feature
switched off wearing the switch's clothes, and that is a thing to answer in
one place rather than two.
"""
values = get_group(db, CROWD)
values["max_models"] = min(max(int(values.get("max_models") or 1), 1), 8)
values["max_rounds"] = min(max(int(values.get("max_rounds") or 1), 1), 5)
values["wall_seconds"] = min(max(int(values.get("wall_seconds") or 1), 60), 7200)
values["enabled"] = bool(values.get("enabled"))
values["collapse_agreement"] = bool(values.get("collapse_agreement"))
return values
def images_ready(db: DBSession) -> bool: def images_ready(db: DBSession) -> bool:
"""Whether image generation can actually happen. """Whether image generation can actually happen.
+7
View File
@@ -76,6 +76,8 @@ LABELS: dict[str, str] = {
"subagent_run": "Helper", "subagent_run": "Helper",
# A question put to one of the other models here. # A question put to one of the other models here.
"ask_friend": "Asked another model", "ask_friend": "Asked another model",
# The main model sending a crowd round again.
"crowd_again": "Another round",
# What a model keeps about itself and about the person it is talking to. # What a model keeps about itself and about the person it is talking to.
"persona_write": "Personality rewritten", "persona_write": "Personality rewritten",
"impression_write": "Impression updated", "impression_write": "Impression updated",
@@ -121,6 +123,7 @@ ICONS: dict[str, str] = {
"schedule_cancel": "stop-circle", "schedule_cancel": "stop-circle",
"subagent_run": "sparkle", "subagent_run": "sparkle",
"ask_friend": "users", "ask_friend": "users",
"crowd_again": "refresh",
"persona_write": "user", "persona_write": "user",
"impression_write": "user", "impression_write": "user",
"memory_add": "star", "memory_add": "star",
@@ -169,6 +172,7 @@ ACTIONS: dict[str, str] = {
"schedule_cancel": "Stop a schedule", "schedule_cancel": "Stop a schedule",
"subagent_run": "Send a helper", "subagent_run": "Send a helper",
"ask_friend": "Ask another model", "ask_friend": "Ask another model",
"crowd_again": "Send the crowd round again",
"persona_write": "Rewrite its own personality", "persona_write": "Rewrite its own personality",
"impression_write": "Update what it makes of you", "impression_write": "Update what it makes of you",
"memory_add": "Remember something", "memory_add": "Remember something",
@@ -216,6 +220,9 @@ DETAIL_KEYS: dict[str, str] = {
# question carrying a wrong assumption comes back as a confident answer # question carrying a wrong assumption comes back as a confident answer
# about the wrong thing -- the same reason `subagent_run` names the task. # about the wrong thing -- the same reason `subagent_run` names the task.
"ask_friend": "question", "ask_friend": "question",
# What the next round is for. The only field it has, and the one thing worth
# correcting before several models spend a reply each on it.
"crowd_again": "focus",
# The whole text, because for these two the text *is* the thing being agreed # The whole text, because for these two the text *is* the thing being agreed
# to: there is no shorter field that says what the model would become. # to: there is no shorter field that says what the model would become.
"persona_write": "content", "persona_write": "content",
+85 -6
View File
@@ -162,6 +162,15 @@ FAMILY_FRIEND = "friend"
# a model up: either it may form and keep opinions of this kind or it may not. # a model up: either it may form and keep opinions of this kind or it may not.
FAMILY_PERSONA = "persona" FAMILY_PERSONA = "persona"
# Sending a crowd round again. Its own family so `harness._families` can map the
# name back to one, and deliberately **not in `FAMILIES`**: that tuple is the list
# of things an administrator switches on, and this is mechanism. Being in it would
# mint a `tool_crowd` capability checkbox and demand a `tools.crowd` permission
# that does not exist -- which, because `_family_allowed` falls through to
# `allowed.get(...)`, would mean the tool could never be offered at all. Its real
# gate is `resolve_tools(crowd_again=…)`: one turn of one round.
FAMILY_CROWD = "crowd"
# The built-in families, in the order they are offered. # The built-in families, in the order they are offered.
FAMILIES = ( FAMILIES = (
FAMILY_SEARCH, FAMILY_SEARCH,
@@ -1635,6 +1644,13 @@ def _family_allowed(
# separate switch would be a second door to the cost with nothing # separate switch would be a second door to the cost with nothing
# naming it. `Helpers` on /admin/agents is where both are bounded. # naming it. `Helpers` on /admin/agents is where both are bounded.
return bool(allowed.get("tools.friend") and subagents) return bool(allowed.get("tools.friend") and subagents)
if gate == FAMILY_CROWD:
# Always allowed, because whether it is *offered* is decided before this:
# `resolve_tools` puts it in the book only on the main model's closing turn
# with a round still left. A permission here would be a second switch for
# one already-enabled feature, and an absent one would silently make the
# crowd a single round for ever.
return True
if gate in ( if gate in (
FAMILY_CUSTOM, FAMILY_CUSTOM,
FAMILY_MCP, FAMILY_MCP,
@@ -1721,6 +1737,13 @@ def _friend_defs() -> list[ToolDef]:
return subagent_service.friend_tool_defs() return subagent_service.friend_tool_defs()
def _crowd_defs() -> list[ToolDef]:
"""The go-round-again tool. Imported inside the call for the reason above."""
from lembas.services import crowd as crowd_service
return crowd_service.tool_defs()
def _image_defs(db: DBSession, values: dict | None = None) -> list[ToolDef]: def _image_defs(db: DBSession, values: dict | None = None) -> list[ToolDef]:
"""The image tool, whose schema carries this instance's own choices. """The image tool, whose schema carries this instance's own choices.
@@ -1776,6 +1799,7 @@ def registry(db: DBSession) -> dict[str, ToolDef]:
*_schedule_defs(), *_schedule_defs(),
*_subagent_defs(), *_subagent_defs(),
*_friend_defs(), *_friend_defs(),
*_crowd_defs(),
] ]
) )
@@ -1786,13 +1810,31 @@ def families(db: DBSession) -> tuple[str, ...]:
return (*FAMILIES, *rows) return (*FAMILIES, *rows)
def resolve_tools(db: DBSession, chat: Chat, user: User | None) -> ToolSet: def resolve_tools(
"""Every tool this chat may call right now, with its runner attached.""" db: DBSession,
chat: Chat,
user: User | None,
speaker=None,
*,
crowd_turn=None,
crowd_again: bool = False,
) -> ToolSet:
"""Every tool this chat may call right now, with its runner attached.
The capabilities are the **answering** model's. `tools` being off is the first
gate and returns nothing at all, so handing a crowd member the main model's
switches would offer a tool list to an endpoint that rejects the request for
carrying one.
"""
from lembas.security import permissions from lembas.security import permissions
from lembas.services import chat as chat_service from lembas.services import chat as chat_service
capabilities = {} capabilities = {}
model = chat_service.model_for(db, chat) model = (
chat_service.model_row(db, speaker)
if speaker is not None
else chat_service.model_for(db, chat)
)
if model is not None: if model is not None:
capabilities = model.capabilities_json or {} capabilities = model.capabilities_json or {}
@@ -1819,6 +1861,12 @@ def resolve_tools(db: DBSession, chat: Chat, user: User | None) -> ToolSet:
*(_schedule_defs() if schedules_on else []), *(_schedule_defs() if schedules_on else []),
*(_subagent_defs() if subagents_on else []), *(_subagent_defs() if subagents_on else []),
*(_friend_defs() if subagents_on else []), *(_friend_defs() if subagents_on else []),
# Only on the closing turn, and only with a round left. Not gated on a
# capability or a permission: a tool that exists on exactly one turn of
# one feature is mechanism, and an administrator switching it off would
# be switching off the main model's ability to use the feature it
# already enabled.
*(_crowd_defs() if crowd_again else []),
] ]
) )
@@ -1832,6 +1880,26 @@ def resolve_tools(db: DBSession, chat: Chat, user: User | None) -> ToolSet:
off = scoped_off(chat) off = scoped_off(chat)
empty_library = not skills_service.count_enabled(db, user, exclude=scoped_skills_off(chat)) empty_library = not skills_service.count_enabled(db, user, exclude=scoped_skills_off(chat))
# What a crowd speaker may do, which is narrower than what the chat may.
if crowd_turn is not None:
from lembas.services import crowd as crowd_service
if crowd_turn.phase == crowd_service.PHASE_BACK:
# The way back is "do you disagree with any of this", which needs
# nothing looked up: everything it is about is already in front of it.
# An empty toolset also guarantees the turn ends in words, which is the
# shape `_wrap_up` relies on.
return ToolSet()
if not crowd_turn.is_main:
# A member answers a machine-composed instruction with several models'
# words quoted into it, and nobody is waiting on *it* in particular.
# So: it cannot stop the round for an approval or a question -- one
# card would park every remaining speaker for `approval_timeout` -- it
# cannot fan out, and it cannot rewrite a personality under wording it
# did not choose. The same set `unattended` withdraws, for the same
# reasons, applied for a different one.
off = off | {FAMILY_ASK, FAMILY_SUBAGENT, FAMILY_FRIEND, FAMILY_PERSONA}
# A scheduled task runs with nobody present, so `ask_user` cannot work here: # A scheduled task runs with nobody present, so `ask_user` cannot work here:
# it pauses the reply and waits for a POST that will never come, until # it pauses the reply and waits for a POST that will never come, until
# `approval_timeout` expires -- a run that silently does nothing for fifteen # `approval_timeout` expires -- a run that silently does nothing for fifteen
@@ -2017,10 +2085,21 @@ def context_for(
chat: Chat | None = None, chat: Chat | None = None,
*, *,
tools: ToolSet | None = None, tools: ToolSet | None = None,
speaker=None,
) -> ToolContext: ) -> ToolContext:
"""The snapshot a running tool needs, taken while the session is open.""" """The snapshot a running tool needs, taken while the session is open.
`speaker` is the model answering, and it decides which model a tool acts *as*:
which personality `persona_write` rewrites, and whose endpoint the image
reviewer and the Preserve-VRAM unload reach for. It defaults to the chat's own
model.
"""
from lembas.services import chat as chat_service
from lembas.services.agent import session as agent_session from lembas.services.agent import session as agent_session
if chat is not None and speaker is None:
speaker = chat_service.speaker_for(db, chat)
return ToolContext( return ToolContext(
agent=agent_session.resolve(db, chat, user) if chat is not None else None, agent=agent_session.resolve(db, chat, user) if chat is not None else None,
owner_id=user.id if user else "", owner_id=user.id if user else "",
@@ -2029,8 +2108,8 @@ def context_for(
image_config=settings_store.images(db), image_config=settings_store.images(db),
image_workflow_id=(chat.image_workflow_id or "") if chat is not None else "", image_workflow_id=(chat.image_workflow_id or "") if chat is not None else "",
image_checkpoint=(chat.image_checkpoint or "") if chat is not None else "", image_checkpoint=(chat.image_checkpoint or "") if chat is not None else "",
model_id=(chat.model_id or "") if chat is not None else "", model_id=(speaker.model_id or "") if speaker is not None else "",
connection_id=(chat.connection_id or "") if chat is not None else "", connection_id=(speaker.connection_id or "") if speaker is not None else "",
base_ids=[base.id for base in chat.knowledge_bases] if chat is not None else [], base_ids=[base.id for base in chat.knowledge_bases] if chat is not None else [],
skills_off=scoped_skills_off(chat), skills_off=scoped_skills_off(chat),
tools=tools.by_name if tools is not None else None, tools=tools.by_name if tools is not None else None,
+282
View File
@@ -0,0 +1,282 @@
"""Translating the interface, without a build step.
## Why not gettext
`.po` files compiled to `.mo` are a build step, and this project does not have
one (hard rule 1). So a catalogue is a committed Python module: a dict, keyed by
**the English source text**, loaded at import.
Keying on the source has one large advantage and one cost, and the advantage is
what decides it: **a missing entry renders the key**, which is the English. An
untranslated string therefore looks exactly as it did before, an instance running
in English is byte-for-byte what shipped, and a half-finished catalogue degrades
into a half-translated page rather than into `settings.appearance.theme.label`
written across somebody's screen. The cost is that editing an English sentence
orphans its translation silently -- which is what
`tests/test_translations.py` exists to catch, in both directions.
This is the shape `branding.FLAVOUR` and `services/prompts.py` already use:
defaults in code, overrides beside them, and a test that the two agree.
## Why a ContextVar
`t()` has to be reachable from a Jinja **global**, not from the template context.
`web/templating.render` is bypassed by 25 direct `TemplateResponse` calls and 8
`get_template().render()` calls, and the second group is the SSE frame path, which
has no `Request` object at all -- so threading a language through the context
would leave a third of the application untranslated, and `brand`'s docstring
records that lesson already.
But a global is bound once at import and the language is **per person**, so the
active language cannot live in the global. It lives in a `ContextVar` that
`LanguageMiddleware` sets per request. That is the one piece of genuinely new
machinery here; `brand` avoids needing it only because instance branding is the
same for everybody.
⚠ A `ContextVar` is per *task*, and a background reply is a task of its own. It
therefore does not inherit a request's language, which is correct rather than
unfortunate: nothing a generation writes is interface text, and the one place it
matters -- a fragment telling a model which language to answer in -- is a prompt
variable, not a `t()` call.
"""
from __future__ import annotations
import logging
from collections.abc import Mapping
from contextvars import ContextVar
log = logging.getLogger(__name__)
# The language every string is written in, and the key every catalogue uses.
SOURCE = "en"
# What an instance may be set to. Ordered, because it is also the order the
# settings screens offer.
LANGUAGES: tuple[tuple[str, str], ...] = (
("en", "English"),
("sk", "Slovenčina"),
)
LANGUAGE_IDS = tuple(code for code, _name in LANGUAGES)
# Text direction, so `<html dir>` is answered from one place when a
# right-to-left language is added rather than being forgotten.
DIRECTIONS: Mapping[str, str] = {"en": "ltr", "sk": "ltr"}
_active: ContextVar[str] = ContextVar("lembas_language", default=SOURCE)
# Loaded lazily and cached: a catalogue is a module, and importing every language
# at start would read files an instance in English never needs.
_catalogues: dict[str, Mapping[str, str]] = {}
# The instance default, cached at process level exactly as `branding.snapshot()`
# is and invalidated the same way -- by the one module that writes it calling
# `forget()`. Without the cache, every request would need a settings read before
# it could decide what language to render in, including the ones that never touch
# the database otherwise.
_DEFAULT: str | None = None
def instance_default() -> str:
"""What this instance renders in when nobody has said otherwise.
Never raises: a language that cannot be read is not a reason to fail a page,
and English is a usable answer. The same argument `branding.snapshot` makes.
"""
global _DEFAULT
if _DEFAULT is not None:
return _DEFAULT
try:
from lembas.db.session import session_scope
from lembas.services import settings_store
with session_scope() as db:
_DEFAULT = known(settings_store.get(db, "language"))
except Exception: # noqa: BLE001 - defaults are a usable answer
log.debug("could not read the instance language; using %s", SOURCE, exc_info=True)
return SOURCE
return _DEFAULT
def forget() -> None:
"""Drop the cached instance default. Called by whoever saves it."""
global _DEFAULT
_DEFAULT = None
def for_user(user) -> str:
"""The language one person sees: their own choice, else the instance's.
A `User` or None, so a signed-out page -- the sign-in screen, an error page --
is rendered in the instance's language rather than in English by accident.
"""
chosen = ""
if user is not None:
chosen = str((getattr(user, "settings_json", None) or {}).get("language") or "")
return known(chosen) if chosen else instance_default()
def known(code: str | None) -> str:
"""A language this application has, from whatever was stored or requested."""
value = (code or "").strip().lower()
if value in LANGUAGE_IDS:
return value
# A stored value from a release that offered more languages than this one, or
# a hand-edited row. English rather than an error: a preference nobody can
# satisfy is not a reason to refuse somebody their settings page.
return SOURCE
def catalogue(code: str) -> Mapping[str, str]:
"""Every translation for one language, keyed by its English source."""
code = known(code)
if code == SOURCE:
return {}
if code not in _catalogues:
try:
module = __import__(f"lembas.web.i18n.{code}", fromlist=["MESSAGES"])
_catalogues[code] = dict(getattr(module, "MESSAGES", {}))
except Exception: # noqa: BLE001 - a broken catalogue must not break the page
log.exception("could not load the %s catalogue", code)
_catalogues[code] = {}
return _catalogues[code]
def active() -> str:
return _active.get()
def activate(code: str | None) -> str:
"""Set the language for this request. Returns what was actually set."""
code = known(code)
_active.set(code)
return code
def direction(code: str | None = None) -> str:
return DIRECTIONS.get(known(code) if code else active(), "ltr")
def translate(text: str, code: str | None = None) -> str:
"""One string in the active language, or the English it was written in.
Whitespace is collapsed for the *lookup* and not for the output. A template
wraps its prose across lines for the width of the file, so the same sentence
reaches here with different newlines in it depending on where it sits -- and a
catalogue keyed on the exact bytes would need an entry per wrapping. What is
returned is the translation as written in the catalogue, or the original text
untouched.
"""
if not text:
return text
entries = catalogue(code or active())
if not entries:
return text
return entries.get(" ".join(text.split()), text)
def t(text: str, **fields: object) -> str:
"""The function templates and routes call.
`t("Saved %(name)s", name=x)` rather than an f-string, because a translator
needs the whole sentence and because the order of the parts is not the same in
every language. Percent-named rather than `str.format`, so a stray brace in a
translation cannot raise.
"""
out = translate(text)
if not fields:
return out
try:
return out % fields
except (KeyError, TypeError, ValueError):
# A catalogue whose placeholders do not match the source is a bug in the
# catalogue, and the English sentence is a better answer than a traceback
# in the middle of somebody's page.
log.warning("placeholder mismatch translating %r", text[:60])
try:
return text % fields
except (KeyError, TypeError, ValueError):
return text
__all__ = [
"DIRECTIONS",
"LANGUAGES",
"LANGUAGE_IDS",
"SOURCE",
"activate",
"active",
"catalogue",
"direction",
"forget",
"for_user",
"instance_default",
"known",
"stamp",
"t",
"translate",
]
# --- Dates ---------------------------------------------------------------------
#
# `strftime("%A")` and `%B` emit C-locale English whatever the page is in, which is
# invisible until the day a second language ships and then wrong on every screen
# showing a date. Setting a process locale is not an option: it is global, it is
# not thread-safe, and this application renders two people's pages at once.
#
# So the names are a table and the *format* is itself translatable -- Slovak wants
# "26. septembra 2026", not "26 September 2026", and that is a different pattern
# rather than different words in the same one.
#
# ⚠ Only for what a **person** reads. `harness.py`, `schedule/runner.py` and
# `schedule/compile.py` all put dates in front of a *model*, and those stay
# English: the prompts are written in English, a model is not the reader, and a
# background task has no request language anyway.
MONTHS: Mapping[str, Mapping[str, str]] = {
"sk": {
"January": "januára",
"February": "februára",
"March": "marca",
"April": "apríla",
"May": "mája",
"June": "júna",
"July": "júla",
"August": "augusta",
"September": "septembra",
"October": "októbra",
"November": "novembra",
"December": "decembra",
}
}
DAYS: Mapping[str, Mapping[str, str]] = {
"sk": {
"Monday": "pondelok",
"Tuesday": "utorok",
"Wednesday": "streda",
"Thursday": "štvrtok",
"Friday": "piatok",
"Saturday": "sobota",
"Sunday": "nedeľa",
}
}
def stamp(value, fmt: str) -> str:
"""One date, in the reader's language.
`fmt` is an English `strftime` pattern and is translated like any other
string, so a language that puts the day before the month -- or wants a full
stop after it -- says so in the catalogue rather than here.
"""
if value is None:
return ""
code = active()
text = value.strftime(translate(fmt, code))
for table in (MONTHS.get(code, {}), DAYS.get(code, {})):
for english, local in table.items():
text = text.replace(english, local)
return text
File diff suppressed because it is too large Load Diff
+3 -1
View File
@@ -260,7 +260,9 @@ a.tabs__tab { text-decoration: none; }
*/ */
.field-row { .field-row {
display: grid; display: grid;
grid-template-columns: repeat(auto-fit, minmax(9rem, 1fr)); /* Both halves of the pair -- see `.grid--2` in app.css. */
min-width: 0;
grid-template-columns: repeat(auto-fit, minmax(min(100%, 9rem), 1fr));
gap: var(--sp-3); gap: var(--sp-3);
} }
.field-row > .field { margin-bottom: var(--sp-4); } .field-row > .field { margin-bottom: var(--sp-4); }
+16 -2
View File
@@ -384,8 +384,16 @@ input.visually-hidden[type="checkbox"] {
/* Multi-column form layout, one definition. */ /* Multi-column form layout, one definition. */
.grid { display: grid; gap: var(--sp-4); } .grid { display: grid; gap: var(--sp-4); }
.grid--2 { grid-template-columns: repeat(auto-fit, minmax(14rem, 1fr)); } /* `min(100%, …)` on every auto-fit track and `min-width: 0` with it, for the
.grid--3 { grid-template-columns: repeat(auto-fit, minmax(9rem, 1fr)); } reason `.suggestions` in chat.css sets out at length. The pair is not
optional: `min(100%, …)` stops the track demanding more than the box, and
`min-width: 0` stops the *box* demanding more than its parent -- a grid or
flex item carries `min-width: auto`, which is a min-content floor, and a
floor beats `width`. A stylesheet cannot tell whether one of these grids has
been dropped into a flex parent today, so both go on every one of them.
`tests/test_narrow_grids.py` refuses a track that has only half the pair. */
.grid--2 { min-width: 0; grid-template-columns: repeat(auto-fit, minmax(min(100%, 14rem), 1fr)); }
.grid--3 { min-width: 0; grid-template-columns: repeat(auto-fit, minmax(min(100%, 9rem), 1fr)); }
/* --- Alerts --------------------------------------------------------------- */ /* --- Alerts --------------------------------------------------------------- */
.alert { .alert {
@@ -417,6 +425,12 @@ input.visually-hidden[type="checkbox"] {
color: var(--ink-muted); color: var(--ink-muted);
} }
.badge--leaf { background: var(--leaf-soft); color: var(--leaf); } .badge--leaf { background: var(--leaf-soft); color: var(--leaf); }
/* A crowd's backward pass: everybody has answered and each is being asked
whether it disagrees. Quieter than an answer, because most of these are one
line saying "no" -- and deliberately *not* hidden, because the one that says
yes is the whole reason the feature exists. */
.msg--crowd-back .msg__body { color: var(--ink-muted); }
.msg--crowd-back .msg__author { font-weight: 500; }
.badge--success { background: var(--success-soft); color: var(--success); } .badge--success { background: var(--success-soft); color: var(--success); }
.badge--danger { background: var(--danger-soft); color: var(--danger); } .badge--danger { background: var(--danger-soft); color: var(--danger); }
.badge--warning { background: var(--warning-soft); color: var(--warning); } .badge--warning { background: var(--warning-soft); color: var(--warning); }
+21 -1
View File
@@ -266,7 +266,27 @@
*/ */
.suggestions { .suggestions {
display: grid; display: grid;
grid-template-columns: repeat(auto-fit, minmax(13rem, 1fr)); /* 🚨 `min-width: 0` is what keeps this grid on the screen, and `width: 100%`
alone did not: it is a grid item of `.thread__intro`, so it carries
`min-width: auto`, which for a grid item means *a min-content floor* -- and
min-width beats width. Its min-content size is two cards side by side, so it
rendered 428px wide inside a 390px phone with `width: 100%` set and ignored.
That floor is also why writing the track as `minmax(min(100%, 13rem), 1fr)`
-- the tree's standing rule, and right -- made it *worse* on its own, 428px
to 455px: a percentage is indefinite while the floor is being measured, so
the track fell back to a card's max-content and raised the very number that
was overflowing. The two go together. With the floor removed, `width: 100%`
finally resolves against the 366px column, `min(100%, …)` hands the track
366px to clamp against, and `auto-fit` places one column.
It scrolled `.thread-scroll` rather than the page, which is why a pass
looking for a document that scrolls sideways never saw it: `overflow-y: auto`
makes the other axis scrollable too. Reported on a phone, found by asking
which *element* could scroll and then reading its computed `width` against
its parent's. */
min-width: 0;
grid-template-columns: repeat(auto-fit, minmax(min(100%, 13rem), 1fr));
gap: var(--sp-3); gap: var(--sp-3);
width: 100%; width: 100%;
max-width: 40rem; max-width: 40rem;
@@ -17,7 +17,7 @@
<span class="badge">{{ model_count }} model{{ '' if model_count == 1 else 's' }}</span> <span class="badge">{{ model_count }} model{{ '' if model_count == 1 else 's' }}</span>
{% endif %} {% endif %}
{% if not connection.enabled %} {% if not connection.enabled %}
<span class="badge">disabled</span> <span class="badge">{{ t("disabled") }}</span>
{% endif %} {% endif %}
</div> </div>
@@ -28,7 +28,7 @@
formnovalidate> formnovalidate>
{{ icon("refresh", "icon--sm") }} Test &amp; refresh {{ icon("refresh", "icon--sm") }} Test &amp; refresh
</button> </button>
<button class="btn btn--sm btn--primary" type="submit">Save</button> <button class="btn btn--sm btn--primary" type="submit">{{ t("Save") }}</button>
</div> </div>
</div> </div>
@@ -45,23 +45,23 @@
{% endif %} {% endif %}
<div class="field"> <div class="field">
<label class="field__label" for="name-{{ connection.id }}">Name</label> <label class="field__label" for="name-{{ connection.id }}">{{ t("Name") }}</label>
<input class="input" id="name-{{ connection.id }}" name="name" <input class="input" id="name-{{ connection.id }}" name="name"
value="{{ connection.name }}" required> value="{{ connection.name }}" required>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="url-{{ connection.id }}">Base URL</label> <label class="field__label" for="url-{{ connection.id }}">{{ t("Base URL") }}</label>
<input class="input input--mono" id="url-{{ connection.id }}" name="base_url" <input class="input input--mono" id="url-{{ connection.id }}" name="base_url"
value="{{ connection.base_url }}" required> value="{{ connection.base_url }}" required>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="key-{{ connection.id }}">API key</label> <label class="field__label" for="key-{{ connection.id }}">{{ t("API key") }}</label>
<input class="input input--mono" id="key-{{ connection.id }}" name="api_key" <input class="input input--mono" id="key-{{ connection.id }}" name="api_key"
type="password" autocomplete="off" type="password" autocomplete="off"
value="{{ unchanged if connection.api_key_encrypted else '' }}" value="{{ unchanged if connection.api_key_encrypted else '' }}"
placeholder="No key set"> placeholder="{{ t('No key set') }}">
<p class="field__hint"> <p class="field__hint">
{% if connection.api_key_encrypted %} {% if connection.api_key_encrypted %}
Currently <code>{{ masked }}</code>. Leave the dots alone to keep it, Currently <code>{{ masked }}</code>. Leave the dots alone to keep it,
@@ -73,14 +73,14 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="unload-{{ connection.id }}">Unload URL</label> <label class="field__label" for="unload-{{ connection.id }}">{{ t("Unload URL") }}</label>
<div class="btn-row"> <div class="btn-row">
<input class="input input--mono" id="unload-{{ connection.id }}" name="unload_url" <input class="input input--mono" id="unload-{{ connection.id }}" name="unload_url"
value="{{ connection.unload_url }}" placeholder="No unload call" value="{{ connection.unload_url }}" placeholder="{{ t('No unload call') }}"
style="flex: 1; min-width: 0"> style="flex: 1; min-width: 0">
<select class="select" name="unload_method" aria-label="How to ask it to unload" style="flex: none"> <select class="select" name="unload_method" aria-label="{{ t('How to ask it to unload') }}" style="flex: none">
<option value="POST" {{ 'selected' if connection.unload_method != 'GET' }}>POST</option> <option value="POST" {{ 'selected' if connection.unload_method != 'GET' }}>{{ t("POST") }}</option>
<option value="GET" {{ 'selected' if connection.unload_method == 'GET' }}>GET</option> <option value="GET" {{ 'selected' if connection.unload_method == 'GET' }}>{{ t("GET") }}</option>
</select> </select>
</div> </div>
<p class="field__hint"> <p class="field__hint">
@@ -92,10 +92,10 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="headers-{{ connection.id }}">Extra headers</label> <label class="field__label" for="headers-{{ connection.id }}">{{ t("Extra headers") }}</label>
<textarea class="textarea input--mono" id="headers-{{ connection.id }}" <textarea class="textarea input--mono" id="headers-{{ connection.id }}"
name="extra_headers" rows="2" name="extra_headers" rows="2"
placeholder="HTTP-Referer: https://example.org">{% for name, value in (connection.extra_headers_json or {}).items() %}{{ name }}: {{ value }} placeholder="{{ t('HTTP-Referer: https://example.org') }}">{% for name, value in (connection.extra_headers_json or {}).items() %}{{ name }}: {{ value }}
{% endfor %}</textarea> {% endfor %}</textarea>
<p class="field__hint"> <p class="field__hint">
One <code>Name: value</code> per line, sent with every request to this One <code>Name: value</code> per line, sent with every request to this
@@ -109,7 +109,7 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" <input type="checkbox" name="enabled" value="true"
{{ 'checked' if connection.enabled }}> {{ 'checked' if connection.enabled }}>
<span>Enabled — its models are offered in chats</span> <span>{{ t("Enabled — its models are offered in chats") }}</span>
</label> </label>
</div> </div>
+26 -19
View File
@@ -29,76 +29,83 @@
{% include "partials/_sidebar_close.html" %} {% include "partials/_sidebar_close.html" %}
</header> </header>
<nav class="sidebar__scroll" aria-label="Administration"> <nav class="sidebar__scroll" aria-label="{{ t('Administration') }}">
<div class="nav-group"> <div class="nav-group">
<div class="nav-group__label">Administration</div> <div class="nav-group__label">Administration</div>
<a class="nav-item {{ 'is-active' if section == 'general' }}" href="/admin/general"> <a class="nav-item {{ 'is-active' if section == 'general' }}" href="/admin/general">
{{ icon("gear", "icon--sm") }} {{ icon("gear", "icon--sm") }}
<span class="nav-item__label">General</span> <span class="nav-item__label">{{ t("General") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'customization' }}" <a class="nav-item {{ 'is-active' if section == 'customization' }}"
href="/admin/customization"> href="/admin/customization">
{{ icon("sun", "icon--sm") }} {{ icon("sun", "icon--sm") }}
<span class="nav-item__label">Customization</span> <span class="nav-item__label">{{ t("Customization") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'connections' }}" <a class="nav-item {{ 'is-active' if section == 'connections' }}"
href="/admin/connections"> href="/admin/connections">
{{ icon("server", "icon--sm") }} {{ icon("server", "icon--sm") }}
<span class="nav-item__label">Connections</span> <span class="nav-item__label">{{ t("Connections") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'models' }}" href="/admin/models"> <a class="nav-item {{ 'is-active' if section == 'models' }}" href="/admin/models">
{{ icon("sliders", "icon--sm") }} {{ icon("sliders", "icon--sm") }}
<span class="nav-item__label">Models</span> <span class="nav-item__label">{{ t("Models") }}</span>
</a>
{# Its own entry rather than a card on Agents, where it started. Sitting
there made it read as an agent-chat feature -- which is what the owner
took it for, reasonably, since that is what the page is called. #}
<a class="nav-item {{ 'is-active' if section == 'crowd' }}" href="/admin/crowd">
{{ icon("users", "icon--sm") }}
<span class="nav-item__label">{{ t("A crowd") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'audio' }}" href="/admin/audio"> <a class="nav-item {{ 'is-active' if section == 'audio' }}" href="/admin/audio">
{{ icon("speaker", "icon--sm") }} {{ icon("speaker", "icon--sm") }}
<span class="nav-item__label">Audio</span> <span class="nav-item__label">{{ t("Audio") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'search' }}" href="/admin/search"> <a class="nav-item {{ 'is-active' if section == 'search' }}" href="/admin/search">
{{ icon("globe", "icon--sm") }} {{ icon("globe", "icon--sm") }}
<span class="nav-item__label">Web search</span> <span class="nav-item__label">{{ t("Web search") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'images' }}" href="/admin/images"> <a class="nav-item {{ 'is-active' if section == 'images' }}" href="/admin/images">
{{ icon("image", "icon--sm") }} {{ icon("image", "icon--sm") }}
<span class="nav-item__label">Image generation</span> <span class="nav-item__label">{{ t("Image generation") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'extraction' }}" <a class="nav-item {{ 'is-active' if section == 'extraction' }}"
href="/admin/extraction"> href="/admin/extraction">
{{ icon("file-text", "icon--sm") }} {{ icon("file-text", "icon--sm") }}
<span class="nav-item__label">Extraction</span> <span class="nav-item__label">{{ t("Extraction") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'tools' }}" href="/admin/tools"> <a class="nav-item {{ 'is-active' if section == 'tools' }}" href="/admin/tools">
{{ icon("link", "icon--sm") }} {{ icon("link", "icon--sm") }}
<span class="nav-item__label">Tools</span> <span class="nav-item__label">{{ t("Tools") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'agents' }}" href="/admin/agents"> <a class="nav-item {{ 'is-active' if section == 'agents' }}" href="/admin/agents">
{{ icon("sparkle", "icon--sm") }} {{ icon("sparkle", "icon--sm") }}
<span class="nav-item__label">Agents</span> <span class="nav-item__label">{{ t("Agents") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'schedules' }}" href="/admin/schedules"> <a class="nav-item {{ 'is-active' if section == 'schedules' }}" href="/admin/schedules">
{{ icon("clock", "icon--sm") }} {{ icon("clock", "icon--sm") }}
<span class="nav-item__label">Scheduling</span> <span class="nav-item__label">{{ t("Scheduling") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'mcp' }}" href="/admin/mcp"> <a class="nav-item {{ 'is-active' if section == 'mcp' }}" href="/admin/mcp">
{{ icon("server", "icon--sm") }} {{ icon("server", "icon--sm") }}
<span class="nav-item__label">MCP servers</span> <span class="nav-item__label">{{ t("MCP servers") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'prompts' }}" href="/admin/prompts"> <a class="nav-item {{ 'is-active' if section == 'prompts' }}" href="/admin/prompts">
{{ icon("sparkle", "icon--sm") }} {{ icon("sparkle", "icon--sm") }}
<span class="nav-item__label">Prompts</span> <span class="nav-item__label">{{ t("Prompts") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'suggestions' }}" <a class="nav-item {{ 'is-active' if section == 'suggestions' }}"
href="/admin/suggestions"> href="/admin/suggestions">
{{ icon("star", "icon--sm") }} {{ icon("star", "icon--sm") }}
<span class="nav-item__label">Suggestions</span> <span class="nav-item__label">{{ t("Suggestions") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'users' }}" href="/admin/users"> <a class="nav-item {{ 'is-active' if section == 'users' }}" href="/admin/users">
{{ icon("user", "icon--sm") }} {{ icon("user", "icon--sm") }}
<span class="nav-item__label">Users</span> <span class="nav-item__label">{{ t("Users") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'updates' }}" href="/admin/updates"> <a class="nav-item {{ 'is-active' if section == 'updates' }}" href="/admin/updates">
{{ icon("refresh", "icon--sm") }} {{ icon("refresh", "icon--sm") }}
<span class="nav-item__label">Updates</span> <span class="nav-item__label">{{ t("Updates") }}</span>
</a> </a>
<a class="nav-item {{ 'is-active' if section == 'groups' }}" href="/admin/groups"> <a class="nav-item {{ 'is-active' if section == 'groups' }}" href="/admin/groups">
{{ icon("users", "icon--sm") }} {{ icon("users", "icon--sm") }}
@@ -111,7 +118,7 @@
<div class="sidebar__footer"> <div class="sidebar__footer">
<a class="nav-item" href="/chat"> <a class="nav-item" href="/chat">
{{ icon("chat", "icon--sm") }} {{ icon("chat", "icon--sm") }}
<span class="nav-item__label">Back to chats</span> <span class="nav-item__label">{{ t("Back to chats") }}</span>
</a> </a>
</div> </div>
</aside> </aside>
@@ -122,7 +129,7 @@
<header class="topbar"> <header class="topbar">
{% include "partials/_sidebar_toggle.html" %} {% include "partials/_sidebar_toggle.html" %}
<h1 class="topbar__title">{% block heading %}Administration{% endblock %}</h1> <h1 class="topbar__title">{% block heading %}Administration{% endblock %}</h1>
<button class="btn btn--icon" type="button" data-theme-toggle aria-label="Switch theme"> <button class="btn btn--icon" type="button" data-theme-toggle aria-label="{{ t('Switch theme') }}">
<span class="theme-icon theme-icon--dark">{{ icon("moon") }}</span> <span class="theme-icon theme-icon--dark">{{ icon("moon") }}</span>
<span class="theme-icon theme-icon--light">{{ icon("sun") }}</span> <span class="theme-icon theme-icon--light">{{ icon("sun") }}</span>
</button> </button>
+3 -3
View File
@@ -10,9 +10,9 @@
<div class="model-row__title"> <div class="model-row__title">
<a class="model-row__name" href="/admin/mcp/{{ server.id }}/edit">{{ server.name }}</a> <a class="model-row__name" href="/admin/mcp/{{ server.id }}/edit">{{ server.name }}</a>
<span class="badge">{{ tool_count }} tool{{ '' if tool_count == 1 else 's' }}</span> <span class="badge">{{ tool_count }} tool{{ '' if tool_count == 1 else 's' }}</span>
{% if not server.enabled %}<span class="badge badge--danger">disabled</span>{% endif %} {% if not server.enabled %}<span class="badge badge--danger">{{ t("disabled") }}</span>{% endif %}
{% if not server.public %}<span class="badge">restricted</span>{% endif %} {% if not server.public %}<span class="badge">{{ t("restricted") }}</span>{% endif %}
{% if server.allow_private %}<span class="badge">private network</span>{% endif %} {% if server.allow_private %}<span class="badge">{{ t("private network") }}</span>{% endif %}
{% if server.protocol_version %} {% if server.protocol_version %}
<span class="badge badge--leaf">MCP {{ server.protocol_version }}</span> <span class="badge badge--leaf">MCP {{ server.protocol_version }}</span>
{% endif %} {% endif %}
@@ -7,17 +7,15 @@
<div class="card__header"> <div class="card__header">
<h2 class="card__title"> <h2 class="card__title">
{{ fragment.label }} {{ fragment.label }}
{% if overridden %}<span class="badge badge--leaf">edited</span>{% endif %} {% if overridden %}<span class="badge badge--leaf">{{ t("edited") }}</span>{% endif %}
{% for family in fragment.families %}<span class="badge">{{ family }}</span>{% endfor %} {% for family in fragment.families %}<span class="badge">{{ family }}</span>{% endfor %}
{% if fragment.when_tools %}<span class="badge">with tools</span>{% endif %} {% if fragment.when_tools %}<span class="badge">{{ t("with tools") }}</span>{% endif %}
</h2> </h2>
<button class="btn btn--sm" type="button" <button class="btn btn--sm" type="button"
hx-post="/admin/prompts/default" hx-post="/admin/prompts/default"
hx-vals='{"key": "{{ fragment.key }}"}' hx-vals='{"key": "{{ fragment.key }}"}'
hx-target="#{{ field_id }}" hx-swap="outerHTML" hx-target="#{{ field_id }}" hx-swap="outerHTML"
hx-confirm="Put the built-in wording back in this box? Your edit is lost, but nothing is saved until you press Save settings."> hx-confirm="Put the built-in wording back in this box? Your edit is lost, but nothing is saved until you press Save settings.">{{ t("Use default") }}</button>
Use default
</button>
</div> </div>
{% if fragment.hint %}<p class="card__lede">{{ fragment.hint }}</p>{% endif %} {% if fragment.hint %}<p class="card__lede">{{ fragment.hint }}</p>{% endif %}
@@ -27,15 +27,10 @@
</p> </p>
{% if title_prompt %} {% if title_prompt %}
<h3 class="admin-section-title">Chat title request</h3> <h3 class="admin-section-title">{{ t("Chat title request") }}</h3>
<p class="card__lede"> <p class="card__lede">{{ t("Sent on its own after the first reply, not as part of any conversation.") }}</p>
Sent on its own after the first reply, not as part of any conversation.
</p>
<pre class="prompt-preview"><code>{{ title_prompt }}</code></pre> <pre class="prompt-preview"><code>{{ title_prompt }}</code></pre>
{% else %} {% else %}
<h3 class="admin-section-title">Chat title request</h3> <h3 class="admin-section-title">{{ t("Chat title request") }}</h3>
<p class="card__lede"> <p class="card__lede">{{ t("Empty, so no model is asked to name a chat. Chats are named from the first thing said in them.") }}</p>
Empty, so no model is asked to name a chat. Chats are named from the first
thing said in them.
</p>
{% endif %} {% endif %}
@@ -16,6 +16,6 @@
{% endif %} {% endif %}
{% if outcome %} {% if outcome %}
<p class="field__hint">This is what the model would read back:</p> <p class="field__hint">{{ t("This is what the model would read back:") }}</p>
<pre class="tool-result__text">{{ outcome.content }}</pre> <pre class="tool-result__text">{{ outcome.content }}</pre>
{% endif %} {% endif %}
+91 -170
View File
@@ -7,9 +7,9 @@
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">
An <strong>Agent</strong> chat can read files, write files and run commands on An <strong>{{ t("Agent") }}</strong> chat can read files, write files and run commands on
a machine reached over SSH. Nothing runs on this server. People add their own a machine reached over SSH. Nothing runs on this server. People add their own
connections under <strong>Connections</strong>; what you decide here is connections under <strong>{{ t("Connections") }}</strong>; what you decide here is
whether the feature exists and what one reply may spend. whether the feature exists and what one reply may spend.
</p> </p>
@@ -20,7 +20,7 @@
whatever host somebody points a connection at. A container built for the whatever host somebody points a connection at. A container built for the
job is a very different thing from a key to a live server, and {{ brand.name }} job is a very different thing from a key to a live server, and {{ brand.name }}
cannot tell them apart. What a model reads — a web page, a file, the output cannot tell them apart. What a model reads — a web page, a file, the output
of the last command — is untrusted, and in <strong>Auto</strong> mode of the last command — is untrusted, and in <strong>{{ t("Auto") }}</strong> mode
nothing stands between that and a command running. nothing stands between that and a command running.
</span> </span>
</div> </div>
@@ -30,17 +30,17 @@
{% endif %} {% endif %}
{% if saved %} {% if saved %}
<div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>Saved.</span></div> <div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>{{ t("Saved.") }}</span></div>
{% endif %} {% endif %}
<form method="post" action="/admin/agents" class="form-grid"> <form method="post" action="/admin/agents" class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">Switch</h2> <h2 class="card__title">{{ t("Switch") }}</h2>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" {{ 'checked' if values.enabled }}> <input type="checkbox" name="enabled" value="true" {{ 'checked' if values.enabled }}>
<span>Allow agent chats</span> <span>{{ t("Allow agent chats") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">
Off, nobody can start one and no agent tool is offered, whatever Off, nobody can start one and no agent tool is offered, whatever
@@ -49,13 +49,13 @@
</p> </p>
</div> </div>
<p class="field__hint"> <p class="field__hint">
People also need the <strong>Run commands</strong> permission, a model People also need the <strong>{{ t("Run commands") }}</strong> permission, a model
flagged <strong>Agent execution</strong>, and a connection of their own. flagged <strong>{{ t("Agent execution") }}</strong>, and a connection of their own.
</p> </p>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Connections to this machine</h2> <h2 class="card__title">{{ t("Connections to this machine") }}</h2>
<p class="card__lede"> <p class="card__lede">
Agent chats reach a machine over SSH, and the point of that is that it is Agent chats reach a machine over SSH, and the point of that is that it is
not this one — nothing runs on the host holding the database and the not this one — nothing runs on the host holding the database and the
@@ -76,11 +76,11 @@
{% endfor %} {% endfor %}
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="loopback_port">The allowed port</label> <label class="field__label" for="loopback_port">{{ t("The allowed port") }}</label>
<input class="input" type="number" id="loopback_port" name="loopback_port" <input class="input" type="number" id="loopback_port" name="loopback_port"
min="0" max="65535" step="1" value="{{ values.loopback_port or 0 }}"> min="0" max="65535" step="1" value="{{ values.loopback_port or 0 }}">
<p class="field__hint"> <p class="field__hint">
Only read when the position above is <strong>Only on one port</strong>. Only read when the position above is <strong>{{ t("Only on one port") }}</strong>.
Port 22 is refused whatever is typed here — that one is this host's own Port 22 is refused whatever is typed here — that one is this host's own
sshd, not a container that published its port on the loopback interface. sshd, not a container that published its port on the loopback interface.
</p> </p>
@@ -88,11 +88,8 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">The modes</h2> <h2 class="card__title">{{ t("The modes") }}</h2>
<p class="field__hint"> <p class="field__hint">{{ t("Set per chat and switchable at any time. This is what each one means; the two lists below adjust them.") }}</p>
Set per chat and switchable at any time. This is what each one means; the
two lists below adjust them.
</p>
<dl class="mode-list"> <dl class="mode-list">
{% for value, label, hint in modes %} {% for value, label, hint in modes %}
<div class="mode-list__row"> <div class="mode-list__row">
@@ -104,9 +101,9 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">What never needs asking</h2> <h2 class="card__title">{{ t("What never needs asking") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="allow_default">Always allow</label> <label class="field__label" for="allow_default">{{ t("Always allow") }}</label>
<textarea class="textarea input--mono" id="allow_default" name="allow_default" rows="5" <textarea class="textarea input--mono" id="allow_default" name="allow_default" rows="5"
spellcheck="false">{{ allow_text }}</textarea> spellcheck="false">{{ allow_text }}</textarea>
<p class="field__hint"> <p class="field__hint">
@@ -120,18 +117,18 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">What always needs asking</h2> <h2 class="card__title">{{ t("What always needs asking") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="deny_default">Always ask</label> <label class="field__label" for="deny_default">{{ t("Always ask") }}</label>
<textarea class="textarea input--mono" id="deny_default" name="deny_default" rows="5" <textarea class="textarea input--mono" id="deny_default" name="deny_default" rows="5"
spellcheck="false">{{ deny_text }}</textarea> spellcheck="false">{{ deny_text }}</textarea>
<p class="field__hint"> <p class="field__hint">
Checked before everything, including <strong>Auto</strong>. Treat it as Checked before everything, including <strong>{{ t("Auto") }}</strong>. Treat it as
a guard against an accident rather than against an adversary: a guard against an accident rather than against an adversary:
<code>rm -rf /*</code> here does not stop <code>/bin/rm -rf /</code>, and <code>rm -rf /*</code> here does not stop <code>/bin/rm -rf /</code>, and
nothing pattern-shaped could. The same limit as above applies, and it nothing pattern-shaped could. The same limit as above applies, and it
cuts the other way here: a command line that runs more than one thing cuts the other way here: a command line that runs more than one thing
matches none of these, so in <strong>Auto</strong> matches none of these, so in <strong>{{ t("Auto") }}</strong>
<code>shutdown -h now</code> asks and <code>shutdown -h now &amp;</code> <code>shutdown -h now</code> asks and <code>shutdown -h now &amp;</code>
runs. Anything that must never happen belongs on the far side, in that runs. Anything that must never happen belongs on the far side, in that
account’s own permissions. account’s own permissions.
@@ -140,40 +137,34 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">What one command may spend</h2> <h2 class="card__title">{{ t("What one command may spend") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="default_timeout">Timeout (seconds)</label> <label class="field__label" for="default_timeout">{{ t("Timeout (seconds)") }}</label>
<input class="input" id="default_timeout" name="default_timeout" <input class="input" id="default_timeout" name="default_timeout"
value="{{ values.default_timeout }}" inputmode="numeric"> value="{{ values.default_timeout }}" inputmode="numeric">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="max_timeout">Longest a command may ask for</label> <label class="field__label" for="max_timeout">{{ t("Longest a command may ask for") }}</label>
<input class="input" id="max_timeout" name="max_timeout" <input class="input" id="max_timeout" name="max_timeout"
value="{{ values.max_timeout }}" inputmode="numeric"> value="{{ values.max_timeout }}" inputmode="numeric">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="max_output_bytes">Most output to keep</label> <label class="field__label" for="max_output_bytes">{{ t("Most output to keep") }}</label>
<input class="input" id="max_output_bytes" name="max_output_bytes" <input class="input" id="max_output_bytes" name="max_output_bytes"
value="{{ values.max_output_bytes }}" inputmode="numeric"> value="{{ values.max_output_bytes }}" inputmode="numeric">
<p class="field__hint"> <p class="field__hint">{{ t("Characters. The rest is cut off and the model is told so.") }}</p>
Characters. The rest is cut off and the model is told so.
</p>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Background commands</h2> <h2 class="card__title">{{ t("Background commands") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("A command that would outlast its timeout can be left running instead of killed — detached on the far side, checked on later. It is how a long install, build or download becomes possible at all.") }}</p>
A command that would outlast its timeout can be left running instead of
killed — detached on the far side, checked on later. It is how a long
install, build or download becomes possible at all.
</p>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="background_enabled" <input type="checkbox" name="background_enabled"
{{ 'checked' if values.background_enabled }}> {{ 'checked' if values.background_enabled }}>
<span>Allow commands to run in the background</span> <span>{{ t("Allow commands to run in the background") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">
Off means byte-for-byte the old behaviour: a command that hits its Off means byte-for-byte the old behaviour: a command that hits its
@@ -188,63 +179,44 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="background_on_timeout" <input type="checkbox" name="background_on_timeout"
{{ 'checked' if values.background_on_timeout }}> {{ 'checked' if values.background_on_timeout }}>
<span>Keep a timed-out command running instead of killing it</span> <span>{{ t("Keep a timed-out command running instead of killing it") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("Off leaves the timeout a hard stop; the model can still choose to background a command up front.") }}</p>
Off leaves the timeout a hard stop; the model can still choose to
background a command up front.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="background_notify" <input type="checkbox" name="background_notify"
{{ 'checked' if values.background_notify }}> {{ 'checked' if values.background_notify }}>
<span>Wake the model when a background job finishes</span> <span>{{ t("Wake the model when a background job finishes") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("On, a finished job starts (or joins) a reply carrying its result. Off, the model only sees it the next time it runs of its own accord.") }}</p>
On, a finished job starts (or joins) a reply carrying its result. Off,
the model only sees it the next time it runs of its own accord.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="background_max_jobs">Most jobs watched at once</label> <label class="field__label" for="background_max_jobs">{{ t("Most jobs watched at once") }}</label>
<input class="input" id="background_max_jobs" name="background_max_jobs" <input class="input" id="background_max_jobs" name="background_max_jobs"
value="{{ values.background_max_jobs }}" inputmode="numeric"> value="{{ values.background_max_jobs }}" inputmode="numeric">
<p class="field__hint"> <p class="field__hint">{{ t("Each is a periodic reconnect to the machine. Jobs past this still run; they are simply not watched, and the model is not woken for them.") }}</p>
Each is a periodic reconnect to the machine. Jobs past this still run;
they are simply not watched, and the model is not woken for them.
</p>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">What one reply may spend</h2> <h2 class="card__title">{{ t("What one reply may spend") }}</h2>
<p class="field__hint"> <p class="field__hint">{{ t("Four separate bounds, because they fail differently: the clock stops one slow command eating an afternoon, tool output stops a model filling its own context with build logs and having no room to answer, written tokens stop one that keeps going, and the step count is a backstop against a runaway.") }}</p>
Four separate bounds, because they fail differently: the clock stops one
slow command eating an afternoon, tool output stops a model filling its own
context with build logs and having no room to answer, written tokens stop
one that keeps going, and the step count is a backstop against a runaway.
</p>
<div class="field"> <div class="field">
<label class="field__label" for="max_completion_tokens"> <label class="field__label" for="max_completion_tokens">{{ t("Most a reply may write") }}</label>
Most a reply may write
</label>
<input class="input" id="max_completion_tokens" name="max_completion_tokens" <input class="input" id="max_completion_tokens" name="max_completion_tokens"
value="{{ values.max_completion_tokens }}" inputmode="numeric"> value="{{ values.max_completion_tokens }}" inputmode="numeric">
<p class="field__hint"> <p class="field__hint">{{ t("In tokens, across every round of one reply. This is the bound that normally ends a long piece of work. Zero means no ceiling.") }}</p>
In tokens, across every round of one reply. This is the bound that
normally ends a long piece of work. Zero means no ceiling.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="max_wall_seconds">Longest a reply may take</label> <label class="field__label" for="max_wall_seconds">{{ t("Longest a reply may take") }}</label>
<input class="input" id="max_wall_seconds" name="max_wall_seconds" <input class="input" id="max_wall_seconds" name="max_wall_seconds"
value="{{ values.max_wall_seconds }}" inputmode="numeric"> value="{{ values.max_wall_seconds }}" inputmode="numeric">
<p class="field__hint">Time spent waiting for you to answer does not count.</p> <p class="field__hint">{{ t("Time spent waiting for you to answer does not count.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="max_total_output_bytes">Most output across a reply</label> <label class="field__label" for="max_total_output_bytes">{{ t("Most output across a reply") }}</label>
<input class="input" id="max_total_output_bytes" name="max_total_output_bytes" <input class="input" id="max_total_output_bytes" name="max_total_output_bytes"
value="{{ values.max_total_output_bytes }}" inputmode="numeric"> value="{{ values.max_total_output_bytes }}" inputmode="numeric">
</div> </div>
@@ -252,61 +224,44 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="nudge_unfinished" <input type="checkbox" name="nudge_unfinished"
{{ 'checked' if values.nudge_unfinished }}> {{ 'checked' if values.nudge_unfinished }}>
<span>Ask it to carry on when it stops with tasks outstanding</span> <span>{{ t("Ask it to carry on when it stops with tasks outstanding") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("Only ever against a plan, and only while tasks on it are still open — that is the one thing there is to be objectively wrong about. A reply with no plan that says it has finished is believed. It is asked at most twice in a row, and if it stops a third time that is recorded in the transcript rather than argued with.") }}</p>
Only ever against a plan, and only while tasks on it are still open —
that is the one thing there is to be objectively wrong about. A reply
with no plan that says it has finished is believed. It is asked at most
twice in a row, and if it stops a third time that is recorded in the
transcript rather than argued with.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="max_steps">Most rounds of tool calls</label> <label class="field__label" for="max_steps">{{ t("Most rounds of tool calls") }}</label>
<input class="input" id="max_steps" name="max_steps" <input class="input" id="max_steps" name="max_steps"
value="{{ values.max_steps }}" inputmode="numeric"> value="{{ values.max_steps }}" inputmode="numeric">
<p class="field__hint"> <p class="field__hint">{{ t("A backstop, not a working budget. An agent reply is meant to run until the task is done, so a number low enough to be what stops it is a number that stops it halfway. Use the token ceiling above for a real limit.") }}</p>
A backstop, not a working budget. An agent reply is meant to run until
the task is done, so a number low enough to be what stops it is a number
that stops it halfway. Use the token ceiling above for a real limit.
</p>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Asking you things</h2> <h2 class="card__title">{{ t("Asking you things") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="approval_timeout">How long a question waits</label> <label class="field__label" for="approval_timeout">{{ t("How long a question waits") }}</label>
<input class="input" id="approval_timeout" name="approval_timeout" <input class="input" id="approval_timeout" name="approval_timeout"
value="{{ values.approval_timeout }}" inputmode="numeric"> value="{{ values.approval_timeout }}" inputmode="numeric">
<p class="field__hint"> <p class="field__hint">{{ t("Seconds. After this the reply carries on without an answer and says so. At least a minute, whatever is typed here.") }}</p>
Seconds. After this the reply carries on without an answer and says so.
At least a minute, whatever is typed here.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="ask_free_text" value="true" <input type="checkbox" name="ask_free_text" value="true"
{{ 'checked' if values.ask_free_text }}> {{ 'checked' if values.ask_free_text }}>
<span>Let people write their own answer</span> <span>{{ t("Let people write their own answer") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("When a model asks a question it can offer answers to pick from, and by default a box to write something else. Turn this off if you would rather nobody typed free text into a prompt a model composed.") }}</p>
When a model asks a question it can offer answers to pick from, and by
default a box to write something else. Turn this off if you would rather
nobody typed free text into a prompt a model composed.
</p>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">The terminal</h2> <h2 class="card__title">{{ t("The terminal") }}</h2>
<p class="field__hint"> <p class="field__hint">
A panel beside an agent chat holding an interactive shell on that chat's A panel beside an agent chat holding an interactive shell on that chat's
own connection. What somebody types there is <em>theirs</em>: the modes and own connection. What somebody types there is <em>{{ t("theirs") }}</em>: the modes and
the two lists above govern the model, not the person at the keyboard, who the two lists above govern the model, not the person at the keyboard, who
could open the same shell with an ssh client. The model cannot see the could open the same shell with an ssh client. The model cannot see the
panel; sending it something is a button they press. panel; sending it something is a button they press.
@@ -316,47 +271,45 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="terminal_enabled" value="true" <input type="checkbox" name="terminal_enabled" value="true"
{{ 'checked' if values.terminal_enabled }}> {{ 'checked' if values.terminal_enabled }}>
<span>Allow the terminal panel</span> <span>{{ t("Allow the terminal panel") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">
People also need the <strong>Open a terminal</strong> permission. People also need the <strong>{{ t("Open a terminal") }}</strong> permission.
{{ terminal_count }} shell{{ '' if terminal_count == 1 else 's' }} open right now. {{ terminal_count }} shell{{ '' if terminal_count == 1 else 's' }} open right now.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="terminal_idle_timeout">Close a shell after</label> <label class="field__label" for="terminal_idle_timeout">{{ t("Close a shell after") }}</label>
<input class="input" id="terminal_idle_timeout" name="terminal_idle_timeout" <input class="input" id="terminal_idle_timeout" name="terminal_idle_timeout"
value="{{ values.terminal_idle_timeout }}" inputmode="numeric"> value="{{ values.terminal_idle_timeout }}" inputmode="numeric">
<p class="field__hint"> <p class="field__hint">
Seconds with nobody watching <em>and</em> nothing typed. Closing the Seconds with nobody watching <em>{{ t("and") }}</em> nothing typed. Closing the
panel does not end the session — a build carries on and is still there panel does not end the session — a build carries on and is still there
on the way back — so this is what eventually ends one. on the way back — so this is what eventually ends one.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="terminal_max_sessions">Most shells at once</label> <label class="field__label" for="terminal_max_sessions">{{ t("Most shells at once") }}</label>
<input class="input" id="terminal_max_sessions" name="terminal_max_sessions" <input class="input" id="terminal_max_sessions" name="terminal_max_sessions"
value="{{ values.terminal_max_sessions }}" inputmode="numeric"> value="{{ values.terminal_max_sessions }}" inputmode="numeric">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="terminal_max_per_user">Most shells per person</label> <label class="field__label" for="terminal_max_per_user">{{ t("Most shells per person") }}</label>
<input class="input" id="terminal_max_per_user" name="terminal_max_per_user" <input class="input" id="terminal_max_per_user" name="terminal_max_per_user"
value="{{ values.terminal_max_per_user }}" inputmode="numeric"> value="{{ values.terminal_max_per_user }}" inputmode="numeric">
<p class="field__hint"> <p class="field__hint">{{ t("One per chat. Each holds an SSH connection open on the far machine.") }}</p>
One per chat. Each holds an SSH connection open on the far machine.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="terminal_integration" <input type="checkbox" name="terminal_integration"
{{ 'checked' if values.terminal_integration }}> {{ 'checked' if values.terminal_integration }}>
<span>Mark where commands begin and end</span> <span>{{ t("Mark where commands begin and end") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">
Gives bash and zsh the same invisible markers VS Code and WezTerm use, Gives bash and zsh the same invisible markers VS Code and WezTerm use,
so <strong>Copy</strong>, <strong>Send</strong> and the automatic so <strong>{{ t("Copy") }}</strong>, <strong>{{ t("Send") }}</strong> and the automatic
toggle know which output belongs to which command. Written by the shell toggle know which output belongs to which command. Written by the shell
into a temporary file it deletes itself, and any other shell is started into a temporary file it deletes itself, and any other shell is started
exactly as it was before. Off means those buttons fall back to copying exactly as it was before. Off means those buttons fall back to copying
@@ -366,7 +319,7 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="section-title">The project directory</h2> <h2 class="section-title">{{ t("The project directory") }}</h2>
<p class="muted"> <p class="muted">
A listing of the directory a chat works in, so a reply does not spend its A listing of the directory a chat works in, so a reply does not spend its
first rounds finding out what is there — and so files can be attached by first rounds finding out what is there — and so files can be attached by
@@ -379,20 +332,17 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="index_enabled" <input type="checkbox" name="index_enabled"
{{ 'checked' if values.index_enabled }}> {{ 'checked' if values.index_enabled }}>
<span>List the project directory</span> <span>{{ t("List the project directory") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("Off means no listing is built at all, and the file picker offers only what is in the library.") }}</p>
Off means no listing is built at all, and the file picker offers only
what is in the library.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="index_chars">Characters of it in the prompt</label> <label class="field__label" for="index_chars">{{ t("Characters of it in the prompt") }}</label>
<input class="input" id="index_chars" name="index_chars" <input class="input" id="index_chars" name="index_chars"
value="{{ values.index_chars }}" inputmode="numeric"> value="{{ values.index_chars }}" inputmode="numeric">
<p class="field__hint"> <p class="field__hint">
This is spent on <em>every</em> request in an agent chat, so it is a This is spent on <em>{{ t("every") }}</em> request in an agent chat, so it is a
budget rather than a limit: directories that will not fit are shown as budget rather than a limit: directories that will not fit are shown as
a count and the model is told to look inside them itself. a count and the model is told to look inside them itself.
<strong>0</strong> keeps the listing for the file picker and puts none <strong>0</strong> keeps the listing for the file picker and puts none
@@ -404,7 +354,7 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="instructions_enabled" <input type="checkbox" name="instructions_enabled"
{{ 'checked' if values.instructions_enabled }}> {{ 'checked' if values.instructions_enabled }}>
<span>Read the project's own instructions</span> <span>{{ t("Read the project's own instructions") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">
Looks for <code>AGENTS.md</code> or <code>CLAUDE.md</code> in the root Looks for <code>AGENTS.md</code> or <code>CLAUDE.md</code> in the root
@@ -412,14 +362,14 @@
the conventions of the project it is working in. The file is written by the conventions of the project it is working in. The file is written by
whoever works on that project, so it is treated as untrusted: it can say whoever works on that project, so it is treated as untrusted: it can say
how to work, and cannot grant permission for anything. The exact wording how to work, and cannot grant permission for anything. The exact wording
around it is the <em>The project's own instructions</em> fragment on around it is the <em>{{ t("The project's own instructions") }}</em> fragment on
<a href="/admin/prompts">Prompts</a>, and clearing that fragment removes <a href="/admin/prompts">Prompts</a>, and clearing that fragment removes
the only path by which the file reaches a model. the only path by which the file reaches a model.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="instructions_chars">Characters of it to use</label> <label class="field__label" for="instructions_chars">{{ t("Characters of it to use") }}</label>
<input class="input" id="instructions_chars" name="instructions_chars" <input class="input" id="instructions_chars" name="instructions_chars"
value="{{ values.instructions_chars }}" inputmode="numeric"> value="{{ values.instructions_chars }}" inputmode="numeric">
<p class="field__hint"> <p class="field__hint">
@@ -430,7 +380,7 @@
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save changes</button> <button class="btn btn--primary" type="submit">{{ t("Save changes") }}</button>
</div> </div>
</form> </form>
@@ -447,18 +397,12 @@
#} #}
<form method="post" action="/admin/agents/subagents" class="form-grid"> <form method="post" action="/admin/agents/subagents" class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">Helpers</h2> <h2 class="card__title">{{ t("Helpers") }}</h2>
<p class="field__hint">{{ t("A reply can hand a self-contained piece of work to a second model that runs on its own and reports back — several at once, which is what makes research fan out instead of queueing. This applies to ordinary chats as much as agent ones.") }}</p>
<p class="field__hint"> <p class="field__hint">
A reply can hand a self-contained piece of work to a second model that <strong>{{ t("Asking another model a question uses the same switch and the same allowance below") }}</strong>, because it costs the same thing: one reply
runs on its own and reports back — several at once, which is what makes
research fan out instead of queueing. This applies to ordinary chats as
much as agent ones.
</p>
<p class="field__hint">
<strong>Asking another model a question uses the same switch and the same
allowance below</strong>, because it costs the same thing: one reply
setting another reply going. Which people may do it is a separate setting another reply going. Which people may do it is a separate
permission — <strong>Ask another model</strong> — and which models may is a permission — <strong>{{ t("Ask another model") }}</strong> — and which models may is a
switch on each model's own page. switch on each model's own page.
</p> </p>
@@ -467,9 +411,9 @@
<span> <span>
A helper cannot ask anybody anything, so nothing in its chat can stop A helper cannot ask anybody anything, so nothing in its chat can stop
for approval. It therefore gets only what this chat could already do for approval. It therefore gets only what this chat could already do
<em>without</em> asking: it reads, it searches, and on a machine it runs <em>{{ t("without") }}</em> asking: it reads, it searches, and on a machine it runs
a short fixed list of read-only commands and nothing else, in every mode a short fixed list of read-only commands and nothing else, in every mode
including <strong>Auto</strong>. It cannot send helpers of its own. including <strong>{{ t("Auto") }}</strong>. It cannot send helpers of its own.
</span> </span>
</div> </div>
@@ -477,11 +421,11 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" <input type="checkbox" name="enabled" value="true"
{{ 'checked' if subagents.enabled }}> {{ 'checked' if subagents.enabled }}>
<span>Let a model delegate</span> <span>{{ t("Let a model delegate") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">
People also need the <strong>Delegate to a helper</strong> permission, People also need the <strong>{{ t("Delegate to a helper") }}</strong> permission,
and the model needs the <strong>Tools</strong> capability. Off by and the model needs the <strong>{{ t("Tools") }}</strong> capability. Off by
default: a reply that spawns helpers spends model time multiplicatively, default: a reply that spawns helpers spends model time multiplicatively,
and on one local endpoint four at once is four times the queue rather and on one local endpoint four at once is four times the queue rather
than four times the speed. than four times the speed.
@@ -489,83 +433,60 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="sub_max_per_reply"> <label class="field__label" for="sub_max_per_reply">{{ t("Most helpers one reply may send") }}</label>
Most helpers one reply may send
</label>
<input class="input" id="sub_max_per_reply" name="max_per_reply" <input class="input" id="sub_max_per_reply" name="max_per_reply"
type="number" min="1" max="20" step="1" type="number" min="1" max="20" step="1"
value="{{ subagents.max_per_reply }}"> value="{{ subagents.max_per_reply }}">
<p class="field__hint"> <p class="field__hint">{{ t("Fanning out across a handful of independent questions is what this is for. A reply that wants twenty has misread the tool. Questions put to other models count against this same number, so one reply cannot spend the allowance twice.") }}</p>
Fanning out across a handful of independent questions is what this is
for. A reply that wants twenty has misread the tool. Questions put to
other models count against this same number, so one reply cannot spend
the allowance twice.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="sub_max_concurrent">Running at once, instance-wide</label> <label class="field__label" for="sub_max_concurrent">{{ t("Running at once, instance-wide") }}</label>
<input class="input" id="sub_max_concurrent" name="max_concurrent" <input class="input" id="sub_max_concurrent" name="max_concurrent"
type="number" min="1" max="50" step="1" type="number" min="1" max="50" step="1"
value="{{ subagents.max_concurrent }}"> value="{{ subagents.max_concurrent }}">
<p class="field__hint"> <p class="field__hint">{{ t("Each is a whole generation against the same endpoint the reply that asked for it is waiting on. Past this a model is told to do the work itself rather than made to wait.") }}</p>
Each is a whole generation against the same endpoint the reply that
asked for it is waiting on. Past this a model is told to do the work
itself rather than made to wait.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="sub_max_completion_tokens">Most a helper may write</label> <label class="field__label" for="sub_max_completion_tokens">{{ t("Most a helper may write") }}</label>
<input class="input" id="sub_max_completion_tokens" name="max_completion_tokens" <input class="input" id="sub_max_completion_tokens" name="max_completion_tokens"
type="number" min="0" max="5000000" step="1000" type="number" min="0" max="5000000" step="1000"
value="{{ subagents.max_completion_tokens }}"> value="{{ subagents.max_completion_tokens }}">
<p class="field__hint"> <p class="field__hint">{{ t("In tokens, across every round. A helper answers one question, so this should run out well before the reply that asked does. Zero means no ceiling.") }}</p>
In tokens, across every round. A helper answers one question, so this
should run out well before the reply that asked does. Zero means no
ceiling.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="sub_wall_seconds">Longest a helper may take</label> <label class="field__label" for="sub_wall_seconds">{{ t("Longest a helper may take") }}</label>
<input class="input" id="sub_wall_seconds" name="wall_seconds" <input class="input" id="sub_wall_seconds" name="wall_seconds"
type="number" min="30" max="7200" step="30" type="number" min="30" max="7200" step="30"
value="{{ subagents.wall_seconds }}"> value="{{ subagents.wall_seconds }}">
<p class="field__hint"> <p class="field__hint">
Seconds. Past it the helper is <em>stopped</em>, not abandoned: what it Seconds. Past it the helper is <em>{{ t("stopped") }}</em>, not abandoned: what it
had written is kept and handed back with a note saying it is partial. had written is kept and handed back with a note saying it is partial.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="sub_max_rounds">Most rounds of tool calls</label> <label class="field__label" for="sub_max_rounds">{{ t("Most rounds of tool calls") }}</label>
<input class="input" id="sub_max_rounds" name="max_rounds" <input class="input" id="sub_max_rounds" name="max_rounds"
type="number" min="1" max="200" step="1" type="number" min="1" max="200" step="1"
value="{{ subagents.max_rounds }}"> value="{{ subagents.max_rounds }}">
<p class="field__hint"> <p class="field__hint">{{ t("A backstop, as it is above. The clock and the token ceiling are what normally end one.") }}</p>
A backstop, as it is above. The clock and the token ceiling are what
normally end one.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="keep_transcript" value="true" <input type="checkbox" name="keep_transcript" value="true"
{{ 'checked' if subagents.keep_transcript }}> {{ 'checked' if subagents.keep_transcript }}>
<span>Keep a helper's own chat afterwards</span> <span>{{ t("Keep a helper's own chat afterwards") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("Off means it is deleted once its answer has been handed over, which is what keeps this cheap to use. Turn it on to work out why one came back with something odd. Kept chats are temporary either way and are swept a day later, and neither appears in anybody's sidebar.") }}</p>
Off means it is deleted once its answer has been handed over, which is
what keeps this cheap to use. Turn it on to work out why one came back
with something odd. Kept chats are temporary either way and are swept a
day later, and neither appears in anybody's sidebar.
</p>
</div> </div>
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save changes</button> <button class="btn btn--primary" type="submit">{{ t("Save changes") }}</button>
</div> </div>
</form> </form>
{% endblock %} {% endblock %}
+30 -44
View File
@@ -6,42 +6,34 @@
{% block heading %}Audio{% endblock %} {% block heading %}Audio{% endblock %}
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">{{ t("Two endpoints speaking the OpenAI audio API: one that turns speech into text so a message can be dictated, one that reads a reply out. They are configured separately because they usually are separate servers — whisper.cpp and Kokoro, say, or Speaches for both.") }}</p>
Two endpoints speaking the OpenAI audio API: one that turns speech into text
so a message can be dictated, one that reads a reply out. They are configured
separately because they usually are separate servers — whisper.cpp and Kokoro,
say, or Speaches for both.
</p>
{% if saved %} {% if saved %}
<div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>Audio settings saved.</span></div> <div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>{{ t("Audio settings saved.") }}</span></div>
{% endif %} {% endif %}
<form method="post" action="/admin/audio"> <form method="post" action="/admin/audio">
<section class="card"> <section class="card">
<h2 class="card__title"> <h2 class="card__title">
Dictation Dictation
{% if values.stt_enabled %}<span class="badge badge--success">on</span> {% if values.stt_enabled %}<span class="badge badge--success">{{ t("on") }}</span>
{% else %}<span class="badge">off</span>{% endif %} {% else %}<span class="badge">{{ t("off") }}</span>{% endif %}
</h2> </h2>
<p class="card__lede"> <p class="card__lede">{{ t("Adds a microphone to the composer. Recordings are sent to this endpoint and never written to disk.") }}</p>
Adds a microphone to the composer. Recordings are sent to this endpoint
and never written to disk.
</p>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="stt_enabled" value="true" <input type="checkbox" name="stt_enabled" value="true"
{{ 'checked' if values.stt_enabled }}> {{ 'checked' if values.stt_enabled }}>
<span>Allow messages to be dictated</span> <span>{{ t("Allow messages to be dictated") }}</span>
</label> </label>
</div> </div>
<div class="grid grid--2"> <div class="grid grid--2">
<div class="field"> <div class="field">
<label class="field__label" for="stt-base-url">Base URL</label> <label class="field__label" for="stt-base-url">{{ t("Base URL") }}</label>
<input class="input" id="stt-base-url" name="stt_base_url" type="url" <input class="input" id="stt-base-url" name="stt_base_url" type="url"
value="{{ values.stt_base_url }}" placeholder="http://127.0.0.1:8081"> value="{{ values.stt_base_url }}" placeholder="{{ t('http://127.0.0.1:8081') }}">
<p class="field__hint"> <p class="field__hint">
Where <code>/v1/audio/transcriptions</code> lives — whisper.cpp's Where <code>/v1/audio/transcriptions</code> lives — whisper.cpp's
<code>whisper-server</code>, Speaches, or anything else speaking it. <code>whisper-server</code>, Speaches, or anything else speaking it.
@@ -49,27 +41,27 @@
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="stt-api-key">API key</label> <label class="field__label" for="stt-api-key">{{ t("API key") }}</label>
<input class="input" id="stt-api-key" name="stt_api_key" type="password" <input class="input" id="stt-api-key" name="stt_api_key" type="password"
value="{{ unchanged if masked.stt else '' }}" value="{{ unchanged if masked.stt else '' }}"
placeholder="{{ masked.stt or 'None needed for a local server' }}" placeholder="{{ masked.stt or 'None needed for a local server' }}"
autocomplete="off"> autocomplete="off">
<p class="field__hint">Encrypted at rest. Clear the field to remove it.</p> <p class="field__hint">{{ t("Encrypted at rest. Clear the field to remove it.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="stt-model">Model</label> <label class="field__label" for="stt-model">{{ t("Model") }}</label>
<input class="input" id="stt-model" name="stt_model" <input class="input" id="stt-model" name="stt_model"
value="{{ values.stt_model }}" placeholder="whisper-1"> value="{{ values.stt_model }}" placeholder="{{ t('whisper-1') }}">
<p class="field__hint"> <p class="field__hint">
A server hosting one model <strong>ignores this</strong> and uses A server hosting one model <strong>{{ t("ignores this") }}</strong> and uses
whatever it was started with — <code>whisper-1</code> is then just a whatever it was started with — <code>whisper-1</code> is then just a
label. It only selects anything on a server that hosts several. label. It only selects anything on a server that hosts several.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="stt-language">Language</label> <label class="field__label" for="stt-language">{{ t("Language") }}</label>
<input class="input" id="stt-language" name="stt_language" maxlength="16" <input class="input" id="stt-language" name="stt_language" maxlength="16"
value="{{ values.stt_language }}" placeholder="detect"> value="{{ values.stt_language }}" placeholder="{{ t('detect') }}">
<p class="field__hint"> <p class="field__hint">
An ISO code such as <code>en</code> or <code>sk</code>. Leave empty to An ISO code such as <code>en</code> or <code>sk</code>. Leave empty to
let the server detect it, which is what whisper does best. let the server detect it, which is what whisper does best.
@@ -89,46 +81,43 @@
<section class="card"> <section class="card">
<h2 class="card__title"> <h2 class="card__title">
Read aloud Read aloud
{% if values.tts_enabled %}<span class="badge badge--success">on</span> {% if values.tts_enabled %}<span class="badge badge--success">{{ t("on") }}</span>
{% else %}<span class="badge">off</span>{% endif %} {% else %}<span class="badge">{{ t("off") }}</span>{% endif %}
</h2> </h2>
<p class="card__lede"> <p class="card__lede">{{ t("Adds a speaker button to every reply. Each reader can pick their own voice in their settings; what is chosen here is the default.") }}</p>
Adds a speaker button to every reply. Each reader can pick their own voice
in their settings; what is chosen here is the default.
</p>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="tts_enabled" value="true" <input type="checkbox" name="tts_enabled" value="true"
{{ 'checked' if values.tts_enabled }}> {{ 'checked' if values.tts_enabled }}>
<span>Allow replies to be read out</span> <span>{{ t("Allow replies to be read out") }}</span>
</label> </label>
</div> </div>
<div class="grid grid--2"> <div class="grid grid--2">
<div class="field"> <div class="field">
<label class="field__label" for="tts-base-url">Base URL</label> <label class="field__label" for="tts-base-url">{{ t("Base URL") }}</label>
<input class="input" id="tts-base-url" name="tts_base_url" type="url" <input class="input" id="tts-base-url" name="tts_base_url" type="url"
value="{{ values.tts_base_url }}" placeholder="http://127.0.0.1:8880"> value="{{ values.tts_base_url }}" placeholder="{{ t('http://127.0.0.1:8880') }}">
<p class="field__hint"> <p class="field__hint">
Where <code>/v1/audio/speech</code> lives — Kokoro-FastAPI, OpenAI, or Where <code>/v1/audio/speech</code> lives — Kokoro-FastAPI, OpenAI, or
anything else speaking it. anything else speaking it.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="tts-api-key">API key</label> <label class="field__label" for="tts-api-key">{{ t("API key") }}</label>
<input class="input" id="tts-api-key" name="tts_api_key" type="password" <input class="input" id="tts-api-key" name="tts_api_key" type="password"
value="{{ unchanged if masked.tts else '' }}" value="{{ unchanged if masked.tts else '' }}"
placeholder="{{ masked.tts or 'None needed for a local server' }}" placeholder="{{ masked.tts or 'None needed for a local server' }}"
autocomplete="off"> autocomplete="off">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="tts-model">Model</label> <label class="field__label" for="tts-model">{{ t("Model") }}</label>
<input class="input" id="tts-model" name="tts_model" <input class="input" id="tts-model" name="tts_model"
value="{{ values.tts_model }}" placeholder="tts-1"> value="{{ values.tts_model }}" placeholder="{{ t('tts-1') }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="tts-voice">Default voice</label> <label class="field__label" for="tts-voice">{{ t("Default voice") }}</label>
<select class="select" id="tts-voice" name="tts_voice"> <select class="select" id="tts-voice" name="tts_voice">
{% with selected = values.tts_voice %} {% with selected = values.tts_voice %}
{% include "partials/_voice_options.html" %} {% include "partials/_voice_options.html" %}
@@ -143,7 +132,7 @@
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="tts-format">Format</label> <label class="field__label" for="tts-format">{{ t("Format") }}</label>
<select class="select" id="tts-format" name="tts_format"> <select class="select" id="tts-format" name="tts_format">
{% for format in formats %} {% for format in formats %}
<option value="{{ format }}" {{ 'selected' if format == values.tts_format }}> <option value="{{ format }}" {{ 'selected' if format == values.tts_format }}>
@@ -153,7 +142,7 @@
</select> </select>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="tts-speed">Speed</label> <label class="field__label" for="tts-speed">{{ t("Speed") }}</label>
<input class="input" id="tts-speed" name="tts_speed" type="number" <input class="input" id="tts-speed" name="tts_speed" type="number"
min="0.25" max="4" step="0.05" value="{{ values.tts_speed }}"> min="0.25" max="4" step="0.05" value="{{ values.tts_speed }}">
</div> </div>
@@ -163,12 +152,9 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="tts_autoplay" value="true" <input type="checkbox" name="tts_autoplay" value="true"
{{ 'checked' if values.tts_autoplay }}> {{ 'checked' if values.tts_autoplay }}>
<span>Read new replies aloud as they finish, by default</span> <span>{{ t("Read new replies aloud as they finish, by default") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("Only the starting value for each account — anyone can turn it off in their own settings, and nobody is made to listen.") }}</p>
Only the starting value for each account — anyone can turn it off in
their own settings, and nobody is made to listen.
</p>
</div> </div>
<div class="btn-row"> <div class="btn-row">
@@ -180,6 +166,6 @@
<div id="audio-test-tts"></div> <div id="audio-test-tts"></div>
</section> </section>
<div class="form-actions"><button class="btn btn--primary" type="submit">Save settings</button></div> <div class="form-actions"><button class="btn btn--primary" type="submit">{{ t("Save settings") }}</button></div>
</form> </form>
{% endblock %} {% endblock %}
@@ -17,30 +17,27 @@
{% endif %} {% endif %}
<section class="card"> <section class="card">
<h2 class="card__title">Add a connection</h2> <h2 class="card__title">{{ t("Add a connection") }}</h2>
<form method="post" action="/admin/connections" > <form method="post" action="/admin/connections" >
<div class="field"> <div class="field">
<label class="field__label" for="new-name">Name</label> <label class="field__label" for="new-name">{{ t("Name") }}</label>
<input class="input" id="new-name" name="name" required placeholder="Local LM Studio"> <input class="input" id="new-name" name="name" required placeholder="{{ t('Local LM Studio') }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="new-url">Base URL</label> <label class="field__label" for="new-url">{{ t("Base URL") }}</label>
<input class="input input--mono" id="new-url" name="base_url" required <input class="input input--mono" id="new-url" name="base_url" required
placeholder="http://localhost:1234/v1"> placeholder="{{ t('http://localhost:1234/v1') }}">
<p class="field__hint"> <p class="field__hint">
With or without the trailing <code>/v1</code> — both are accepted. With or without the trailing <code>/v1</code> — both are accepted.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="new-key">API key</label> <label class="field__label" for="new-key">{{ t("API key") }}</label>
<input class="input input--mono" id="new-key" name="api_key" type="password" <input class="input input--mono" id="new-key" name="api_key" type="password"
autocomplete="off" placeholder="sk-…"> autocomplete="off" placeholder="{{ t('sk-…') }}">
<p class="field__hint"> <p class="field__hint">{{ t("Encrypted before it is stored, and never sent back to the browser. Leave empty for endpoints that need no key.") }}</p>
Encrypted before it is stored, and never sent back to the browser.
Leave empty for endpoints that need no key.
</p>
</div> </div>
<div class="btn-row" style="margin-top: var(--sp-5)"> <div class="btn-row" style="margin-top: var(--sp-5)">
@@ -59,9 +56,7 @@
{% if not connections %} {% if not connections %}
<div class="empty" style="padding: var(--sp-10) 0"> <div class="empty" style="padding: var(--sp-10) 0">
{{ icon("server", "empty__mark") }} {{ icon("server", "empty__mark") }}
<p class="empty__text"> <p class="empty__text">{{ t("Nothing configured yet. Add a connection above and its models appear here.") }}</p>
Nothing configured yet. Add a connection above and its models appear here.
</p>
</div> </div>
{% endif %} {% endif %}
+87
View File
@@ -0,0 +1,87 @@
{% extends "admin/_layout.html" %}
{% from "_macros.html" import icon %}
{% set section = "crowd" %}
{% block title %}A crowd - {{ brand.name }}{% endblock %}
{% block heading %}A crowd{% endblock %}
{% block admin_content %}
{#
Its own page rather than a card on Agents, which is where it shipped in 1.6.0.
Sitting there made it read as an agent-chat feature -- the owner took it for one,
reasonably, because that is what the page is called -- and a crowd has nothing to
do with agent chats: it works in any conversation.
#}
<p class="admin-lede">{{ t("Several models answering one turn, in any chat. Not an agent-chat feature: it works in an ordinary conversation, and the control is in the composer beside the tool switches.") }}</p>
{% if saved %}
<div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>{{ t("Settings saved.") }}</span></div>
{% endif %}
<form method="post" action="/admin/crowd" class="form-grid">
<section class="card">
<p class="field__hint">
A chat can have more than one model in it. The chat's own model answers, then
each of the others in turn; then the order runs <strong>{{ t("backwards") }}</strong>,
each one asked whether it disagrees with anything; and it ends back at the
first, which either closes or sends them round again.
</p>
<div class="alert">
{{ icon("warning", "icon--sm") }}
<span>
One turn costs <strong>{{ t("models × rounds × 2 − 1") }}</strong> replies — four
models over two rounds is fifteen — and on a single local endpoint every
change of speaker also loads a different model. Larger crowds of smaller
models, and sometimes of bigger ones, start going round in circles: that is
what the round limit is for, and it is a limit ordinary work will reach
rather than a runaway backstop.
</span>
</div>
<div class="field">
<label class="checkbox">
<input type="checkbox" name="enabled" value="true"
{{ 'checked' if crowd.enabled }}>
<span>{{ t("Let a chat have a crowd") }}</span>
</label>
<p class="field__hint">{{ t("Off by default. With it on, every chat's composer offers the other models; a chat with none ticked behaves exactly as it always has.") }}</p>
</div>
<div class="field">
<label class="field__label" for="crowd_max_models">{{ t("Most models besides the chat's own") }}</label>
<input class="input" id="crowd_max_models" name="max_models"
type="number" min="1" max="8" step="1" value="{{ crowd.max_models }}">
<p class="field__hint">{{ t("Four is already eight replies a turn at one round each. More voices past that tend to repeat each other rather than add anything.") }}</p>
</div>
<div class="field">
<label class="field__label" for="crowd_max_rounds">{{ t("Most rounds") }}</label>
<input class="input" id="crowd_max_rounds" name="max_rounds"
type="number" min="1" max="5" step="1" value="{{ crowd.max_rounds }}">
<p class="field__hint">{{ t("A round is out and back. Two gives the first model one chance to change its mind after hearing the objections, which is the point of the whole thing; three is where going in circles starts.") }}</p>
</div>
<div class="field">
<label class="field__label" for="crowd_wall_seconds">{{ t("Longest a turn may take") }}</label>
<input class="input" id="crowd_wall_seconds" name="wall_seconds"
type="number" min="60" max="7200" step="30" value="{{ crowd.wall_seconds }}">
<p class="field__hint">{{ t("Across every speaker, not each. A member whose endpoint has stalled cannot then hold the round open all afternoon.") }}</p>
</div>
<div class="field">
<label class="checkbox">
<input type="checkbox" name="collapse_agreement" value="true"
{{ 'checked' if crowd.collapse_agreement }}>
<span>{{ t('Fold away a short "I agree" on the way back') }}</span>
</label>
<p class="field__hint">{{ t("The disagreements are what a crowd is for; a column of bubbles saying nothing is what makes somebody switch it off. The text is still there behind a disclosure.") }}</p>
</div>
<div class="btn-row">
<button class="btn btn--primary" type="submit">{{ t("Save") }}</button>
</div>
</section>
</form>
{% endblock %}
@@ -8,7 +8,7 @@
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">
What this installation is called and what it looks like. Every box below ships What this installation is called and what it looks like. Every box below ships
with a default; leaving one alone means it is <em>not</em> stored, so a later with a default; leaving one alone means it is <em>{{ t("not") }}</em> stored, so a later
release can still improve the wording. Clearing a box gives you the shipped release can still improve the wording. Clearing a box gives you the shipped
version back rather than nothing. version back rather than nothing.
</p> </p>
@@ -24,38 +24,38 @@
<form method="post" action="/admin/customization/identity" enctype="multipart/form-data" <form method="post" action="/admin/customization/identity" enctype="multipart/form-data"
class="form-grid"> class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">Identity</h2> <h2 class="card__title">{{ t("Identity") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="instance-name">Name</label> <label class="field__label" for="instance-name">{{ t("Name") }}</label>
<input class="input" id="instance-name" name="instance_name" <input class="input" id="instance-name" name="instance_name"
value="{{ values.instance_name }}" maxlength="120" placeholder="LLeMbas"> value="{{ values.instance_name }}" maxlength="120" placeholder="{{ t('LLeMbas') }}">
<p class="field__hint"> <p class="field__hint">
Shown in the sidebar, in every page title, in the launcher when this is Shown in the sidebar, in every page title, in the launcher when this is
installed as an app, and to the model — it is told which installation it installed as an app, and to the model — it is told which installation it
is answering in. Empty means <strong>LLeMbas</strong>. is answering in. Empty means <strong>{{ t("LLeMbas") }}</strong>.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="tagline">Tagline</label> <label class="field__label" for="tagline">{{ t("Tagline") }}</label>
<input class="input" id="tagline" name="tagline" <input class="input" id="tagline" name="tagline"
value="{{ values.tagline }}" maxlength="200"> value="{{ values.tagline }}" maxlength="200">
<p class="field__hint"> <p class="field__hint">
One line, used in the page description. The sign-in page has a line of One line, used in the page description. The sign-in page has a line of
its own under <strong>Wording</strong> below. its own under <strong>{{ t("Wording") }}</strong> below.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="logo">Logo</label> <label class="field__label" for="logo">{{ t("Logo") }}</label>
{% if current.logo_path %} {% if current.logo_path %}
<p class="field__hint" style="margin-bottom: var(--sp-2)"> <p class="field__hint" style="margin-bottom: var(--sp-2)">
<img src="/branding/{{ current.logo_path }}" alt="" width="48" height="48" <img src="/branding/{{ current.logo_path }}" alt="" width="48" height="48"
style="vertical-align: middle; border-radius: var(--radius)"> style="vertical-align: middle; border-radius: var(--radius)">
<label class="checkbox" style="display: inline-flex; margin-left: var(--sp-3)"> <label class="checkbox" style="display: inline-flex; margin-left: var(--sp-3)">
<input type="checkbox" name="remove_logo" value="true"> <input type="checkbox" name="remove_logo" value="true">
<span>Remove it</span> <span>{{ t("Remove it") }}</span>
</label> </label>
</p> </p>
{% endif %} {% endif %}
@@ -63,47 +63,40 @@
accept="image/png,image/jpeg,image/webp,image/gif"> accept="image/png,image/jpeg,image/webp,image/gif">
<p class="field__hint"> <p class="field__hint">
Replaces the leaf mark everywhere it appears. PNG, JPEG, WEBP or GIF, Replaces the leaf mark everywhere it appears. PNG, JPEG, WEBP or GIF,
under 2 MB, square. <strong>SVG is deliberately not accepted</strong>: under 2 MB, square. <strong>{{ t("SVG is deliberately not accepted") }}</strong>:
these files are served to people who are not signed in, and an SVG can these files are served to people who are not signed in, and an SVG can
carry a script. The launcher icons are made from this automatically. carry a script. The launcher icons are made from this automatically.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="favicon">Favicon</label> <label class="field__label" for="favicon">{{ t("Favicon") }}</label>
{% if current.favicon_path %} {% if current.favicon_path %}
<p class="field__hint" style="margin-bottom: var(--sp-2)"> <p class="field__hint" style="margin-bottom: var(--sp-2)">
<img src="/branding/{{ current.favicon_path }}" alt="" width="16" height="16" <img src="/branding/{{ current.favicon_path }}" alt="" width="16" height="16"
style="vertical-align: middle"> style="vertical-align: middle">
<label class="checkbox" style="display: inline-flex; margin-left: var(--sp-3)"> <label class="checkbox" style="display: inline-flex; margin-left: var(--sp-3)">
<input type="checkbox" name="remove_favicon" value="true"> <input type="checkbox" name="remove_favicon" value="true">
<span>Remove it</span> <span>{{ t("Remove it") }}</span>
</label> </label>
</p> </p>
{% endif %} {% endif %}
<input class="input" id="favicon" name="favicon" type="file" <input class="input" id="favicon" name="favicon" type="file"
accept="image/png,image/jpeg,image/webp,image/gif"> accept="image/png,image/jpeg,image/webp,image/gif">
<p class="field__hint"> <p class="field__hint">{{ t("Optional. Without one, a logo you upload is used at 32px, and without that the shipped leaf.") }}</p>
Optional. Without one, a logo you upload is used at 32px, and without
that the shipped leaf.
</p>
</div> </div>
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save identity</button> <button class="btn btn--primary" type="submit">{{ t("Save identity") }}</button>
</div> </div>
</form> </form>
{# --- Wording -------------------------------------------------------------- #} {# --- Wording -------------------------------------------------------------- #}
<form method="post" action="/admin/customization/flavour" class="form-grid"> <form method="post" action="/admin/customization/flavour" class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">Wording</h2> <h2 class="card__title">{{ t("Wording") }}</h2>
<p class="field__hint"> <p class="field__hint">{{ t("The lines with a bit of character in them. They live in the empty states, the error pages and the sign-in screen — never in the functional interface, where a button says what it does. Replace them with your own, or leave them.") }}</p>
The lines with a bit of character in them. They live in the empty states,
the error pages and the sign-in screen — never in the functional interface,
where a button says what it does. Replace them with your own, or leave them.
</p>
{% for entry in flavour %} {% for entry in flavour %}
<div class="field"> <div class="field">
@@ -117,7 +110,7 @@
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save wording</button> <button class="btn btn--primary" type="submit">{{ t("Save wording") }}</button>
</div> </div>
</form> </form>
@@ -145,14 +138,8 @@
#} #}
<form method="post" action="/admin/customization/themes" class="form-grid"> <form method="post" action="/admin/customization/themes" class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">Themes</h2> <h2 class="card__title">{{ t("Themes") }}</h2>
<p class="field__hint"> <p class="field__hint">{{ t("A theme is a set of colours, not a stylesheet — nothing in this interface hard-codes one, so a third palette composes with everything. Pick which built-in it starts from and change only what you want; everything left empty is inherited. The soft variants behind focus rings and selected rows are worked out from the accent, so you do not have to.") }}</p>
A theme is a set of colours, not a stylesheet — nothing in this interface
hard-codes one, so a third palette composes with everything. Pick which
built-in it starts from and change only what you want; everything left
empty is inherited. The soft variants behind focus rings and selected rows
are worked out from the accent, so you do not have to.
</p>
{# The spare block is offered until the cap, so the form cannot grow without {# The spare block is offered until the cap, so the form cannot grow without
end and the page cannot stop offering one while there is room. #} end and the page cannot stop offering one while there is room. #}
@@ -166,10 +153,10 @@
<div class="field-row"> <div class="field-row">
<div class="field"> <div class="field">
<label class="field__label" for="theme-{{ index }}-id">Id</label> <label class="field__label" for="theme-{{ index }}-id">{{ t("Id") }}</label>
<input class="input" id="theme-{{ index }}-id" name="theme_{{ index }}_id" <input class="input" id="theme-{{ index }}-id" name="theme_{{ index }}_id"
value="{{ existing.id if existing else '' }}" maxlength="24" value="{{ existing.id if existing else '' }}" maxlength="24"
pattern="[a-z][a-z0-9-]*" placeholder="dusk"> pattern="[a-z][a-z0-9-]*" placeholder="{{ t('dusk') }}">
<p class="field__hint"> <p class="field__hint">
{% if existing %} {% if existing %}
Lowercase letters, digits and hyphens. Clear it to remove this theme. Lowercase letters, digits and hyphens. Clear it to remove this theme.
@@ -179,13 +166,13 @@
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="theme-{{ index }}-label">Name</label> <label class="field__label" for="theme-{{ index }}-label">{{ t("Name") }}</label>
<input class="input" id="theme-{{ index }}-label" name="theme_{{ index }}_label" <input class="input" id="theme-{{ index }}-label" name="theme_{{ index }}_label"
value="{{ existing.label if existing else '' }}" maxlength="60" value="{{ existing.label if existing else '' }}" maxlength="60"
placeholder="Dusk"> placeholder="{{ t('Dusk') }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="theme-{{ index }}-base">Starts from</label> <label class="field__label" for="theme-{{ index }}-base">{{ t("Starts from") }}</label>
<select class="input" id="theme-{{ index }}-base" name="theme_{{ index }}_base"> <select class="input" id="theme-{{ index }}-base" name="theme_{{ index }}_base">
{% for base in bases %} {% for base in bases %}
<option value="{{ base }}" <option value="{{ base }}"
@@ -203,7 +190,7 @@
{% if existing and existing.tokens %} {% if existing and existing.tokens %}
<span class="badge">{{ existing.tokens | length }} set</span> <span class="badge">{{ existing.tokens | length }} set</span>
{% else %} {% else %}
<span class="faint">all inherited</span> <span class="faint">{{ t("all inherited") }}</span>
{% endif %} {% endif %}
</summary> </summary>
<div class="field-row"> <div class="field-row">
@@ -215,7 +202,7 @@
<input class="input" id="theme-{{ index }}-{{ name }}" <input class="input" id="theme-{{ index }}-{{ name }}"
name="theme_{{ index }}_{{ name }}" type="text" name="theme_{{ index }}_{{ name }}" type="text"
value="{{ existing.tokens.get(name, '') if existing else '' }}" value="{{ existing.tokens.get(name, '') if existing else '' }}"
maxlength="40" placeholder="inherited" maxlength="40" placeholder="{{ t('inherited') }}"
spellcheck="false"> spellcheck="false">
<p class="field__hint"><code>--{{ name }}</code></p> <p class="field__hint"><code>--{{ name }}</code></p>
</div> </div>
@@ -234,14 +221,14 @@
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save themes</button> <button class="btn btn--primary" type="submit">{{ t("Save themes") }}</button>
</div> </div>
</form> </form>
{# --- Stylesheet ----------------------------------------------------------- #} {# --- Stylesheet ----------------------------------------------------------- #}
<form method="post" action="/admin/customization/css" class="form-grid"> <form method="post" action="/admin/customization/css" class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">Stylesheet</h2> <h2 class="card__title">{{ t("Stylesheet") }}</h2>
<p class="field__hint"> <p class="field__hint">
Served as <code>/branding.css</code> after everything else, so these rules Served as <code>/branding.css</code> after everything else, so these rules
win. It is a file rather than a block inside the page on purpose: a win. It is a file rather than a block inside the page on purpose: a
@@ -251,21 +238,17 @@
</p> </p>
<div class="field"> <div class="field">
<label class="field__label" for="custom-css">CSS</label> <label class="field__label" for="custom-css">{{ t("CSS") }}</label>
<textarea class="input textarea" id="custom-css" name="custom_css" rows="10" <textarea class="input textarea" id="custom-css" name="custom_css" rows="10"
spellcheck="false" spellcheck="false"
placeholder=".sidebar__brand { letter-spacing: 0.02em; }" placeholder=".sidebar__brand { letter-spacing: 0.02em; }"
>{{ values.custom_css }}</textarea> >{{ values.custom_css }}</textarea>
<p class="field__hint"> <p class="field__hint">{{ t("Up to 40,000 characters. Nothing here is validated: a rule that does not parse is dropped by the browser, quietly, as it would be in any stylesheet.") }}</p>
Up to 40,000 characters. Nothing here is validated: a rule that does not
parse is dropped by the browser, quietly, as it would be in any
stylesheet.
</p>
</div> </div>
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save stylesheet</button> <button class="btn btn--primary" type="submit">{{ t("Save stylesheet") }}</button>
</div> </div>
</form> </form>
{% endblock %} {% endblock %}
+33 -74
View File
@@ -6,11 +6,7 @@
{% block heading %}Extraction and search{% endblock %} {% block heading %}Extraction and search{% endblock %}
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">{{ t("What happens to a file between the upload and the model, and how anything is found again afterwards. The two are the same pipeline: what is extracted decides what there is to search.") }}</p>
What happens to a file between the upload and the model, and how anything is
found again afterwards. The two are the same pipeline: what is extracted
decides what there is to search.
</p>
{% if saved %} {% if saved %}
<div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>{{ saved }}</span></div> <div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>{{ saved }}</span></div>
@@ -19,75 +15,58 @@
{# --- Extraction ----------------------------------------------------------- #} {# --- Extraction ----------------------------------------------------------- #}
<form method="post" action="/admin/extraction" class="form-grid"> <form method="post" action="/admin/extraction" class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">What a file may cost</h2> <h2 class="card__title">{{ t("What a file may cost") }}</h2>
<p class="field__hint"> <p class="field__hint">{{ t("Every number here is a trade, and a large one usually breaks a request rather than being slow — the text of a whole book does not fit in a context window, and a model handed it fails the request outright rather than reading the first half.") }}</p>
Every number here is a trade, and a large one usually breaks a request
rather than being slow — the text of a whole book does not fit in a
context window, and a model handed it fails the request outright rather
than reading the first half.
</p>
<div class="field-row"> <div class="field-row">
<div class="field"> <div class="field">
<label class="field__label" for="max_upload_mb">Largest upload</label> <label class="field__label" for="max_upload_mb">{{ t("Largest upload") }}</label>
<input class="input" id="max_upload_mb" name="max_upload_mb" <input class="input" id="max_upload_mb" name="max_upload_mb"
type="number" min="1" max="512" step="1" value="{{ values.max_upload_mb }}"> type="number" min="1" max="512" step="1" value="{{ values.max_upload_mb }}">
<p class="field__hint">Megabytes, before anything is done to it.</p> <p class="field__hint">{{ t("Megabytes, before anything is done to it.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="max_extracted_chars">Text kept per file</label> <label class="field__label" for="max_extracted_chars">{{ t("Text kept per file") }}</label>
<input class="input" id="max_extracted_chars" name="max_extracted_chars" <input class="input" id="max_extracted_chars" name="max_extracted_chars"
type="number" min="1000" max="5000000" step="1000" type="number" min="1000" max="5000000" step="1000"
value="{{ values.max_extracted_chars }}"> value="{{ values.max_extracted_chars }}">
<p class="field__hint"> <p class="field__hint">{{ t("Characters. Roughly four to a token, so 120,000 is about 30,000 tokens — already most of a small context window. The rest is cut and the model is told so.") }}</p>
Characters. Roughly four to a token, so 120,000 is about 30,000 tokens
— already most of a small context window. The rest is cut and the
model is told so.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="max_pdf_pages">Pages read from a PDF</label> <label class="field__label" for="max_pdf_pages">{{ t("Pages read from a PDF") }}</label>
<input class="input" id="max_pdf_pages" name="max_pdf_pages" <input class="input" id="max_pdf_pages" name="max_pdf_pages"
type="number" min="1" max="5000" step="1" value="{{ values.max_pdf_pages }}"> type="number" min="1" max="5000" step="1" value="{{ values.max_pdf_pages }}">
<p class="field__hint"> <p class="field__hint">{{ t("Extraction is slow and happens once, at upload. Beyond this the file is still stored; only its text stops.") }}</p>
Extraction is slow and happens once, at upload. Beyond this the file
is still stored; only its text stops.
</p>
</div> </div>
</div> </div>
<div class="field-row"> <div class="field-row">
<div class="field"> <div class="field">
<label class="field__label" for="max_image_edge">Longest image edge</label> <label class="field__label" for="max_image_edge">{{ t("Longest image edge") }}</label>
<input class="input" id="max_image_edge" name="max_image_edge" <input class="input" id="max_image_edge" name="max_image_edge"
type="number" min="128" max="8192" step="16" type="number" min="128" max="8192" step="16"
value="{{ values.max_image_edge }}"> value="{{ values.max_image_edge }}">
<p class="field__hint"> <p class="field__hint">{{ t("Pixels. Images are re-encoded before they are sent, because a phone photo is several megabytes of base64.") }}</p>
Pixels. Images are re-encoded before they are sent, because a phone
photo is several megabytes of base64.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="jpeg_quality">JPEG quality</label> <label class="field__label" for="jpeg_quality">{{ t("JPEG quality") }}</label>
<input class="input" id="jpeg_quality" name="jpeg_quality" <input class="input" id="jpeg_quality" name="jpeg_quality"
type="number" min="30" max="100" step="1" value="{{ values.jpeg_quality }}"> type="number" min="30" max="100" step="1" value="{{ values.jpeg_quality }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="orphan_hours">Keep abandoned uploads for</label> <label class="field__label" for="orphan_hours">{{ t("Keep abandoned uploads for") }}</label>
<input class="input" id="orphan_hours" name="orphan_hours" <input class="input" id="orphan_hours" name="orphan_hours"
type="number" min="1" max="8760" step="1" value="{{ values.orphan_hours }}"> type="number" min="1" max="8760" step="1" value="{{ values.orphan_hours }}">
<p class="field__hint"> <p class="field__hint">{{ t("Hours. A file chosen in the composer and never sent. Swept at startup.") }}</p>
Hours. A file chosen in the composer and never sent. Swept at startup.
</p>
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="extra_text_extensions">Also treat as text</label> <label class="field__label" for="extra_text_extensions">{{ t("Also treat as text") }}</label>
<textarea class="textarea input--mono" id="extra_text_extensions" <textarea class="textarea input--mono" id="extra_text_extensions"
name="extra_text_extensions" rows="4" spellcheck="false" name="extra_text_extensions" rows="4" spellcheck="false"
>{{ extensions_text }}</textarea> >{{ extensions_text }}</textarea>
@@ -102,28 +81,24 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="reject_unreadable_pdf" value="true" <input type="checkbox" name="reject_unreadable_pdf" value="true"
{{ 'checked' if values.reject_unreadable_pdf }}> {{ 'checked' if values.reject_unreadable_pdf }}>
<span>Refuse a PDF whose text cannot be read</span> <span>{{ t("Refuse a PDF whose text cannot be read") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("Off, a scanned PDF is stored with an explanation saying why it contributes nothing — there is no OCR here. That is usually what somebody wants: the file is still attached and still downloadable.") }}</p>
Off, a scanned PDF is stored with an explanation saying why it
contributes nothing — there is no OCR here. That is usually what
somebody wants: the file is still attached and still downloadable.
</p>
</div> </div>
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save extraction</button> <button class="btn btn--primary" type="submit">{{ t("Save extraction") }}</button>
</div> </div>
</form> </form>
{# --- Semantic search ------------------------------------------------------ #} {# --- Semantic search ------------------------------------------------------ #}
<form method="post" action="/admin/extraction/search" class="form-grid"> <form method="post" action="/admin/extraction/search" class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">Searching by meaning</h2> <h2 class="card__title">{{ t("Searching by meaning") }}</h2>
<p class="field__hint"> <p class="field__hint">
Keyword search finds a document that uses your words. This finds one that Keyword search finds a document that uses your words. This finds one that
means the same thing — <em>"how do I get in"</em> reaching a note about means the same thing — <em>{{ t('"how do I get in"') }}</em> reaching a note about
passwords. Both run and the two rankings are fused, so nothing that passwords. Both run and the two rankings are fused, so nothing that
keyword search found is lost. keyword search found is lost.
</p> </p>
@@ -133,7 +108,7 @@
{{ icon("warning", "icon--sm") }} {{ icon("warning", "icon--sm") }}
<span> <span>
No model is marked as producing embeddings. Tick No model is marked as producing embeddings. Tick
<strong>embeddings</strong> on one under <strong>{{ t("embeddings") }}</strong> on one under
<a href="/admin/models">Models</a> — usually a small dedicated model <a href="/admin/models">Models</a> — usually a small dedicated model
such as <code>nomic-embed-text</code> or <code>bge-m3</code>, not a chat such as <code>nomic-embed-text</code> or <code>bge-m3</code>, not a chat
model. model.
@@ -153,9 +128,9 @@
{% endif %} {% endif %}
<div class="field"> <div class="field">
<label class="field__label" for="embedding_model_id">Embedding model</label> <label class="field__label" for="embedding_model_id">{{ t("Embedding model") }}</label>
<select class="input" id="embedding_model_id" name="embedding_model_id"> <select class="input" id="embedding_model_id" name="embedding_model_id">
<option value="">None — keyword search only</option> <option value="">{{ t("None — keyword search only") }}</option>
{% for model in models %} {% for model in models %}
<option value="{{ model.model_id }}" <option value="{{ model.model_id }}"
{{ 'selected' if values.embedding_model_id == model.model_id }}> {{ 'selected' if values.embedding_model_id == model.model_id }}>
@@ -164,7 +139,7 @@
{% endfor %} {% endfor %}
</select> </select>
<p class="field__hint"> <p class="field__hint">
<strong>None</strong> is not a degraded mode: it is the keyword search <strong>{{ t("None") }}</strong> is not a degraded mode: it is the keyword search
this has always had, with nothing stored and nothing sent anywhere. this has always had, with nothing stored and nothing sent anywhere.
Changing the model changes what a vector means, so anything already Changing the model changes what a vector means, so anything already
indexed is ignored until it is rebuilt. indexed is ignored until it is rebuilt.
@@ -173,53 +148,37 @@
<div class="field-row"> <div class="field-row">
<div class="field"> <div class="field">
<label class="field__label" for="chunk_chars">Piece size</label> <label class="field__label" for="chunk_chars">{{ t("Piece size") }}</label>
<input class="input" id="chunk_chars" name="chunk_chars" <input class="input" id="chunk_chars" name="chunk_chars"
type="number" min="200" max="8000" step="50" value="{{ values.chunk_chars }}"> type="number" min="200" max="8000" step="50" value="{{ values.chunk_chars }}">
<p class="field__hint"> <p class="field__hint">{{ t("Characters. A record is split on paragraph boundaries into pieces of about this size, and each is embedded separately — a document is found by its best piece, not by its average.") }}</p>
Characters. A record is split on paragraph boundaries into pieces of
about this size, and each is embedded separately — a document is found
by its best piece, not by its average.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="chunk_overlap">Overlap</label> <label class="field__label" for="chunk_overlap">{{ t("Overlap") }}</label>
<input class="input" id="chunk_overlap" name="chunk_overlap" <input class="input" id="chunk_overlap" name="chunk_overlap"
type="number" min="0" max="4000" step="10" value="{{ values.chunk_overlap }}"> type="number" min="0" max="4000" step="10" value="{{ values.chunk_overlap }}">
<p class="field__hint"> <p class="field__hint">{{ t("How much of each piece is repeated at the start of the next, so a sentence across a boundary is whole somewhere. Capped at half the piece size.") }}</p>
How much of each piece is repeated at the start of the next, so a
sentence across a boundary is whole somewhere. Capped at half the
piece size.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="embed_batch">Pieces per request</label> <label class="field__label" for="embed_batch">{{ t("Pieces per request") }}</label>
<input class="input" id="embed_batch" name="embed_batch" <input class="input" id="embed_batch" name="embed_batch"
type="number" min="1" max="256" step="1" value="{{ values.embed_batch }}"> type="number" min="1" max="256" step="1" value="{{ values.embed_batch }}">
<p class="field__hint"> <p class="field__hint">{{ t("Lower this if the endpoint refuses large requests; raise it if a rebuild is slow and the far side has room.") }}</p>
Lower this if the endpoint refuses large requests; raise it if a
rebuild is slow and the far side has room.
</p>
</div> </div>
</div> </div>
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save search</button> <button class="btn btn--primary" type="submit">{{ t("Save search") }}</button>
</div> </div>
</form> </form>
{# --- The index ------------------------------------------------------------ #} {# --- The index ------------------------------------------------------------ #}
<section class="card"> <section class="card">
<h2 class="card__title">The index</h2> <h2 class="card__title">{{ t("The index") }}</h2>
<p class="field__hint"> <p class="field__hint">{{ t("Documents, notes, skills and reports are indexed as they are written. A rebuild is for everything that already existed — or for after changing the model or the piece size, both of which make what is stored stop meaning anything. It runs in the background and can be left.") }}</p>
Documents, notes, skills and reports are indexed as they are written. A
rebuild is for everything that already existed — or for after changing the
model or the piece size, both of which make what is stored stop meaning
anything. It runs in the background and can be left.
</p>
{% include "admin/_index_progress.html" %} {% include "admin/_index_progress.html" %}
</section> </section>
+40 -41
View File
@@ -6,13 +6,10 @@
{% block heading %}General{% endblock %} {% block heading %}General{% endblock %}
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">{{ t("Instance-wide settings. These are stored in the database and take effect immediately — no restart, and they survive one.") }}</p>
Instance-wide settings. These are stored in the database and take effect
immediately — no restart, and they survive one.
</p>
{% if saved %} {% if saved %}
<div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>Settings saved.</span></div> <div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>{{ t("Settings saved.") }}</span></div>
{% endif %} {% endif %}
{# {#
@@ -29,30 +26,40 @@
<form method="post" action="/admin/general"> <form method="post" action="/admin/general">
<section class="card"> <section class="card">
<h2 class="card__title">Default system prompt</h2> <h2 class="card__title">{{ t("Language") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("What the interface is in for anybody who has not chosen for themselves. Everyone can pick their own under Appearance in their settings, and that choice wins here.") }}</p>
Applied to every chat that does not have a prompt of its own. A model's
prompt overrides this, and a chat's prompt overrides both — most specific
wins outright rather than the three being stacked together.
</p>
<div class="field"> <div class="field">
<label class="field__label visually-hidden" for="system-prompt">System prompt</label> <label class="field__label" for="language">{{ t("Interface language") }}</label>
<textarea class="textarea" id="system-prompt" name="system_prompt" rows="5" <select class="select" id="language" name="language">
placeholder="You are a helpful assistant.">{{ values.system_prompt }}</textarea> {% for code, name in languages %}
<p class="field__hint">Leave empty to send no system prompt at all.</p> <option value="{{ code }}" {{ 'selected' if values.language == code
or (not values.language and code == "en") }}>{{ name }}</option>
{% endfor %}
</select>
<p class="field__hint">
This is the interface only. Models answer in whatever language you write
to them in, which is a line you can edit under
<a href="/admin/prompts">Prompts</a>.
</p>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Compaction</h2> <h2 class="card__title">{{ t("Default system prompt") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("Applied to every chat that does not have a prompt of its own. A model's prompt overrides this, and a chat's prompt overrides both — most specific wins outright rather than the three being stacked together.") }}</p>
A long conversation eventually fills the model's context. When it gets
close, the earlier turns are summarised and the summary is sent in their
place. The messages themselves are kept and stay readable in the
transcript — they simply stop being sent.
</p>
<div class="field"> <div class="field">
<label class="field__label" for="compact-threshold">Compact at</label> <label class="field__label visually-hidden" for="system-prompt">{{ t("System prompt") }}</label>
<textarea class="textarea" id="system-prompt" name="system_prompt" rows="5"
placeholder="{{ t('You are a helpful assistant.') }}">{{ values.system_prompt }}</textarea>
<p class="field__hint">{{ t("Leave empty to send no system prompt at all.") }}</p>
</div>
</section>
<section class="card">
<h2 class="card__title">{{ t("Compaction") }}</h2>
<p class="card__lede">{{ t("A long conversation eventually fills the model's context. When it gets close, the earlier turns are summarised and the summary is sent in their place. The messages themselves are kept and stay readable in the transcript — they simply stop being sent.") }}</p>
<div class="field">
<label class="field__label" for="compact-threshold">{{ t("Compact at") }}</label>
<input class="input" id="compact-threshold" name="compact_threshold" type="number" <input class="input" id="compact-threshold" name="compact_threshold" type="number"
min="0" max="99" value="{{ values.compact_threshold }}"> min="0" max="99" value="{{ values.compact_threshold }}">
<p class="field__hint"> <p class="field__hint">
@@ -67,20 +74,16 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Tool calls in an ordinary chat</h2> <h2 class="card__title">{{ t("Tool calls in an ordinary chat") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("A model ends its own turn the moment it stops asking for tools — that is it saying it has what it needs, and nothing here overrides it. This is a ceiling for the case where it never says so.") }}</p>
A model ends its own turn the moment it stops asking for tools — that is
it saying it has what it needs, and nothing here overrides it. This is a
ceiling for the case where it never says so.
</p>
<div class="field"> <div class="field">
<label class="field__label" for="max-chat-rounds">Most rounds of tool calls</label> <label class="field__label" for="max-chat-rounds">{{ t("Most rounds of tool calls") }}</label>
<input class="input" id="max-chat-rounds" name="max_chat_rounds" type="number" <input class="input" id="max-chat-rounds" name="max_chat_rounds" type="number"
min="0" max="100" value="{{ values.max_chat_rounds }}"> min="0" max="100" value="{{ values.max_chat_rounds }}">
<p class="field__hint"> <p class="field__hint">
Several tools can be called in one round, so this is not a count of Several tools can be called in one round, so this is not a count of
tools. Leave room for at least two: <code>knowledge_get</code> and tools. Leave room for at least two: <code>knowledge_get</code> and
<code>notes_get</code> read a document by an id a <em>search</em> <code>notes_get</code> read a document by an id a <em>{{ t("search") }}</em>
returned, so a ceiling of one leaves the library searchable and not returned, so a ceiling of one leaves the library searchable and not
readable. <code>0</code> means no ceiling, which is how an agent chat readable. <code>0</code> means no ceiling, which is how an agent chat
already works — those are bounded under already works — those are bounded under
@@ -93,9 +96,9 @@
<h2 class="card__title"> <h2 class="card__title">
Registration Registration
{% if values.allow_signup %} {% if values.allow_signup %}
<span class="badge badge--success">open</span> <span class="badge badge--success">{{ t("open") }}</span>
{% else %} {% else %}
<span class="badge badge--danger">closed</span> <span class="badge badge--danger">{{ t("closed") }}</span>
{% endif %} {% endif %}
</h2> </h2>
@@ -103,20 +106,16 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="allow_signup" value="true" <input type="checkbox" name="allow_signup" value="true"
{{ 'checked' if values.allow_signup }}> {{ 'checked' if values.allow_signup }}>
<span>Anyone who can reach this instance may create an account</span> <span>{{ t("Anyone who can reach this instance may create an account") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t('Turn this off once your users exist. Sign-in is unaffected — existing accounts keep working, and the "Create one" link disappears from the sign-in page.') }}</p>
Turn this off once your users exist. Sign-in is unaffected — existing
accounts keep working, and the "Create one" link disappears from the
sign-in page.
</p>
</div> </div>
{% if values.allow_signup and user_count > 0 %} {% if values.allow_signup and user_count > 0 %}
<div class="alert alert--warning"> <div class="alert alert--warning">
{{ icon("warning", "alert__icon") }} {{ icon("warning", "alert__icon") }}
<div> <div>
<strong>Registration is open.</strong> <strong>{{ t("Registration is open.") }}</strong>
<div class="text-sm" style="margin-top: var(--sp-1)"> <div class="text-sm" style="margin-top: var(--sp-1)">
This instance has {{ user_count }} account{{ '' if user_count == 1 else 's' }}. This instance has {{ user_count }} account{{ '' if user_count == 1 else 's' }}.
Anyone who can reach it can add another, and every account can use your Anyone who can reach it can add another, and every account can use your
@@ -132,6 +131,6 @@
</p> </p>
</section> </section>
<div class="form-actions"><button class="btn btn--primary" type="submit">Save settings</button></div> <div class="form-actions"><button class="btn btn--primary" type="submit">{{ t("Save settings") }}</button></div>
</form> </form>
{% endblock %} {% endblock %}
@@ -8,7 +8,7 @@
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">
<a href="/admin/groups">{{ icon("chevron-left", "icon--sm") }} All groups</a> <a href="/admin/groups">{{ icon("chevron-left", "icon--sm") }} All groups</a>
· A group only ever <em>adds</em>. Anything already in the baseline is shown · A group only ever <em>{{ t("adds") }}</em>. Anything already in the baseline is shown
below as such, so a tick here that changes nothing looks like one. below as such, so a tick here that changes nothing looks like one.
</p> </p>
@@ -18,20 +18,20 @@
<form method="post" action="/admin/groups/{{ group.id }}" class="form-grid"> <form method="post" action="/admin/groups/{{ group.id }}" class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">Name</h2> <h2 class="card__title">{{ t("Name") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="name">Name</label> <label class="field__label" for="name">{{ t("Name") }}</label>
<input class="input" id="name" name="name" value="{{ group.name }}" required> <input class="input" id="name" name="name" value="{{ group.name }}" required>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="description">What it is for</label> <label class="field__label" for="description">{{ t("What it is for") }}</label>
<input class="input" id="description" name="description" <input class="input" id="description" name="description"
value="{{ group.description }}" maxlength="1000"> value="{{ group.description }}" maxlength="1000">
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Permissions this group adds</h2> <h2 class="card__title">{{ t("Permissions this group adds") }}</h2>
{% for section_name, defs in permission_groups.items() %} {% for section_name, defs in permission_groups.items() %}
<div class="field"> <div class="field">
<span class="field__label">{{ section_name }}</span> <span class="field__label">{{ section_name }}</span>
@@ -42,7 +42,7 @@
<span> <span>
<strong>{{ definition.label }}</strong> <strong>{{ definition.label }}</strong>
{% if baseline[definition.key] %} {% if baseline[definition.key] %}
<span class="badge">already in the baseline</span> <span class="badge">{{ t("already in the baseline") }}</span>
{% endif %} {% endif %}
<span class="perm-row__desc">{{ definition.description }}</span> <span class="perm-row__desc">{{ definition.description }}</span>
</span> </span>
@@ -59,11 +59,11 @@
only place somebody will read it. only place somebody will read it.
#} #}
<section class="card"> <section class="card">
<h2 class="card__title">Quotas</h2> <h2 class="card__title">{{ t("Quotas") }}</h2>
<p class="card__lede"> <p class="card__lede">
Resolved across a person's groups by <strong>maximum</strong> — the union Resolved across a person's groups by <strong>{{ t("maximum") }}</strong> — the union
rule applied to numbers, so a second group can only grant more. rule applied to numbers, so a second group can only grant more.
<strong>Leave a box empty</strong> for “no opinion”, and use <strong>{{ t("Leave a box empty") }}</strong> for “no opinion”, and use
<strong>0</strong> for “no limit”, which beats any number another group <strong>0</strong> for “no limit”, which beats any number another group
sets. Administrators are unlimited whatever is here. sets. Administrators are unlimited whatever is here.
</p> </p>
@@ -73,7 +73,7 @@
<label class="field__label" for="limit-{{ key }}">{{ label }}</label> <label class="field__label" for="limit-{{ key }}">{{ label }}</label>
<input class="input" id="limit-{{ key }}" name="limit_{{ key }}" <input class="input" id="limit-{{ key }}" name="limit_{{ key }}"
type="number" min="0" step="1" type="number" min="0" step="1"
value="{{ limits.get(key, '') }}" placeholder="no opinion"> value="{{ limits.get(key, '') }}" placeholder="{{ t('no opinion') }}">
<p class="field__hint">{{ description }}</p> <p class="field__hint">{{ description }}</p>
</div> </div>
{% endfor %} {% endfor %}
@@ -85,11 +85,8 @@
and a full-form POST from either side overwrote what the other had shown. and a full-form POST from either side overwrote what the other had shown.
#} #}
<section class="card"> <section class="card">
<h2 class="card__title">Members</h2> <h2 class="card__title">{{ t("Members") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("The one place membership is edited. A user's own page links here rather than offering a second control for the same value.") }}</p>
The one place membership is edited. A user's own page links here rather
than offering a second control for the same value.
</p>
<div class="checkbox-row"> <div class="checkbox-row">
{% for person in users %} {% for person in users %}
<label class="checkbox"> <label class="checkbox">
@@ -102,12 +99,8 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Models this group unlocks</h2> <h2 class="card__title">{{ t("Models this group unlocks") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("A model marked public is available to everyone; one that is not is available to the groups named here. Model access is separate from permissions — one says what somebody may do, the other what with.") }}</p>
A model marked public is available to everyone; one that is not is
available to the groups named here. Model access is separate from
permissions — one says what somebody may do, the other what with.
</p>
<div class="checkbox-row"> <div class="checkbox-row">
{% for model in models %} {% for model in models %}
<label class="checkbox"> <label class="checkbox">
@@ -120,22 +113,18 @@
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save group</button> <button class="btn btn--primary" type="submit">{{ t("Save group") }}</button>
</div> </div>
</form> </form>
<section class="card"> <section class="card">
<h2 class="card__title">Remove</h2> <h2 class="card__title">{{ t("Remove") }}</h2>
<form method="post" action="/admin/groups/{{ group.id }}/delete" <form method="post" action="/admin/groups/{{ group.id }}/delete"
data-confirm="Delete {{ group.name }}? Its members keep their accounts."> data-confirm="Delete {{ group.name }}? Its members keep their accounts.">
<button class="btn btn--danger btn--sm" type="submit"> <button class="btn btn--danger btn--sm" type="submit">
{{ icon("trash", "icon--sm") }} Delete this group {{ icon("trash", "icon--sm") }} Delete this group
</button> </button>
</form> </form>
<p class="field__hint"> <p class="field__hint">{{ t("Members keep their accounts and lose whatever this group granted them. Every share naming this group goes too — nothing cascades to those, so they are deleted explicitly.") }}</p>
Members keep their accounts and lose whatever this group granted them. Every
share naming this group goes too — nothing cascades to those, so they are
deleted explicitly.
</p>
</section> </section>
{% endblock %} {% endblock %}
+8 -13
View File
@@ -7,7 +7,7 @@
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">
Permissions are a <strong>union</strong>: everyone starts with the baseline Permissions are a <strong>{{ t("union") }}</strong>: everyone starts with the baseline
below, and each group they belong to can add more. A group never takes below, and each group they belong to can add more. A group never takes
something away, so being in a second group can only widen what someone can do — something away, so being in a second group can only widen what someone can do —
which is what keeps “why can this person not do X?” answerable without which is what keeps “why can this person not do X?” answerable without
@@ -19,11 +19,8 @@
{% endif %} {% endif %}
<section class="card"> <section class="card">
<h2 class="card__title">Baseline permissions</h2> <h2 class="card__title">{{ t("Baseline permissions") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("What every signed-in user can do before any group is considered. Turn something off here and grant it through a group to make it opt-in.") }}</p>
What every signed-in user can do before any group is considered. Turn
something off here and grant it through a group to make it opt-in.
</p>
<form method="post" action="/admin/permissions/defaults"> <form method="post" action="/admin/permissions/defaults">
{% for section_name, defs in permission_groups.items() %} {% for section_name, defs in permission_groups.items() %}
@@ -41,7 +38,7 @@
{% endfor %} {% endfor %}
</div> </div>
{% endfor %} {% endfor %}
<div class="btn-row"><button class="btn btn--primary" type="submit">Save baseline</button></div> <div class="btn-row"><button class="btn btn--primary" type="submit">{{ t("Save baseline") }}</button></div>
</form> </form>
</section> </section>
@@ -69,22 +66,20 @@
{% if granted[group.id] %} {% if granted[group.id] %}
<span class="badge badge--leaf">+{{ granted[group.id] }} permission{{ '' if granted[group.id] == 1 else 's' }}</span> <span class="badge badge--leaf">+{{ granted[group.id] }} permission{{ '' if granted[group.id] == 1 else 's' }}</span>
{% endif %} {% endif %}
{% if group.limits_json %}<span class="badge">quotas</span>{% endif %} {% if group.limits_json %}<span class="badge">{{ t("quotas") }}</span>{% endif %}
</div> </div>
</a> </a>
{% else %} {% else %}
<div class="empty" style="padding: var(--sp-8) 0"> <div class="empty" style="padding: var(--sp-8) 0">
<p class="empty__text"> <p class="empty__text">{{ t("No groups yet. Everybody gets the baseline above and nothing more.") }}</p>
No groups yet. Everybody gets the baseline above and nothing more.
</p>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<section class="card" style="margin-top: var(--sp-6)"> <section class="card" style="margin-top: var(--sp-6)">
<form method="post" action="/admin/groups" class="btn-row"> <form method="post" action="/admin/groups" class="btn-row">
<input class="input" name="name" placeholder="New group name" required <input class="input" name="name" placeholder="{{ t('New group name') }}" required
aria-label="New group name"> aria-label="{{ t('New group name') }}">
<button class="btn btn--primary" type="submit"> <button class="btn btn--primary" type="submit">
{{ icon("plus", "icon--sm") }} Create group {{ icon("plus", "icon--sm") }} Create group
</button> </button>
+58 -108
View File
@@ -6,13 +6,7 @@
{% block heading %}Image generation{% endblock %} {% block heading %}Image generation{% endblock %}
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">{{ t("Lets a model draw a picture and show it in the conversation, on a ComfyUI you are running. It is offered as a tool the model chooses to call, so nothing changes for a conversation that never asks for one — and it is only offered once there is a ComfyUI, a workflow and at least one checkpoint, because a tool that fails on its first call is worse than a tool nobody was given.") }}</p>
Lets a model draw a picture and show it in the conversation, on a ComfyUI you
are running. It is offered as a tool the model chooses to call, so nothing
changes for a conversation that never asks for one — and it is only offered
once there is a ComfyUI, a workflow and at least one checkpoint, because a
tool that fails on its first call is worse than a tool nobody was given.
</p>
{% if saved %} {% if saved %}
<div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>{{ saved }}</span></div> <div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>{{ saved }}</span></div>
@@ -22,13 +16,13 @@
<section class="card"> <section class="card">
<h2 class="card__title"> <h2 class="card__title">
Image generation Image generation
{% if values.enabled %}<span class="badge badge--success">on</span> {% if values.enabled %}<span class="badge badge--success">{{ t("on") }}</span>
{% else %}<span class="badge">off</span>{% endif %} {% else %}<span class="badge">{{ t("off") }}</span>{% endif %}
</h2> </h2>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" {{ 'checked' if values.enabled }}> <input type="checkbox" name="enabled" value="true" {{ 'checked' if values.enabled }}>
<span>Offer image generation to models that support tools</span> <span>{{ t("Offer image generation to models that support tools") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">
Who may use it is a permission — <code>tools.image</code> under Who may use it is a permission — <code>tools.image</code> under
@@ -38,22 +32,18 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">ComfyUI</h2> <h2 class="card__title">{{ t("ComfyUI") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="base_url">Base URL</label> <label class="field__label" for="base_url">{{ t("Base URL") }}</label>
<input class="input input--mono" id="base_url" name="base_url" type="url" <input class="input input--mono" id="base_url" name="base_url" type="url"
placeholder="http://127.0.0.1:8188" value="{{ values.base_url }}"> placeholder="{{ t('http://127.0.0.1:8188') }}" value="{{ values.base_url }}">
<p class="field__hint"> <p class="field__hint">{{ t("Where ComfyUI is listening. An address on this machine or this network is fine here and is not checked against the request-forgery rules — you typed it, unlike an address a model asks for.") }}</p>
Where ComfyUI is listening. An address on this machine or this network is
fine here and is not checked against the request-forgery rules — you
typed it, unlike an address a model asks for.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="api_key">API key</label> <label class="field__label" for="api_key">{{ t("API key") }}</label>
<input class="input input--mono" id="api_key" name="api_key" type="password" <input class="input input--mono" id="api_key" name="api_key" type="password"
autocomplete="off" placeholder="No key set" autocomplete="off" placeholder="{{ t('No key set') }}"
value="{{ unchanged if values.api_key_encrypted else '' }}"> value="{{ unchanged if values.api_key_encrypted else '' }}">
<p class="field__hint"> <p class="field__hint">
{% if values.api_key_encrypted %} {% if values.api_key_encrypted %}
@@ -66,29 +56,21 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="timeout">Timeout (seconds)</label> <label class="field__label" for="timeout">{{ t("Timeout (seconds)") }}</label>
<input class="input" id="timeout" name="timeout" type="number" <input class="input" id="timeout" name="timeout" type="number"
min="10" max="3600" step="10" value="{{ values.timeout | int }}"> min="10" max="3600" step="10" value="{{ values.timeout | int }}">
<p class="field__hint"> <p class="field__hint">{{ t("How long to wait for one image, queue included. Far longer than any other timeout here, because the thing being waited for genuinely takes that long.") }}</p>
How long to wait for one image, queue included. Far longer than any other
timeout here, because the thing being waited for genuinely takes that long.
</p>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Checkpoints</h2> <h2 class="card__title">{{ t("Checkpoints") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="checkpoints">Available checkpoints</label> <label class="field__label" for="checkpoints">{{ t("Available checkpoints") }}</label>
<textarea class="textarea input--mono" id="checkpoints" name="checkpoints" rows="4" <textarea class="textarea input--mono" id="checkpoints" name="checkpoints" rows="4"
spellcheck="false" spellcheck="false"
placeholder="sd_xl_base_1.0.safetensors">{{ checkpoints_text }}</textarea> placeholder="{{ t('sd_xl_base_1.0.safetensors') }}">{{ checkpoints_text }}</textarea>
<p class="field__hint"> <p class="field__hint">{{ t("One filename per line, exactly as ComfyUI spells it. This is the list the model chooses from, so leaving out a checkpoint is how you stop it being used. Press Test below to read them off ComfyUI — that fills this in the first time and never overwrites it afterwards.") }}</p>
One filename per line, exactly as ComfyUI spells it. This is the list the
model chooses from, so leaving out a checkpoint is how you stop it being
used. Press Test below to read them off ComfyUI — that fills this in the
first time and never overwrites it afterwards.
</p>
</div> </div>
<div class="btn-row"> <div class="btn-row">
@@ -101,21 +83,16 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">What a generation uses by default</h2> <h2 class="card__title">{{ t("What a generation uses by default") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("What every picture is drawn with unless the model names otherwise. Leave a box empty to use the built-in value shown beside it — the built-ins are SD1.5-era, and 512×512 on an SDXL checkpoint is what produces the duplicated limbs.") }}</p>
What every picture is drawn with unless the model names otherwise. Leave a
box empty to use the built-in value shown beside it — the built-ins are
SD1.5-era, and 512×512 on an SDXL checkpoint is what produces the
duplicated limbs.
</p>
<div class="field"> <div class="field">
<label class="field__label" for="default_checkpoint">Checkpoint</label> <label class="field__label" for="default_checkpoint">{{ t("Checkpoint") }}</label>
{# A select rather than a box, from the list above. Typing a name that is {# A select rather than a box, from the list above. Typing a name that is
not there produced a picture drawn with whatever happened to be first, not there produced a picture drawn with whatever happened to be first,
with nothing anywhere saying so. #} with nothing anywhere saying so. #}
<select class="select" id="default_checkpoint" name="default_checkpoint"> <select class="select" id="default_checkpoint" name="default_checkpoint">
<option value="">The first in the list above</option> <option value="">{{ t("The first in the list above") }}</option>
{% for name in values.checkpoints or [] %} {% for name in values.checkpoints or [] %}
<option value="{{ name }}" {{ 'selected' if values.default_checkpoint == name }}> <option value="{{ name }}" {{ 'selected' if values.default_checkpoint == name }}>
{{ name }} {{ name }}
@@ -126,13 +103,13 @@
<div class="field-row"> <div class="field-row">
<div class="field"> <div class="field">
<label class="field__label" for="default_width">Width</label> <label class="field__label" for="default_width">{{ t("Width") }}</label>
<input class="input" type="number" id="default_width" name="default_width" <input class="input" type="number" id="default_width" name="default_width"
min="64" max="2048" step="64" placeholder="512" min="64" max="2048" step="64" placeholder="512"
value="{{ values.default_width }}"> value="{{ values.default_width }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="default_height">Height</label> <label class="field__label" for="default_height">{{ t("Height") }}</label>
<input class="input" type="number" id="default_height" name="default_height" <input class="input" type="number" id="default_height" name="default_height"
min="64" max="2048" step="64" placeholder="512" min="64" max="2048" step="64" placeholder="512"
value="{{ values.default_height }}"> value="{{ values.default_height }}">
@@ -153,19 +130,19 @@
<div class="field-row"> <div class="field-row">
<div class="field"> <div class="field">
<label class="field__label" for="default_steps">Steps</label> <label class="field__label" for="default_steps">{{ t("Steps") }}</label>
<input class="input" type="number" id="default_steps" name="default_steps" <input class="input" type="number" id="default_steps" name="default_steps"
min="1" max="150" step="1" placeholder="20" min="1" max="150" step="1" placeholder="20"
value="{{ values.default_steps }}"> value="{{ values.default_steps }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="default_cfg">Guidance (cfg)</label> <label class="field__label" for="default_cfg">{{ t("Guidance (cfg)") }}</label>
<input class="input" type="number" id="default_cfg" name="default_cfg" <input class="input" type="number" id="default_cfg" name="default_cfg"
min="0" max="30" step="0.5" placeholder="8" min="0" max="30" step="0.5" placeholder="8"
value="{{ values.default_cfg }}"> value="{{ values.default_cfg }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="default_denoise">Denoise</label> <label class="field__label" for="default_denoise">{{ t("Denoise") }}</label>
<input class="input" type="number" id="default_denoise" name="default_denoise" <input class="input" type="number" id="default_denoise" name="default_denoise"
min="0" max="1" step="0.05" placeholder="1" min="0" max="1" step="0.05" placeholder="1"
value="{{ values.default_denoise }}"> value="{{ values.default_denoise }}">
@@ -174,13 +151,13 @@
<div class="field-row"> <div class="field-row">
<div class="field"> <div class="field">
<label class="field__label" for="default_sampler">Sampler</label> <label class="field__label" for="default_sampler">{{ t("Sampler") }}</label>
{# From what the Test button read off ComfyUI. There are forty-odd and {# From what the Test button read off ComfyUI. There are forty-odd and
spelling one wrong is a refused workflow, so it is picked rather than spelling one wrong is a refused workflow, so it is picked rather than
typed — and the current value is kept as an option even when the list typed — and the current value is kept as an option even when the list
has not been read, or saving this page would quietly clear it. #} has not been read, or saving this page would quietly clear it. #}
<select class="select" id="default_sampler" name="default_sampler"> <select class="select" id="default_sampler" name="default_sampler">
<option value="">euler (built-in)</option> <option value="">{{ t("euler (built-in)") }}</option>
{% for name in values.samplers or [] %} {% for name in values.samplers or [] %}
<option value="{{ name }}" {{ 'selected' if values.default_sampler == name }}> <option value="{{ name }}" {{ 'selected' if values.default_sampler == name }}>
{{ name }} {{ name }}
@@ -194,9 +171,9 @@
</select> </select>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="default_scheduler">Scheduler</label> <label class="field__label" for="default_scheduler">{{ t("Scheduler") }}</label>
<select class="select" id="default_scheduler" name="default_scheduler"> <select class="select" id="default_scheduler" name="default_scheduler">
<option value="">normal (built-in)</option> <option value="">{{ t("normal (built-in)") }}</option>
{% for name in values.schedulers or [] %} {% for name in values.schedulers or [] %}
<option value="{{ name }}" {{ 'selected' if values.default_scheduler == name }}> <option value="{{ name }}" {{ 'selected' if values.default_scheduler == name }}>
{{ name }} {{ name }}
@@ -211,7 +188,7 @@
</select> </select>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="default_batch">Images per run</label> <label class="field__label" for="default_batch">{{ t("Images per run") }}</label>
<input class="input" type="number" id="default_batch" name="default_batch" <input class="input" type="number" id="default_batch" name="default_batch"
min="1" max="8" step="1" placeholder="1" min="1" max="8" step="1" placeholder="1"
value="{{ values.default_batch }}"> value="{{ values.default_batch }}">
@@ -225,38 +202,28 @@
{% endif %} {% endif %}
<div class="field"> <div class="field">
<label class="field__label" for="default_negative">Negative prompt</label> <label class="field__label" for="default_negative">{{ t("Negative prompt") }}</label>
<input class="input" type="text" id="default_negative" name="default_negative" <input class="input" type="text" id="default_negative" name="default_negative"
placeholder="text, watermark" value="{{ values.default_negative }}"> placeholder="{{ t('text, watermark') }}" value="{{ values.default_negative }}">
<p class="field__hint"> <p class="field__hint">{{ t("Used when the model does not write one of its own. It writes one often, so this is a floor rather than something always applied — “always add these words” belongs in the instructions below, where the model is told to include them.") }}</p>
Used when the model does not write one of its own. It writes one often,
so this is a floor rather than something always applied — “always add
these words” belongs in the instructions below, where the model is told
to include them.
</p>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Checking the result</h2> <h2 class="card__title">{{ t("Checking the result") }}</h2>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="review_enabled" value="true" <input type="checkbox" name="review_enabled" value="true"
{{ 'checked' if values.review_enabled }}> {{ 'checked' if values.review_enabled }}>
<span>Look at each image before showing it, and try again if it is wrong</span> <span>{{ t("Look at each image before showing it, and try again if it is wrong") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("A vision model is shown the picture and the request it came from, and says keep or retry. Only clearly wrong images are retried — a missing subject, a mangled picture — because taste is not a fault and the next attempt is not promised to be better. The reader sees only the image that was kept.") }}</p>
A vision model is shown the picture and the request it came from, and says
keep or retry. Only clearly wrong images are retried — a missing subject, a
mangled picture — because taste is not a fault and the next attempt is not
promised to be better. The reader sees only the image that was kept.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="review_model_id">Model that reviews</label> <label class="field__label" for="review_model_id">{{ t("Model that reviews") }}</label>
<select class="select" id="review_model_id" name="review_model_id"> <select class="select" id="review_model_id" name="review_model_id">
<option value="">The chat's own model, when it has vision</option> <option value="">{{ t("The chat's own model, when it has vision") }}</option>
{% for model in vision_models %} {% for model in vision_models %}
{% if model.capabilities_json.get("vision") %} {% if model.capabilities_json.get("vision") %}
{# The model's own id, not the row's primary key: "Test & refresh" {# The model's own id, not the row's primary key: "Test & refresh"
@@ -270,38 +237,26 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</select> </select>
<p class="field__hint"> <p class="field__hint">{{ t("Only models marked as having vision are listed. If there is nothing to ask, the first image is kept and nothing fails.") }}</p>
Only models marked as having vision are listed. If there is nothing to ask,
the first image is kept and nothing fails.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="max_tries">Attempts per image</label> <label class="field__label" for="max_tries">{{ t("Attempts per image") }}</label>
<input class="input" id="max_tries" name="max_tries" type="number" <input class="input" id="max_tries" name="max_tries" type="number"
min="1" max="10" value="{{ values.max_tries }}"> min="1" max="10" value="{{ values.max_tries }}">
<p class="field__hint"> <p class="field__hint">{{ t("Including the first. The last attempt is kept whatever the review says, so a request always produces a picture.") }}</p>
Including the first. The last attempt is kept whatever the review says, so
a request always produces a picture.
</p>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Memory</h2> <h2 class="card__title">{{ t("Memory") }}</h2>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="preserve_vram" value="true" <input type="checkbox" name="preserve_vram" value="true"
{{ 'checked' if values.preserve_vram }}> {{ 'checked' if values.preserve_vram }}>
<span>Preserve VRAM: unload the language model while ComfyUI works</span> <span>{{ t("Preserve VRAM: unload the language model while ComfyUI works") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("For a machine that cannot hold both at once. Before generating, the chat's own connection is asked to unload — set an unload URL on it under Connections, or nothing happens. Afterwards ComfyUI is asked to free its own models, and the language model loads again by itself on the next request.") }}</p>
For a machine that cannot hold both at once. Before generating, the chat's
own connection is asked to unload — set an unload URL on it under
Connections, or nothing happens. Afterwards ComfyUI is asked to free its
own models, and the language model loads again by itself on the next
request.
</p>
</div> </div>
{% if values.preserve_vram and values.review_enabled %} {% if values.preserve_vram and values.review_enabled %}
@@ -317,28 +272,28 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Extra instructions</h2> <h2 class="card__title">{{ t("Extra instructions") }}</h2>
<div class="field"> <div class="field">
<label class="field__label visually-hidden" for="instructions">Extra instructions</label> <label class="field__label visually-hidden" for="instructions">{{ t("Extra instructions") }}</label>
<textarea class="textarea" id="instructions" name="instructions" rows="4" <textarea class="textarea" id="instructions" name="instructions" rows="4"
placeholder="Prefer the SDXL template for anything photographic.">{{ values.instructions }}</textarea> placeholder="{{ t('Prefer the SDXL template for anything photographic.') }}">{{ values.instructions }}</textarea>
<p class="field__hint"> <p class="field__hint">
Added to what every model is told about image generation, on this instance. Added to what every model is told about image generation, on this instance.
Where “always put <em>text, watermark</em> in the negative prompt” lives. Where “always put <em>{{ t("text, watermark") }}</em> in the negative prompt” lives.
Leave it empty and nothing is added at all. Leave it empty and nothing is added at all.
</p> </p>
</div> </div>
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save changes</button> <button class="btn btn--primary" type="submit">{{ t("Save changes") }}</button>
</div> </div>
</form> </form>
<section class="card"> <section class="card">
<h2 class="card__title">Workflows</h2> <h2 class="card__title">{{ t("Workflows") }}</h2>
<p class="field__hint"> <p class="field__hint">
A workflow is a ComfyUI graph exported with <strong>Export (API)</strong>, with A workflow is a ComfyUI graph exported with <strong>{{ t("Export (API)") }}</strong>, with
<code>{{ '{{prompt}}' }}</code> and the other placeholders where the values go. <code>{{ '{{prompt}}' }}</code> and the other placeholders where the values go.
The model picks between them by their descriptions, so write the description The model picks between them by their descriptions, so write the description
for a reader who cannot see the graph. for a reader who cannot see the graph.
@@ -353,10 +308,7 @@
{% if not workflows %} {% if not workflows %}
<div class="empty" style="padding: var(--sp-8) 0"> <div class="empty" style="padding: var(--sp-8) 0">
{{ icon("image", "empty__mark") }} {{ icon("image", "empty__mark") }}
<p class="empty__text"> <p class="empty__text">{{ t("No workflows yet. One is needed before anything can be drawn; the default one is filled in for you when you add the first.") }}</p>
No workflows yet. One is needed before anything can be drawn; the default
one is filled in for you when you add the first.
</p>
</div> </div>
{% else %} {% else %}
<div class="model-rows"> <div class="model-rows">
@@ -365,9 +317,9 @@
<div class="model-row__main"> <div class="model-row__main">
<span class="model-row__name"> <span class="model-row__name">
{{ item.name }} {{ item.name }}
{% if not item.enabled %}<span class="badge badge--danger">disabled</span>{% endif %} {% if not item.enabled %}<span class="badge badge--danger">{{ t("disabled") }}</span>{% endif %}
{% if values.default_workflow_id == item.id %} {% if values.default_workflow_id == item.id %}
<span class="badge">default</span> <span class="badge">{{ t("default") }}</span>
{% endif %} {% endif %}
</span> </span>
<code class="model-row__id">{{ item.slug }}</code> <code class="model-row__id">{{ item.slug }}</code>
@@ -395,20 +347,18 @@
<input type="hidden" name="max_tries" value="{{ values.max_tries }}"> <input type="hidden" name="max_tries" value="{{ values.max_tries }}">
<input type="hidden" name="preserve_vram" value="{{ 'true' if values.preserve_vram }}"> <input type="hidden" name="preserve_vram" value="{{ 'true' if values.preserve_vram }}">
<input type="hidden" name="instructions" value="{{ values.instructions }}"> <input type="hidden" name="instructions" value="{{ values.instructions }}">
<label class="field__label" for="default_workflow_id">Default workflow</label> <label class="field__label" for="default_workflow_id">{{ t("Default workflow") }}</label>
<div class="btn-row"> <div class="btn-row">
<select class="select" id="default_workflow_id" name="default_workflow_id"> <select class="select" id="default_workflow_id" name="default_workflow_id">
<option value="">The first one</option> <option value="">{{ t("The first one") }}</option>
{% for item in workflows %} {% for item in workflows %}
<option value="{{ item.id }}" <option value="{{ item.id }}"
{{ 'selected' if values.default_workflow_id == item.id }}>{{ item.name }}</option> {{ 'selected' if values.default_workflow_id == item.id }}>{{ item.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
<button class="btn" type="submit">Set default</button> <button class="btn" type="submit">{{ t("Set default") }}</button>
</div> </div>
<p class="field__hint"> <p class="field__hint">{{ t("Used when the model names no template and the chat has no preference.") }}</p>
Used when the model names no template and the chat has no preference.
</p>
</form> </form>
{% endif %} {% endif %}
</section> </section>
+3 -10
View File
@@ -8,18 +8,14 @@
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">
Remote servers speaking the Model Context Protocol over HTTP. Their tools are Remote servers speaking the Model Context Protocol over HTTP. Their tools are
offered beside the built-in ones to models marked <strong>MCP servers</strong>. offered beside the built-in ones to models marked <strong>{{ t("MCP servers") }}</strong>.
The list of tools is discovered and cached — press <strong>Test &amp; The list of tools is discovered and cached — press <strong>Test &amp;
refresh</strong> after adding one, and again whenever the server changes. refresh</strong> after adding one, and again whenever the server changes.
</p> </p>
<div class="alert"> <div class="alert">
{{ icon("shield", "icon--sm") }} {{ icon("shield", "icon--sm") }}
<span> <span>{{ t("A server's tool names and descriptions are sent to the model as instructions, and what it returns is read back as fact. Add servers you trust, the way you would a dependency.") }}</span>
A server's tool names and descriptions are sent to the model as
instructions, and what it returns is read back as fact. Add servers you
trust, the way you would a dependency.
</span>
</div> </div>
{% if saved %} {% if saved %}
@@ -35,10 +31,7 @@
{% if not servers %} {% if not servers %}
<div class="empty" style="padding: var(--sp-10) 0"> <div class="empty" style="padding: var(--sp-10) 0">
{{ icon("server", "empty__mark") }} {{ icon("server", "empty__mark") }}
<p class="empty__text"> <p class="empty__text">{{ t("No servers yet. You will need the URL of an MCP endpoint that speaks streamable HTTP — local ones launched as a subprocess are not supported.") }}</p>
No servers yet. You will need the URL of an MCP endpoint that speaks
streamable HTTP — local ones launched as a subprocess are not supported.
</p>
</div> </div>
{% else %} {% else %}
+29 -37
View File
@@ -27,18 +27,18 @@
class="form-grid"> class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">The server</h2> <h2 class="card__title">{{ t("The server") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="name">Name</label> <label class="field__label" for="name">{{ t("Name") }}</label>
<input class="input" id="name" name="name" value="{{ server.name }}" required <input class="input" id="name" name="name" value="{{ server.name }}" required
maxlength="120" placeholder="GitHub"> maxlength="120" placeholder="{{ t('GitHub') }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="slug">Identifier</label> <label class="field__label" for="slug">{{ t("Identifier") }}</label>
<input class="input input--mono" id="slug" name="slug" value="{{ server.slug }}" required <input class="input input--mono" id="slug" name="slug" value="{{ server.slug }}" required
maxlength="24" pattern="[a-z0-9][a-z0-9_\-]*" placeholder="github"> maxlength="24" pattern="[a-z0-9][a-z0-9_\-]*" placeholder="{{ t('github') }}">
<p class="field__hint"> <p class="field__hint">
Prefixed onto every tool name this server offers, so that two servers Prefixed onto every tool name this server offers, so that two servers
both exposing <code>search</code> do not collide. both exposing <code>search</code> do not collide.
@@ -46,40 +46,37 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="url">Endpoint URL</label> <label class="field__label" for="url">{{ t("Endpoint URL") }}</label>
<input class="input input--mono" id="url" name="url" value="{{ server.url }}" required <input class="input input--mono" id="url" name="url" value="{{ server.url }}" required
placeholder="https://mcp.example.com/mcp"> placeholder="{{ t('https://mcp.example.com/mcp') }}">
<p class="field__hint"> <p class="field__hint">{{ t("The streamable-HTTP endpoint itself, the one that accepts a POST. A server that answers with a redirect to somewhere else will be refused.") }}</p>
The streamable-HTTP endpoint itself, the one that accepts a POST. A
server that answers with a redirect to somewhere else will be refused.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="headers">Extra headers</label> <label class="field__label" for="headers">{{ t("Extra headers") }}</label>
<textarea class="textarea input--mono" id="headers" name="headers" rows="3" <textarea class="textarea input--mono" id="headers" name="headers" rows="3"
spellcheck="false">{{ headers_text }}</textarea> spellcheck="false">{{ headers_text }}</textarea>
<p class="field__hint">One <code>Name: value</code> per line.</p> <p class="field__hint">One <code>Name: value</code> per line.</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="timeout">Timeout (seconds)</label> <label class="field__label" for="timeout">{{ t("Timeout (seconds)") }}</label>
<input class="input" id="timeout" name="timeout" value="{{ server.timeout }}" <input class="input" id="timeout" name="timeout" value="{{ server.timeout }}"
inputmode="numeric"> inputmode="numeric">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="max_chars">Most characters to keep per call</label> <label class="field__label" for="max_chars">{{ t("Most characters to keep per call") }}</label>
<input class="input" id="max_chars" name="max_chars" value="{{ server.max_chars }}" <input class="input" id="max_chars" name="max_chars" value="{{ server.max_chars }}"
inputmode="numeric"> inputmode="numeric">
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Credential</h2> <h2 class="card__title">{{ t("Credential") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="secret_placement">How it is sent</label> <label class="field__label" for="secret_placement">{{ t("How it is sent") }}</label>
<select class="select" id="secret_placement" name="secret_placement"> <select class="select" id="secret_placement" name="secret_placement">
{% for value, label in secret_placements %} {% for value, label in secret_placements %}
<option value="{{ value }}" {{ 'selected' if value == server.secret_placement }}> <option value="{{ value }}" {{ 'selected' if value == server.secret_placement }}>
@@ -90,15 +87,15 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="secret_name">Header or parameter name</label> <label class="field__label" for="secret_name">{{ t("Header or parameter name") }}</label>
<input class="input input--mono" id="secret_name" name="secret_name" <input class="input input--mono" id="secret_name" name="secret_name"
value="{{ server.secret_name }}" maxlength="120"> value="{{ server.secret_name }}" maxlength="120">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="secret">Secret</label> <label class="field__label" for="secret">{{ t("Secret") }}</label>
<input class="input input--mono" id="secret" name="secret" type="password" <input class="input input--mono" id="secret" name="secret" type="password"
autocomplete="off" placeholder="No secret set" autocomplete="off" placeholder="{{ t('No secret set') }}"
value="{{ unchanged if server.secret_encrypted else '' }}"> value="{{ unchanged if server.secret_encrypted else '' }}">
<p class="field__hint"> <p class="field__hint">
{% if server.secret_encrypted %} {% if server.secret_encrypted %}
@@ -113,11 +110,8 @@
{% if tools %} {% if tools %}
<section class="card"> <section class="card">
<h2 class="card__title">Tools it offers</h2> <h2 class="card__title">{{ t("Tools it offers") }}</h2>
<p class="field__hint"> <p class="field__hint">{{ t("Discovered at the last refresh. Untick one to withhold it — a tool this server adds later is offered by default.") }}</p>
Discovered at the last refresh. Untick one to withhold it — a tool this
server adds later is offered by default.
</p>
<input type="hidden" name="tool_choices" value="1"> <input type="hidden" name="tool_choices" value="1">
<div class="checkbox-row checkbox-row--stacked"> <div class="checkbox-row checkbox-row--stacked">
@@ -141,7 +135,7 @@
</section> </section>
{% elif not is_new %} {% elif not is_new %}
<section class="card"> <section class="card">
<h2 class="card__title">Tools it offers</h2> <h2 class="card__title">{{ t("Tools it offers") }}</h2>
<p class="field__hint"> <p class="field__hint">
Nothing discovered yet. Save, then press <strong>Test &amp; refresh</strong> Nothing discovered yet. Save, then press <strong>Test &amp; refresh</strong>
on the <a href="/admin/mcp">list</a>. on the <a href="/admin/mcp">list</a>.
@@ -150,11 +144,11 @@
{% endif %} {% endif %}
<section class="card"> <section class="card">
<h2 class="card__title">Guidance</h2> <h2 class="card__title">{{ t("Guidance") }}</h2>
<div class="field"> <div class="field">
<textarea class="textarea" name="guidance" rows="4" <textarea class="textarea" name="guidance" rows="4"
placeholder="- Use the GitHub tools for anything about our repositories." placeholder="{{ t('- Use the GitHub tools for anything about our repositories.') }}"
>{{ server.guidance }}</textarea> >{{ server.guidance }}</textarea>
<p class="field__hint"> <p class="field__hint">
Added to the system message whenever any tool from this server is Added to the system message whenever any tool from this server is
@@ -170,18 +164,18 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Availability</h2> <h2 class="card__title">{{ t("Availability") }}</h2>
<div class="field"> <div class="field">
<div class="checkbox-row"> <div class="checkbox-row">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" {{ 'checked' if server.enabled }}> <input type="checkbox" name="enabled" value="true" {{ 'checked' if server.enabled }}>
<span>Enabled — offered in chats</span> <span>{{ t("Enabled — offered in chats") }}</span>
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="allow_private" value="true" <input type="checkbox" name="allow_private" value="true"
{{ 'checked' if server.allow_private }}> {{ 'checked' if server.allow_private }}>
<span>May reach private and loopback addresses</span> <span>{{ t("May reach private and loopback addresses") }}</span>
</label> </label>
</div> </div>
<p class="field__hint"> <p class="field__hint">
@@ -193,12 +187,12 @@
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="public" value="true" {{ 'checked' if server.public }}> <input type="checkbox" name="public" value="true" {{ 'checked' if server.public }}>
<span>Available to everyone</span> <span>{{ t("Available to everyone") }}</span>
</label> </label>
</div> </div>
<div class="field"> <div class="field">
<span class="field__label">Groups with access</span> <span class="field__label">{{ t("Groups with access") }}</span>
{% if groups %} {% if groups %}
<div class="checkbox-row"> <div class="checkbox-row">
{% for group in groups %} {% for group in groups %}
@@ -209,7 +203,7 @@
</label> </label>
{% endfor %} {% endfor %}
</div> </div>
<p class="field__hint">Ignored while the server is available to everyone.</p> <p class="field__hint">{{ t("Ignored while the server is available to everyone.") }}</p>
{% else %} {% else %}
<p class="field__hint"> <p class="field__hint">
No groups yet — <a href="/admin/groups">create one</a> to restrict access. No groups yet — <a href="/admin/groups">create one</a> to restrict access.
@@ -218,7 +212,7 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="position">Position</label> <label class="field__label" for="position">{{ t("Position") }}</label>
<input class="input" id="position" name="position" value="{{ server.position }}" <input class="input" id="position" name="position" value="{{ server.position }}"
inputmode="numeric"> inputmode="numeric">
</div> </div>
@@ -232,9 +226,7 @@
{% if not is_new %} {% if not is_new %}
<button class="btn btn--danger" type="submit" formnovalidate <button class="btn btn--danger" type="submit" formnovalidate
formaction="/admin/mcp/{{ server.id }}/delete" formaction="/admin/mcp/{{ server.id }}/delete"
data-confirm-button="Delete the server “{{ server.name }}”? Chats that used its tools keep their transcripts."> data-confirm-button="Delete the server “{{ server.name }}”? Chats that used its tools keep their transcripts.">{{ t("Delete") }}</button>
Delete
</button>
{% endif %} {% endif %}
</div> </div>
</form> </form>
@@ -54,19 +54,16 @@
enctype="multipart/form-data" class="btn-row"> enctype="multipart/form-data" class="btn-row">
<input class="input input--file" type="file" name="image" <input class="input input--file" type="file" name="image"
accept="image/png,image/jpeg,image/webp,image/gif" required accept="image/png,image/jpeg,image/webp,image/gif" required
aria-label="Model image"> aria-label="{{ t('Model image') }}">
<button class="btn btn--sm" type="submit">{{ icon("image", "icon--sm") }} Upload image</button> <button class="btn btn--sm" type="submit">{{ icon("image", "icon--sm") }} Upload image</button>
</form> </form>
{% if model.image_path %} {% if model.image_path %}
<form method="post" action="/admin/models/{{ model.id }}/image/delete"> <form method="post" action="/admin/models/{{ model.id }}/image/delete">
<button class="btn btn--sm btn--danger" type="submit">Remove image</button> <button class="btn btn--sm btn--danger" type="submit">{{ t("Remove image") }}</button>
</form> </form>
{% endif %} {% endif %}
</div> </div>
<p class="field__hint"> <p class="field__hint">{{ t("PNG, JPEG, WEBP or GIF, under 2 MB. Without one, the model gets a generated badge whose colour is derived from its id.") }}</p>
PNG, JPEG, WEBP or GIF, under 2 MB. Without one, the model gets a generated
badge whose colour is derived from its id.
</p>
</section> </section>
{# Empty, hidden, and outside every other form: the Detect button further down {# Empty, hidden, and outside every other form: the Detect button further down
@@ -77,18 +74,18 @@
<form method="post" action="/admin/models/{{ model.id }}"> <form method="post" action="/admin/models/{{ model.id }}">
<section class="card"> <section class="card">
<h2 class="card__title">Presentation</h2> <h2 class="card__title">{{ t("Presentation") }}</h2>
<div class="grid grid--2"> <div class="grid grid--2">
<div class="field"> <div class="field">
<label class="field__label" for="display-name">Display name</label> <label class="field__label" for="display-name">{{ t("Display name") }}</label>
<input class="input" id="display-name" name="display_name" <input class="input" id="display-name" name="display_name"
value="{{ model.display_name }}" placeholder="{{ model.model_id }}"> value="{{ model.display_name }}" placeholder="{{ model.model_id }}">
<p class="field__hint">Shown instead of the raw id. Empty uses the id.</p> <p class="field__hint">{{ t("Shown instead of the raw id. Empty uses the id.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="position">Position</label> <label class="field__label" for="position">{{ t("Position") }}</label>
<input class="input" id="position" name="position" type="number" min="1" <input class="input" id="position" name="position" type="number" min="1"
max="{{ total }}" value="{{ position_of }}"> max="{{ total }}" value="{{ position_of }}">
<p class="field__hint"> <p class="field__hint">
@@ -99,19 +96,15 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="context-length">Context length</label> <label class="field__label" for="context-length">{{ t("Context length") }}</label>
<input class="input" id="context-length" name="context_length" type="number" <input class="input" id="context-length" name="context_length" type="number"
min="0" step="1" placeholder="unknown" min="0" step="1" placeholder="{{ t('unknown') }}"
value="{{ model.context_length or '' }}"> value="{{ model.context_length or '' }}">
<p class="field__hint"> <p class="field__hint">{{ t("How many tokens this model can hold, filled in from the endpoint where it says. Leave it empty if you do not know: the context percentage and automatic compaction both stay off rather than working from a guess.") }}</p>
How many tokens this model can hold, filled in from the endpoint where
it says. Leave it empty if you do not know: the context percentage and
automatic compaction both stay off rather than working from a guess.
</p>
</div> </div>
<div class="field"> <div class="field">
<span class="field__label">Reasoning efforts this model accepts</span> <span class="field__label">{{ t("Reasoning efforts this model accepts") }}</span>
<div class="btn-row"> <div class="btn-row">
{% for value in efforts %} {% for value in efforts %}
<label class="checkbox"> <label class="checkbox">
@@ -162,14 +155,14 @@
</button> </button>
<p class="field__hint"> <p class="field__hint">
The vocabulary is <strong>not the same for every model</strong>, and The vocabulary is <strong>{{ t("not the same for every model") }}</strong>, and
sending one a model does not know is not ignored — it is rendered into sending one a model does not know is not ignored — it is rendered into
the model's chat template, which raises and fails the whole reply. the model's chat template, which raises and fails the whole reply.
gpt-oss takes <span class="mono">low/medium/high</span>; Bonsai takes gpt-oss takes <span class="mono">{{ t("low/medium/high") }}</span>; Bonsai takes
<span class="mono">low/medium/xhigh</span> and refuses <span class="mono">{{ t("low/medium/xhigh") }}</span> and refuses
<span class="mono">high</span>; OpenAI has added <span class="mono">{{ t("high") }}</span>; OpenAI has added
<span class="mono">minimal</span>, <span class="mono">xhigh</span> and <span class="mono">{{ t("minimal") }}</span>, <span class="mono">{{ t("xhigh") }}</span> and
<span class="mono">max</span> at various points. <span class="mono">{{ t("max") }}</span> at various points.
<br> <br>
Tick none and the common three are offered, which is right for almost Tick none and the common three are offered, which is right for almost
everything. If an endpoint ever refuses one anyway, that reply is everything. If an endpoint ever refuses one anyway, that reply is
@@ -179,9 +172,9 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="default-effort">Default reasoning effort</label> <label class="field__label" for="default-effort">{{ t("Default reasoning effort") }}</label>
<select class="select" id="default-effort" name="default_effort"> <select class="select" id="default-effort" name="default_effort">
<option value="">None — send nothing</option> <option value="">{{ t("None — send nothing") }}</option>
{% for value in model_efforts %} {% for value in model_efforts %}
<option value="{{ value }}" <option value="{{ value }}"
{{ 'selected' if model.params_json.get('reasoning_effort') == value }}> {{ 'selected' if model.params_json.get('reasoning_effort') == value }}>
@@ -190,19 +183,19 @@
{% endfor %} {% endfor %}
</select> </select>
<p class="field__hint"> <p class="field__hint">
A <em>seed</em>, not a per-request setting: it is copied onto a chat when A <em>{{ t("seed") }}</em>, not a per-request setting: it is copied onto a chat when
the chat is created and when somebody switches to this model, and from the chat is created and when somebody switches to this model, and from
then on the chat's own value is what is sent. Changing it here therefore then on the chat's own value is what is sent. Changing it here therefore
does nothing to chats that already exist. The composer's picker shows does nothing to chats that already exist. The composer's picker shows
whichever level is actually in force, so what somebody sees there is whichever level is actually in force, so what somebody sees there is
what goes out. Anyone can change it per chat with what goes out. Anyone can change it per chat with
<span class="mono">/effort</span>, and the control only appears on a <span class="mono">{{ t("/effort") }}</span>, and the control only appears on a
model marked <strong>Reasoning</strong> above. model marked <strong>{{ t("Reasoning") }}</strong> above.
<br> <br>
Sent two ways at once, because there is no one field that works: OpenAI Sent two ways at once, because there is no one field that works: OpenAI
and vLLM read <span class="mono">reasoning_effort</span>, while and vLLM read <span class="mono">{{ t("reasoning_effort") }}</span>, while
llama.cpp drops it silently and reads only llama.cpp drops it silently and reads only
<span class="mono">chat_template_kwargs</span> — which is the route by <span class="mono">{{ t("chat_template_kwargs") }}</span> — which is the route by
which it reaches gpt-oss. Both go out, and only on a chat that has an which it reaches gpt-oss. Both go out, and only on a chat that has an
effort set, so an endpoint strict about unknown parameters is untouched effort set, so an endpoint strict about unknown parameters is untouched
until somebody chooses one. until somebody chooses one.
@@ -210,9 +203,9 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="description">Description</label> <label class="field__label" for="description">{{ t("Description") }}</label>
<textarea class="textarea" id="description" name="description" rows="2" <textarea class="textarea" id="description" name="description" rows="2"
placeholder="What is this model good at?">{{ model.description }}</textarea> placeholder="{{ t('What is this model good at?') }}">{{ model.description }}</textarea>
<p class="field__hint"> <p class="field__hint">
Shown in the chat settings panel and your users' settings &mdash; and, if any Shown in the chat settings panel and your users' settings &mdash; and, if any
model here may ask another one a question, read by those models too. model here may ask another one a question, read by those models too.
@@ -220,26 +213,18 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="notes">Facts for other models</label> <label class="field__label" for="notes">{{ t("Facts for other models") }}</label>
<textarea class="textarea" id="notes" name="notes" rows="3" <textarea class="textarea" id="notes" name="notes" rows="3"
placeholder="Parameters, quantisation, a benchmark figure, what it is bad at">{{ model.notes }}</textarea> placeholder="{{ t('Parameters, quantisation, a benchmark figure, what it is bad at') }}">{{ model.notes }}</textarea>
<p class="field__hint"> <p class="field__hint">{{ t("Never shown to a person. It goes into the list of the other models that a model sees when it is allowed to ask one of them a question, so write what would help it choose: size, what this one is good and bad at, a score you trust. Leave it empty and the description above carries that on its own.") }}</p>
Never shown to a person. It goes into the list of the other models that a
model sees when it is allowed to ask one of them a question, so write what
would help it choose: size, what this one is good and bad at, a score you
trust. Leave it empty and the description above carries that on its own.
</p>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">System prompt</h2> <h2 class="card__title">{{ t("System prompt") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("Used by chats on this model that have no prompt of their own. A chat's own prompt overrides this; this overrides the instance prompt.") }}</p>
Used by chats on this model that have no prompt of their own. A chat's own
prompt overrides this; this overrides the instance prompt.
</p>
<div class="field"> <div class="field">
<label class="field__label visually-hidden" for="system-prompt">System prompt</label> <label class="field__label visually-hidden" for="system-prompt">{{ t("System prompt") }}</label>
<textarea class="textarea" id="system-prompt" name="system_prompt" rows="5" <textarea class="textarea" id="system-prompt" name="system_prompt" rows="5"
placeholder="{{ instance_prompt or 'No instance prompt is set.' }}" placeholder="{{ instance_prompt or 'No instance prompt is set.' }}"
>{{ model.system_prompt }}</textarea> >{{ model.system_prompt }}</textarea>
@@ -254,14 +239,14 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Capabilities</h2> <h2 class="card__title">{{ t("Capabilities") }}</h2>
<p class="card__lede"> <p class="card__lede">
What this endpoint can do. Endpoints rarely advertise it reliably, so it What this endpoint can do. Endpoints rarely advertise it reliably, so it
is your call. <strong>reasoning</strong> shows the thinking block, is your call. <strong>{{ t("reasoning") }}</strong> shows the thinking block,
<strong>vision</strong> lets images be sent, and <strong>tools</strong> is <strong>{{ t("vision") }}</strong> lets images be sent, and <strong>{{ t("tools") }}</strong> is
whether a tool list may be sent at all — turn it on for a model that does whether a tool list may be sent at all — turn it on for a model that does
not support tool calling and every one of its replies fails. not support tool calling and every one of its replies fails.
<strong>embeddings</strong> is the odd one out: it says this is not a chat <strong>{{ t("embeddings") }}</strong> is the odd one out: it says this is not a chat
model at all, but one that turns text into vectors, and it is what model at all, but one that turns text into vectors, and it is what
<a href="/admin/extraction">Extraction</a> picks from. <a href="/admin/extraction">Extraction</a> picks from.
</p> </p>
@@ -280,14 +265,14 @@
<h2 class="card__title"> <h2 class="card__title">
Built-in tools Built-in tools
{% if not (model.capabilities_json or {}).get("tools") %} {% if not (model.capabilities_json or {}).get("tools") %}
<span class="badge">needs tools</span> <span class="badge">{{ t("needs tools") }}</span>
{% endif %} {% endif %}
</h2> </h2>
<p class="card__lede"> <p class="card__lede">
What this model is given, as opposed to what it is capable of. None of it What this model is given, as opposed to what it is capable of. None of it
applies unless <strong>tools</strong> is ticked above. Each one is also applies unless <strong>{{ t("tools") }}</strong> is ticked above. Each one is also
subject to the instance being configured for it and to the reader's own subject to the instance being configured for it and to the reader's own
permissions — this only decides whether it is offered to <em>this</em> permissions — this only decides whether it is offered to <em>{{ t("this") }}</em>
model. model.
</p> </p>
<div class="checkbox-row"> <div class="checkbox-row">
@@ -306,17 +291,17 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Availability</h2> <h2 class="card__title">{{ t("Availability") }}</h2>
<div class="field"> <div class="field">
<div class="checkbox-row"> <div class="checkbox-row">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" {{ 'checked' if model.enabled }}> <input type="checkbox" name="enabled" value="true" {{ 'checked' if model.enabled }}>
<span>Enabled — offered in chats</span> <span>{{ t("Enabled — offered in chats") }}</span>
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="pinned" value="true" {{ 'checked' if model.pinned }}> <input type="checkbox" name="pinned" value="true" {{ 'checked' if model.pinned }}>
<span>Pinned — shortcut in the chat sidebar</span> <span>{{ t("Pinned — shortcut in the chat sidebar") }}</span>
</label> </label>
</div> </div>
</div> </div>
@@ -324,16 +309,13 @@
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="public" value="true" {{ 'checked' if model.public }}> <input type="checkbox" name="public" value="true" {{ 'checked' if model.public }}>
<span>Available to everyone</span> <span>{{ t("Available to everyone") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("Uncheck to restrict this model to chosen groups. Administrators always have access.") }}</p>
Uncheck to restrict this model to chosen groups. Administrators always
have access.
</p>
</div> </div>
<div class="field"> <div class="field">
<span class="field__label">Groups with access</span> <span class="field__label">{{ t("Groups with access") }}</span>
{% if groups %} {% if groups %}
<div class="checkbox-row"> <div class="checkbox-row">
{% for group in groups %} {% for group in groups %}
@@ -344,7 +326,7 @@
</label> </label>
{% endfor %} {% endfor %}
</div> </div>
<p class="field__hint">Ignored while the model is available to everyone.</p> <p class="field__hint">{{ t("Ignored while the model is available to everyone.") }}</p>
{% else %} {% else %}
<p class="field__hint"> <p class="field__hint">
No groups yet — <a href="/admin/groups">create one</a> to restrict access. No groups yet — <a href="/admin/groups">create one</a> to restrict access.
@@ -354,7 +336,7 @@
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save changes</button> <button class="btn btn--primary" type="submit">{{ t("Save changes") }}</button>
<a class="btn btn--ghost" href="/admin/models">Back to all models</a> <a class="btn btn--ghost" href="/admin/models">Back to all models</a>
</div> </div>
</form> </form>
@@ -362,28 +344,28 @@
{# Outside the form above, and it has to be: two forms cannot nest, and this one {# Outside the form above, and it has to be: two forms cannot nest, and this one
posts somewhere else. See the note beside the Detect button. #} posts somewhere else. See the note beside the Detect button. #}
<section class="card"> <section class="card">
<h2 class="card__title">Default personality</h2> <h2 class="card__title">{{ t("Default personality") }}</h2>
<p class="card__lede"> <p class="card__lede">
Who this model is before it has worked out who it is with somebody. Different Who this model is before it has worked out who it is with somebody. Different
from the system prompt above: that is an instruction you write, this is a from the system prompt above: that is an instruction you write, this is a
character it can be — and, with <strong>Edit its own personality</strong> character it can be — and, with <strong>{{ t("Edit its own personality") }}</strong>
ticked, one it rewrites for itself. ticked, one it rewrites for itself.
</p> </p>
<p class="card__lede"> <p class="card__lede">
<strong>A personality belongs to a person.</strong> Each account gets its own <strong>{{ t("A personality belongs to a person.") }}</strong> Each account gets its own
version of this model's character, starting from what you write here and version of this model's character, starting from what you write here and
diverging from it the first time the model writes its own. Changing this diverging from it the first time the model writes its own. Changing this
afterwards does not reach anybody who already has one, and it is not stacked afterwards does not reach anybody who already has one, and it is not stacked
underneath theirs — two personalities at once would contradict each other and underneath theirs — two personalities at once would contradict each other and
nobody could tell which was losing. What the model *is*, as opposed to who it nobody could tell which was losing. What the model *is*, as opposed to who it
has become with somebody, belongs in <strong>Description</strong> and has become with somebody, belongs in <strong>{{ t("Description") }}</strong> and
<strong>Facts for other models</strong> above, which are the same for everyone. <strong>{{ t("Facts for other models") }}</strong> above, which are the same for everyone.
</p> </p>
<form method="post" action="/admin/models/{{ model.id }}/persona"> <form method="post" action="/admin/models/{{ model.id }}/persona">
<div class="field"> <div class="field">
<label class="field__label visually-hidden" for="persona">Default personality</label> <label class="field__label visually-hidden" for="persona">{{ t("Default personality") }}</label>
<textarea class="textarea" id="persona" name="content" rows="6" <textarea class="textarea" id="persona" name="content" rows="6"
placeholder="Nothing yet. Write one, or let the model write its own." placeholder="{{ t('Nothing yet. Write one, or let the model write its own.') }}"
>{{ persona.content if persona else "" }}</textarea> >{{ persona.content if persona else "" }}</textarea>
<p class="field__hint"> <p class="field__hint">
Up to {{ persona_limit }} characters, in the first person. Empty removes it Up to {{ persona_limit }} characters, in the first person. Empty removes it
@@ -392,11 +374,11 @@
</p> </p>
</div> </div>
<div class="btn-row"> <div class="btn-row">
<button class="btn" type="submit">Save personality</button> <button class="btn" type="submit">{{ t("Save personality") }}</button>
{% if persona and persona.author == "model" %} {% if persona and persona.author == "model" %}
<span class="badge badge--leaf">last written by the model</span> <span class="badge badge--leaf">{{ t("last written by the model") }}</span>
{% elif persona %} {% elif persona %}
<span class="badge">last written here</span> <span class="badge">{{ t("last written here") }}</span>
{% endif %} {% endif %}
</div> </div>
</form> </form>
@@ -407,20 +389,16 @@
<h2 class="card__title"> <h2 class="card__title">
Earlier defaults <span class="badge">{{ persona.revisions|length }}</span> Earlier defaults <span class="badge">{{ persona.revisions|length }}</span>
</h2> </h2>
<p class="card__lede"> <p class="card__lede">{{ t("What this default said before each change. Each person's own personality keeps its own history, which they can see and restore in their own settings — this is the starting point's history, not theirs.") }}</p>
What this default said before each change. Each person's own personality keeps
its own history, which they can see and restore in their own settings — this is
the starting point's history, not theirs.
</p>
<ul class="model-list"> <ul class="model-list">
{% for revision in persona.revisions %} {% for revision in persona.revisions %}
<li class="model-list__item"> <li class="model-list__item">
<div style="min-width: 0"> <div style="min-width: 0">
<strong>{{ revision.created_at.strftime("%Y-%m-%d %H:%M") }}</strong> <strong>{{ revision.created_at.strftime("%Y-%m-%d %H:%M") }}</strong>
{% if revision.author == "model" %} {% if revision.author == "model" %}
<span class="badge badge--leaf">model</span> <span class="badge badge--leaf">{{ t("model") }}</span>
{% else %} {% else %}
<span class="badge">you</span> <span class="badge">{{ t("you") }}</span>
{% endif %} {% endif %}
{% if revision.note %}<div class="text-xs faint">{{ revision.note }}</div>{% endif %} {% if revision.note %}<div class="text-xs faint">{{ revision.note }}</div>{% endif %}
<div class="text-xs faint"> <div class="text-xs faint">
@@ -428,8 +406,8 @@
</div> </div>
</div> </div>
<form method="post" action="/admin/models/{{ model.id }}/persona/revert" <form method="post" action="/admin/models/{{ model.id }}/persona/revert"
data-confirm="Put this version back? The current one is kept in the history." data-confirm="{{ t('Put this version back? The current one is kept in the history.') }}"
data-confirm-label="Restore" data-confirm-danger="false"> data-confirm-label="{{ t('Restore') }}" data-confirm-danger="false">
<input type="hidden" name="revision_id" value="{{ revision.id }}"> <input type="hidden" name="revision_id" value="{{ revision.id }}">
<button class="btn btn--sm" type="submit"> <button class="btn btn--sm" type="submit">
{{ icon("refresh", "icon--sm") }} Restore {{ icon("refresh", "icon--sm") }} Restore
+21 -21
View File
@@ -8,8 +8,8 @@
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">
Every model discovered across your connections. The order here is the order Every model discovered across your connections. The order here is the order
users see in the picker. <strong>Pinning</strong> does not reorder anything — users see in the picker. <strong>{{ t("Pinning") }}</strong> does not reorder anything —
it puts a shortcut in the chat sidebar. The <strong>default</strong> is what a it puts a shortcut in the chat sidebar. The <strong>{{ t("default") }}</strong> is what a
new chat starts with. new chat starts with.
</p> </p>
@@ -41,9 +41,9 @@
<form class="filter-form" method="get" action="/admin/models"> <form class="filter-form" method="get" action="/admin/models">
<input type="hidden" name="filter" value="{{ active_filter }}"> <input type="hidden" name="filter" value="{{ active_filter }}">
<input class="input" type="search" name="q" value="{{ q }}" <input class="input" type="search" name="q" value="{{ q }}"
placeholder="Search models…" aria-label="Search models"> placeholder="{{ t('Search models…') }}" aria-label="{{ t('Search models') }}">
<select class="select" name="connection" aria-label="Connection"> <select class="select" name="connection" aria-label="{{ t('Connection') }}">
<option value="">All connections</option> <option value="">{{ t("All connections") }}</option>
{% for conn in connections %} {% for conn in connections %}
<option value="{{ conn.id }}" {{ 'selected' if conn.id == connection_id }}> <option value="{{ conn.id }}" {{ 'selected' if conn.id == connection_id }}>
{{ conn.name }} {{ conn.name }}
@@ -59,7 +59,7 @@
{% if not models %} {% if not models %}
<div class="empty" style="padding: var(--sp-8) 0"> <div class="empty" style="padding: var(--sp-8) 0">
<p class="empty__text">Nothing matches that filter.</p> <p class="empty__text">{{ t("Nothing matches that filter.") }}</p>
</div> </div>
{% else %} {% else %}
@@ -67,15 +67,15 @@
<div class="bulk-bar"> <div class="bulk-bar">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" data-select-all="#model-rows" <input type="checkbox" data-select-all="#model-rows"
aria-label="Select every model on this page"> aria-label="{{ t('Select every model on this page') }}">
<span class="bulk-bar__label">Select all</span> <span class="bulk-bar__label">{{ t("Select all") }}</span>
</label> </label>
<span class="spacer"></span> <span class="spacer"></span>
<span class="bulk-bar__label">With selected:</span> <span class="bulk-bar__label">{{ t("With selected:") }}</span>
<button class="btn btn--sm" name="action" value="enable" type="submit">Enable</button> <button class="btn btn--sm" name="action" value="enable" type="submit">{{ t("Enable") }}</button>
<button class="btn btn--sm" name="action" value="disable" type="submit">Disable</button> <button class="btn btn--sm" name="action" value="disable" type="submit">{{ t("Disable") }}</button>
<button class="btn btn--sm" name="action" value="public" type="submit">Make public</button> <button class="btn btn--sm" name="action" value="public" type="submit">{{ t("Make public") }}</button>
<button class="btn btn--sm" name="action" value="private" type="submit">Restrict</button> <button class="btn btn--sm" name="action" value="private" type="submit">{{ t("Restrict") }}</button>
</div> </div>
<div class="model-rows" id="model-rows"> <div class="model-rows" id="model-rows">
@@ -92,11 +92,11 @@
<div class="model-row__title"> <div class="model-row__title">
<a class="model-row__name" href="/admin/models/{{ model.id }}/edit">{{ model.label }}</a> <a class="model-row__name" href="/admin/models/{{ model.id }}/edit">{{ model.label }}</a>
{% if model.model_id == default_model %} {% if model.model_id == default_model %}
<span class="badge badge--leaf">default</span> <span class="badge badge--leaf">{{ t("default") }}</span>
{% endif %} {% endif %}
{% if model.pinned %}<span class="badge">pinned</span>{% endif %} {% if model.pinned %}<span class="badge">{{ t("pinned") }}</span>{% endif %}
{% if not model.enabled %}<span class="badge badge--danger">disabled</span>{% endif %} {% if not model.enabled %}<span class="badge badge--danger">{{ t("disabled") }}</span>{% endif %}
{% if not model.public %}<span class="badge">restricted</span>{% endif %} {% if not model.public %}<span class="badge">{{ t("restricted") }}</span>{% endif %}
{% for name, on in (model.capabilities_json or {}).items() %} {% for name, on in (model.capabilities_json or {}).items() %}
{% if on %}<span class="badge badge--leaf">{{ name }}</span>{% endif %} {% if on %}<span class="badge badge--leaf">{{ name }}</span>{% endif %}
{% endfor %} {% endfor %}
@@ -106,12 +106,12 @@
<div class="model-row__actions"> <div class="model-row__actions">
{# formaction lets these post elsewhere without nesting a second form. #} {# formaction lets these post elsewhere without nesting a second form. #}
<button class="btn btn--icon btn--sm" type="submit" aria-label="Move up" <button class="btn btn--icon btn--sm" type="submit" aria-label="{{ t('Move up') }}"
formaction="/admin/models/{{ model.id }}/move" name="direction" value="up" formaction="/admin/models/{{ model.id }}/move" name="direction" value="up"
{{ 'disabled' if page == 1 and loop.first }}> {{ 'disabled' if page == 1 and loop.first }}>
{{ icon("arrow-up", "icon--sm") }} {{ icon("arrow-up", "icon--sm") }}
</button> </button>
<button class="btn btn--icon btn--sm" type="submit" aria-label="Move down" <button class="btn btn--icon btn--sm" type="submit" aria-label="{{ t('Move down') }}"
formaction="/admin/models/{{ model.id }}/move" name="direction" value="down" formaction="/admin/models/{{ model.id }}/move" name="direction" value="down"
{{ 'disabled' if page == pages and loop.last }}> {{ 'disabled' if page == pages and loop.last }}>
{{ icon("arrow-down", "icon--sm") }} {{ icon("arrow-down", "icon--sm") }}
@@ -135,13 +135,13 @@
{% if page > 1 %} {% if page > 1 %}
<a class="btn btn--sm" href="{{ base }}&page={{ page - 1 }}">Previous</a> <a class="btn btn--sm" href="{{ base }}&page={{ page - 1 }}">Previous</a>
{% else %} {% else %}
<span class="btn btn--sm" aria-disabled="true" style="opacity: .45">Previous</span> <span class="btn btn--sm" aria-disabled="true" style="opacity: .45">{{ t("Previous") }}</span>
{% endif %} {% endif %}
<span class="text-xs faint">Page {{ page }} of {{ pages }}</span> <span class="text-xs faint">Page {{ page }} of {{ pages }}</span>
{% if page < pages %} {% if page < pages %}
<a class="btn btn--sm" href="{{ base }}&page={{ page + 1 }}">Next</a> <a class="btn btn--sm" href="{{ base }}&page={{ page + 1 }}">Next</a>
{% else %} {% else %}
<span class="btn btn--sm" aria-disabled="true" style="opacity: .45">Next</span> <span class="btn btn--sm" aria-disabled="true" style="opacity: .45">{{ t("Next") }}</span>
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
+23 -36
View File
@@ -11,11 +11,11 @@
use each tool, what it has been asked to remember. These sit above whichever use each tool, what it has been asked to remember. These sit above whichever
system prompt was authored for the instance, the model or the chat — that system prompt was authored for the instance, the model or the chat — that
prompt still wins where the two disagree. Clear a box to leave that piece out prompt still wins where the two disagree. Clear a box to leave that piece out
altogether; press <strong>Use default</strong> to put the built-in wording back. altogether; press <strong>{{ t("Use default") }}</strong> to put the built-in wording back.
</p> </p>
{% if saved %} {% if saved %}
<div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>Prompts saved.</span></div> <div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>{{ t("Prompts saved.") }}</span></div>
{% endif %} {% endif %}
{# {#
@@ -39,7 +39,7 @@
#} #}
<form method="post" action="/admin/prompts" id="prompt-form"> <form method="post" action="/admin/prompts" id="prompt-form">
<div class="tabs"> <div class="tabs">
<div class="tabs__bar" role="radiogroup" aria-label="Prompt groups"> <div class="tabs__bar" role="radiogroup" aria-label="{{ t('Prompt groups') }}">
{% for key, label, fragments in groups %} {% for key, label, fragments in groups %}
<input class="visually-hidden" type="radio" name="prompts-tab" <input class="visually-hidden" type="radio" name="prompts-tab"
id="tab-{{ key }}" {{ 'checked' if loop.first }}> id="tab-{{ key }}" {{ 'checked' if loop.first }}>
@@ -61,9 +61,9 @@
</div> </div>
<section class="card"> <section class="card">
<h2 class="card__title">Length</h2> <h2 class="card__title">{{ t("Length") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="max-harness-chars">Preamble character cap</label> <label class="field__label" for="max-harness-chars">{{ t("Preamble character cap") }}</label>
<input class="input" id="max-harness-chars" name="max_harness_chars" type="number" <input class="input" id="max-harness-chars" name="max_harness_chars" type="number"
min="0" max="100000" value="{{ max_harness_chars }}"> min="0" max="100000" value="{{ max_harness_chars }}">
<p class="field__hint"> <p class="field__hint">
@@ -75,22 +75,20 @@
</section> </section>
<div class="form-actions"> <div class="form-actions">
<button class="btn btn--primary" type="submit">Save settings</button> <button class="btn btn--primary" type="submit">{{ t("Save settings") }}</button>
{# {#
data-confirm-button, not data-confirm: this button acts on its own through data-confirm-button, not data-confirm: this button acts on its own through
formaction, and confirming the whole form would also catch plain Save. formaction, and confirming the whole form would also catch plain Save.
#} #}
<button class="btn" type="submit" formaction="/admin/prompts/reset" <button class="btn" type="submit" formaction="/admin/prompts/reset"
data-confirm-button="Put every prompt back to its built-in wording? Everything you have edited here is lost." data-confirm-button="{{ t('Put every prompt back to its built-in wording? Everything you have edited here is lost.') }}"
data-confirm-title="Restore defaults" data-confirm-label="Restore"> data-confirm-title="{{ t('Restore defaults') }}" data-confirm-label="{{ t('Restore') }}">{{ t("Restore all defaults") }}</button>
Restore all defaults
</button>
</div> </div>
</form> </form>
<section class="card"> <section class="card">
<h2 class="card__title">Variables</h2> <h2 class="card__title">{{ t("Variables") }}</h2>
<p class="card__lede"> <p class="card__lede">
Write these in double braces. Anything in double braces that is not on this Write these in double braces. Anything in double braces that is not on this
list is left exactly as you typed it — variable names are lowercase letters, list is left exactly as you typed it — variable names are lowercase letters,
@@ -105,11 +103,11 @@
<span>{{ variable.description }}</span> <span>{{ variable.description }}</span>
<span class="ref-row__value"> <span class="ref-row__value">
{% if variable.name not in resolved %} {% if variable.name not in resolved %}
<em>only in the title request</em> <em>{{ t("only in the title request") }}</em>
{% elif resolved[variable.name] %} {% elif resolved[variable.name] %}
{{ resolved[variable.name] | truncate(80) }} {{ resolved[variable.name] | truncate(80) }}
{% else %} {% else %}
<em>empty</em> <em>{{ t("empty") }}</em>
{% endif %} {% endif %}
</span> </span>
</div> </div>
@@ -124,32 +122,27 @@
replaced -- an outerHTML swap would re-fire it and loop forever. replaced -- an outerHTML swap would re-fire it and loop forever.
#} #}
<section class="card"> <section class="card">
<h2 class="card__title">Preview</h2> <h2 class="card__title">{{ t("Preview") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("The whole system message, assembled from what is in the boxes below — including changes you have not saved yet. Your own memories and skills are used, because a preview against invented ones cannot tell you whether it reads well against what is actually there.") }}</p>
The whole system message, assembled from what is in the boxes below —
including changes you have not saved yet. Your own memories and skills are
used, because a preview against invented ones cannot tell you whether it
reads well against what is actually there.
</p>
<div class="grid grid--2" id="preview-controls"> <div class="grid grid--2" id="preview-controls">
<div class="field"> <div class="field">
<label class="field__label" for="preview-model">Answering model</label> <label class="field__label" for="preview-model">{{ t("Answering model") }}</label>
<select class="select" id="preview-model" name="preview_model"> <select class="select" id="preview-model" name="preview_model">
{% for model in models %} {% for model in models %}
<option value="{{ model.label }}">{{ model.label }}</option> <option value="{{ model.label }}">{{ model.label }}</option>
{% else %} {% else %}
<option value="">No models configured</option> <option value="">{{ t("No models configured") }}</option>
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="preview-bases">Knowledge bases in scope</label> <label class="field__label" for="preview-bases">{{ t("Knowledge bases in scope") }}</label>
<input class="input" id="preview-bases" name="preview_bases" value="Contracts, Recipes"> <input class="input" id="preview-bases" name="preview_bases" value="Contracts, Recipes">
<p class="field__hint">Empty means a chat that can see everything.</p> <p class="field__hint">{{ t("Empty means a chat that can see everything.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="preview-documents">Attached files</label> <label class="field__label" for="preview-documents">{{ t("Attached files") }}</label>
<input class="input" id="preview-documents" name="preview_documents" <input class="input" id="preview-documents" name="preview_documents"
value="{{ sample_documents }}"> value="{{ sample_documents }}">
</div> </div>
@@ -161,7 +154,7 @@
filled when there is one. filled when there is one.
#} #}
<div class="field"> <div class="field">
<label class="field__label" for="preview-situation">This chat is</label> <label class="field__label" for="preview-situation">{{ t("This chat is") }}</label>
<select class="select" id="preview-situation" name="preview_situation"> <select class="select" id="preview-situation" name="preview_situation">
{% for value, label in situations %} {% for value, label in situations %}
<option value="{{ value }}">{{ label }}</option> <option value="{{ value }}">{{ label }}</option>
@@ -169,7 +162,7 @@
</select> </select>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="preview-mode">Agent mode</label> <label class="field__label" for="preview-mode">{{ t("Agent mode") }}</label>
<select class="select" id="preview-mode" name="preview_mode"> <select class="select" id="preview-mode" name="preview_mode">
{% for value, label in modes.items() %} {% for value, label in modes.items() %}
<option value="{{ value }}"{{ ' selected' if value == 'edit' }}>{{ label }}</option> <option value="{{ value }}"{{ ' selected' if value == 'edit' }}>{{ label }}</option>
@@ -181,7 +174,7 @@
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<span class="field__label">Tools offered</span> <span class="field__label">{{ t("Tools offered") }}</span>
{% for family in families %} {% for family in families %}
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="preview_family" value="{{ family }}" checked> <input type="checkbox" name="preview_family" value="{{ family }}" checked>
@@ -206,14 +199,8 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Tool descriptions</h2> <h2 class="card__title">{{ t("Tool descriptions") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("Defined in code — part of the schema sent to the endpoint alongside the prompt, not guidance layered on top of it. They are statements of fact about what each tool does, so they change when the tool does; editing them here would let the text quietly become a lie. A custom tool's description will be editable, because a custom tool is a row rather than a function.") }}</p>
Defined in code — part of the schema sent to the endpoint alongside the
prompt, not guidance layered on top of it. They are statements of fact about
what each tool does, so they change when the tool does; editing them here
would let the text quietly become a lie. A custom tool's description will be
editable, because a custom tool is a row rather than a function.
</p>
<div class="ref-list"> <div class="ref-list">
{% for tool in registry %} {% for tool in registry %}
<div class="ref-row"> <div class="ref-row">
+19 -36
View File
@@ -7,10 +7,10 @@
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">
A <strong>schedule</strong> runs a piece of work because time has passed A <strong>{{ t("schedule") }}</strong> runs a piece of work because time has passed
rather than because somebody asked just now — a daily summary, a check every rather than because somebody asked just now — a daily summary, a check every
Monday, a reminder in an hour. Each one has its own chat and replies into it, Monday, a reminder in an hour. Each one has its own chat and replies into it,
or files a report. People make their own under <strong>Scheduled</strong>; or files a report. People make their own under <strong>{{ t("Scheduled") }}</strong>;
what you decide here is whether the feature exists and what it may spend. what you decide here is whether the feature exists and what it may spend.
</p> </p>
@@ -20,24 +20,24 @@
This is the one thing here that spends model time with nobody watching. A This is the one thing here that spends model time with nobody watching. A
schedule pointed at a chat that can run commands would run them unattended, schedule pointed at a chat that can run commands would run them unattended,
so a scheduled task is never an agent chat — but everything else a model can so a scheduled task is never an agent chat — but everything else a model can
reach, it can reach on a timer. Give <strong>Schedule work</strong> under reach, it can reach on a timer. Give <strong>{{ t("Schedule work") }}</strong> under
Groups &amp; permissions to the people who should have it; it is off for Groups &amp; permissions to the people who should have it; it is off for
everybody by default. everybody by default.
</span> </span>
</div> </div>
{% if saved %} {% if saved %}
<div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>Saved.</span></div> <div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>{{ t("Saved.") }}</span></div>
{% endif %} {% endif %}
<form method="post" action="/admin/schedules" class="form-grid"> <form method="post" action="/admin/schedules" class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">Switch</h2> <h2 class="card__title">{{ t("Switch") }}</h2>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" {{ 'checked' if values.enabled }}> <input type="checkbox" name="enabled" value="true" {{ 'checked' if values.enabled }}>
<span>Let scheduled work run</span> <span>{{ t("Let scheduled work run") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">
Off by default. Turning this off stops everything firing and deletes Off by default. Turning this off stops everything firing and deletes
@@ -53,65 +53,48 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">How often it looks</h2> <h2 class="card__title">{{ t("How often it looks") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="tick">Check for due work every</label> <label class="field__label" for="tick">{{ t("Check for due work every") }}</label>
<input class="input" type="number" id="tick" name="tick_seconds" min="5" max="300" <input class="input" type="number" id="tick" name="tick_seconds" min="5" max="300"
value="{{ values.tick_seconds }}"> value="{{ values.tick_seconds }}">
<p class="field__hint"> <p class="field__hint">{{ t("Seconds. This is how late a run can be, not how often anything happens: the finest a schedule can be set to is one minute, so anything under that buys nothing. One indexed query per tick.") }}</p>
Seconds. This is how late a run can be, not how often anything happens:
the finest a schedule can be set to is one minute, so anything under
that buys nothing. One indexed query per tick.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="min-interval">Nothing may repeat faster than</label> <label class="field__label" for="min-interval">{{ t("Nothing may repeat faster than") }}</label>
<input class="input" type="number" id="min-interval" name="min_interval_seconds" <input class="input" type="number" id="min-interval" name="min_interval_seconds"
min="60" max="86400" value="{{ values.min_interval_seconds }}"> min="60" max="86400" value="{{ values.min_interval_seconds }}">
<p class="field__hint"> <p class="field__hint">{{ t("Seconds. A floor on how often one schedule may come round. Raise it if people are setting things to run more often than the work takes.") }}</p>
Seconds. A floor on how often one schedule may come round. Raise it if
people are setting things to run more often than the work takes.
</p>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">What it may spend</h2> <h2 class="card__title">{{ t("What it may spend") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="per-user">Schedules per person</label> <label class="field__label" for="per-user">{{ t("Schedules per person") }}</label>
<input class="input" type="number" id="per-user" name="max_per_user" min="1" max="200" <input class="input" type="number" id="per-user" name="max_per_user" min="1" max="200"
value="{{ values.max_per_user }}"> value="{{ values.max_per_user }}">
<p class="field__hint"> <p class="field__hint">{{ t("Refused at the point of creation, with the reason. Existing schedules over a lowered limit keep running; only new ones are refused.") }}</p>
Refused at the point of creation, with the reason. Existing schedules
over a lowered limit keep running; only new ones are refused.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="concurrent">Runs at once</label> <label class="field__label" for="concurrent">{{ t("Runs at once") }}</label>
<input class="input" type="number" id="concurrent" name="max_concurrent" min="1" max="20" <input class="input" type="number" id="concurrent" name="max_concurrent" min="1" max="20"
value="{{ values.max_concurrent }}"> value="{{ values.max_concurrent }}">
<p class="field__hint"> <p class="field__hint">{{ t("Fifty schedules due at nine o'clock must not open fifty replies against one endpoint. The rest wait their turn rather than being dropped.") }}</p>
Fifty schedules due at nine o'clock must not open fifty replies against
one endpoint. The rest wait their turn rather than being dropped.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="queued">Turns that may pile up in one chat</label> <label class="field__label" for="queued">{{ t("Turns that may pile up in one chat") }}</label>
<input class="input" type="number" id="queued" name="max_queued" min="1" max="50" <input class="input" type="number" id="queued" name="max_queued" min="1" max="50"
value="{{ values.max_queued }}"> value="{{ values.max_queued }}">
<p class="field__hint"> <p class="field__hint">{{ t("A schedule that comes round faster than its chat can answer would build a backlog for ever. Past this, a run is skipped and says so on the schedule rather than joining the queue.") }}</p>
A schedule that comes round faster than its chat can answer would build
a backlog for ever. Past this, a run is skipped and says so on the
schedule rather than joining the queue.
</p>
</div> </div>
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save</button> <button class="btn btn--primary" type="submit">{{ t("Save") }}</button>
</div> </div>
</form> </form>
{% endblock %} {% endblock %}
+31 -39
View File
@@ -6,28 +6,23 @@
{% block heading %}Web search{% endblock %} {% block heading %}Web search{% endblock %}
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">{{ t("Lets a model look things up while it answers. It is offered as a tool the model chooses to call, so nothing changes for a question that does not need it — and it is only offered to models marked as supporting tools, because sending a tool list to one that does not fails the whole request.") }}</p>
Lets a model look things up while it answers. It is offered as a tool the
model chooses to call, so nothing changes for a question that does not need
it — and it is only offered to models marked as supporting tools, because
sending a tool list to one that does not fails the whole request.
</p>
{% if saved %} {% if saved %}
<div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>Search settings saved.</span></div> <div class="alert alert--success">{{ icon("check", "icon--sm") }} <span>{{ t("Search settings saved.") }}</span></div>
{% endif %} {% endif %}
<form method="post" action="/admin/search"> <form method="post" action="/admin/search">
<section class="card"> <section class="card">
<h2 class="card__title"> <h2 class="card__title">
Web search Web search
{% if values.enabled %}<span class="badge badge--success">on</span> {% if values.enabled %}<span class="badge badge--success">{{ t("on") }}</span>
{% else %}<span class="badge">off</span>{% endif %} {% else %}<span class="badge">{{ t("off") }}</span>{% endif %}
</h2> </h2>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" {{ 'checked' if values.enabled }}> <input type="checkbox" name="enabled" value="true" {{ 'checked' if values.enabled }}>
<span>Offer web search to models that support tools</span> <span>{{ t("Offer web search to models that support tools") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">
Who may use it is a permission — <code>tools.web_search</code> under Who may use it is a permission — <code>tools.web_search</code> under
@@ -37,7 +32,7 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Provider</h2> <h2 class="card__title">{{ t("Provider") }}</h2>
<div class="field"> <div class="field">
{% for provider in providers %} {% for provider in providers %}
<label class="checkbox" style="align-items: flex-start"> <label class="checkbox" style="align-items: flex-start">
@@ -45,7 +40,7 @@
{{ 'checked' if values.provider == provider.key }}> {{ 'checked' if values.provider == provider.key }}>
<span> <span>
<strong>{{ provider.label }}</strong> <strong>{{ provider.label }}</strong>
{% if not provider.needs_setup %}<span class="badge">no setup</span>{% endif %} {% if not provider.needs_setup %}<span class="badge">{{ t("no setup") }}</span>{% endif %}
<div class="text-xs faint">{{ provider.description }}</div> <div class="text-xs faint">{{ provider.description }}</div>
{% if problems[provider.key] %} {% if problems[provider.key] %}
<div class="text-xs" style="color: var(--danger)">{{ problems[provider.key] }}</div> <div class="text-xs" style="color: var(--danger)">{{ problems[provider.key] }}</div>
@@ -57,13 +52,13 @@
<div class="grid grid--3"> <div class="grid grid--3">
<div class="field"> <div class="field">
<label class="field__label" for="max-results">Results per search</label> <label class="field__label" for="max-results">{{ t("Results per search") }}</label>
<input class="input" id="max-results" name="max_results" type="number" <input class="input" id="max-results" name="max_results" type="number"
min="1" max="20" value="{{ values.max_results }}"> min="1" max="20" value="{{ values.max_results }}">
<p class="field__hint">A ceiling — a model asking for more gets this.</p> <p class="field__hint">{{ t("A ceiling — a model asking for more gets this.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="safesearch">Safe search</label> <label class="field__label" for="safesearch">{{ t("Safe search") }}</label>
<select class="select" id="safesearch" name="safesearch"> <select class="select" id="safesearch" name="safesearch">
{% for option in safesearch_options %} {% for option in safesearch_options %}
<option value="{{ option }}" {{ 'selected' if option == values.safesearch }}> <option value="{{ option }}" {{ 'selected' if option == values.safesearch }}>
@@ -73,16 +68,16 @@
</select> </select>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="timeout">Timeout (seconds)</label> <label class="field__label" for="timeout">{{ t("Timeout (seconds)") }}</label>
<input class="input" id="timeout" name="timeout" type="number" <input class="input" id="timeout" name="timeout" type="number"
min="5" max="120" step="1" value="{{ values.timeout }}"> min="5" max="120" step="1" value="{{ values.timeout }}">
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="region">DuckDuckGo region</label> <label class="field__label" for="region">{{ t("DuckDuckGo region") }}</label>
<input class="input" id="region" name="region" maxlength="16" <input class="input" id="region" name="region" maxlength="16"
value="{{ values.region }}" placeholder="wt-wt"> value="{{ values.region }}" placeholder="{{ t('wt-wt') }}">
<p class="field__hint"> <p class="field__hint">
<code>wt-wt</code> is no region at all. <code>uk-en</code>, <code>wt-wt</code> is no region at all. <code>uk-en</code>,
<code>de-de</code> and so on bias results to a country. <code>de-de</code> and so on bias results to a country.
@@ -91,15 +86,12 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">SearXNG</h2> <h2 class="card__title">{{ t("SearXNG") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("Only used when SearXNG is the chosen provider. Your own instance, so no third party sees the queries.") }}</p>
Only used when SearXNG is the chosen provider. Your own instance, so no
third party sees the queries.
</p>
<div class="field"> <div class="field">
<label class="field__label" for="searxng-base-url">Instance URL</label> <label class="field__label" for="searxng-base-url">{{ t("Instance URL") }}</label>
<input class="input" id="searxng-base-url" name="searxng_base_url" type="url" <input class="input" id="searxng-base-url" name="searxng_base_url" type="url"
value="{{ values.searxng_base_url }}" placeholder="http://127.0.0.1:8888"> value="{{ values.searxng_base_url }}" placeholder="{{ t('http://127.0.0.1:8888') }}">
<p class="field__hint"> <p class="field__hint">
A stock SearXNG refuses JSON. Add <code>- json</code> under A stock SearXNG refuses JSON. Add <code>- json</code> under
<code>search.formats</code> in its <code>settings.yml</code> and restart <code>search.formats</code> in its <code>settings.yml</code> and restart
@@ -109,16 +101,16 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Saving links</h2> <h2 class="card__title">{{ t("Saving links") }}</h2>
<p class="card__lede"> <p class="card__lede">
Applies to the composer's <strong>Link</strong> option and to anything the Applies to the composer's <strong>{{ t("Link") }}</strong> option and to anything the
model fetches: {{ brand.name }} retrieves the page and keeps its text. model fetches: {{ brand.name }} retrieves the page and keeps its text.
</p> </p>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="fetch_enabled" value="true" <input type="checkbox" name="fetch_enabled" value="true"
{{ 'checked' if values.fetch_enabled }}> {{ 'checked' if values.fetch_enabled }}>
<span>Let a model fetch a page itself</span> <span>{{ t("Let a model fetch a page itself") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">
Offers the <code>fetch</code> tool, so a model can read an address it Offers the <code>fetch</code> tool, so a model can read an address it
@@ -132,7 +124,7 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="allow_private_fetch" value="true" <input type="checkbox" name="allow_private_fetch" value="true"
{{ 'checked' if values.allow_private_fetch }}> {{ 'checked' if values.allow_private_fetch }}>
<span>Allow fetching addresses on this machine and this network</span> <span>{{ t("Allow fetching addresses on this machine and this network") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">
Off by default, and worth leaving off. This server can reach your Off by default, and worth leaving off. This server can reach your
@@ -145,36 +137,36 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Firecrawl</h2> <h2 class="card__title">{{ t("Firecrawl") }}</h2>
<div class="grid grid--2"> <div class="grid grid--2">
<div class="field"> <div class="field">
<label class="field__label" for="firecrawl-base-url">API URL</label> <label class="field__label" for="firecrawl-base-url">{{ t("API URL") }}</label>
<input class="input" id="firecrawl-base-url" name="firecrawl_base_url" type="url" <input class="input" id="firecrawl-base-url" name="firecrawl_base_url" type="url"
value="{{ values.firecrawl_base_url }}" value="{{ values.firecrawl_base_url }}"
placeholder="https://api.firecrawl.dev"> placeholder="{{ t('https://api.firecrawl.dev') }}">
<p class="field__hint">Change only for a self-hosted Firecrawl.</p> <p class="field__hint">{{ t("Change only for a self-hosted Firecrawl.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="firecrawl-api-key">API key</label> <label class="field__label" for="firecrawl-api-key">{{ t("API key") }}</label>
<input class="input" id="firecrawl-api-key" name="firecrawl_api_key" type="password" <input class="input" id="firecrawl-api-key" name="firecrawl_api_key" type="password"
value="{{ unchanged if masked else '' }}" value="{{ unchanged if masked else '' }}"
placeholder="{{ masked or 'fc-...' }}" autocomplete="off"> placeholder="{{ masked or 'fc-...' }}" autocomplete="off">
<p class="field__hint">Encrypted at rest. Clear the field to remove it.</p> <p class="field__hint">{{ t("Encrypted at rest. Clear the field to remove it.") }}</p>
</div> </div>
</div> </div>
</section> </section>
<div class="form-actions"><button class="btn btn--primary" type="submit">Save settings</button></div> <div class="form-actions"><button class="btn btn--primary" type="submit">{{ t("Save settings") }}</button></div>
</form> </form>
<section class="card"> <section class="card">
<h2 class="card__title">Try it</h2> <h2 class="card__title">{{ t("Try it") }}</h2>
<p class="card__lede"> <p class="card__lede">
Runs a real search against the <em>saved</em> settings, which is what a chat Runs a real search against the <em>{{ t("saved") }}</em> settings, which is what a chat
would do. Save first if you have just changed something. would do. Save first if you have just changed something.
</p> </p>
<div class="row" style="gap: var(--sp-2)"> <div class="row" style="gap: var(--sp-2)">
<input class="input" id="test-query" name="query" placeholder="mallorn tree" <input class="input" id="test-query" name="query" placeholder="{{ t('mallorn tree') }}"
style="flex: 1"> style="flex: 1">
<button class="btn" type="button" hx-post="/admin/search/test" <button class="btn" type="button" hx-post="/admin/search/test"
hx-include="#test-query" hx-target="#search-test" hx-swap="outerHTML"> hx-include="#test-query" hx-target="#search-test" hx-swap="outerHTML">
+24 -29
View File
@@ -22,93 +22,88 @@
<div class="card__header"> <div class="card__header">
<h2 class="card__title"> <h2 class="card__title">
{{ suggestion.name }} {{ suggestion.name }}
{% if not suggestion.enabled %}<span class="badge">hidden</span>{% endif %} {% if not suggestion.enabled %}<span class="badge">{{ t("hidden") }}</span>{% endif %}
{% if loop.index > max_shown and suggestion.enabled %} {% if loop.index > max_shown and suggestion.enabled %}
<span class="badge badge--warning" title="Only the first {{ max_shown }} are shown"> <span class="badge badge--warning" title="Only the first {{ max_shown }} are shown">{{ t("below the cut") }}</span>
below the cut
</span>
{% endif %} {% endif %}
</h2> </h2>
<button class="btn btn--sm btn--danger" type="submit" <button class="btn btn--sm btn--danger" type="submit"
formaction="/admin/suggestions/{{ suggestion.id }}/delete" formaction="/admin/suggestions/{{ suggestion.id }}/delete"
data-confirm-button="Delete the suggestion “{{ suggestion.name }}”?" data-confirm-button="Delete the suggestion “{{ suggestion.name }}”?"
data-confirm-title="Delete suggestion" data-confirm-title="{{ t('Delete suggestion') }}"
aria-label="Delete suggestion" title="Delete suggestion"> aria-label="{{ t('Delete suggestion') }}" title="{{ t('Delete suggestion') }}">
{{ icon("trash", "icon--sm") }} {{ icon("trash", "icon--sm") }}
</button> </button>
</div> </div>
<div class="grid grid--2"> <div class="grid grid--2">
<div class="field"> <div class="field">
<label class="field__label" for="name-{{ suggestion.id }}">Name</label> <label class="field__label" for="name-{{ suggestion.id }}">{{ t("Name") }}</label>
<input class="input" id="name-{{ suggestion.id }}" name="name" <input class="input" id="name-{{ suggestion.id }}" name="name"
value="{{ suggestion.name }}" maxlength="120"> value="{{ suggestion.name }}" maxlength="120">
<p class="field__hint">The heading on the card.</p> <p class="field__hint">{{ t("The heading on the card.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="position-{{ suggestion.id }}">Position</label> <label class="field__label" for="position-{{ suggestion.id }}">{{ t("Position") }}</label>
<input class="input" id="position-{{ suggestion.id }}" name="position" type="number" <input class="input" id="position-{{ suggestion.id }}" name="position" type="number"
min="1" value="{{ suggestion.position + 1 }}"> min="1" value="{{ suggestion.position + 1 }}">
<p class="field__hint">Order on the screen, lowest first.</p> <p class="field__hint">{{ t("Order on the screen, lowest first.") }}</p>
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="description-{{ suggestion.id }}">Description</label> <label class="field__label" for="description-{{ suggestion.id }}">{{ t("Description") }}</label>
<input class="input" id="description-{{ suggestion.id }}" name="description" <input class="input" id="description-{{ suggestion.id }}" name="description"
value="{{ suggestion.description }}" maxlength="300"> value="{{ suggestion.description }}" maxlength="300">
<p class="field__hint">One line under the name, saying what it is for.</p> <p class="field__hint">{{ t("One line under the name, saying what it is for.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="prompt-{{ suggestion.id }}">Prompt</label> <label class="field__label" for="prompt-{{ suggestion.id }}">{{ t("Prompt") }}</label>
<textarea class="textarea" id="prompt-{{ suggestion.id }}" name="prompt" <textarea class="textarea" id="prompt-{{ suggestion.id }}" name="prompt"
rows="4">{{ suggestion.prompt }}</textarea> rows="4">{{ suggestion.prompt }}</textarea>
<p class="field__hint"> <p class="field__hint">{{ t("Sent as the first message. Nothing is added to it, so a prompt that needs material should ask for it.") }}</p>
Sent as the first message. Nothing is added to it, so a prompt that needs
material should ask for it.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" {{ 'checked' if suggestion.enabled }}> <input type="checkbox" name="enabled" value="true" {{ 'checked' if suggestion.enabled }}>
<span>Show this one</span> <span>{{ t("Show this one") }}</span>
</label> </label>
</div> </div>
<div class="card__footer"> <div class="card__footer">
<button class="btn btn--primary btn--sm" type="submit">Save</button> <button class="btn btn--primary btn--sm" type="submit">{{ t("Save") }}</button>
</div> </div>
</form> </form>
{% else %} {% else %}
<div class="empty"> <div class="empty">
{{ icon("sparkle", "empty__mark") }} {{ icon("sparkle", "empty__mark") }}
<h2 class="empty__title">No suggestions</h2> <h2 class="empty__title">{{ t("No suggestions") }}</h2>
<p class="empty__text">The new-chat screen shows its empty state instead.</p> <p class="empty__text">{{ t("The new-chat screen shows its empty state instead.") }}</p>
</div> </div>
{% endfor %} {% endfor %}
{% if not at_limit %} {% if not at_limit %}
<form class="card" method="post" action="/admin/suggestions"> <form class="card" method="post" action="/admin/suggestions">
<h2 class="card__title">Add a suggestion</h2> <h2 class="card__title">{{ t("Add a suggestion") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="new-name">Name</label> <label class="field__label" for="new-name">{{ t("Name") }}</label>
<input class="input" id="new-name" name="name" maxlength="120" <input class="input" id="new-name" name="name" maxlength="120"
placeholder="Summarise a document" required> placeholder="{{ t('Summarise a document') }}" required>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="new-description">Description</label> <label class="field__label" for="new-description">{{ t("Description") }}</label>
<input class="input" id="new-description" name="description" maxlength="300" <input class="input" id="new-description" name="description" maxlength="300"
placeholder="What it is for, in one line."> placeholder="{{ t('What it is for, in one line.') }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="new-prompt">Prompt</label> <label class="field__label" for="new-prompt">{{ t("Prompt") }}</label>
<textarea class="textarea" id="new-prompt" name="prompt" rows="4" <textarea class="textarea" id="new-prompt" name="prompt" rows="4"
placeholder="Sent as the first message when the card is clicked."></textarea> placeholder="{{ t('Sent as the first message when the card is clicked.') }}"></textarea>
</div> </div>
<div class="card__footer"> <div class="card__footer">
<button class="btn btn--primary" type="submit">Add</button> <button class="btn btn--primary" type="submit">{{ t("Add") }}</button>
</div> </div>
</form> </form>
{% else %} {% else %}
+46 -72
View File
@@ -20,19 +20,19 @@
class="form-grid"> class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">What it is</h2> <h2 class="card__title">{{ t("What it is") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="name">Name</label> <label class="field__label" for="name">{{ t("Name") }}</label>
<input class="input" id="name" name="name" value="{{ tool.name }}" required <input class="input" id="name" name="name" value="{{ tool.name }}" required
maxlength="120" placeholder="Weather"> maxlength="120" placeholder="{{ t('Weather') }}">
<p class="field__hint">Shown in the transcript when the model uses it.</p> <p class="field__hint">{{ t("Shown in the transcript when the model uses it.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="slug">Identifier</label> <label class="field__label" for="slug">{{ t("Identifier") }}</label>
<input class="input input--mono" id="slug" name="slug" value="{{ tool.slug }}" required <input class="input input--mono" id="slug" name="slug" value="{{ tool.slug }}" required
maxlength="48" placeholder="weather" pattern="[a-z0-9][a-z0-9_\-]*"> maxlength="48" placeholder="{{ t('weather') }}" pattern="[a-z0-9][a-z0-9_\-]*">
<p class="field__hint"> <p class="field__hint">
The name the model calls, and the key its guidance is stored under. The name the model calls, and the key its guidance is stored under.
Lowercase letters, digits, hyphens and underscores. Lowercase letters, digits, hyphens and underscores.
@@ -41,19 +41,15 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="description">Description</label> <label class="field__label" for="description">{{ t("Description") }}</label>
<textarea class="textarea" id="description" name="description" rows="3" <textarea class="textarea" id="description" name="description" rows="3"
placeholder="Look up the current weather for a city." placeholder="{{ t('Look up the current weather for a city.') }}"
>{{ tool.description }}</textarea> >{{ tool.description }}</textarea>
<p class="field__hint"> <p class="field__hint">{{ t("Sent to the model verbatim. This is the whole basis on which it decides whether to call this tool, so say what it does and when it is the right thing to use.") }}</p>
Sent to the model verbatim. This is the whole basis on which it decides
whether to call this tool, so say what it does and when it is the right
thing to use.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="parameters">Parameters</label> <label class="field__label" for="parameters">{{ t("Parameters") }}</label>
<textarea class="textarea input--mono" id="parameters" name="parameters" rows="10" <textarea class="textarea input--mono" id="parameters" name="parameters" rows="10"
spellcheck="false">{{ parameters_text }}</textarea> spellcheck="false">{{ parameters_text }}</textarea>
<p class="field__hint"> <p class="field__hint">
@@ -66,10 +62,10 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">The call</h2> <h2 class="card__title">{{ t("The call") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="method">Method</label> <label class="field__label" for="method">{{ t("Method") }}</label>
<select class="select" id="method" name="method"> <select class="select" id="method" name="method">
{% for method in methods %} {% for method in methods %}
<option value="{{ method }}" {{ 'selected' if method == tool.method }}>{{ method }}</option> <option value="{{ method }}" {{ 'selected' if method == tool.method }}>{{ method }}</option>
@@ -78,46 +74,39 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="url_template">URL</label> <label class="field__label" for="url_template">{{ t("URL") }}</label>
<input class="input input--mono" id="url_template" name="url_template" required <input class="input input--mono" id="url_template" name="url_template" required
value="{{ tool.url_template }}" value="{{ tool.url_template }}"
placeholder="https://api.example.com/weather/{{ '{{city}}' }}"> placeholder="https://api.example.com/weather/{{ '{{city}}' }}">
<p class="field__hint"> <p class="field__hint">{{ t("Placeholders are filled from the arguments and escaped, so a value cannot add a path segment or a query of its own. The scheme and host must be written out — they cannot come from an argument.") }}</p>
Placeholders are filled from the arguments and escaped, so a value
cannot add a path segment or a query of its own. The scheme and host
must be written out — they cannot come from an argument.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="headers">Headers</label> <label class="field__label" for="headers">{{ t("Headers") }}</label>
<textarea class="textarea input--mono" id="headers" name="headers" rows="3" <textarea class="textarea input--mono" id="headers" name="headers" rows="3"
spellcheck="false" spellcheck="false"
placeholder="Accept: application/json">{{ headers_text }}</textarea> placeholder="{{ t('Accept: application/json') }}">{{ headers_text }}</textarea>
<p class="field__hint">One <code>Name: value</code> per line. Placeholders work here too.</p> <p class="field__hint">One <code>Name: value</code> per line. Placeholders work here too.</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="body_template">Body</label> <label class="field__label" for="body_template">{{ t("Body") }}</label>
<textarea class="textarea input--mono" id="body_template" name="body_template" rows="4" <textarea class="textarea input--mono" id="body_template" name="body_template" rows="4"
spellcheck="false">{{ tool.body_template }}</textarea> spellcheck="false">{{ tool.body_template }}</textarea>
<p class="field__hint"> <p class="field__hint">{{ t("Ignored for GET. Placeholders are escaped for JSON, so a value cannot end the string it sits in and add a field.") }}</p>
Ignored for GET. Placeholders are escaped for JSON, so a value cannot
end the string it sits in and add a field.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="timeout">Timeout (seconds)</label> <label class="field__label" for="timeout">{{ t("Timeout (seconds)") }}</label>
<input class="input" id="timeout" name="timeout" value="{{ tool.timeout }}" inputmode="numeric"> <input class="input" id="timeout" name="timeout" value="{{ tool.timeout }}" inputmode="numeric">
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Credential</h2> <h2 class="card__title">{{ t("Credential") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="secret_placement">How it is sent</label> <label class="field__label" for="secret_placement">{{ t("How it is sent") }}</label>
<select class="select" id="secret_placement" name="secret_placement"> <select class="select" id="secret_placement" name="secret_placement">
{% for value, label in secret_placements %} {% for value, label in secret_placements %}
<option value="{{ value }}" {{ 'selected' if value == tool.secret_placement }}> <option value="{{ value }}" {{ 'selected' if value == tool.secret_placement }}>
@@ -128,15 +117,15 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="secret_name">Header or parameter name</label> <label class="field__label" for="secret_name">{{ t("Header or parameter name") }}</label>
<input class="input input--mono" id="secret_name" name="secret_name" <input class="input input--mono" id="secret_name" name="secret_name"
value="{{ tool.secret_name }}" maxlength="120"> value="{{ tool.secret_name }}" maxlength="120">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="secret">Secret</label> <label class="field__label" for="secret">{{ t("Secret") }}</label>
<input class="input input--mono" id="secret" name="secret" type="password" <input class="input input--mono" id="secret" name="secret" type="password"
autocomplete="off" placeholder="No secret set" autocomplete="off" placeholder="{{ t('No secret set') }}"
value="{{ unchanged if tool.secret_encrypted else '' }}"> value="{{ unchanged if tool.secret_encrypted else '' }}">
<p class="field__hint"> <p class="field__hint">
{% if tool.secret_encrypted %} {% if tool.secret_encrypted %}
@@ -151,10 +140,10 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">The answer</h2> <h2 class="card__title">{{ t("The answer") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="response_mode">Read the response as</label> <label class="field__label" for="response_mode">{{ t("Read the response as") }}</label>
<select class="select" id="response_mode" name="response_mode"> <select class="select" id="response_mode" name="response_mode">
{% for value, label in response_modes %} {% for value, label in response_modes %}
<option value="{{ value }}" {{ 'selected' if value == tool.response_mode }}>{{ label }}</option> <option value="{{ value }}" {{ 'selected' if value == tool.response_mode }}>{{ label }}</option>
@@ -163,32 +152,26 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="response_path">Path into the JSON</label> <label class="field__label" for="response_path">{{ t("Path into the JSON") }}</label>
<input class="input input--mono" id="response_path" name="response_path" <input class="input input--mono" id="response_path" name="response_path"
value="{{ tool.response_path }}" placeholder="data.items.0.title" maxlength="300"> value="{{ tool.response_path }}" placeholder="{{ t('data.items.0.title') }}" maxlength="300">
<p class="field__hint"> <p class="field__hint">{{ t("Dotted; a number indexes a list. Leave empty for the whole document. A path that leads nowhere gives the whole document rather than nothing.") }}</p>
Dotted; a number indexes a list. Leave empty for the whole document.
A path that leads nowhere gives the whole document rather than nothing.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="max_chars">Most characters to keep</label> <label class="field__label" for="max_chars">{{ t("Most characters to keep") }}</label>
<input class="input" id="max_chars" name="max_chars" value="{{ tool.max_chars }}" <input class="input" id="max_chars" name="max_chars" value="{{ tool.max_chars }}"
inputmode="numeric"> inputmode="numeric">
<p class="field__hint"> <p class="field__hint">{{ t("Spent out of the context window on every call. The rest is cut off, and the model is told so.") }}</p>
Spent out of the context window on every call. The rest is cut off, and
the model is told so.
</p>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Guidance</h2> <h2 class="card__title">{{ t("Guidance") }}</h2>
<div class="field"> <div class="field">
<textarea class="textarea" name="guidance" rows="4" <textarea class="textarea" name="guidance" rows="4"
placeholder="- Check the weather rather than guessing at it." placeholder="{{ t('- Check the weather rather than guessing at it.') }}"
>{{ tool.guidance }}</textarea> >{{ tool.guidance }}</textarea>
<p class="field__hint"> <p class="field__hint">
Added to the system message whenever this tool is offered, and nowhere Added to the system message whenever this tool is offered, and nowhere
@@ -205,40 +188,33 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Availability</h2> <h2 class="card__title">{{ t("Availability") }}</h2>
<div class="field"> <div class="field">
<div class="checkbox-row"> <div class="checkbox-row">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" {{ 'checked' if tool.enabled }}> <input type="checkbox" name="enabled" value="true" {{ 'checked' if tool.enabled }}>
<span>Enabled — offered in chats</span> <span>{{ t("Enabled — offered in chats") }}</span>
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="allow_private" value="true" <input type="checkbox" name="allow_private" value="true"
{{ 'checked' if tool.allow_private }}> {{ 'checked' if tool.allow_private }}>
<span>May reach private and loopback addresses</span> <span>{{ t("May reach private and loopback addresses") }}</span>
</label> </label>
</div> </div>
<p class="field__hint"> <p class="field__hint">{{ t("Leave the second unticked unless this tool points at something on your own network. It is what stops a tool being aimed at this server, a router, or a cloud metadata endpoint.") }}</p>
Leave the second unticked unless this tool points at something on your
own network. It is what stops a tool being aimed at this server, a
router, or a cloud metadata endpoint.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="public" value="true" {{ 'checked' if tool.public }}> <input type="checkbox" name="public" value="true" {{ 'checked' if tool.public }}>
<span>Available to everyone</span> <span>{{ t("Available to everyone") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("Uncheck to restrict this tool to chosen groups. Administrators always have access.") }}</p>
Uncheck to restrict this tool to chosen groups. Administrators always
have access.
</p>
</div> </div>
<div class="field"> <div class="field">
<span class="field__label">Groups with access</span> <span class="field__label">{{ t("Groups with access") }}</span>
{% if groups %} {% if groups %}
<div class="checkbox-row"> <div class="checkbox-row">
{% for group in groups %} {% for group in groups %}
@@ -249,7 +225,7 @@
</label> </label>
{% endfor %} {% endfor %}
</div> </div>
<p class="field__hint">Ignored while the tool is available to everyone.</p> <p class="field__hint">{{ t("Ignored while the tool is available to everyone.") }}</p>
{% else %} {% else %}
<p class="field__hint"> <p class="field__hint">
No groups yet — <a href="/admin/groups">create one</a> to restrict access. No groups yet — <a href="/admin/groups">create one</a> to restrict access.
@@ -258,7 +234,7 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="position">Position</label> <label class="field__label" for="position">{{ t("Position") }}</label>
<input class="input" id="position" name="position" value="{{ tool.position }}" <input class="input" id="position" name="position" value="{{ tool.position }}"
inputmode="numeric"> inputmode="numeric">
</div> </div>
@@ -272,23 +248,21 @@
{% if not is_new %} {% if not is_new %}
<button class="btn btn--danger" type="submit" formnovalidate <button class="btn btn--danger" type="submit" formnovalidate
formaction="/admin/tools/{{ tool.id }}/delete" formaction="/admin/tools/{{ tool.id }}/delete"
data-confirm-button="Delete the tool “{{ tool.name }}”? Chats that used it keep their transcripts."> data-confirm-button="Delete the tool “{{ tool.name }}”? Chats that used it keep their transcripts.">{{ t("Delete") }}</button>
Delete
</button>
{% endif %} {% endif %}
</div> </div>
</form> </form>
{% if not is_new %} {% if not is_new %}
<section class="card"> <section class="card">
<h2 class="card__title">Try it</h2> <h2 class="card__title">{{ t("Try it") }}</h2>
<p class="field__hint"> <p class="field__hint">
Calls the <em>saved</em> tool once, so what you see here is what a chat would Calls the <em>{{ t("saved") }}</em> tool once, so what you see here is what a chat would
get. Nothing is sent to a model. get. Nothing is sent to a model.
</p> </p>
<div class="field"> <div class="field">
<label class="field__label" for="arguments">Arguments</label> <label class="field__label" for="arguments">{{ t("Arguments") }}</label>
<textarea class="textarea input--mono" id="arguments" name="arguments" rows="3" <textarea class="textarea input--mono" id="arguments" name="arguments" rows="3"
spellcheck="false">{"city": "Minas Tirith"}</textarea> spellcheck="false">{"city": "Minas Tirith"}</textarea>
</div> </div>
+10 -10
View File
@@ -8,9 +8,9 @@
{% block admin_content %} {% block admin_content %}
<p class="admin-lede"> <p class="admin-lede">
HTTP calls a model can make while it answers. Each one is offered to models HTTP calls a model can make while it answers. Each one is offered to models
marked <strong>Custom tools</strong>, to people who have the permission, and — marked <strong>{{ t("Custom tools") }}</strong>, to people who have the permission, and —
if it is restricted — only to the groups you choose. The model decides if it is restricted — only to the groups you choose. The model decides
<em>when</em> to call it from the description you write, so write that as if <em>{{ t("when") }}</em> to call it from the description you write, so write that as if
explaining to a colleague what the tool is for. explaining to a colleague what the tool is for.
</p> </p>
@@ -42,7 +42,7 @@
<form class="filter-form" method="get" action="/admin/tools"> <form class="filter-form" method="get" action="/admin/tools">
<input type="hidden" name="filter" value="{{ active_filter }}"> <input type="hidden" name="filter" value="{{ active_filter }}">
<input class="input" type="search" name="q" value="{{ q }}" <input class="input" type="search" name="q" value="{{ q }}"
placeholder="Search tools…" aria-label="Search tools"> placeholder="{{ t('Search tools…') }}" aria-label="{{ t('Search tools') }}">
<button class="btn" type="submit">{{ icon("search", "icon--sm") }} Filter</button> <button class="btn" type="submit">{{ icon("search", "icon--sm") }} Filter</button>
{% if q or active_filter != "all" %} {% if q or active_filter != "all" %}
<a class="btn btn--ghost" href="/admin/tools">Clear</a> <a class="btn btn--ghost" href="/admin/tools">Clear</a>
@@ -53,7 +53,7 @@
{% if not tools %} {% if not tools %}
<div class="empty" style="padding: var(--sp-8) 0"> <div class="empty" style="padding: var(--sp-8) 0">
<p class="empty__text">Nothing matches that filter.</p> <p class="empty__text">{{ t("Nothing matches that filter.") }}</p>
</div> </div>
{% else %} {% else %}
@@ -65,10 +65,10 @@
<div class="model-row__main"> <div class="model-row__main">
<div class="model-row__title"> <div class="model-row__title">
<a class="model-row__name" href="/admin/tools/{{ tool.id }}/edit">{{ tool.name }}</a> <a class="model-row__name" href="/admin/tools/{{ tool.id }}/edit">{{ tool.name }}</a>
{% if not tool.enabled %}<span class="badge badge--danger">disabled</span>{% endif %} {% if not tool.enabled %}<span class="badge badge--danger">{{ t("disabled") }}</span>{% endif %}
{% if not tool.public %}<span class="badge">restricted</span>{% endif %} {% if not tool.public %}<span class="badge">{{ t("restricted") }}</span>{% endif %}
{% if tool.allow_private %}<span class="badge">private network</span>{% endif %} {% if tool.allow_private %}<span class="badge">{{ t("private network") }}</span>{% endif %}
{% if tool.last_error %}<span class="badge badge--danger">last call failed</span>{% endif %} {% if tool.last_error %}<span class="badge badge--danger">{{ t("last call failed") }}</span>{% endif %}
</div> </div>
<code class="model-row__id"> <code class="model-row__id">
{{ tool.slug }} · {{ tool.method }} {{ tool.url_template }} {{ tool.slug }} · {{ tool.method }} {{ tool.url_template }}
@@ -94,13 +94,13 @@
{% if page > 1 %} {% if page > 1 %}
<a class="btn btn--sm" href="{{ base }}&page={{ page - 1 }}">Previous</a> <a class="btn btn--sm" href="{{ base }}&page={{ page - 1 }}">Previous</a>
{% else %} {% else %}
<span class="btn btn--sm" aria-disabled="true" style="opacity: .45">Previous</span> <span class="btn btn--sm" aria-disabled="true" style="opacity: .45">{{ t("Previous") }}</span>
{% endif %} {% endif %}
<span class="text-xs faint">Page {{ page }} of {{ pages }}</span> <span class="text-xs faint">Page {{ page }} of {{ pages }}</span>
{% if page < pages %} {% if page < pages %}
<a class="btn btn--sm" href="{{ base }}&page={{ page + 1 }}">Next</a> <a class="btn btn--sm" href="{{ base }}&page={{ page + 1 }}">Next</a>
{% else %} {% else %}
<span class="btn btn--sm" aria-disabled="true" style="opacity: .45">Next</span> <span class="btn btn--sm" aria-disabled="true" style="opacity: .45">{{ t("Next") }}</span>
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
+17 -32
View File
@@ -23,10 +23,10 @@
{% endif %} {% endif %}
<section class="card"> <section class="card">
<h2 class="card__title">Running</h2> <h2 class="card__title">{{ t("Running") }}</h2>
<dl class="mode-list"> <dl class="mode-list">
<div class="mode-list__row"> <div class="mode-list__row">
<dt><strong>Version</strong></dt> <dt><strong>{{ t("Version") }}</strong></dt>
<dd> <dd>
{# {#
`git describe`, not the version string: "1.0.0" exactly at a tag and `git describe`, not the version string: "1.0.0" exactly at a tag and
@@ -42,16 +42,16 @@
</div> </div>
{% if state.head %} {% if state.head %}
<div class="mode-list__row"> <div class="mode-list__row">
<dt><strong>Commit</strong></dt> <dt><strong>{{ t("Commit") }}</strong></dt>
<dd> <dd>
<code>{{ state.head.short }}</code> {{ state.head.subject }} <code>{{ state.head.short }}</code> {{ state.head.subject }}
{% if state.dirty %}<span class="badge">uncommitted changes</span>{% endif %} {% if state.dirty %}<span class="badge">{{ t("uncommitted changes") }}</span>{% endif %}
</dd> </dd>
</div> </div>
{% endif %} {% endif %}
{% if state.checkout %} {% if state.checkout %}
<div class="mode-list__row"> <div class="mode-list__row">
<dt><strong>Checkout</strong></dt> <dt><strong>{{ t("Checkout") }}</strong></dt>
<dd><code>{{ state.checkout }}</code></dd> <dd><code>{{ state.checkout }}</code></dd>
</div> </div>
{% endif %} {% endif %}
@@ -69,10 +69,7 @@
{% endif %} {% endif %}
{% if not state.is_git %} {% if not state.is_git %}
<p class="field__hint"> <p class="field__hint">{{ t("This was not installed from a git checkout — a container image, or a wheel — so there is nothing here to compare or update. Pull a new image instead.") }}</p>
This was not installed from a git checkout — a container image, or a wheel —
so there is nothing here to compare or update. Pull a new image instead.
</p>
{% else %} {% else %}
<form method="post" action="/admin/updates/check" class="btn-row"> <form method="post" action="/admin/updates/check" class="btn-row">
<button class="btn" type="submit"> <button class="btn" type="submit">
@@ -86,8 +83,8 @@
<section class="card"> <section class="card">
<h2 class="card__title"> <h2 class="card__title">
Available Available
{% if state.no_releases %}<span class="badge">nothing released yet</span> {% if state.no_releases %}<span class="badge">{{ t("nothing released yet") }}</span>
{% elif state.up_to_date %}<span class="badge badge--leaf">up to date</span> {% elif state.up_to_date %}<span class="badge badge--leaf">{{ t("up to date") }}</span>
{% elif state.behind %}<span class="badge">{{ state.behind | length }} commit{{ '' if state.behind|length == 1 else 's' }} behind</span> {% elif state.behind %}<span class="badge">{{ state.behind | length }} commit{{ '' if state.behind|length == 1 else 's' }} behind</span>
{% endif %} {% endif %}
</h2> </h2>
@@ -100,9 +97,7 @@
</p> </p>
{% elif not state.available %} {% elif not state.available %}
<p class="field__hint"> <p class="field__hint">{{ t("Nothing known about the remote yet. Check it above.") }}</p>
Nothing known about the remote yet. Check it above.
</p>
{% elif state.up_to_date %} {% elif state.up_to_date %}
<p class="field__hint"> <p class="field__hint">
@@ -149,11 +144,7 @@
{% if state.dirty %} {% if state.dirty %}
<div class="alert alert--warning"> <div class="alert alert--warning">
{{ icon("warning", "icon--sm") }} {{ icon("warning", "icon--sm") }}
<span> <span>{{ t("This checkout has uncommitted changes, and updating discards them. Nothing here is meant to be edited in place, so this usually means somebody was debugging on the box.") }}</span>
This checkout has uncommitted changes, and updating discards them.
Nothing here is meant to be edited in place, so this usually means somebody
was debugging on the box.
</span>
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}
@@ -166,18 +157,15 @@
the worst moment to discover a thing has to be installed from a shell. the worst moment to discover a thing has to be installed from a shell.
#} #}
<section class="card"> <section class="card">
<h2 class="card__title">Applying an update</h2> <h2 class="card__title">{{ t("Applying an update") }}</h2>
{% if state.requested %} {% if state.requested %}
<div class="alert"> <div class="alert">
{{ icon("clock", "icon--sm") }} {{ icon("clock", "icon--sm") }}
<span> <span>{{ t("An update has been requested and is waiting for the helper to pick it up. The service restarts when it does.") }}</span>
An update has been requested and is waiting for the helper to pick it up.
The service restarts when it does.
</span>
</div> </div>
<form method="post" action="/admin/updates/cancel" class="btn-row"> <form method="post" action="/admin/updates/cancel" class="btn-row">
<button class="btn btn--sm" type="submit">Withdraw the request</button> <button class="btn btn--sm" type="submit">{{ t("Withdraw the request") }}</button>
</form> </form>
{% elif state.helper %} {% elif state.helper %}
@@ -207,7 +195,7 @@
no channel, so pressing it is never “deploy something else”. no channel, so pressing it is never “deploy something else”.
</p> </p>
<form method="post" action="/admin/updates/apply" class="btn-row" <form method="post" action="/admin/updates/apply" class="btn-row"
data-confirm="Update and restart? Replies being written are saved; open terminals are cut off."> data-confirm="{{ t('Update and restart? Replies being written are saved; open terminals are cut off.') }}">
<button class="btn btn--primary" type="submit" <button class="btn btn--primary" type="submit"
{{ 'disabled' if state.up_to_date or state.no_releases }}> {{ 'disabled' if state.up_to_date or state.no_releases }}>
{{ icon("sparkle", "icon--sm") }} {{ icon("sparkle", "icon--sm") }}
@@ -216,19 +204,16 @@
{% else %}Update to {{ state.available.label }} and restart{% endif %} {% else %}Update to {{ state.available.label }} and restart{% endif %}
</button> </button>
</form> </form>
<p class="field__hint"> <p class="field__hint">{{ t("Every restart ends every open terminal session — a command still running on the far side is cut off. A reply being written is saved with whatever it has.") }}</p>
Every restart ends every open terminal session — a command still running on
the far side is cut off. A reply being written is saved with whatever it has.
</p>
{% else %} {% else %}
<div class="alert"> <div class="alert">
{{ icon("shield", "icon--sm") }} {{ icon("shield", "icon--sm") }}
<span> <span>
The update helper is <strong>not installed on this host</strong>, so there The update helper is <strong>{{ t("not installed on this host") }}</strong>, so there
is no button. That is the honest default: the service runs as an is no button. That is the honest default: the service runs as an
unprivileged account and cannot restart itself, and a web application that unprivileged account and cannot restart itself, and a web application that
<em>can</em> is one whose worst day is much worse. Run this instead: <em>{{ t("can") }}</em> is one whose worst day is much worse. Run this instead:
<code>{{ command }}</code> <code>{{ command }}</code>
</span> </span>
</div> </div>
+28 -49
View File
@@ -17,49 +17,44 @@
<form method="post" action="/admin/users/{{ target.id }}" class="form-grid"> <form method="post" action="/admin/users/{{ target.id }}" class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">Account</h2> <h2 class="card__title">{{ t("Account") }}</h2>
<div class="field-row"> <div class="field-row">
<div class="field"> <div class="field">
<label class="field__label" for="name">Name</label> <label class="field__label" for="name">{{ t("Name") }}</label>
<input class="input" id="name" name="name" value="{{ target.name }}" required> <input class="input" id="name" name="name" value="{{ target.name }}" required>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="role">Role</label> <label class="field__label" for="role">{{ t("Role") }}</label>
<select class="input" id="role" name="role"> <select class="input" id="role" name="role">
{% for role in roles %} {% for role in roles %}
<option value="{{ role }}" {{ 'selected' if target.role == role }}>{{ role }}</option> <option value="{{ role }}" {{ 'selected' if target.role == role }}>{{ role }}</option>
{% endfor %} {% endfor %}
</select> </select>
<p class="field__hint"> <p class="field__hint">{{ t("An administrator bypasses every permission and every quota below.") }}</p>
An administrator bypasses every permission and every quota below.
</p>
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="active" value="true" {{ 'checked' if target.active }}> <input type="checkbox" name="active" value="true" {{ 'checked' if target.active }}>
<span>Active</span> <span>{{ t("Active") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("Turning this off signs them out everywhere at once, rather than waiting for a cookie to expire.") }}</p>
Turning this off signs them out everywhere at once, rather than waiting
for a cookie to expire.
</p>
</div> </div>
</section> </section>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--primary" type="submit">Save</button> <button class="btn btn--primary" type="submit">{{ t("Save") }}</button>
</div> </div>
</form> </form>
{# --- What they can actually do -------------------------------------------- #} {# --- What they can actually do -------------------------------------------- #}
<section class="card"> <section class="card">
<h2 class="card__title">What this account can do</h2> <h2 class="card__title">{{ t("What this account can do") }}</h2>
<p class="card__lede"> <p class="card__lede">
Read-only, and deliberately: every switch here is set somewhere else — in the Read-only, and deliberately: every switch here is set somewhere else — in the
<a href="/admin/groups">baseline</a> or in a named group — and a control on <a href="/admin/groups">baseline</a> or in a named group — and a control on
this page would be a third place to change one thing. What it adds is the this page would be a third place to change one thing. What it adds is the
<em>source</em>, which is the question the grids could not answer without <em>{{ t("source") }}</em>, which is the question the grids could not answer without
opening every group by eye. opening every group by eye.
</p> </p>
@@ -77,7 +72,7 @@
from {{ state.source | join(", ") }} from {{ state.source | join(", ") }}
</span> </span>
{% else %} {% else %}
<span class="perm-row__desc faint">not granted</span> <span class="perm-row__desc faint">{{ t("not granted") }}</span>
{% endif %} {% endif %}
</span> </span>
</div> </div>
@@ -88,11 +83,8 @@
{# --- Membership ----------------------------------------------------------- #} {# --- Membership ----------------------------------------------------------- #}
<section class="card"> <section class="card">
<h2 class="card__title">Groups</h2> <h2 class="card__title">{{ t("Groups") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("Edited from the group's own page. One control per value, so a save here cannot undo a save there.") }}</p>
Edited from the group's own page. One control per value, so a save here
cannot undo a save there.
</p>
{% if target.groups %} {% if target.groups %}
<div class="btn-row"> <div class="btn-row">
{% for group in target.groups %} {% for group in target.groups %}
@@ -100,21 +92,17 @@
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}
<p class="muted text-sm">In no group. They get the baseline and nothing more.</p> <p class="muted text-sm">{{ t("In no group. They get the baseline and nothing more.") }}</p>
{% endif %} {% endif %}
</section> </section>
{# --- Quotas and usage ----------------------------------------------------- #} {# --- Quotas and usage ----------------------------------------------------- #}
<section class="card"> <section class="card">
<h2 class="card__title">This month</h2> <h2 class="card__title">{{ t("This month") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("Counted from the first of the month, UTC. Recorded for every reply including one that was stopped or failed — an endpoint charges for tokens it generated whether or not anybody wanted them.") }}</p>
Counted from the first of the month, UTC. Recorded for every reply including
one that was stopped or failed — an endpoint charges for tokens it generated
whether or not anybody wanted them.
</p>
<dl class="mode-list"> <dl class="mode-list">
<div class="mode-list__row"> <div class="mode-list__row">
<dt><strong>Tokens</strong></dt> <dt><strong>{{ t("Tokens") }}</strong></dt>
<dd> <dd>
{{ "{:,}".format(usage.tokens) }} {{ "{:,}".format(usage.tokens) }}
{% if limits.monthly_tokens %} of {{ "{:,}".format(limits.monthly_tokens) }}{% endif %} {% if limits.monthly_tokens %} of {{ "{:,}".format(limits.monthly_tokens) }}{% endif %}
@@ -125,11 +113,11 @@
</dd> </dd>
</div> </div>
<div class="mode-list__row"> <div class="mode-list__row">
<dt><strong>Replies</strong></dt> <dt><strong>{{ t("Replies") }}</strong></dt>
<dd>{{ usage.replies }}</dd> <dd>{{ usage.replies }}</dd>
</div> </div>
<div class="mode-list__row"> <div class="mode-list__row">
<dt><strong>Images</strong></dt> <dt><strong>{{ t("Images") }}</strong></dt>
<dd> <dd>
{{ usage.images }} this month, {{ usage.images_today }} today {{ usage.images }} this month, {{ usage.images_today }} today
{% if limits.images_per_day %} (limit {{ limits.images_per_day }} a day){% endif %} {% if limits.images_per_day %} (limit {{ limits.images_per_day }} a day){% endif %}
@@ -137,9 +125,9 @@
</div> </div>
</dl> </dl>
<h3 class="section-title">Limits in force</h3> <h3 class="section-title">{{ t("Limits in force") }}</h3>
<p class="field__hint"> <p class="field__hint">
Resolved across their groups by <strong>maximum</strong> — the union rule Resolved across their groups by <strong>{{ t("maximum") }}</strong> — the union rule
applied to numbers, so a second group can only ever grant more. Zero means no applied to numbers, so a second group can only ever grant more. Zero means no
limit and wins outright, because a group saying “unlimited” must not count limit and wins outright, because a group saying “unlimited” must not count
for less than one saying “a million”. for less than one saying “a million”.
@@ -159,11 +147,8 @@
{# --- Models --------------------------------------------------------------- #} {# --- Models --------------------------------------------------------------- #}
<section class="card"> <section class="card">
<h2 class="card__title">Models they can use</h2> <h2 class="card__title">{{ t("Models they can use") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("Model access is separate from permissions: a permission says what somebody may do, this says what they may do it with.") }}</p>
Model access is separate from permissions: a permission says what somebody
may do, this says what they may do it with.
</p>
{% if models %} {% if models %}
<div class="btn-row"> <div class="btn-row">
{% for model in models %} {% for model in models %}
@@ -171,22 +156,19 @@
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}
<p class="muted text-sm">None. They cannot start a chat at all.</p> <p class="muted text-sm">{{ t("None. They cannot start a chat at all.") }}</p>
{% endif %} {% endif %}
</section> </section>
{# --- Dangerous ------------------------------------------------------------ #} {# --- Dangerous ------------------------------------------------------------ #}
<section class="card"> <section class="card">
<h2 class="card__title">Password and removal</h2> <h2 class="card__title">{{ t("Password and removal") }}</h2>
<form method="post" action="/admin/users/{{ target.id }}/password" class="btn-row"> <form method="post" action="/admin/users/{{ target.id }}/password" class="btn-row">
<input class="input" name="password" type="password" required <input class="input" name="password" type="password" required
placeholder="New password" aria-label="New password" style="flex: 1"> placeholder="{{ t('New password') }}" aria-label="{{ t('New password') }}" style="flex: 1">
<button class="btn" type="submit">Reset password</button> <button class="btn" type="submit">{{ t("Reset password") }}</button>
</form> </form>
<p class="field__hint"> <p class="field__hint">{{ t("Signs them out everywhere. An administrator resetting a password usually means the account is compromised or the person has gone.") }}</p>
Signs them out everywhere. An administrator resetting a password usually
means the account is compromised or the person has gone.
</p>
<form method="post" action="/admin/users/{{ target.id }}/delete" <form method="post" action="/admin/users/{{ target.id }}/delete"
data-confirm="Delete {{ target.email }}? Their chats, folders and library go with them." data-confirm="Delete {{ target.email }}? Their chats, folders and library go with them."
@@ -195,9 +177,6 @@
{{ icon("trash", "icon--sm") }} Delete this account {{ icon("trash", "icon--sm") }} Delete this account
</button> </button>
</form> </form>
<p class="field__hint"> <p class="field__hint">{{ t("Their chats, folders and library go too, and every share naming them or naming anything of theirs.") }}</p>
Their chats, folders and library go too, and every share naming them or
naming anything of theirs.
</p>
</section> </section>
{% endblock %} {% endblock %}
+11 -13
View File
@@ -20,7 +20,7 @@
<div class="filter-bar"> <div class="filter-bar">
<form class="filter-form" method="get" action="/admin/users"> <form class="filter-form" method="get" action="/admin/users">
<input class="input" type="search" name="q" value="{{ q }}" <input class="input" type="search" name="q" value="{{ q }}"
placeholder="Search by name or email…" aria-label="Search users"> placeholder="{{ t('Search by name or email…') }}" aria-label="{{ t('Search users') }}">
<button class="btn" type="submit">{{ icon("search", "icon--sm") }} Filter</button> <button class="btn" type="submit">{{ icon("search", "icon--sm") }} Filter</button>
{% if q %}<a class="btn btn--ghost" href="/admin/users">Clear</a>{% endif %} {% if q %}<a class="btn btn--ghost" href="/admin/users">Clear</a>{% endif %}
</form> </form>
@@ -32,9 +32,9 @@
<div class="model-row__main"> <div class="model-row__main">
<span class="model-row__name"> <span class="model-row__name">
{{ person.name }} {{ person.name }}
{% if person.role == "admin" %}<span class="badge badge--leaf">admin</span>{% endif %} {% if person.role == "admin" %}<span class="badge badge--leaf">{{ t("admin") }}</span>{% endif %}
{% if person.role == "pending" %}<span class="badge">pending</span>{% endif %} {% if person.role == "pending" %}<span class="badge">{{ t("pending") }}</span>{% endif %}
{% if not person.active %}<span class="badge">disabled</span>{% endif %} {% if not person.active %}<span class="badge">{{ t("disabled") }}</span>{% endif %}
</span> </span>
<span class="model-row__id">{{ person.email }}</span> <span class="model-row__id">{{ person.email }}</span>
</div> </div>
@@ -46,7 +46,7 @@
{% endif %} {% endif %}
{% set spent = usage[person.id] %} {% set spent = usage[person.id] %}
{% if spent.tokens %} {% if spent.tokens %}
<span class="badge" title="Tokens this month">{{ "{:,}".format(spent.tokens) }}</span> <span class="badge" title="{{ t('Tokens this month') }}">{{ "{:,}".format(spent.tokens) }}</span>
{% endif %} {% endif %}
</div> </div>
</a> </a>
@@ -74,26 +74,24 @@
{% endif %} {% endif %}
<section class="card" style="margin-top: var(--sp-8)"> <section class="card" style="margin-top: var(--sp-8)">
<h2 class="card__title">Add an account</h2> <h2 class="card__title">{{ t("Add an account") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("Without going through registration — useful when sign-up is closed.") }}</p>
Without going through registration — useful when sign-up is closed.
</p>
<form method="post" action="/admin/users" class="form-grid"> <form method="post" action="/admin/users" class="form-grid">
<div class="field-row"> <div class="field-row">
<div class="field"> <div class="field">
<label class="field__label" for="new-name">Name</label> <label class="field__label" for="new-name">{{ t("Name") }}</label>
<input class="input" id="new-name" name="name" required> <input class="input" id="new-name" name="name" required>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="new-email">Email</label> <label class="field__label" for="new-email">{{ t("Email") }}</label>
<input class="input" id="new-email" name="email" type="email" required> <input class="input" id="new-email" name="email" type="email" required>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="new-password">Password</label> <label class="field__label" for="new-password">{{ t("Password") }}</label>
<input class="input" id="new-password" name="password" type="password" required> <input class="input" id="new-password" name="password" type="password" required>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="new-role">Role</label> <label class="field__label" for="new-role">{{ t("Role") }}</label>
<select class="input" id="new-role" name="role"> <select class="input" id="new-role" name="role">
{% for role in roles %}<option value="{{ role }}">{{ role }}</option>{% endfor %} {% for role in roles %}<option value="{{ role }}">{{ role }}</option>{% endfor %}
</select> </select>
@@ -20,56 +20,53 @@
action="{{ '/admin/images/workflows' if is_new else '/admin/images/workflows/' ~ workflow.id }}" action="{{ '/admin/images/workflows' if is_new else '/admin/images/workflows/' ~ workflow.id }}"
class="form-grid"> class="form-grid">
<section class="card"> <section class="card">
<h2 class="card__title">What it is</h2> <h2 class="card__title">{{ t("What it is") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="name">Name</label> <label class="field__label" for="name">{{ t("Name") }}</label>
<input class="input" id="name" name="name" required maxlength="120" <input class="input" id="name" name="name" required maxlength="120"
value="{{ workflow.name }}" placeholder="SDXL, photographic"> value="{{ workflow.name }}" placeholder="{{ t('SDXL, photographic') }}">
<p class="field__hint">Shown to you, in the list.</p> <p class="field__hint">{{ t("Shown to you, in the list.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="slug">Name the model uses</label> <label class="field__label" for="slug">{{ t("Name the model uses") }}</label>
<input class="input input--mono" id="slug" name="slug" required maxlength="48" <input class="input input--mono" id="slug" name="slug" required maxlength="48"
value="{{ workflow.slug }}" placeholder="sdxl-photo"> value="{{ workflow.slug }}" placeholder="{{ t('sdxl-photo') }}">
<p class="field__hint"> <p class="field__hint">{{ t("Lowercase letters, digits, hyphens and underscores. This is what the model writes when it picks this workflow.") }}</p>
Lowercase letters, digits, hyphens and underscores. This is what the model
writes when it picks this workflow.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="description">Description</label> <label class="field__label" for="description">{{ t("Description") }}</label>
<textarea class="textarea" id="description" name="description" rows="3" <textarea class="textarea" id="description" name="description" rows="3"
placeholder="Photographic and slow. Best for people, interiors and product shots at 1024px.">{{ workflow.description }}</textarea> placeholder="{{ t('Photographic and slow. Best for people, interiors and product shots at 1024px.') }}">{{ workflow.description }}</textarea>
<p class="field__hint"> <p class="field__hint">
The only thing the model has to choose with, so say what this is The only thing the model has to choose with, so say what this is
<em>for</em> rather than what it contains. It never sees the graph. <em>{{ t("for") }}</em> rather than what it contains. It never sees the graph.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" {{ 'checked' if workflow.enabled }}> <input type="checkbox" name="enabled" value="true" {{ 'checked' if workflow.enabled }}>
<span>Offer this workflow</span> <span>{{ t("Offer this workflow") }}</span>
</label> </label>
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">The workflow</h2> <h2 class="card__title">{{ t("The workflow") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="workflow">ComfyUI API format</label> <label class="field__label" for="workflow">{{ t("ComfyUI API format") }}</label>
<textarea class="textarea input--mono" id="workflow" name="workflow" rows="20" <textarea class="textarea input--mono" id="workflow" name="workflow" rows="20"
spellcheck="false">{{ workflow_text }}</textarea> spellcheck="false">{{ workflow_text }}</textarea>
<p class="field__hint"> <p class="field__hint">
Export this from ComfyUI with <strong>Export (API)</strong>, not Save — the Export this from ComfyUI with <strong>{{ t("Export (API)") }}</strong>, not Save — the
two formats are different and only the API one can be submitted. two formats are different and only the API one can be submitted.
</p> </p>
<p class="field__hint"> <p class="field__hint">
Then put a placeholder where each value goes. A placeholder that is the Then put a placeholder where each value goes. A placeholder that is the
<em>whole</em> value keeps its type, so <em>{{ t("whole") }}</em> value keeps its type, so
<code>"steps": {{ '{{steps}}' }}</code> sends the number 20 rather than the <code>"steps": {{ '{{steps}}' }}</code> sends the number 20 rather than the
text “20”; one inside a longer string is substituted as text, so text “20”; one inside a longer string is substituted as text, so
<code>"{{ '{{prompt}}' }}, masterpiece"</code> works. Anything you leave out <code>"{{ '{{prompt}}' }}, masterpiece"</code> works. Anything you leave out
@@ -79,7 +76,7 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">The placeholders</h2> <h2 class="card__title">{{ t("The placeholders") }}</h2>
<p class="card__lede"> <p class="card__lede">
Every hole a template may carry, what it fills, and what it resolves to Every hole a template may carry, what it fills, and what it resolves to
right now. <code>{{ '{{prompt}}' }}</code> is required — without it every right now. <code>{{ '{{prompt}}' }}</code> is required — without it every
@@ -95,7 +92,7 @@
<code>{{ '{{' ~ name ~ '}}' }}</code> <code>{{ '{{' ~ name ~ '}}' }}</code>
<span> <span>
{{ what }} {{ what }}
{% if name == "prompt" %}<strong>Required.</strong>{% endif %} {% if name == "prompt" %}<strong>{{ t("Required.") }}</strong>{% endif %}
</span> </span>
<code class="faint">{{ current }}</code> <code class="faint">{{ current }}</code>
</div> </div>
@@ -123,9 +120,7 @@
{% if not is_new %} {% if not is_new %}
<button class="btn btn--danger" type="submit" formnovalidate <button class="btn btn--danger" type="submit" formnovalidate
formaction="/admin/images/workflows/{{ workflow.id }}/delete" formaction="/admin/images/workflows/{{ workflow.id }}/delete"
data-confirm-button="Delete the workflow “{{ workflow.name }}”? Chats that used it fall back to the default."> data-confirm-button="Delete the workflow “{{ workflow.name }}”? Chats that used it fall back to the default.">{{ t("Delete") }}</button>
Delete
</button>
{% endif %} {% endif %}
</div> </div>
</form> </form>
+2 -4
View File
@@ -25,7 +25,7 @@
<button class="picker__option" type="button" data-dir-open="{{ parent }}"> <button class="picker__option" type="button" data-dir-open="{{ parent }}">
{{ icon("chevron-left", "icon--sm") }} {{ icon("chevron-left", "icon--sm") }}
<span class="picker__option-body"> <span class="picker__option-body">
<span class="picker__option-name">Up a level</span> <span class="picker__option-name">{{ t("Up a level") }}</span>
<span class="picker__option-note mono">{{ parent }}</span> <span class="picker__option-note mono">{{ parent }}</span>
</span> </span>
</button> </button>
@@ -70,9 +70,7 @@
{% if not entries %} {% if not entries %}
<li> <li>
<p class="muted text-sm" style="padding: var(--sp-3)"> <p class="muted text-sm" style="padding: var(--sp-3)">{{ t("Nothing here.") }}</p>
Nothing here.
</p>
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
+4 -6
View File
@@ -33,16 +33,14 @@
hx-post="/api/agents/{{ profile.id }}/accept" hx-post="/api/agents/{{ profile.id }}/accept"
hx-target="#check-result" hx-target="#check-result"
hx-confirm="Accept this fingerprint and pin it? Every future connection will be checked against it." hx-confirm="Accept this fingerprint and pin it? Every future connection will be checked against it."
data-confirm-label="Accept" data-confirm-label="{{ t('Accept') }}"
data-confirm-danger="{{ 'true' if offer.changed else 'false' }}"> data-confirm-danger="{{ 'true' if offer.changed else 'false' }}">
{{ icon("check", "icon--sm") }} Accept and pin {{ icon("check", "icon--sm") }} Accept and pin
</button> </button>
{% if profile.verified %} {% if profile.verified %}
<button class="btn" type="button" <button class="btn" type="button"
hx-post="/api/agents/{{ profile.id }}/forget" hx-post="/api/agents/{{ profile.id }}/forget"
hx-target="#check-result"> hx-target="#check-result">{{ t("Forget the old key") }}</button>
Forget the old key
</button>
{% endif %} {% endif %}
</div> </div>
</div> </div>
@@ -58,7 +56,7 @@
{% if forgotten %} {% if forgotten %}
<div class="alert"> <div class="alert">
{{ icon("warning", "icon--sm") }} {{ icon("warning", "icon--sm") }}
<span>Key forgotten. Check again to see the new one.</span> <span>{{ t("Key forgotten. Check again to see the new one.") }}</span>
</div> </div>
{% endif %} {% endif %}
@@ -67,6 +65,6 @@
{{ icon("check", "icon--sm") }} {{ icon("check", "icon--sm") }}
<span>Connected{% if found.system %} to {{ found.system }}{% endif %}.</span> <span>Connected{% if found.system %} to {{ found.system }}{% endif %}.</span>
</div> </div>
<p class="field__hint">What it said:</p> <p class="field__hint">{{ t("What it said:") }}</p>
<pre class="tool-result__text">{{ found.output }}</pre> <pre class="tool-result__text">{{ found.output }}</pre>
{% endif %} {% endif %}
+24 -30
View File
@@ -30,7 +30,7 @@
{% if not is_new %} {% if not is_new %}
<section class="card"> <section class="card">
<h2 class="card__title">Check it</h2> <h2 class="card__title">{{ t("Check it") }}</h2>
<p class="field__hint"> <p class="field__hint">
{% if profile.verified %} {% if profile.verified %}
Confirms the host is still the one you accepted, then logs in and runs Confirms the host is still the one you accepted, then logs in and runs
@@ -63,70 +63,66 @@
action="{{ '/api/agents' if is_new else '/api/agents/' ~ profile.id }}"> action="{{ '/api/agents' if is_new else '/api/agents/' ~ profile.id }}">
<section class="card"> <section class="card">
<h2 class="card__title">The machine</h2> <h2 class="card__title">{{ t("The machine") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="name">Name</label> <label class="field__label" for="name">{{ t("Name") }}</label>
<input class="input" id="name" name="name" value="{{ profile.name }}" required <input class="input" id="name" name="name" value="{{ profile.name }}" required
maxlength="120" placeholder="Project container"> maxlength="120" placeholder="{{ t('Project container') }}">
<p class="field__hint">What you will pick from when starting an agent chat.</p> <p class="field__hint">{{ t("What you will pick from when starting an agent chat.") }}</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="host">Host</label> <label class="field__label" for="host">{{ t("Host") }}</label>
<input class="input input--mono" id="host" name="host" value="{{ profile.host }}" required <input class="input input--mono" id="host" name="host" value="{{ profile.host }}" required
maxlength="255" placeholder="127.0.0.1"> maxlength="255" placeholder="127.0.0.1">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="port">Port</label> <label class="field__label" for="port">{{ t("Port") }}</label>
<input class="input" id="port" name="port" value="{{ profile.port }}" inputmode="numeric"> <input class="input" id="port" name="port" value="{{ profile.port }}" inputmode="numeric">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="username">Log in as</label> <label class="field__label" for="username">{{ t("Log in as") }}</label>
<input class="input input--mono" id="username" name="username" required <input class="input input--mono" id="username" name="username" required
value="{{ profile.username }}" maxlength="120" placeholder="root"> value="{{ profile.username }}" maxlength="120" placeholder="{{ t('root') }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="default_dir">Project directory</label> <label class="field__label" for="default_dir">{{ t("Project directory") }}</label>
<input class="input input--mono" id="default_dir" name="default_dir" <input class="input input--mono" id="default_dir" name="default_dir"
value="{{ profile.default_dir }}" maxlength="500" placeholder="/project"> value="{{ profile.default_dir }}" maxlength="500" placeholder="{{ t('/project') }}">
<p class="field__hint"> <p class="field__hint">{{ t("Where a chat starts by default. Each chat records its own when it is created, so changing this later does not move a conversation already under way.") }}</p>
Where a chat starts by default. Each chat records its own when it is
created, so changing this later does not move a conversation already
under way.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="connect_timeout">Connect timeout (seconds)</label> <label class="field__label" for="connect_timeout">{{ t("Connect timeout (seconds)") }}</label>
<input class="input" id="connect_timeout" name="connect_timeout" <input class="input" id="connect_timeout" name="connect_timeout"
value="{{ profile.connect_timeout }}" inputmode="numeric"> value="{{ profile.connect_timeout }}" inputmode="numeric">
</div> </div>
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">How it logs in</h2> <h2 class="card__title">{{ t("How it logs in") }}</h2>
<div class="field"> <div class="field">
<div class="checkbox-row"> <div class="checkbox-row">
<label class="checkbox"> <label class="checkbox">
<input type="radio" name="auth" value="key" <input type="radio" name="auth" value="key"
{{ 'checked' if profile.auth != 'password' }}> {{ 'checked' if profile.auth != 'password' }}>
<span>A private key</span> <span>{{ t("A private key") }}</span>
</label> </label>
<label class="checkbox"> <label class="checkbox">
<input type="radio" name="auth" value="password" <input type="radio" name="auth" value="password"
{{ 'checked' if profile.auth == 'password' }}> {{ 'checked' if profile.auth == 'password' }}>
<span>A password</span> <span>{{ t("A password") }}</span>
</label> </label>
</div> </div>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="private_key">Private key</label> <label class="field__label" for="private_key">{{ t("Private key") }}</label>
<textarea class="textarea input--mono" id="private_key" name="private_key" rows="5" <textarea class="textarea input--mono" id="private_key" name="private_key" rows="5"
spellcheck="false" spellcheck="false"
placeholder="-----BEGIN OPENSSH PRIVATE KEY-----" placeholder="-----BEGIN OPENSSH PRIVATE KEY-----"
@@ -142,15 +138,15 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="key_passphrase">Key passphrase</label> <label class="field__label" for="key_passphrase">{{ t("Key passphrase") }}</label>
<input class="input input--mono" id="key_passphrase" name="key_passphrase" <input class="input input--mono" id="key_passphrase" name="key_passphrase"
type="password" autocomplete="off" placeholder="If the key has one"> type="password" autocomplete="off" placeholder="{{ t('If the key has one') }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="password">Password</label> <label class="field__label" for="password">{{ t("Password") }}</label>
<input class="input input--mono" id="password" name="password" type="password" <input class="input input--mono" id="password" name="password" type="password"
autocomplete="off" placeholder="No password set" autocomplete="off" placeholder="{{ t('No password set') }}"
value="{{ unchanged if profile.password_encrypted else '' }}"> value="{{ unchanged if profile.password_encrypted else '' }}">
<p class="field__hint"> <p class="field__hint">
{% if profile.password_encrypted %} {% if profile.password_encrypted %}
@@ -164,11 +160,11 @@
</section> </section>
<section class="card"> <section class="card">
<h2 class="card__title">Availability</h2> <h2 class="card__title">{{ t("Availability") }}</h2>
<div class="field"> <div class="field">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" {{ 'checked' if profile.enabled }}> <input type="checkbox" name="enabled" value="true" {{ 'checked' if profile.enabled }}>
<span>Enabled — can be picked when starting an agent chat</span> <span>{{ t("Enabled — can be picked when starting an agent chat") }}</span>
</label> </label>
</div> </div>
</section> </section>
@@ -181,9 +177,7 @@
{% if not is_new %} {% if not is_new %}
<button class="btn btn--danger" type="submit" formnovalidate <button class="btn btn--danger" type="submit" formnovalidate
formaction="/api/agents/{{ profile.id }}/delete" formaction="/api/agents/{{ profile.id }}/delete"
data-confirm-button="Delete the connection “{{ profile.name }}”? Chats that used it keep their transcripts."> data-confirm-button="Delete the connection “{{ profile.name }}”? Chats that used it keep their transcripts.">{{ t("Delete") }}</button>
Delete
</button>
{% endif %} {% endif %}
</div> </div>
</form> </form>
+10 -14
View File
@@ -11,8 +11,8 @@
{% block agents_content %} {% block agents_content %}
<p class="admin-lede"> <p class="admin-lede">
Machines an <strong>Agent</strong> chat can work on. A model with one of these Machines an <strong>{{ t("Agent") }}</strong> chat can work on. A model with one of these
can read files, write files and run commands <em>there</em> — never here. can read files, write files and run commands <em>{{ t("there") }}</em> — never here.
Which of those it may do without asking you first is the chat's mode. Which of those it may do without asking you first is the chat's mode.
</p> </p>
@@ -33,11 +33,7 @@
{% elif not enabled %} {% elif not enabled %}
<div class="alert alert--error"> <div class="alert alert--error">
{{ icon("warning", "icon--sm") }} {{ icon("warning", "icon--sm") }}
<span> <span>{{ t("Agent chats are switched off for this instance. You can still add connections here, but nothing will use them until an administrator turns them on.") }}</span>
Agent chats are switched off for this instance. You can still add
connections here, but nothing will use them until an administrator turns
them on.
</span>
</div> </div>
{% endif %} {% endif %}
@@ -48,10 +44,10 @@
{% if not profiles %} {% if not profiles %}
<div class="empty"> <div class="empty">
{{ icon("server", "empty__mark") }} {{ icon("server", "empty__mark") }}
<h2 class="empty__title">No connections yet</h2> <h2 class="empty__title">{{ t("No connections yet") }}</h2>
<p class="empty__text"> <p class="empty__text">
Add the host, the user to log in as, and a key or password. Then press Add the host, the user to log in as, and a key or password. Then press
<strong>Check</strong> — you will be shown its fingerprint to confirm before <strong>{{ t("Check") }}</strong> — you will be shown its fingerprint to confirm before
anything is sent to it. anything is sent to it.
</p> </p>
<a class="btn btn--primary" href="/agents/new"> <a class="btn btn--primary" href="/agents/new">
@@ -72,14 +68,14 @@
<div class="model-row__title"> <div class="model-row__title">
<a class="model-row__name" href="/agents/{{ profile.id }}">{{ profile.name }}</a> <a class="model-row__name" href="/agents/{{ profile.id }}">{{ profile.name }}</a>
{% if refused %} {% if refused %}
<span class="badge badge--danger">not allowed</span> <span class="badge badge--danger">{{ t("not allowed") }}</span>
{% elif profile.verified %} {% elif profile.verified %}
<span class="badge badge--leaf">key confirmed</span> <span class="badge badge--leaf">{{ t("key confirmed") }}</span>
{% else %} {% else %}
<span class="badge badge--danger">not checked</span> <span class="badge badge--danger">{{ t("not checked") }}</span>
{% endif %} {% endif %}
{% if not profile.enabled %}<span class="badge">disabled</span>{% endif %} {% if not profile.enabled %}<span class="badge">{{ t("disabled") }}</span>{% endif %}
{% if profile.auth == "password" %}<span class="badge">password</span>{% endif %} {% if profile.auth == "password" %}<span class="badge">{{ t("password") }}</span>{% endif %}
</div> </div>
<code class="model-row__id"> <code class="model-row__id">
{{ profile.address }}{% if profile.default_dir %} · {{ profile.default_dir }}{% endif %} {{ profile.address }}{% if profile.default_dir %} · {{ profile.default_dir }}{% endif %}
+3 -3
View File
@@ -23,18 +23,18 @@
<input type="hidden" name="next" value="{{ next|default('/') }}"> <input type="hidden" name="next" value="{{ next|default('/') }}">
<div class="field"> <div class="field">
<label class="field__label" for="email">Email</label> <label class="field__label" for="email">{{ t("Email") }}</label>
<input class="input" type="email" id="email" name="email" required <input class="input" type="email" id="email" name="email" required
autocomplete="username" autofocus value="{{ email|default('') }}"> autocomplete="username" autofocus value="{{ email|default('') }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="password">Password</label> <label class="field__label" for="password">{{ t("Password") }}</label>
<input class="input" type="password" id="password" name="password" required <input class="input" type="password" id="password" name="password" required
autocomplete="current-password"> autocomplete="current-password">
</div> </div>
<button class="btn btn--primary btn--block" type="submit">Sign in</button> <button class="btn btn--primary btn--block" type="submit">{{ t("Sign in") }}</button>
</form> </form>
{% if allow_signup %} {% if allow_signup %}
+6 -8
View File
@@ -10,11 +10,9 @@
{{ mark(cls="brand-mark", uid="auth") }} {{ mark(cls="brand-mark", uid="auth") }}
<h1 class="auth__title">{{ wordmark() }}</h1> <h1 class="auth__title">{{ wordmark() }}</h1>
{% if first_run %} {% if first_run %}
<p class="auth__subtitle"> <p class="auth__subtitle">{{ t("Nobody has claimed this instance yet. The first account becomes its administrator.") }}</p>
Nobody has claimed this instance yet. The first account becomes its administrator.
</p>
{% else %} {% else %}
<p class="auth__subtitle">Create your account.</p> <p class="auth__subtitle">{{ t("Create your account.") }}</p>
{% endif %} {% endif %}
</div> </div>
@@ -27,22 +25,22 @@
<form method="post" action="/auth/register" class="stack"> <form method="post" action="/auth/register" class="stack">
<div class="field"> <div class="field">
<label class="field__label" for="name">Name</label> <label class="field__label" for="name">{{ t("Name") }}</label>
<input class="input" type="text" id="name" name="name" required autofocus <input class="input" type="text" id="name" name="name" required autofocus
autocomplete="name" value="{{ name|default('') }}"> autocomplete="name" value="{{ name|default('') }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="email">Email</label> <label class="field__label" for="email">{{ t("Email") }}</label>
<input class="input" type="email" id="email" name="email" required <input class="input" type="email" id="email" name="email" required
autocomplete="username" value="{{ email|default('') }}"> autocomplete="username" value="{{ email|default('') }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="password">Password</label> <label class="field__label" for="password">{{ t("Password") }}</label>
<input class="input" type="password" id="password" name="password" required <input class="input" type="password" id="password" name="password" required
autocomplete="new-password" minlength="8"> autocomplete="new-password" minlength="8">
<p class="field__hint">At least 8 characters.</p> <p class="field__hint">{{ t("At least 8 characters.") }}</p>
</div> </div>
<button class="btn btn--primary btn--block" type="submit"> <button class="btn btn--primary btn--block" type="submit">
+1 -1
View File
@@ -9,7 +9,7 @@
in order to set both attributes when somebody switches -- one attribute to in order to set both attributes when somebody switches -- one attribute to
split rather than a JSON island to parse. split rather than a JSON island to parse.
#} #}
<html lang="en" data-theme="{{ theme }}" data-base="{{ brand.theme(theme).base }}" <html lang="{{ language() }}" dir="{{ text_direction() }}" data-theme="{{ theme }}" data-base="{{ brand.theme(theme).base }}"
data-themes="{{ brand.theme_list }}"{% if layout %} style="{{ layout }}"{% endif %}> data-themes="{{ brand.theme_list }}"{% if layout %} style="{{ layout }}"{% endif %}>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
@@ -10,7 +10,7 @@
<span class="attach-chip__name">{{ filename }}</span> <span class="attach-chip__name">{{ filename }}</span>
<span class="attach-chip__warning">{{ error }}</span> <span class="attach-chip__warning">{{ error }}</span>
</span> </span>
<button class="btn btn--icon btn--sm" type="button" aria-label="Dismiss" <button class="btn btn--icon btn--sm" type="button" aria-label="{{ t('Dismiss') }}"
onclick="this.closest('.attach-chip').remove()"> onclick="this.closest('.attach-chip').remove()">
{{ icon("x", "icon--sm") }} {{ icon("x", "icon--sm") }}
</button> </button>
@@ -14,6 +14,6 @@
<span class="attach-chip__icon">{{ icon("archive", "icon--sm") }}</span> <span class="attach-chip__icon">{{ icon("archive", "icon--sm") }}</span>
<span class="attach-chip__body"> <span class="attach-chip__body">
<span class="attach-chip__name" title="{{ base.name }}">{{ base.name }}</span> <span class="attach-chip__name" title="{{ base.name }}">{{ base.name }}</span>
<span class="attach-chip__meta">This chat now searches only the bases it is attached to</span> <span class="attach-chip__meta">{{ t("This chat now searches only the bases it is attached to") }}</span>
</span> </span>
</div> </div>
+5 -5
View File
@@ -14,7 +14,7 @@
path allowed to emit HTML), or into a <textarea>, whose contents Jinja escapes path allowed to emit HTML), or into a <textarea>, whose contents Jinja escapes
and which cannot contain markup by construction. and which cannot contain markup by construction.
#} #}
<aside class="canvas" id="canvas" hidden aria-label="Canvas" <aside class="canvas" id="canvas" hidden aria-label="{{ t('Canvas') }}"
data-canvas data-canvas
data-chat="{{ chat.id if chat else "" }}" data-chat="{{ chat.id if chat else "" }}"
data-resize-target> data-resize-target>
@@ -23,7 +23,7 @@
mouse and the grip is a focus trap that does nothing. #} mouse and the grip is a focus trap that does nothing. #}
<div class="panel-resize" data-resize="--canvas-width" data-resize-min="384" <div class="panel-resize" data-resize="--canvas-width" data-resize-min="384"
role="separator" aria-orientation="vertical" tabindex="0" role="separator" aria-orientation="vertical" tabindex="0"
aria-label="Resize the canvas"> aria-label="{{ t('Resize the canvas') }}">
{{ icon("grip", "icon--sm") }} {{ icon("grip", "icon--sm") }}
</div> </div>
@@ -44,15 +44,15 @@
<div class="panel-head"> <div class="panel-head">
<h2 class="panel-head__title"> <h2 class="panel-head__title">
{{ icon("file-text", "icon--sm") }} {{ icon("file-text", "icon--sm") }}
<span>Canvas</span> <span>{{ t("Canvas") }}</span>
</h2> </h2>
<button class="btn btn--icon btn--sm" type="button" data-toggle="#canvas" <button class="btn btn--icon btn--sm" type="button" data-toggle="#canvas"
aria-label="Close canvas"> aria-label="{{ t('Close canvas') }}">
{{ icon("x", "icon--sm") }} {{ icon("x", "icon--sm") }}
</button> </button>
</div> </div>
<div class="canvas__body"> <div class="canvas__body">
<p class="canvas__empty">Opening…</p> <p class="canvas__empty">{{ t("Opening…") }}</p>
</div> </div>
</div> </div>
</aside> </aside>
@@ -22,7 +22,7 @@
</div> </div>
<details class="canvas__theirs"> <details class="canvas__theirs">
<summary>What is there now</summary> <summary>{{ t("What is there now") }}</summary>
<pre class="canvas__code"><code>{{ conflict.text }}</code></pre> <pre class="canvas__code"><code>{{ conflict.text }}</code></pre>
</details> </details>
@@ -34,7 +34,7 @@
regardless, which is exactly what Overwrite means -- somebody has now regardless, which is exactly what Overwrite means -- somebody has now
been shown both versions and chosen. #} been shown both versions and chosen. #}
<input type="hidden" name="revision" value=""> <input type="hidden" name="revision" value="">
<label class="visually-hidden" for="canvas-mine">Your version</label> <label class="visually-hidden" for="canvas-mine">{{ t("Your version") }}</label>
<textarea class="canvas__editor" id="canvas-mine" name="text" <textarea class="canvas__editor" id="canvas-mine" name="text"
spellcheck="false" data-canvas-editor>{{ mine }}</textarea> spellcheck="false" data-canvas-editor>{{ mine }}</textarea>
<div class="canvas__actions"> <div class="canvas__actions">
@@ -44,9 +44,7 @@
<button class="btn btn--sm" type="button" <button class="btn btn--sm" type="button"
hx-post="/api/chats/{{ chat.id }}/canvas/tabs" hx-post="/api/chats/{{ chat.id }}/canvas/tabs"
hx-vals='{"key": {{ conflict.key | tojson }}}' hx-vals='{"key": {{ conflict.key | tojson }}}'
hx-target="#canvas-inner" hx-swap="innerHTML"> hx-target="#canvas-inner" hx-swap="innerHTML">{{ t("Discard mine and reload") }}</button>
Discard mine and reload
</button>
</div> </div>
</form> </form>
</div> </div>
@@ -46,7 +46,7 @@
{% if rendered %} {% if rendered %}
{{ rendered | safe }} {{ rendered | safe }}
{% else %} {% else %}
<p class="canvas__empty">This file is empty.</p> <p class="canvas__empty">{{ t("This file is empty.") }}</p>
{% endif %} {% endif %}
</div> </div>
@@ -66,8 +66,8 @@
<button class="btn btn--primary btn--sm" type="submit"> <button class="btn btn--primary btn--sm" type="submit">
{{ icon("check", "icon--sm") }} Save {{ icon("check", "icon--sm") }} Save
</button> </button>
<button class="btn btn--sm" type="button" @click="editing = false">Cancel</button> <button class="btn btn--sm" type="button" @click="editing = false">{{ t("Cancel") }}</button>
<span class="canvas__hint">No colour while you type. Tab inserts a tab.</span> <span class="canvas__hint">{{ t("No colour while you type. Tab inserts a tab.") }}</span>
</div> </div>
</form> </form>
{% endif %} {% endif %}
@@ -23,13 +23,13 @@
hx-post="/api/files/from-scratch" hx-post="/api/files/from-scratch"
hx-vals='{"chat_id": "{{ chat.id }}"}' hx-vals='{"chat_id": "{{ chat.id }}"}'
hx-target="#attachments" hx-swap="beforeend" hx-target="#attachments" hx-swap="beforeend"
title="Put this in the message box as an attachment"> title="{{ t('Put this in the message box as an attachment') }}">
{{ icon("attach", "icon--sm") }} Attach {{ icon("attach", "icon--sm") }} Attach
</button> </button>
{% endif %} {% endif %}
<button class="btn btn--icon btn--sm" type="button" data-toggle="#canvas" <button class="btn btn--icon btn--sm" type="button" data-toggle="#canvas"
aria-label="Close canvas"> aria-label="{{ t('Close canvas') }}">
{{ icon("x", "icon--sm") }} {{ icon("x", "icon--sm") }}
</button> </button>
</div> </div>
@@ -66,7 +66,7 @@
hx-post="/api/chats/{{ chat.id }}/canvas/tabs" hx-post="/api/chats/{{ chat.id }}/canvas/tabs"
hx-vals='{"key": "scratch:{{ chat.id }}"}' hx-vals='{"key": "scratch:{{ chat.id }}"}'
hx-target="#canvas-inner" hx-swap="innerHTML" hx-target="#canvas-inner" hx-swap="innerHTML"
title="This chat's own working document"> title="{{ t('This chat\'s own working document') }}">
{{ icon("file-text", "icon--sm") }} Scratch {{ icon("file-text", "icon--sm") }} Scratch
</button> </button>
</div> </div>
+127 -34
View File
@@ -106,7 +106,7 @@
<textarea class="composer__input" name="content" rows="1" <textarea class="composer__input" name="content" rows="1"
data-autosize data-max-height="320" data-composer-input data-autosize data-max-height="320" data-composer-input
placeholder="{% if chat %}Send a message…{% else %}Ask anything…{% endif %}" placeholder="{% if chat %}Send a message…{% else %}Ask anything…{% endif %}"
aria-label="Message" {{ 'autofocus' if not chat }}></textarea> aria-label="{{ t('Message') }}" {{ 'autofocus' if not chat }}></textarea>
</div> </div>
<div class="composer__toolbar"> <div class="composer__toolbar">
@@ -118,34 +118,34 @@
<div class="picker picker--up" data-picker> <div class="picker picker--up" data-picker>
<button class="btn btn--icon composer__btn" type="button" data-picker-toggle <button class="btn btn--icon composer__btn" type="button" data-picker-toggle
aria-haspopup="menu" aria-expanded="false" aria-haspopup="menu" aria-expanded="false"
aria-label="Attach" title="Attach"> aria-label="{{ t('Attach') }}" title="{{ t('Attach') }}">
{{ icon("attach") }} {{ icon("attach") }}
</button> </button>
<div class="picker__menu picker__menu--compact" data-picker-menu role="menu" <div class="picker__menu picker__menu--compact" data-picker-menu role="menu"
hidden aria-label="Attach"> hidden aria-label="{{ t('Attach') }}">
<button class="picker__option" type="button" role="menuitem" <button class="picker__option" type="button" role="menuitem"
data-attach="file"> data-attach="file">
{{ icon("attach", "icon--sm") }} {{ icon("attach", "icon--sm") }}
<span class="picker__option-body"> <span class="picker__option-body">
<span class="picker__option-name">File</span> <span class="picker__option-name">{{ t("File") }}</span>
<span class="picker__option-note">PDF, text, code</span> <span class="picker__option-note">{{ t("PDF, text, code") }}</span>
</span> </span>
</button> </button>
<button class="picker__option" type="button" role="menuitem" <button class="picker__option" type="button" role="menuitem"
data-attach="image"> data-attach="image">
{{ icon("image", "icon--sm") }} {{ icon("image", "icon--sm") }}
<span class="picker__option-body"> <span class="picker__option-body">
<span class="picker__option-name">Image</span> <span class="picker__option-name">{{ t("Image") }}</span>
<span class="picker__option-note">Sent only to vision models</span> <span class="picker__option-note">{{ t("Sent only to vision models") }}</span>
</span> </span>
</button> </button>
<button class="picker__option" type="button" role="menuitem" <button class="picker__option" type="button" role="menuitem"
data-attach="link"> data-attach="link">
{{ icon("link", "icon--sm") }} {{ icon("link", "icon--sm") }}
<span class="picker__option-body"> <span class="picker__option-body">
<span class="picker__option-name">Link</span> <span class="picker__option-name">{{ t("Link") }}</span>
<span class="picker__option-note">Fetch a page and attach its text</span> <span class="picker__option-note">{{ t("Fetch a page and attach its text") }}</span>
</span> </span>
</button> </button>
{% if can.get("library.use") %} {% if can.get("library.use") %}
@@ -153,8 +153,8 @@
data-attach="knowledge"> data-attach="knowledge">
{{ icon("archive", "icon--sm") }} {{ icon("archive", "icon--sm") }}
<span class="picker__option-body"> <span class="picker__option-body">
<span class="picker__option-name">Knowledge</span> <span class="picker__option-name">{{ t("Knowledge") }}</span>
<span class="picker__option-note">From your library</span> <span class="picker__option-note">{{ t("From your library") }}</span>
</span> </span>
</button> </button>
{% endif %} {% endif %}
@@ -209,20 +209,18 @@
<div class="picker picker--up" data-picker> <div class="picker picker--up" data-picker>
<button class="btn btn--icon composer__btn" type="button" data-picker-toggle <button class="btn btn--icon composer__btn" type="button" data-picker-toggle
aria-haspopup="menu" aria-expanded="false" aria-haspopup="menu" aria-expanded="false"
aria-label="Toggle" title="Toggle"> aria-label="{{ t('Toggle') }}" title="{{ t('Toggle') }}">
{{ icon("sliders") }} {{ icon("sliders") }}
</button> </button>
<div class="picker__menu picker__menu--scope" data-picker-menu role="menu" <div class="picker__menu picker__menu--scope" data-picker-menu role="menu"
hidden aria-label="Toggle"> hidden aria-label="{{ t('Toggle') }}">
{% if has_scope %} {% if has_scope %}
<p class="picker__lede"> <p class="picker__lede">{{ t("Switched off here only. Everything is on unless you say otherwise.") }}</p>
Switched off here only. Everything is on unless you say otherwise.
</p>
{% endif %} {% endif %}
{% if scope_families %} {% if scope_families %}
<p class="picker__group">Tools</p> <p class="picker__group">{{ t("Tools") }}</p>
{% for family in scope_families %} {% for family in scope_families %}
<label class="picker__option picker__option--toggle"> <label class="picker__option picker__option--toggle">
{% if scope_prospective %} {% if scope_prospective %}
@@ -243,7 +241,7 @@
{% endif %} {% endif %}
{% if scope_skills %} {% if scope_skills %}
<p class="picker__group">Skills</p> <p class="picker__group">{{ t("Skills") }}</p>
{% for skill in scope_skills %} {% for skill in scope_skills %}
<label class="picker__option picker__option--toggle"> <label class="picker__option picker__option--toggle">
{% if scope_prospective %} {% if scope_prospective %}
@@ -277,7 +275,7 @@
empty body. #} empty body. #}
{% if scope_allow %} {% if scope_allow %}
<div class="picker__allow"> <div class="picker__allow">
<p class="picker__group">Always allowed here</p> <p class="picker__group">{{ t("Always allowed here") }}</p>
{% for entry in scope_allow %} {% for entry in scope_allow %}
<p class="picker__allow-entry">{{ entry }}</p> <p class="picker__allow-entry">{{ entry }}</p>
{% endfor %} {% endfor %}
@@ -286,7 +284,7 @@
hx-target="closest .picker__allow" hx-swap="outerHTML"> hx-target="closest .picker__allow" hx-swap="outerHTML">
{{ icon("trash", "icon--sm") }} {{ icon("trash", "icon--sm") }}
<span class="picker__option-body"> <span class="picker__option-body">
<span class="picker__option-name">Ask me about these again</span> <span class="picker__option-name">{{ t("Ask me about these again") }}</span>
</span> </span>
</button> </button>
</div> </div>
@@ -295,6 +293,97 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{#
Who else answers.
Beside the tool switches rather than buried in Chat settings, and
*inside this form* rather than in the topbar, for one reason each.
The first: somebody deciding who answers is making the same kind of
choice as somebody picking the model, and the first version of this
put it only in the Chat settings panel — behind the ⋯ menu, inside a
chat that already existed. The owner enabled the feature, went
looking, and could not find it. A control nobody can find is a
feature nobody has.
The second: on the new-chat screen there is no chat row to attach
anybody to, so the choice has to *ride along with the first message*
— which means being a field of this form. That is the same mechanism
the scope switches above use, with the same hidden-input trick,
because a browser submits only the ticked boxes and `start_chat`
needs to know which ones were not.
#}
{% if crowd_available %}
<div class="picker picker--up" data-picker>
<button class="btn btn--icon composer__btn" type="button" data-picker-toggle
aria-haspopup="menu" aria-expanded="false"
aria-label="{{ t('Crowd') }}" title="{{ t('Crowd') }}">
{{ icon("users") }}
{% if crowd_member_ids %}
<span class="composer__count">{{ crowd_member_ids|length + 1 }}</span>
{% endif %}
</button>
<div class="picker__menu picker__menu--scope" data-picker-menu role="menu"
hidden aria-label="{{ t('Crowd') }}">
<p class="picker__lede">
{{ t("Tick a model to have it answer after this one, then be asked whether it disagrees.") }}
</p>
<p class="picker__group">{{ t("Also answering") }}</p>
{% if chat %}
{# One hidden field for the whole list, always submitted, so
unticking the last box still says something -- an absent checkbox
carries no signal of its own. #}
<input type="hidden" name="crowd_model_ids" value="" form="crowd-form">
{% else %}
<input type="hidden" name="crowd_model_ids" value="">
{% endif %}
{% for model in crowd_available %}
<label class="picker__option picker__option--toggle">
{% if chat %}
{# An existing chat: written at once. The verb is on the checkbox
and not on `#crowd-form`, because htmx binds a trigger to the
annotated element and `change` bubbles through *ancestors* --
which a sibling form is not. `form=` scopes the values, and
only the values: without it the PATCH would carry the
composer's own `content` and `project_dir`, and `update_chat`
answers that with a 409. The same reasoning the agent mode
select below carries. #}
<input type="checkbox" name="crowd_model_ids" value="{{ model.model_id }}"
{{ 'checked' if model.model_id in crowd_member_ids }}
form="crowd-form"
hx-patch="/api/chats/{{ chat.id }}" hx-swap="none">
{% else %}
<input type="checkbox" name="crowd_model_ids" value="{{ model.model_id }}"
{{ 'checked' if model.model_id in crowd_member_ids }}>
{% endif %}
<span class="picker__option-body">
<span class="picker__option-name">{{ model.label }}</span>
{% if model.description %}
<span class="picker__option-note">{{ model.description }}</span>
{% endif %}
</span>
</label>
{% endfor %}
{% if crowd_member_ids %}
{# One sentence and not three, with the numbers as placeholders: a
translation puts the parts in its own order, and two of these
fragments are not sentences in any language. #}
<p class="picker__lede">
{{ t("%(models)s models answer each turn, over up to %(rounds)s rounds.",
models=crowd_member_ids|length + 1, rounds=crowd_rounds) }}
</p>
{% endif %}
{% if crowd_skipped %}
<p class="picker__lede">
{{ t("Skipped, because you cannot reach them any more:") }}
<s>{{ crowd_skipped|join(", ") }}</s>
</p>
{% endif %}
</div>
</div>
{% endif %}
</div> </div>
{# {#
@@ -316,7 +405,7 @@
<input type="hidden" name="kind" value="{{ starting_kind | default('chat') }}" <input type="hidden" name="kind" value="{{ starting_kind | default('chat') }}"
id="chat-kind"> id="chat-kind">
<div class="segmented" role="group" aria-label="Kind of chat"> <div class="segmented" role="group" aria-label="{{ t('Kind of chat') }}">
<label class="segmented__option"> <label class="segmented__option">
<input type="radio" name="kind_choice" value="chat" <input type="radio" name="kind_choice" value="chat"
{{ '' if starting_kind == 'agent' else 'checked' }}> {{ '' if starting_kind == 'agent' else 'checked' }}>
@@ -331,7 +420,7 @@
<span class="composer__agent" data-agent-extra hidden> <span class="composer__agent" data-agent-extra hidden>
<select class="select select--sm composer__connection" <select class="select select--sm composer__connection"
name="ssh_profile_id" aria-label="Connection"> name="ssh_profile_id" aria-label="{{ t('Connection') }}">
{% for profile in agent_profiles %} {% for profile in agent_profiles %}
<option value="{{ profile.id }}" data-dir="{{ profile.default_dir }}" <option value="{{ profile.id }}" data-dir="{{ profile.default_dir }}"
{{ 'disabled' if not profile.verified }}> {{ 'disabled' if not profile.verified }}>
@@ -346,14 +435,14 @@
is also something you would rather find than spell. #} is also something you would rather find than spell. #}
<input type="hidden" name="project_dir" value="" data-dir-value> <input type="hidden" name="project_dir" value="" data-dir-value>
<button class="btn btn--sm composer__dir" type="button" data-dir-browse <button class="btn btn--sm composer__dir" type="button" data-dir-browse
aria-label="Project directory" aria-label="{{ t('Project directory') }}"
title="Choose the directory this chat works in"> title="{{ t('Choose the directory this chat works in') }}">
{{ icon("folder", "icon--sm") }} {{ icon("folder", "icon--sm") }}
<span class="composer__dir-path" data-dir-label>/</span> <span class="composer__dir-path" data-dir-label>/</span>
</button> </button>
{% if agent_modes %} {% if agent_modes %}
<select class="select select--sm" name="agent_mode" aria-label="Approval mode"> <select class="select select--sm" name="agent_mode" aria-label="{{ t('Approval mode') }}">
{% for value, label, hint in agent_modes %} {% for value, label, hint in agent_modes %}
<option value="{{ value }}" title="{{ hint }}">{{ label }}</option> <option value="{{ value }}" title="{{ hint }}">{{ label }}</option>
{% endfor %} {% endfor %}
@@ -376,7 +465,7 @@
through this element's *ancestors* -- which a sibling form is not. through this element's *ancestors* -- which a sibling form is not.
`form=` scopes the values, and only the values. #} `form=` scopes the values, and only the values. #}
<div class="composer__context"> <div class="composer__context">
<select class="select select--sm" name="agent_mode" aria-label="Approval mode" <select class="select select--sm" name="agent_mode" aria-label="{{ t('Approval mode') }}"
form="agent-mode-form" form="agent-mode-form"
hx-patch="/api/chats/{{ chat.id }}" hx-swap="none"> hx-patch="/api/chats/{{ chat.id }}" hx-swap="none">
{% for value, label, hint in agent_modes %} {% for value, label, hint in agent_modes %}
@@ -428,7 +517,7 @@
#} #}
{% if current_model and current_model.capabilities_json.get("reasoning") %} {% if current_model and current_model.capabilities_json.get("reasoning") %}
<select class="select select--sm" name="reasoning_effort" data-effort <select class="select select--sm" name="reasoning_effort" data-effort
aria-label="Reasoning effort" title="How hard this model should think" aria-label="{{ t('Reasoning effort') }}" title="{{ t('How hard this model should think') }}"
{% if chat %} {% if chat %}
form="chat-params-form" form="chat-params-form"
hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-patch="/api/chats/{{ chat.id }}" hx-swap="none"
@@ -449,7 +538,7 @@
#} #}
{% set chosen = resolved_effort if chat {% set chosen = resolved_effort if chat
else (current_model.params_json or {}).get('reasoning_effort') %} else (current_model.params_json or {}).get('reasoning_effort') %}
<option value="off" {{ 'selected' if chosen not in efforts }}>Effort: off</option> <option value="off" {{ 'selected' if chosen not in efforts }}>{{ t("Effort: off") }}</option>
{% for value in efforts %} {% for value in efforts %}
<option value="{{ value }}" {{ 'selected' if chosen == value }}> <option value="{{ value }}" {{ 'selected' if chosen == value }}>
Effort: {{ value }} Effort: {{ value }}
@@ -464,7 +553,7 @@
data-mic-state and the icon with it. #} data-mic-state and the icon with it. #}
<button class="btn btn--icon composer__btn composer__mic" type="button" <button class="btn btn--icon composer__btn composer__mic" type="button"
data-mic data-mic-state="idle" data-mic data-mic-state="idle"
aria-label="Dictate a message" title="Dictate a message"> aria-label="{{ t('Dictate a message') }}" title="{{ t('Dictate a message') }}">
<span class="composer__icon composer__icon--mic">{{ icon("mic") }}</span> <span class="composer__icon composer__icon--mic">{{ icon("mic") }}</span>
<span class="composer__icon composer__icon--recording" aria-hidden="true"> <span class="composer__icon composer__icon--recording" aria-hidden="true">
{{ icon("stop-circle") }} {{ icon("stop-circle") }}
@@ -483,7 +572,7 @@
layout and cannot flash an empty button. layout and cannot flash an empty button.
#} #}
<button class="btn btn--primary btn--icon composer__btn" type="submit" <button class="btn btn--primary btn--icon composer__btn" type="submit"
data-composer-action="send" aria-label="Send"> data-composer-action="send" aria-label="{{ t('Send') }}">
<span class="composer__icon composer__icon--send">{{ icon("send") }}</span> <span class="composer__icon composer__icon--send">{{ icon("send") }}</span>
<span class="composer__icon composer__icon--stop" aria-hidden="true"> <span class="composer__icon composer__icon--stop" aria-hidden="true">
<span class="composer__stop-square"></span> <span class="composer__stop-square"></span>
@@ -504,6 +593,12 @@
hx-patch and not hx-post: there is no POST for a chat, only PATCH, and hx-patch and not hx-post: there is no POST for a chat, only PATCH, and
htmx shows nothing when a request 405s -- which is how these controls htmx shows nothing when a request 405s -- which is how these controls
spent the first half of their lives doing nothing. #} spent the first half of their lives doing nothing. #}
{% if chat and crowd_available %}
{# Empty, and a sibling of the composer's form rather than inside it. See the
crowd checkboxes above, and `#agent-mode-form` below, for why both halves
of that sentence matter. #}
<form id="crowd-form"></form>
{% endif %}
{% if chat and chat.kind == "agent" %} {% if chat and chat.kind == "agent" %}
<form id="agent-mode-form"></form> <form id="agent-mode-form"></form>
{% endif %} {% endif %}
@@ -514,9 +609,7 @@
<p class="composer__hint"> <p class="composer__hint">
Enter to send, Shift+Enter for a new line. Enter to send, Shift+Enter for a new line.
<button class="composer__hint-link" type="button" <button class="composer__hint-link" type="button"
onclick="window.lembasCommands &amp;&amp; window.lembasCommands.help()"> onclick="window.lembasCommands &amp;&amp; window.lembasCommands.help()">{{ t("/ for commands") }}</button>,
/ for commands
</button>,
@ for files. @ for files.
{% if can.get("files.upload") %} {% if can.get("files.upload") %}
Drag files in, or paste an image. Drag files in, or paste an image.
@@ -531,7 +624,7 @@
{% if can.get("files.upload") %} {% if can.get("files.upload") %}
<div class="dropzone-overlay" aria-hidden="true"> <div class="dropzone-overlay" aria-hidden="true">
{{ icon("attach", "icon--lg") }} {{ icon("attach", "icon--lg") }}
<span>Drop to attach</span> <span>{{ t("Drop to attach") }}</span>
</div> </div>
{% endif %} {% endif %}
</div> </div>
@@ -14,17 +14,17 @@
<div class="msg__main"> <div class="msg__main">
<header class="msg__meta"> <header class="msg__meta">
<span class="msg__author">{{ user.name or "You" }}</span> <span class="msg__author">{{ user.name or "You" }}</span>
<span class="msg__model">editing</span> <span class="msg__model">{{ t("editing") }}</span>
</header> </header>
<form class="edit-form" <form class="edit-form"
hx-post="/api/chats/{{ chat.id }}/messages/{{ message.id }}/edit" hx-post="/api/chats/{{ chat.id }}/messages/{{ message.id }}/edit"
hx-target="#thread" hx-swap="innerHTML" hx-target="#thread" hx-swap="innerHTML"
hx-confirm="Rewind here? The {{ following }} message{{ '' if following == 1 else 's' }} after this one will be deleted." hx-confirm="Rewind here? The {{ following }} message{{ '' if following == 1 else 's' }} after this one will be deleted."
data-confirm-title="Rewind the conversation" data-confirm-title="{{ t('Rewind the conversation') }}"
data-confirm-label="Rewind and send"> data-confirm-label="{{ t('Rewind and send') }}">
<textarea class="textarea" name="content" rows="3" data-autosize <textarea class="textarea" name="content" rows="3" data-autosize
data-max-height="320" aria-label="Edit message" data-max-height="320" aria-label="{{ t('Edit message') }}"
autofocus>{{ message.content }}</textarea> autofocus>{{ message.content }}</textarea>
<div class="btn-row"> <div class="btn-row">
@@ -34,9 +34,7 @@
</button> </button>
<button class="btn" type="button" <button class="btn" type="button"
hx-get="/api/chats/{{ chat.id }}/messages/{{ message.id }}/cancel-edit" hx-get="/api/chats/{{ chat.id }}/messages/{{ message.id }}/cancel-edit"
hx-target="#msg-{{ message.id }}" hx-swap="outerHTML"> hx-target="#msg-{{ message.id }}" hx-swap="outerHTML">{{ t("Cancel") }}</button>
Cancel
</button>
{% if following %} {% if following %}
<span class="text-xs faint"> <span class="text-xs faint">
{{ following }} later message{{ '' if following == 1 else 's' }} will be discarded. {{ following }} later message{{ '' if following == 1 else 's' }} will be discarded.
@@ -7,11 +7,11 @@
never intersects the viewport, so the request fires the first time it is never intersects the viewport, so the request fires the first time it is
opened and never on a page load nobody looked at. opened and never on a page load nobody looked at.
#} #}
<aside class="inspector" id="inspector" hidden aria-label="Request inspector"> <aside class="inspector" id="inspector" hidden aria-label="{{ t('Request inspector') }}">
<div class="panel-head"> <div class="panel-head">
<h2 class="panel-head__title">{{ icon("search", "icon--sm") }} Inspector</h2> <h2 class="panel-head__title">{{ icon("search", "icon--sm") }} Inspector</h2>
<button class="btn btn--icon btn--sm" type="button" data-toggle="#inspector" <button class="btn btn--icon btn--sm" type="button" data-toggle="#inspector"
aria-label="Close inspector"> aria-label="{{ t('Close inspector') }}">
{{ icon("x", "icon--sm") }} {{ icon("x", "icon--sm") }}
</button> </button>
</div> </div>
@@ -19,6 +19,6 @@
<div class="inspector__body" id="inspector-body" <div class="inspector__body" id="inspector-body"
hx-get="/api/chats/{{ chat.id }}/inspect" hx-get="/api/chats/{{ chat.id }}/inspect"
hx-trigger="intersect once" hx-target="this" hx-swap="innerHTML"> hx-trigger="intersect once" hx-target="this" hx-swap="innerHTML">
<p class="inspector__note">Opening…</p> <p class="inspector__note">{{ t("Opening…") }}</p>
</div> </div>
</aside> </aside>
@@ -4,11 +4,7 @@
JSON is full of model output, search results and uploaded documents -- hard JSON is full of model output, search results and uploaded documents -- hard
rule 6 applies here exactly as it does to a chat bubble. rule 6 applies here exactly as it does to a chat bubble.
#} #}
<p class="inspector__note"> <p class="inspector__note">{{ t("Rebuilt now against the current configuration. This is not a recording of the request that produced the last reply — if a prompt or a setting has changed since, this shows what would be sent today.") }}</p>
Rebuilt now against the current configuration. This is not a recording of the
request that produced the last reply — if a prompt or a setting has changed
since, this shows what would be sent today.
</p>
<div class="btn-row"> <div class="btn-row">
<button class="btn btn--sm" type="button" <button class="btn btn--sm" type="button"
@@ -18,7 +14,7 @@
</button> </button>
</div> </div>
<h3 class="inspector__heading">This chat</h3> <h3 class="inspector__heading">{{ t("This chat") }}</h3>
<dl class="inspector__facts"> <dl class="inspector__facts">
<dt>Model</dt><dd>{{ chat.model_id or "—" }}</dd> <dt>Model</dt><dd>{{ chat.model_id or "—" }}</dd>
<dt>Context</dt> <dt>Context</dt>
@@ -34,7 +30,7 @@
{% if chat.temporary %}<dt>Lifetime</dt><dd>temporary</dd>{% endif %} {% if chat.temporary %}<dt>Lifetime</dt><dd>temporary</dd>{% endif %}
</dl> </dl>
<h3 class="inspector__heading">Last reply</h3> <h3 class="inspector__heading">{{ t("Last reply") }}</h3>
{% if row %} {% if row %}
<dl class="inspector__facts"> <dl class="inspector__facts">
<dt>Tokens</dt> <dt>Tokens</dt>
@@ -42,7 +38,7 @@
{% if metrics.has_anything %} {% if metrics.has_anything %}
{% if metrics.estimated %}~{% endif %}{{ metrics.prompt_tokens }} in, {% if metrics.estimated %}~{% endif %}{{ metrics.prompt_tokens }} in,
{% if metrics.estimated %}~{% endif %}{{ metrics.completion_tokens }} out {% if metrics.estimated %}~{% endif %}{{ metrics.completion_tokens }} out
{% if metrics.estimated %}<span class="badge">estimated</span>{% endif %} {% if metrics.estimated %}<span class="badge">{{ t("estimated") }}</span>{% endif %}
{% else %} {% else %}
not reported not reported
{% endif %} {% endif %}
@@ -53,24 +49,24 @@
<dt>Rounds</dt><dd>{{ metrics.rounds }}</dd> <dt>Rounds</dt><dd>{{ metrics.rounds }}</dd>
<dt>State</dt> <dt>State</dt>
<dd> <dd>
{% if row.error %}<span class="badge badge--danger">error</span> {% if row.error %}<span class="badge badge--danger">{{ t("error") }}</span>
{% elif row.stopped %}<span class="badge badge--warning">stopped</span> {% elif row.stopped %}<span class="badge badge--warning">{{ t("stopped") }}</span>
{% elif not row.complete %}<span class="badge">writing</span> {% elif not row.complete %}<span class="badge">{{ t("writing") }}</span>
{% else %}<span class="badge badge--success">complete</span>{% endif %} {% else %}<span class="badge badge--success">{{ t("complete") }}</span>{% endif %}
</dd> </dd>
</dl> </dl>
{% if row.error %} {% if row.error %}
<p class="inspector__note">{{ row.error }}</p> <p class="inspector__note">{{ row.error }}</p>
{% endif %} {% endif %}
{% else %} {% else %}
<p class="inspector__note">Nothing has been answered in this chat yet.</p> <p class="inspector__note">{{ t("Nothing has been answered in this chat yet.") }}</p>
{% endif %} {% endif %}
<h3 class="inspector__heading">System message</h3> <h3 class="inspector__heading">{{ t("System message") }}</h3>
{% if system %} {% if system %}
<pre class="inspector__json">{{ system }}</pre> <pre class="inspector__json">{{ system }}</pre>
{% else %} {% else %}
<p class="inspector__note">None is being sent.</p> <p class="inspector__note">{{ t("None is being sent.") }}</p>
{% endif %} {% endif %}
<h3 class="inspector__heading"> <h3 class="inspector__heading">
@@ -80,11 +76,8 @@
{% if tool_names %} {% if tool_names %}
<p class="inspector__note mono">{{ tool_names | join(", ") }}</p> <p class="inspector__note mono">{{ tool_names | join(", ") }}</p>
{% else %} {% else %}
<p class="inspector__note"> <p class="inspector__note">{{ t("None. A model has to be marked as supporting tools, the user needs the permission, and the tool itself has to be turned on.") }}</p>
None. A model has to be marked as supporting tools, the user needs the
permission, and the tool itself has to be turned on.
</p>
{% endif %} {% endif %}
<h3 class="inspector__heading">Request body</h3> <h3 class="inspector__heading">{{ t("Request body") }}</h3>
<pre class="inspector__json">{{ request_json }}</pre> <pre class="inspector__json">{{ request_json }}</pre>
@@ -22,7 +22,7 @@
<div class="interaction interaction--{{ ask.kind }}"> <div class="interaction interaction--{{ ask.kind }}">
<p class="interaction__from"> <p class="interaction__from">
{{ icon("sparkle", "icon--sm") }} {{ icon("sparkle", "icon--sm") }}
<span>The model is asking you</span> <span>{{ t("The model is asking you") }}</span>
</p> </p>
<form class="interaction__form" <form class="interaction__form"
@@ -70,13 +70,13 @@
<input type="{{ 'checkbox' if item.multiple else 'radio' }}" <input type="{{ 'checkbox' if item.multiple else 'radio' }}"
name="choice.{{ item.key }}" value="{{ other_value }}"> name="choice.{{ item.key }}" value="{{ other_value }}">
<span class="interaction__option-body"> <span class="interaction__option-body">
<span class="interaction__option-name">Something else</span> <span class="interaction__option-name">{{ t("Something else") }}</span>
{# Never type="password". A model talked into asking for a {# Never type="password". A model talked into asking for a
credential must not be handed a field that looks built for one, credential must not be handed a field that looks built for one,
and a chat transcript is not a place to keep secrets. #} and a chat transcript is not a place to keep secrets. #}
<input class="input interaction__other-input" type="text" <input class="input interaction__other-input" type="text"
name="text.{{ item.key }}" autocomplete="off" name="text.{{ item.key }}" autocomplete="off"
placeholder="Your own answer…"> placeholder="{{ t('Your own answer…') }}">
</span> </span>
</label> </label>
{% endif %} {% endif %}
@@ -130,17 +130,12 @@
</button> </button>
</div> </div>
<div x-show="editing" x-cloak> <div x-show="editing" x-cloak>
<label class="visually-hidden" for="edit-{{ item.key }}"> <label class="visually-hidden" for="edit-{{ item.key }}">{{ t("Change this before it runs") }}</label>
Change this before it runs
</label>
<textarea class="textarea interaction__edit" id="edit-{{ item.key }}" <textarea class="textarea interaction__edit" id="edit-{{ item.key }}"
name="text.{{ item.key }}" rows="3" spellcheck="false" name="text.{{ item.key }}" rows="3" spellcheck="false"
x-ref="edit{{ item.key }}" x-ref="edit{{ item.key }}"
:disabled="!editing">{{ item.detail }}</textarea> :disabled="!editing">{{ item.detail }}</textarea>
<p class="interaction__reason"> <p class="interaction__reason">{{ t("Allow runs what is in the box. It is not checked against this chat's rules again — you typed it.") }}</p>
Allow runs what is in the box. It is not checked against this
chat's rules again — you typed it.
</p>
</div> </div>
{% else %} {% else %}
<pre class="interaction__detail">{{ item.detail }}</pre> <pre class="interaction__detail">{{ item.detail }}</pre>
@@ -172,9 +167,7 @@
<button class="btn btn--primary" type="submit" name="verdict" value="allow"> <button class="btn btn--primary" type="submit" name="verdict" value="allow">
{{ icon("check", "icon--sm") }} Allow {{ icon("check", "icon--sm") }} Allow
</button> </button>
<button class="btn" type="submit" name="verdict" value="allow_always"> <button class="btn" type="submit" name="verdict" value="allow_always">{{ t("Always allow this") }}</button>
Always allow this
</button>
<button class="btn btn--danger" type="submit" name="verdict" value="deny" <button class="btn btn--danger" type="submit" name="verdict" value="deny"
x-show="!explaining"> x-show="!explaining">
{{ icon("x", "icon--sm") }} Don't {{ icon("x", "icon--sm") }} Don't
@@ -185,9 +178,7 @@
</button> </button>
<div class="interaction__deny" x-show="explaining" x-cloak> <div class="interaction__deny" x-show="explaining" x-cloak>
<label class="visually-hidden" for="deny-reason"> <label class="visually-hidden" for="deny-reason">{{ t("Why not, and what to do instead") }}</label>
Why not, and what to do instead
</label>
{# Never type="password", for the reason the "Something else" box {# Never type="password", for the reason the "Something else" box
above states: a chat transcript is not a place to keep secrets. #} above states: a chat transcript is not a place to keep secrets. #}
{# `--deny-input` and not `--reason`: `.interaction__reason` already {# `--deny-input` and not `--reason`: `.interaction__reason` already
@@ -195,14 +186,12 @@
<textarea class="textarea interaction__deny-input" id="deny-reason" <textarea class="textarea interaction__deny-input" id="deny-reason"
name="reason" rows="2" spellcheck="false" x-ref="reason" name="reason" rows="2" spellcheck="false" x-ref="reason"
:disabled="!explaining" :disabled="!explaining"
placeholder="Why not, and what to do instead…"></textarea> placeholder="{{ t('Why not, and what to do instead…') }}"></textarea>
<div class="interaction__deny-actions"> <div class="interaction__deny-actions">
<button class="btn btn--danger" type="submit" name="verdict" value="deny"> <button class="btn btn--danger" type="submit" name="verdict" value="deny">
{{ icon("x", "icon--sm") }} Don't, and tell it why {{ icon("x", "icon--sm") }} Don't, and tell it why
</button> </button>
<button class="btn btn--sm" type="button" @click="explaining = false"> <button class="btn btn--sm" type="button" @click="explaining = false">{{ t("Cancel") }}</button>
Cancel
</button>
</div> </div>
</div> </div>
</div> </div>
@@ -38,7 +38,7 @@
seconds. Rendering it inside the poll would fetch output nobody has seconds. Rendering it inside the poll would fetch output nobody has
opened, on a loop. #} opened, on a loop. #}
<div class="picker__menu picker__menu--jobs" data-picker-menu role="menu" <div class="picker__menu picker__menu--jobs" data-picker-menu role="menu"
hidden aria-label="Background jobs" id="jobs-panel"></div> hidden aria-label="{{ t('Background jobs') }}" id="jobs-panel"></div>
</div> </div>
{% endif %} {% endif %}
</div> </div>
@@ -15,9 +15,9 @@
most of them. most of them.
#} #}
{% if not jobs %} {% if not jobs %}
<p class="picker__lede">Nothing is running.</p> <p class="picker__lede">{{ t("Nothing is running.") }}</p>
{% else %} {% else %}
<p class="picker__group">Background jobs</p> <p class="picker__group">{{ t("Background jobs") }}</p>
{% for job in jobs %} {% for job in jobs %}
<div class="jobs__row{{ ' jobs__row--open' if open_job == job.id }}"> <div class="jobs__row{{ ' jobs__row--open' if open_job == job.id }}">
@@ -42,9 +42,7 @@
<button class="btn btn--sm btn--danger jobs__stop" type="button" <button class="btn btn--sm btn--danger jobs__stop" type="button"
hx-post="/api/chats/{{ chat.id }}/jobs/{{ job.id }}/stop" hx-post="/api/chats/{{ chat.id }}/jobs/{{ job.id }}/stop"
hx-target="#jobs-panel" hx-swap="innerHTML" hx-target="#jobs-panel" hx-swap="innerHTML"
data-confirm-button="Stop this job? It and everything it started are killed."> data-confirm-button="{{ t('Stop this job? It and everything it started are killed.') }}">{{ t("Stop") }}</button>
Stop
</button>
{% endif %} {% endif %}
</div> </div>
@@ -23,14 +23,14 @@
{% else %} {% else %}
{% if website %} {% if website %}
<p class="picker__group">A page to read</p> <p class="picker__group">{{ t("A page to read") }}</p>
<ul class="picker__list"> <ul class="picker__list">
<li> <li>
<button class="picker__option" type="button" <button class="picker__option" type="button"
data-mention-url="{{ website }}" data-mention-token="{{ website }}"> data-mention-url="{{ website }}" data-mention-token="{{ website }}">
{{ icon("link", "icon--sm") }} {{ icon("link", "icon--sm") }}
<span class="picker__option-body"> <span class="picker__option-body">
<span class="picker__option-name">Fetch this page</span> <span class="picker__option-name">{{ t("Fetch this page") }}</span>
<span class="picker__option-note mono">{{ website }}</span> <span class="picker__option-note mono">{{ website }}</span>
</span> </span>
</button> </button>
@@ -39,7 +39,7 @@
{% endif %} {% endif %}
{% if files %} {% if files %}
<p class="picker__group">In the project</p> <p class="picker__group">{{ t("In the project") }}</p>
<ul class="picker__list"> <ul class="picker__list">
{% for file in files %} {% for file in files %}
<li> <li>
@@ -57,7 +57,7 @@
{% endif %} {% endif %}
{% if documents %} {% if documents %}
<p class="picker__group">In your library</p> <p class="picker__group">{{ t("In your library") }}</p>
<ul class="picker__list"> <ul class="picker__list">
{% for document in documents %} {% for document in documents %}
<li> <li>
@@ -79,7 +79,7 @@
{% endif %} {% endif %}
{% if notes %} {% if notes %}
<p class="picker__group">Notes</p> <p class="picker__group">{{ t("Notes") }}</p>
<ul class="picker__list"> <ul class="picker__list">
{% for note in notes %} {% for note in notes %}
<li> <li>
@@ -99,7 +99,7 @@
{% endif %} {% endif %}
{% if skills %} {% if skills %}
<p class="picker__group">Skills</p> <p class="picker__group">{{ t("Skills") }}</p>
<ul class="picker__list"> <ul class="picker__list">
{% for skill in skills %} {% for skill in skills %}
<li> <li>
@@ -119,7 +119,7 @@
{% if bases %} {% if bases %}
{# A base is a reference and not a copy: choosing one narrows what this chat {# A base is a reference and not a copy: choosing one narrows what this chat
may search rather than putting anything into the message. #} may search rather than putting anything into the message. #}
<p class="picker__group">Search only these</p> <p class="picker__group">{{ t("Search only these") }}</p>
<ul class="picker__list"> <ul class="picker__list">
{% for base in bases %} {% for base in bases %}
<li> <li>
@@ -128,7 +128,7 @@
{{ icon("archive", "icon--sm") }} {{ icon("archive", "icon--sm") }}
<span class="picker__option-body"> <span class="picker__option-body">
<span class="picker__option-name">{{ base.name }}</span> <span class="picker__option-name">{{ base.name }}</span>
<span class="picker__option-note">Scope this chat to this knowledge base</span> <span class="picker__option-note">{{ t("Scope this chat to this knowledge base") }}</span>
</span> </span>
</button> </button>
</li> </li>
@@ -137,7 +137,7 @@
{% endif %} {% endif %}
{% if attachments %} {% if attachments %}
<p class="picker__group">Already in this chat</p> <p class="picker__group">{{ t("Already in this chat") }}</p>
<ul class="picker__list"> <ul class="picker__list">
{% for attachment in attachments %} {% for attachment in attachments %}
<li> <li>
+46 -10
View File
@@ -29,8 +29,17 @@
`msg--machine` only overrides what should differ. `msg--machine` only overrides what should differ.
#} #}
{% set machine = (message.role == "user" and message.machine) %} {% set machine = (message.role == "user" and message.machine) %}
{#
Where this bubble sits in a crowd round, if it is in one. Nine bubbles for one
question need orienting, and a `<details>` wrapper round the round is the wrong
way to do it: bubbles arrive with `beforeend:#thread`, which appends *after* any
container, so the live and reloaded renderings would disagree and a reload would
rearrange nine bubbles under the reader. A chip on each one is the same markup
either way.
#}
{% set crowd = message.crowd_json or None %}
<article class="msg msg--{{ message.role }}{{ ' msg--machine' if machine }}{{ ' msg--queued' if queued }}" <article class="msg msg--{{ message.role }}{{ ' msg--machine' if machine }}{{ ' msg--queued' if queued }}{{ ' msg--crowd-back' if crowd and crowd.get('phase') == 'back' }}"
id="msg-{{ message.id }}" id="msg-{{ message.id }}"
{% if streaming %} {% if streaming %}
hx-ext="sse" hx-ext="sse"
@@ -74,6 +83,33 @@
{# Only worth showing when it adds something the author line does not. #} {# Only worth showing when it adds something the author line does not. #}
<span class="msg__model" title="{{ message.model_id }}">{{ message.model_id }}</span> <span class="msg__model" title="{{ message.model_id }}">{{ message.model_id }}</span>
{% endif %} {% endif %}
{% if crowd %}
{# Which speaker, which pass. The count is of speakers rather than of
replies: a round produces more bubbles than it has models in it. #}
<span class="badge">
{% if crowd.get("phase") == "out" %}
{{ crowd.get("index", 0) + 1 }} of {{ crowd.get("of", 1) }}
{% elif crowd.get("phase") == "back" %}
on the way back
{% else %}
closing
{% endif %}
{% if crowd.get("round", 1) > 1 %} · round {{ crowd.get("round") }}{% endif %}
</span>
{% if crowd.get("stopped") %}
{# Why a round ended, where it ended. Without this a crowd that ran out of
rounds or time simply stops, which reads as the feature failing. #}
<span class="badge badge--warning" title="{{ t('The round ended here') }}">
{% if crowd.get("stopped") == "rounds" %}
no rounds left
{% elif crowd.get("stopped") == "time" %}
out of time
{% else %}
two endpoints failed
{% endif %}
</span>
{% endif %}
{% endif %}
</header> </header>
{% if message.attachments %} {% if message.attachments %}
@@ -140,7 +176,7 @@
<summary class="reasoning__summary"> <summary class="reasoning__summary">
{{ icon("sparkle", "icon--sm reasoning__icon") }} {{ icon("sparkle", "icon--sm reasoning__icon") }}
<span class="reasoning__label"> <span class="reasoning__label">
<span class="reasoning__working">Thinking</span> <span class="reasoning__working">{{ t("Thinking") }}</span>
<span class="reasoning__stats" sse-swap="think" hx-swap="innerHTML"></span> <span class="reasoning__stats" sse-swap="think" hx-swap="innerHTML"></span>
</span> </span>
{{ icon("chevron-down", "icon--sm reasoning__chevron") }} {{ icon("chevron-down", "icon--sm reasoning__chevron") }}
@@ -201,7 +237,7 @@
<div class="alert alert--error msg__error" role="alert"> <div class="alert alert--error msg__error" role="alert">
{{ icon("warning", "alert__icon") }} {{ icon("warning", "alert__icon") }}
<div> <div>
<strong>The reply could not be completed.</strong> <strong>{{ t("The reply could not be completed.") }}</strong>
<div class="text-sm" style="margin-top: var(--sp-1)">{{ message.error }}</div> <div class="text-sm" style="margin-top: var(--sp-1)">{{ message.error }}</div>
</div> </div>
</div> </div>
@@ -255,22 +291,22 @@
holds a job's output, which is the one waiting bubble somebody actually holds a job's output, which is the one waiting bubble somebody actually
wants to paste somewhere. The hidden source div is already below. #} wants to paste somewhere. The hidden source div is already below. #}
<button class="btn btn--icon btn--sm" type="button" <button class="btn btn--icon btn--sm" type="button"
data-copy="msg-body-{{ message.id }}" aria-label="Copy message"> data-copy="msg-body-{{ message.id }}" aria-label="{{ t('Copy message') }}">
{{ icon("copy", "icon--sm") }} {{ icon("copy", "icon--sm") }}
</button> </button>
<button class="btn btn--sm" type="button" <button class="btn btn--sm" type="button"
hx-post="/api/chats/{{ chat.id }}/messages/{{ message.id }}/send-now" hx-post="/api/chats/{{ chat.id }}/messages/{{ message.id }}/send-now"
hx-target="#thread" hx-swap="innerHTML">Send now</button> hx-target="#thread" hx-swap="innerHTML">{{ t("Send now") }}</button>
<button class="btn btn--sm" type="button" <button class="btn btn--sm" type="button"
hx-post="/api/chats/{{ chat.id }}/messages/{{ message.id }}/discard" hx-post="/api/chats/{{ chat.id }}/messages/{{ message.id }}/discard"
hx-target="#msg-{{ message.id }}" hx-swap="outerHTML" hx-target="#msg-{{ message.id }}" hx-swap="outerHTML"
data-confirm-button="Discard this message?">Discard</button> data-confirm-button="{{ t('Discard this message?') }}">{{ t("Discard") }}</button>
</footer> </footer>
<div hidden id="msg-body-{{ message.id }}">{{ message.content }}</div> <div hidden id="msg-body-{{ message.id }}">{{ message.content }}</div>
{% elif not streaming %} {% elif not streaming %}
<footer class="msg__actions"> <footer class="msg__actions">
<button class="btn btn--icon btn--sm" type="button" <button class="btn btn--icon btn--sm" type="button"
data-copy="msg-body-{{ message.id }}" aria-label="Copy message"> data-copy="msg-body-{{ message.id }}" aria-label="{{ t('Copy message') }}">
{{ icon("copy", "icon--sm") }} {{ icon("copy", "icon--sm") }}
</button> </button>
{# Not on a machine event: editing rewinds the transcript and starts a {# Not on a machine event: editing rewinds the transcript and starts a
@@ -282,7 +318,7 @@
hx-get="/api/chats/{{ chat.id }}/messages/{{ message.id }}/edit" hx-get="/api/chats/{{ chat.id }}/messages/{{ message.id }}/edit"
hx-target="#msg-{{ message.id }}" hx-swap="outerHTML" hx-target="#msg-{{ message.id }}" hx-swap="outerHTML"
data-edit-message data-edit-message
aria-label="Edit and retry from here"> aria-label="{{ t('Edit and retry from here') }}">
{{ icon("pencil", "icon--sm") }} {{ icon("pencil", "icon--sm") }}
</button> </button>
{% endif %} {% endif %}
@@ -290,7 +326,7 @@
<button class="btn btn--icon btn--sm" type="button" <button class="btn btn--icon btn--sm" type="button"
hx-post="/api/chats/{{ chat.id }}/messages/{{ message.id }}/regenerate" hx-post="/api/chats/{{ chat.id }}/messages/{{ message.id }}/regenerate"
hx-target="#msg-{{ message.id }}" hx-swap="outerHTML" hx-target="#msg-{{ message.id }}" hx-swap="outerHTML"
aria-label="Regenerate reply"> aria-label="{{ t('Regenerate reply') }}">
{{ icon("refresh", "icon--sm") }} {{ icon("refresh", "icon--sm") }}
</button> </button>
{% if can_listen | default(false) and message.content and not message.error %} {% if can_listen | default(false) and message.content and not message.error %}
@@ -303,7 +339,7 @@
<button class="btn btn--icon btn--sm" type="button" <button class="btn btn--icon btn--sm" type="button"
data-speak="/api/audio/speech/{{ chat.id }}/{{ message.id }}" data-speak="/api/audio/speech/{{ chat.id }}/{{ message.id }}"
{% if audio_autoplay | default(false) and just_finished | default(false) %}data-speak-auto{% endif %} {% if audio_autoplay | default(false) and just_finished | default(false) %}data-speak-auto{% endif %}
aria-label="Read this reply aloud"> aria-label="{{ t('Read this reply aloud') }}">
<span class="speak__icon speak__icon--play">{{ icon("speaker", "icon--sm") }}</span> <span class="speak__icon speak__icon--play">{{ icon("speaker", "icon--sm") }}</span>
<span class="speak__icon speak__icon--stop">{{ icon("stop-circle", "icon--sm") }}</span> <span class="speak__icon speak__icon--stop">{{ icon("stop-circle", "icon--sm") }}</span>
</button> </button>
@@ -17,17 +17,17 @@
{{ model_avatar(current_model, cls="picker__avatar") }} {{ model_avatar(current_model, cls="picker__avatar") }}
<span class="picker__label">{{ current_model.label }}</span> <span class="picker__label">{{ current_model.label }}</span>
{% else %} {% else %}
<span class="picker__label">Choose a model</span> <span class="picker__label">{{ t("Choose a model") }}</span>
{% endif %} {% endif %}
{{ icon("chevron-down", "icon--sm picker__chevron") }} {{ icon("chevron-down", "icon--sm picker__chevron") }}
</button> </button>
<div class="picker__menu" data-picker-menu role="listbox" hidden <div class="picker__menu" data-picker-menu role="listbox" hidden
aria-label="Models"> aria-label="{{ t('Models') }}">
{% if models|length > 8 %} {% if models|length > 8 %}
<div class="picker__search"> <div class="picker__search">
<input class="input input--sm" type="search" data-picker-filter <input class="input input--sm" type="search" data-picker-filter
placeholder="Filter models…" aria-label="Filter models"> placeholder="{{ t('Filter models…') }}" aria-label="{{ t('Filter models') }}">
</div> </div>
{% endif %} {% endif %}
@@ -59,7 +59,7 @@
</button> </button>
{% endfor %} {% endfor %}
</div> </div>
<p class="picker__empty" data-picker-empty hidden>No model matches that.</p> <p class="picker__empty" data-picker-empty hidden>{{ t("No model matches that.") }}</p>
</div> </div>
{% if chat %} {% if chat %}
+4 -4
View File
@@ -35,7 +35,7 @@
{% if plan.findings %} {% if plan.findings %}
<div class="plan__section"> <div class="plan__section">
<h4 class="plan__heading">What was found</h4> <h4 class="plan__heading">{{ t("What was found") }}</h4>
<ul class="plan__findings"> <ul class="plan__findings">
{% for finding in plan.findings %} {% for finding in plan.findings %}
<li>{{ finding.text }}</li> <li>{{ finding.text }}</li>
@@ -46,7 +46,7 @@
{% if plan.objectives %} {% if plan.objectives %}
<div class="plan__section"> <div class="plan__section">
<h4 class="plan__heading">What it is for</h4> <h4 class="plan__heading">{{ t("What it is for") }}</h4>
<ul class="plan__objectives"> <ul class="plan__objectives">
{% for objective in plan.objectives %} {% for objective in plan.objectives %}
<li class="plan__item plan__item--{{ objective.status }}">{{ objective.text }}</li> <li class="plan__item plan__item--{{ objective.status }}">{{ objective.text }}</li>
@@ -79,11 +79,11 @@
hx-post="/api/chats/{{ chat.id }}/messages/{{ message.id }}/execute-plan" hx-post="/api/chats/{{ chat.id }}/messages/{{ message.id }}/execute-plan"
hx-target="#thread" hx-swap="beforeend" hx-target="#thread" hx-swap="beforeend"
hx-confirm="Switch this chat to Edit mode and carry out this plan? Every command will still be shown to you before it runs." hx-confirm="Switch this chat to Edit mode and carry out this plan? Every command will still be shown to you before it runs."
data-confirm-label="Carry it out" data-confirm-label="{{ t('Carry it out') }}"
data-confirm-danger="false"> data-confirm-danger="false">
{{ icon("send", "icon--sm") }} Carry out this plan {{ icon("send", "icon--sm") }} Carry out this plan
</button> </button>
<span class="plan__note">Switches to Edit — commands still ask.</span> <span class="plan__note">{{ t("Switches to Edit — commands still ask.") }}</span>
</div> </div>
{% endif %} {% endif %}
</section> </section>
+13 -13
View File
@@ -10,7 +10,7 @@
the person at the keyboard holds the credential and could open the same shell the person at the keyboard holds the credential and could open the same shell
with an ssh client. with an ssh client.
#} #}
<aside class="terminal" id="terminal" hidden aria-label="Terminal" <aside class="terminal" id="terminal" hidden aria-label="{{ t('Terminal') }}"
data-terminal data-terminal
{# Empty before a chat exists: `draft.js` writes a draft id in as soon as {# Empty before a chat exists: `draft.js` writes a draft id in as soon as
the composer has a connection selected. Explicit rather than relying on the composer has a connection selected. Explicit rather than relying on
@@ -26,7 +26,7 @@
#} #}
<div class="panel-resize" data-resize="--terminal-width" data-resize-min="384" <div class="panel-resize" data-resize="--terminal-width" data-resize-min="384"
role="separator" aria-orientation="vertical" tabindex="0" role="separator" aria-orientation="vertical" tabindex="0"
aria-label="Resize the terminal"> aria-label="{{ t('Resize the terminal') }}">
{{ icon("grip", "icon--sm") }} {{ icon("grip", "icon--sm") }}
</div> </div>
@@ -44,13 +44,13 @@
message is worse than nothing attached at all. message is worse than nothing attached at all.
#} #}
<button class="btn btn--icon btn--sm" type="button" data-terminal-copy <button class="btn btn--icon btn--sm" type="button" data-terminal-copy
title="Copy the last command and its output" title="{{ t('Copy the last command and its output') }}"
aria-label="Copy the last command and its output"> aria-label="{{ t('Copy the last command and its output') }}">
{{ icon("copy", "icon--sm") }} {{ icon("copy", "icon--sm") }}
</button> </button>
<button class="btn btn--icon btn--sm" type="button" data-terminal-send <button class="btn btn--icon btn--sm" type="button" data-terminal-send
title="Put the last command and its output into the message box" title="{{ t('Put the last command and its output into the message box') }}"
aria-label="Send to chat"> aria-label="{{ t('Send to chat') }}">
{{ icon("arrow-up", "icon--sm") }} {{ icon("arrow-up", "icon--sm") }}
</button> </button>
{# {#
@@ -62,14 +62,14 @@
command you run to a model is not something to inherit from last week. command you run to a model is not something to inherit from last week.
#} #}
<select class="select select--sm" data-terminal-auto <select class="select select--sm" data-terminal-auto
aria-label="What to do when a command finishes" aria-label="{{ t('What to do when a command finishes') }}"
title="What to do with each command you run"> title="{{ t('What to do with each command you run') }}">
<option value="off" selected>Auto: off</option> <option value="off" selected>{{ t("Auto: off") }}</option>
<option value="copy">Auto: copy</option> <option value="copy">{{ t("Auto: copy") }}</option>
<option value="send">Auto: send</option> <option value="send">{{ t("Auto: send") }}</option>
</select> </select>
<button class="btn btn--icon btn--sm" type="button" data-toggle="#terminal" <button class="btn btn--icon btn--sm" type="button" data-toggle="#terminal"
aria-label="Close terminal"> aria-label="{{ t('Close terminal') }}">
{{ icon("x", "icon--sm") }} {{ icon("x", "icon--sm") }}
</button> </button>
</div> </div>
@@ -77,7 +77,7 @@
<div class="terminal__screen" data-terminal-screen></div> <div class="terminal__screen" data-terminal-screen></div>
<div class="terminal__status"> <div class="terminal__status">
<span class="terminal__message" data-terminal-message>Connecting…</span> <span class="terminal__message" data-terminal-message>{{ t("Connecting…") }}</span>
<span class="terminal__last" data-terminal-last></span> <span class="terminal__last" data-terminal-last></span>
<span>Ctrl+Shift+C / V</span> <span>Ctrl+Shift+C / V</span>
</div> </div>
+1 -4
View File
@@ -19,10 +19,7 @@
<span>{{ compacted | length }} earlier messages, summarised</span> <span>{{ compacted | length }} earlier messages, summarised</span>
{{ icon("chevron-down", "icon--sm reasoning__chevron") }} {{ icon("chevron-down", "icon--sm reasoning__chevron") }}
</summary> </summary>
<p class="compacted__note"> <p class="compacted__note">{{ t("These are no longer sent to the model; a summary of them goes instead. They are kept here so nothing is lost.") }}</p>
These are no longer sent to the model; a summary of them goes instead. They
are kept here so nothing is lost.
</p>
<div class="compacted__body"> <div class="compacted__body">
{% for message in compacted %} {% for message in compacted %}
{% include "chat/_message.html" %} {% include "chat/_message.html" %}
@@ -82,7 +82,7 @@
left to be inferred: attributing somebody's own typing to a model is left to be inferred: attributing somebody's own typing to a model is
the same misattribution as the other way round, and a transcript read the same misattribution as the other way round, and a transcript read
back a week later has nothing else to go on. #} back a week later has nothing else to go on. #}
<span class="badge">edited by you</span> <span class="badge">{{ t("edited by you") }}</span>
{% endif %} {% endif %}
{% if event.why %} {% if event.why %}
@@ -107,7 +107,7 @@
{% if event.error %} {% if event.error %}
<p class="tool-activity__error">{{ event.error }}</p> <p class="tool-activity__error">{{ event.error }}</p>
{% elif not event.results and not event.text and not event.image %} {% elif not event.results and not event.text and not event.image %}
<p class="tool-activity__error">Nothing was found.</p> <p class="tool-activity__error">{{ t("Nothing was found.") }}</p>
{% endif %} {% endif %}
{% if event.image and event.image.id %} {% if event.image and event.image.id %}
@@ -125,7 +125,7 @@
#} #}
<a class="tool-image" href="/api/files/{{ event.image.id }}/content" <a class="tool-image" href="/api/files/{{ event.image.id }}/content"
target="_blank" rel="noopener"> target="_blank" rel="noopener">
<img src="/api/files/{{ event.image.id }}/content" alt="The generated image" <img src="/api/files/{{ event.image.id }}/content" alt="{{ t('The generated image') }}"
loading="lazy" loading="lazy"
{% if event.image.width %}width="{{ event.image.width }}"{% endif %} {% if event.image.width %}width="{{ event.image.width }}"{% endif %}
{% if event.image.height %}height="{{ event.image.height }}"{% endif %}> {% if event.image.height %}height="{{ event.image.height }}"{% endif %}>
+8 -11
View File
@@ -14,7 +14,7 @@
<table class="sheet"> <table class="sheet">
<tbody> <tbody>
<tr> <tr>
<td>In the window now</td> <td>{{ t("In the window now") }}</td>
<td> <td>
{% if metrics.context_tokens %} {% if metrics.context_tokens %}
{{ '~' if metrics.estimated }}{{ '{:,}'.format(metrics.context_tokens) }} tokens {{ '~' if metrics.estimated }}{{ '{:,}'.format(metrics.context_tokens) }} tokens
@@ -33,7 +33,7 @@
the percentage is omitted rather than computed, and automatic the percentage is omitted rather than computed, and automatic
compaction never fires. #} compaction never fires. #}
<tr> <tr>
<td>Window size</td> <td>{{ t("Window size") }}</td>
<td> <td>
Not recorded for {{ model.label if model else "this model" }}, so there is Not recorded for {{ model.label if model else "this model" }}, so there is
no percentage and this chat will never compact itself. no percentage and this chat will never compact itself.
@@ -45,35 +45,32 @@
{% endif %} {% endif %}
<tr> <tr>
<td>Spent in total</td> <td>{{ t("Spent in total") }}</td>
<td> <td>
{{ '~' if estimated }}{{ '{:,}'.format(totals.total) }} tokens {{ '~' if estimated }}{{ '{:,}'.format(totals.total) }} tokens
across {{ replies }} repl{{ 'y' if replies == 1 else 'ies' }} across {{ replies }} repl{{ 'y' if replies == 1 else 'ies' }}
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Of which sent</td> <td>{{ t("Of which sent") }}</td>
<td>{{ '~' if estimated }}{{ '{:,}'.format(totals.prompt) }} tokens</td> <td>{{ '~' if estimated }}{{ '{:,}'.format(totals.prompt) }} tokens</td>
</tr> </tr>
<tr> <tr>
<td>Of which written</td> <td>{{ t("Of which written") }}</td>
<td>{{ '~' if estimated }}{{ '{:,}'.format(totals.completion) }} tokens</td> <td>{{ '~' if estimated }}{{ '{:,}'.format(totals.completion) }} tokens</td>
</tr> </tr>
{% if metrics.tokens_per_second %} {% if metrics.tokens_per_second %}
<tr> <tr>
<td>Last reply</td> <td>{{ t("Last reply") }}</td>
<td>{{ '%.1f'|format(metrics.tokens_per_second) }} tokens/second</td> <td>{{ '%.1f'|format(metrics.tokens_per_second) }} tokens/second</td>
</tr> </tr>
{% endif %} {% endif %}
{% if chat.compact_summary %} {% if chat.compact_summary %}
<tr> <tr>
<td>Compacted</td> <td>{{ t("Compacted") }}</td>
<td> <td>{{ t("Earlier turns are summarised. They are still in the transcript; they just stop being sent.") }}</td>
Earlier turns are summarised. They are still in the transcript; they
just stop being sent.
</td>
</tr> </tr>
{% endif %} {% endif %}
</tbody> </tbody>
+74 -37
View File
@@ -33,9 +33,9 @@
<button class="btn btn--icon btn--sm topbar__rename" type="button" <button class="btn btn--icon btn--sm topbar__rename" type="button"
hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-patch="/api/chats/{{ chat.id }}" hx-swap="none"
data-prompt="What should this chat be called?" data-prompt="What should this chat be called?"
data-prompt-title="Rename chat" data-prompt-field="title" data-prompt-title="{{ t('Rename chat') }}" data-prompt-field="title"
data-prompt-value="{{ chat.title }}" data-prompt-value="{{ chat.title }}"
aria-label="Rename chat" title="Rename chat"> aria-label="{{ t('Rename chat') }}" title="{{ t('Rename chat') }}">
{{ icon("pencil", "icon--sm") }} {{ icon("pencil", "icon--sm") }}
</button> </button>
{% endif %} {% endif %}
@@ -43,9 +43,7 @@
it. The way out of it is Keep, in the overflow menu. #} it. The way out of it is Keep, in the overflow menu. #}
{% if chat and chat.temporary %} {% if chat and chat.temporary %}
<span class="badge badge--warning" <span class="badge badge--warning"
title="Not listed in the sidebar, and removed 24 hours after the last message."> title="{{ t('Not listed in the sidebar, and removed 24 hours after the last message.') }}">{{ t("Temporary") }}</span>
Temporary
</span>
{% endif %} {% endif %}
</h1> </h1>
@@ -72,7 +70,7 @@
{% if not chat and can.get("chat.create") %} {% if not chat and can.get("chat.create") %}
<a class="btn btn--icon {{ 'is-active' if starting_temporary }}" <a class="btn btn--icon {{ 'is-active' if starting_temporary }}"
href="{{ '/chat' if starting_temporary else '/chat?temporary=1' }}" href="{{ '/chat' if starting_temporary else '/chat?temporary=1' }}"
aria-label="Temporary chat" aria-label="{{ t('Temporary chat') }}"
title="{% if starting_temporary %}Starting a temporary chat. Click to go back to a normal one.{% else %}Start a temporary chat: not listed in the sidebar, and removed after a day.{% endif %}"> title="{% if starting_temporary %}Starting a temporary chat. Click to go back to a normal one.{% else %}Start a temporary chat: not listed in the sidebar, and removed after a day.{% endif %}">
{{ icon("clock") }} {{ icon("clock") }}
</a> </a>
@@ -97,8 +95,8 @@
most likely to be open beside it. All three share one slot: at most likely to be open beside it. All three share one slot: at
1280px the sidebar plus two panels leaves about seventy pixels of 1280px the sidebar plus two panels leaves about seventy pixels of
chat. #} chat. #}
<button class="btn btn--icon" type="button" aria-label="Canvas" <button class="btn btn--icon" type="button" aria-label="{{ t('Canvas') }}"
title="Open a file beside the conversation" title="{{ t('Open a file beside the conversation') }}"
{% if not chat %}data-agent-only hidden{% endif %} {% if not chat %}data-agent-only hidden{% endif %}
aria-expanded="false" data-toggle="#canvas" data-toggle-group="side"> aria-expanded="false" data-toggle="#canvas" data-toggle-group="side">
{{ icon("file-text") }} {{ icon("file-text") }}
@@ -108,7 +106,7 @@
{% if terminal_enabled %} {% if terminal_enabled %}
{# To the left of the inspector, and never open beside it: see the {# To the left of the inspector, and never open beside it: see the
toggle group in app.js. #} toggle group in app.js. #}
<button class="btn btn--icon" type="button" aria-label="Terminal" <button class="btn btn--icon" type="button" aria-label="{{ t('Terminal') }}"
title="Open a shell on {{ agent_profile.name if agent_profile else 'this connection' }}" title="Open a shell on {{ agent_profile.name if agent_profile else 'this connection' }}"
{% if not chat %}data-agent-only hidden{% endif %} {% if not chat %}data-agent-only hidden{% endif %}
aria-expanded="false" data-toggle="#terminal" data-toggle-group="side"> aria-expanded="false" data-toggle="#terminal" data-toggle-group="side">
@@ -117,8 +115,8 @@
{% endif %} {% endif %}
{% if chat and user.is_admin %} {% if chat and user.is_admin %}
<button class="btn btn--icon" type="button" aria-label="Inspect this chat" <button class="btn btn--icon" type="button" aria-label="{{ t('Inspect this chat') }}"
title="Inspect this chat" aria-expanded="false" data-toggle="#inspector" title="{{ t('Inspect this chat') }}" aria-expanded="false" data-toggle="#inspector"
data-toggle-group="side"> data-toggle-group="side">
{{ icon("search") }} {{ icon("search") }}
</button> </button>
@@ -136,21 +134,19 @@
<div class="picker" data-picker> <div class="picker" data-picker>
<button class="btn btn--icon" type="button" data-picker-toggle <button class="btn btn--icon" type="button" data-picker-toggle
aria-haspopup="menu" aria-expanded="false" aria-haspopup="menu" aria-expanded="false"
aria-label="More" title="More"> aria-label="{{ t('More') }}" title="{{ t('More') }}">
{{ icon("dots") }} {{ icon("dots") }}
</button> </button>
<div class="picker__menu picker__menu--compact" data-picker-menu role="menu" <div class="picker__menu picker__menu--compact" data-picker-menu role="menu"
hidden aria-label="More"> hidden aria-label="{{ t('More') }}">
{% if chat.temporary %} {% if chat.temporary %}
<button class="picker__option" type="button" role="menuitem" <button class="picker__option" type="button" role="menuitem"
hx-post="/api/chats/{{ chat.id }}/keep" hx-swap="none"> hx-post="/api/chats/{{ chat.id }}/keep" hx-swap="none">
{{ icon("pin", "icon--sm") }} {{ icon("pin", "icon--sm") }}
<span class="picker__option-body"> <span class="picker__option-body">
<span class="picker__option-name">Keep this chat</span> <span class="picker__option-name">{{ t("Keep this chat") }}</span>
<span class="picker__option-note"> <span class="picker__option-note">{{ t("Temporary — removed 24 hours after the last message") }}</span>
Temporary — removed 24 hours after the last message
</span>
</span> </span>
</button> </button>
{% endif %} {% endif %}
@@ -160,8 +156,8 @@
data-toggle="#chat-settings"> data-toggle="#chat-settings">
{{ icon("sliders", "icon--sm") }} {{ icon("sliders", "icon--sm") }}
<span class="picker__option-body"> <span class="picker__option-body">
<span class="picker__option-name">Chat settings</span> <span class="picker__option-name">{{ t("Chat settings") }}</span>
<span class="picker__option-note">Prompt, knowledge, sampling</span> <span class="picker__option-note">{{ t("Prompt, knowledge, sampling") }}</span>
</span> </span>
</button> </button>
{% endif %} {% endif %}
@@ -174,10 +170,8 @@
onclick="window.lembasCommands &amp;&amp; window.lembasCommands.run('compact')"> onclick="window.lembasCommands &amp;&amp; window.lembasCommands.run('compact')">
{{ icon("archive", "icon--sm") }} {{ icon("archive", "icon--sm") }}
<span class="picker__option-body"> <span class="picker__option-body">
<span class="picker__option-name">Compact</span> <span class="picker__option-name">{{ t("Compact") }}</span>
<span class="picker__option-note"> <span class="picker__option-note">{{ t("Summarise the earlier turns so they stop costing context") }}</span>
Summarise the earlier turns so they stop costing context
</span>
</span> </span>
</button> </button>
{% endif %} {% endif %}
@@ -198,7 +192,7 @@
{% if can.get("chat.system_prompt") %} {% if can.get("chat.system_prompt") %}
<div class="field"> <div class="field">
<label class="field__label" for="system-prompt">System prompt</label> <label class="field__label" for="system-prompt">{{ t("System prompt") }}</label>
<textarea class="textarea" id="system-prompt" name="system_prompt" rows="3" <textarea class="textarea" id="system-prompt" name="system_prompt" rows="3"
placeholder="{{ inherited_prompt or 'Instructions that apply to every message in this chat.' }}" placeholder="{{ inherited_prompt or 'Instructions that apply to every message in this chat.' }}"
hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-patch="/api/chats/{{ chat.id }}" hx-swap="none"
@@ -217,7 +211,7 @@
{# Which bases this chat draws on. None ticked means everything you can {# Which bases this chat draws on. None ticked means everything you can
see, which is what a chat with nothing chosen should do. #} see, which is what a chat with nothing chosen should do. #}
<div class="field"> <div class="field">
<label class="field__label">Knowledge</label> <label class="field__label">{{ t("Knowledge") }}</label>
<form hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-trigger="change"> <form hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-trigger="change">
{# Always submitted, so unticking the last box still says something. {# Always submitted, so unticking the last box still says something.
An absent checkbox carries no signal of its own. #} An absent checkbox carries no signal of its own. #}
@@ -243,34 +237,77 @@
</div> </div>
{% endif %} {% endif %}
{% if crowd_available %}
{# Who else answers. Nothing ticked is every chat that has ever existed:
one model, answering on its own. #}
<div class="field">
<label class="field__label">{{ t("Crowd") }}</label>
<form hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-trigger="change">
{# Always submitted, for the reason the bases above are. #}
<input type="hidden" name="crowd_model_ids" value="">
<div class="checkbox-row">
{% for model in crowd_available %}
<label class="checkbox">
<input type="checkbox" name="crowd_model_ids" value="{{ model.model_id }}"
{{ 'checked' if model.model_id in crowd_member_ids }}>
<span>{{ model.label }}</span>
</label>
{% endfor %}
</div>
</form>
<p class="field__hint">
{% if crowd_member_ids %}
{{ crowd_member_ids|length + 1 }} models answer each turn: this one
first, then the others, then back through them asking whether they
disagree, ending here.
<strong>That is {{ crowd_replies }} replies a turn</strong>, and up to
{{ crowd_rounds }} rounds of it.
{% else %}
Tick a model to have it answer after this one, then be asked whether
it disagrees. Useful for a second opinion; expensive, because each
one is a whole reply, and slow on one local endpoint because every
change of speaker loads a different model.
{% endif %}
</p>
{# Outside the two branches above, deliberately. A member whose model has
gone is filtered out of `crowd_member_ids`, so if it was the only one
this would fall into the "tick a model" branch and never mention the
row that is still there -- which is the one thing somebody needs to
know to tidy it up. #}
{% if crowd_skipped %}
<p class="field__hint">
Skipped, because you cannot reach {{ "them" if crowd_skipped|length > 1 else "it" }}
any more: <s>{{ crowd_skipped|join(", ") }}</s>. Untick to clear.
</p>
{% endif %}
</div>
{% endif %}
{% if can.get("chat.params") %} {% if can.get("chat.params") %}
<div class="grid grid--3"> <div class="grid grid--3">
<div class="field"> <div class="field">
<label class="field__label" for="temperature">Temperature</label> <label class="field__label" for="temperature">{{ t("Temperature") }}</label>
<input class="input" id="temperature" name="temperature" type="number" <input class="input" id="temperature" name="temperature" type="number"
min="0" max="2" step="0.05" placeholder="default" min="0" max="2" step="0.05" placeholder="{{ t('default') }}"
value="{{ chat.params_json.get('temperature') if chat.params_json.get('temperature') is not none else '' }}" value="{{ chat.params_json.get('temperature') if chat.params_json.get('temperature') is not none else '' }}"
hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-trigger="change"> hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-trigger="change">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="top-p">Top-p</label> <label class="field__label" for="top-p">{{ t("Top-p") }}</label>
<input class="input" id="top-p" name="top_p" type="number" <input class="input" id="top-p" name="top_p" type="number"
min="0" max="1" step="0.05" placeholder="default" min="0" max="1" step="0.05" placeholder="{{ t('default') }}"
value="{{ chat.params_json.get('top_p') if chat.params_json.get('top_p') is not none else '' }}" value="{{ chat.params_json.get('top_p') if chat.params_json.get('top_p') is not none else '' }}"
hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-trigger="change"> hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-trigger="change">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="max-tokens">Max tokens</label> <label class="field__label" for="max-tokens">{{ t("Max tokens") }}</label>
<input class="input" id="max-tokens" name="max_tokens" type="number" <input class="input" id="max-tokens" name="max_tokens" type="number"
min="1" step="1" placeholder="default" min="1" step="1" placeholder="{{ t('default') }}"
value="{{ chat.params_json.get('max_tokens') if chat.params_json.get('max_tokens') is not none else '' }}" value="{{ chat.params_json.get('max_tokens') if chat.params_json.get('max_tokens') is not none else '' }}"
hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-trigger="change"> hx-patch="/api/chats/{{ chat.id }}" hx-swap="none" hx-trigger="change">
</div> </div>
</div> </div>
<p class="field__hint"> <p class="field__hint">{{ t("Leave a field empty to let the provider decide. Values outside the allowed range are ignored rather than clamped.") }}</p>
Leave a field empty to let the provider decide. Values outside the
allowed range are ignored rather than clamped.
</p>
{% endif %} {% endif %}
</div> </div>
</section> </section>
@@ -280,7 +317,7 @@
{# Every fresh install lands here, so it points at the fix. #} {# Every fresh install lands here, so it points at the fix. #}
<div class="empty"> <div class="empty">
{{ icon("server", "empty__mark") }} {{ icon("server", "empty__mark") }}
<h2 class="empty__title">No models available</h2> <h2 class="empty__title">{{ t("No models available") }}</h2>
<p class="empty__text"> <p class="empty__text">
{% if user.is_admin %} {% if user.is_admin %}
Add an OpenAI-compatible connection and {{ brand.name }} will load its models. Add an OpenAI-compatible connection and {{ brand.name }} will load its models.
@@ -301,7 +338,7 @@
{% if not messages %} {% if not messages %}
<div class="thread__intro"> <div class="thread__intro">
{{ mark(cls="empty__mark", uid="intro") }} {{ mark(cls="empty__mark", uid="intro") }}
<h2 class="empty__title">What would you ask?</h2> <h2 class="empty__title">{{ t("What would you ask?") }}</h2>
<p class="empty__text">{{ brand.text.chat_empty }}</p> <p class="empty__text">{{ brand.text.chat_empty }}</p>
{# Only on a chat that does not exist yet. An empty chat someone {# Only on a chat that does not exist yet. An empty chat someone
+30 -51
View File
@@ -51,19 +51,17 @@
<div class="page"> <div class="page">
<form hx-patch="/api/folders/{{ folder.id }}" hx-swap="none"> <form hx-patch="/api/folders/{{ folder.id }}" hx-swap="none">
<div class="card"> <div class="card">
<h2 class="card__title">Name</h2> <h2 class="card__title">{{ t("Name") }}</h2>
<div class="field"> <div class="field">
<input class="input" type="text" name="name" maxlength="200" <input class="input" type="text" name="name" maxlength="200"
value="{{ folder.name }}" aria-label="Folder name" required> value="{{ folder.name }}" aria-label="{{ t('Folder name') }}" required>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="folder-description">Description</label> <label class="field__label" for="folder-description">{{ t("Description") }}</label>
<input class="input" type="text" id="folder-description" name="description" <input class="input" type="text" id="folder-description" name="description"
maxlength="500" value="{{ folder.description }}" maxlength="500" value="{{ folder.description }}"
placeholder="What this folder is for."> placeholder="{{ t('What this folder is for.') }}">
<p class="field__hint"> <p class="field__hint">{{ t("For you, not for any model. It is never sent anywhere.") }}</p>
For you, not for any model. It is never sent anywhere.
</p>
</div> </div>
{# {#
Nesting has worked at the route since folders existed -- with a cycle Nesting has worked at the route since folders existed -- with a cycle
@@ -77,9 +75,9 @@
route will reject is a control that looks like it works. route will reject is a control that looks like it works.
#} #}
<div class="field"> <div class="field">
<label class="field__label" for="folder-parent">Inside</label> <label class="field__label" for="folder-parent">{{ t("Inside") }}</label>
<select class="select" id="folder-parent" name="parent_id"> <select class="select" id="folder-parent" name="parent_id">
<option value="">Nothing — a folder at the top</option> <option value="">{{ t("Nothing — a folder at the top") }}</option>
{% for candidate in parents %} {% for candidate in parents %}
<option value="{{ candidate.id }}" <option value="{{ candidate.id }}"
{{ 'selected' if folder.parent_id == candidate.id }}> {{ 'selected' if folder.parent_id == candidate.id }}>
@@ -87,43 +85,29 @@
</option> </option>
{% endfor %} {% endfor %}
</select> </select>
<p class="field__hint"> <p class="field__hint">{{ t("A folder inside another inherits its system prompt where it has none of its own.") }}</p>
A folder inside another inherits its system prompt where it has
none of its own.
</p>
</div> </div>
</div> </div>
<div class="card"> <div class="card">
<h2 class="card__title">System prompt</h2> <h2 class="card__title">{{ t("System prompt") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("Used by every chat in this folder, and by folders nested inside it, unless the chat has a prompt of its own. Read each time a reply is built rather than copied when a chat is made, so editing this reaches the chats already here.") }}</p>
Used by every chat in this folder, and by folders nested inside it,
unless the chat has a prompt of its own. Read each time a reply is
built rather than copied when a chat is made, so editing this
reaches the chats already here.
</p>
<div class="field"> <div class="field">
<textarea class="textarea" name="system_prompt" rows="8" <textarea class="textarea" name="system_prompt" rows="8"
aria-label="System prompt" aria-label="{{ t('System prompt') }}"
placeholder="Leave empty to fall through to the model's prompt, then the instance's.">{{ folder.system_prompt }}</textarea> placeholder="{{ t('Leave empty to fall through to the model\'s prompt, then the instance\'s.') }}">{{ folder.system_prompt }}</textarea>
<p class="field__hint"> <p class="field__hint">{{ t("Precedence, not concatenation: chat, then folder, then model, then instance. The most specific one wins outright.") }}</p>
Precedence, not concatenation: chat, then folder, then model, then
instance. The most specific one wins outright.
</p>
</div> </div>
</div> </div>
<div class="card"> <div class="card">
<h2 class="card__title">What a new chat starts as</h2> <h2 class="card__title">{{ t("What a new chat starts as") }}</h2>
<p class="card__lede"> <p class="card__lede">{{ t("Seeds, copied onto a chat when it is created and its own from then on. Anything chosen on the new-chat screen wins over these.") }}</p>
Seeds, copied onto a chat when it is created and its own from then
on. Anything chosen on the new-chat screen wins over these.
</p>
<div class="field"> <div class="field">
<label class="field__label" for="folder-model">Model</label> <label class="field__label" for="folder-model">{{ t("Model") }}</label>
<select class="select" id="folder-model" name="model_id"> <select class="select" id="folder-model" name="model_id">
<option value="">No opinion</option> <option value="">{{ t("No opinion") }}</option>
{% for model in models %} {% for model in models %}
<option value="{{ model.model_id }}" <option value="{{ model.model_id }}"
{{ 'selected' if model.model_id == folder.model_id }}> {{ 'selected' if model.model_id == folder.model_id }}>
@@ -134,16 +118,13 @@
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="folder-kind">Kind</label> <label class="field__label" for="folder-kind">{{ t("Kind") }}</label>
<select class="select" id="folder-kind" name="kind"> <select class="select" id="folder-kind" name="kind">
<option value="" {{ 'selected' if not folder.kind }}>No opinion</option> <option value="" {{ 'selected' if not folder.kind }}>{{ t("No opinion") }}</option>
<option value="chat" {{ 'selected' if folder.kind == 'chat' }}>Chat</option> <option value="chat" {{ 'selected' if folder.kind == 'chat' }}>{{ t("Chat") }}</option>
<option value="agent" {{ 'selected' if folder.kind == 'agent' }}>Agent chat</option> <option value="agent" {{ 'selected' if folder.kind == 'agent' }}>{{ t("Agent chat") }}</option>
</select> </select>
<p class="field__hint"> <p class="field__hint">{{ t("A folder set to one kind shows on only that side of the sidebar's switch, and opens the new-chat screen already on that fork.") }}</p>
A folder set to one kind shows on only that side of the sidebar's
switch, and opens the new-chat screen already on that fork.
</p>
</div> </div>
{% if agent_profiles %} {% if agent_profiles %}
@@ -152,9 +133,9 @@
too, and a field that appears only once another field is right is a too, and a field that appears only once another field is right is a
field people conclude is missing. #} field people conclude is missing. #}
<div class="field"> <div class="field">
<label class="field__label" for="folder-profile">Connection</label> <label class="field__label" for="folder-profile">{{ t("Connection") }}</label>
<select class="select" id="folder-profile" name="ssh_profile_id"> <select class="select" id="folder-profile" name="ssh_profile_id">
<option value="">No opinion</option> <option value="">{{ t("No opinion") }}</option>
{% for profile in agent_profiles %} {% for profile in agent_profiles %}
<option value="{{ profile.id }}" <option value="{{ profile.id }}"
{{ 'selected' if profile.id == folder.ssh_profile_id }}> {{ 'selected' if profile.id == folder.ssh_profile_id }}>
@@ -169,12 +150,12 @@
path is something you would rather find than spell. `data-dir-field` path is something you would rather find than spell. `data-dir-field`
is what wires it; see ui.js. #} is what wires it; see ui.js. #}
<div class="field" data-dir-field> <div class="field" data-dir-field>
<span class="field__label">Project directory</span> <span class="field__label">{{ t("Project directory") }}</span>
<input type="hidden" name="project_dir" <input type="hidden" name="project_dir"
value="{{ folder.project_dir }}" data-dir-value> value="{{ folder.project_dir }}" data-dir-value>
<div class="dir-row"> <div class="dir-row">
<button class="btn" type="button" data-dir-browse <button class="btn" type="button" data-dir-browse
aria-label="Choose the project directory"> aria-label="{{ t('Choose the project directory') }}">
{{ icon("folder", "icon--sm") }} {{ icon("folder", "icon--sm") }}
<span class="dir-row__path" data-dir-label> <span class="dir-row__path" data-dir-label>
{{ folder.project_dir or "the connection's own default" }} {{ folder.project_dir or "the connection's own default" }}
@@ -184,20 +165,18 @@
directory and then changing your mind before saving needs a way directory and then changing your mind before saving needs a way
back to "no opinion" as much as clearing a saved one does. #} back to "no opinion" as much as clearing a saved one does. #}
<button class="btn btn--icon" type="button" data-dir-clear <button class="btn btn--icon" type="button" data-dir-clear
aria-label="Clear the project directory" title="No opinion"> aria-label="{{ t('Clear the project directory') }}" title="{{ t('No opinion') }}">
{{ icon("x", "icon--sm") }} {{ icon("x", "icon--sm") }}
</button> </button>
</div> </div>
<p class="field__hint"> <p class="field__hint">{{ t("What a relative path is measured from in chats started here.") }}</p>
What a relative path is measured from in chats started here.
</p>
</div> </div>
{% if agent_modes %} {% if agent_modes %}
<div class="field"> <div class="field">
<label class="field__label" for="folder-mode">Approval mode</label> <label class="field__label" for="folder-mode">{{ t("Approval mode") }}</label>
<select class="select" id="folder-mode" name="agent_mode"> <select class="select" id="folder-mode" name="agent_mode">
<option value="">No opinion</option> <option value="">{{ t("No opinion") }}</option>
{% for value, label, hint in agent_modes %} {% for value, label, hint in agent_modes %}
<option value="{{ value }}" title="{{ hint }}" <option value="{{ value }}" title="{{ hint }}"
{{ 'selected' if value == folder.agent_mode }}>{{ label }}</option> {{ 'selected' if value == folder.agent_mode }}>{{ label }}</option>
@@ -26,7 +26,7 @@
<div class="topbar__actions">{% block actions %}{% endblock %}</div> <div class="topbar__actions">{% block actions %}{% endblock %}</div>
</header> </header>
<nav class="tabs__bar" aria-label="Library"> <nav class="tabs__bar" aria-label="{{ t('Library') }}">
<a class="tabs__tab {{ 'is-active' if section == 'knowledge' }}" <a class="tabs__tab {{ 'is-active' if section == 'knowledge' }}"
href="/library/knowledge">{{ icon("archive", "icon--sm") }} Knowledge</a> href="/library/knowledge">{{ icon("archive", "icon--sm") }} Knowledge</a>
<a class="tabs__tab {{ 'is-active' if section == 'notes' }}" <a class="tabs__tab {{ 'is-active' if section == 'notes' }}"
+3 -3
View File
@@ -25,8 +25,8 @@
something is missing. `aria-hidden` and a `role="status"` label beside it, something is missing. `aria-hidden` and a `role="status"` label beside it,
because a paragraph of grey blocks is nothing to read aloud. #} because a paragraph of grey blocks is nothing to read aloud. #}
<section class="card"> <section class="card">
<h2 class="card__title">Shared with</h2> <h2 class="card__title">{{ t("Shared with") }}</h2>
<span class="visually-hidden" role="status">Loading who this is shared with</span> <span class="visually-hidden" role="status">{{ t("Loading who this is shared with") }}</span>
<div aria-hidden="true"> <div aria-hidden="true">
<div class="skeleton skeleton--row"></div> <div class="skeleton skeleton--row"></div>
<div class="skeleton skeleton--row skeleton--short"></div> <div class="skeleton skeleton--row skeleton--short"></div>
@@ -36,6 +36,6 @@
{% elif not is_owner %} {% elif not is_owner %}
<div class="alert"> <div class="alert">
{{ icon("users", "alert__icon") }} {{ icon("users", "alert__icon") }}
<span>Shared with you. You can read this but not change it.</span> <span>{{ t("Shared with you. You can read this but not change it.") }}</span>
</div> </div>
{% endif %} {% endif %}
@@ -22,34 +22,27 @@
{% if share_count %} {% if share_count %}
<span class="badge badge--leaf">{{ share_count }}</span> <span class="badge badge--leaf">{{ share_count }}</span>
{% else %} {% else %}
<span class="badge">nobody</span> <span class="badge">{{ t("nobody") }}</span>
{% endif %} {% endif %}
</h2> </h2>
<p class="card__lede"> <p class="card__lede">{{ t("They will be able to read this, and their models will find it. They cannot change it, delete it, or share it on — so “who can see this?” stays a question you can answer.") }}</p>
They will be able to read this, and their models will find it. They cannot
change it, delete it, or share it on — so “who can see this?” stays a
question you can answer.
</p>
<div class="field"> <div class="field">
<label class="field__label" for="share-search">Find somebody</label> <label class="field__label" for="share-search">{{ t("Find somebody") }}</label>
<input class="input" id="share-search" type="search" name="q" value="{{ q }}" <input class="input" id="share-search" type="search" name="q" value="{{ q }}"
placeholder="Name, email or group…" placeholder="{{ t('Name, email or group…') }}"
hx-get="/api/library/share/{{ kind }}/{{ resource.id }}" hx-get="/api/library/share/{{ kind }}/{{ resource.id }}"
hx-trigger="input changed delay:250ms, search" hx-trigger="input changed delay:250ms, search"
hx-target="#share-panel" hx-target="#share-panel"
hx-swap="outerHTML"> hx-swap="outerHTML">
{% if truncated %} {% if truncated %}
<p class="field__hint"> <p class="field__hint">{{ t("Showing the first few. Type to narrow it — anything already shared stays listed whatever you search for.") }}</p>
Showing the first few. Type to narrow it — anything already shared stays
listed whatever you search for.
</p>
{% endif %} {% endif %}
</div> </div>
{% if groups %} {% if groups %}
<div class="field"> <div class="field">
<label class="field__label">Groups</label> <label class="field__label">{{ t("Groups") }}</label>
<div class="checkbox-row"> <div class="checkbox-row">
{% for group in groups %} {% for group in groups %}
{% set on = group.id in shared_groups %} {% set on = group.id in shared_groups %}
@@ -69,7 +62,7 @@
{% if people %} {% if people %}
<div class="field"> <div class="field">
<label class="field__label">People</label> <label class="field__label">{{ t("People") }}</label>
<div class="checkbox-row"> <div class="checkbox-row">
{% for person in people %} {% for person in people %}
{% set on = person.id in shared_users %} {% set on = person.id in shared_users %}
@@ -14,32 +14,28 @@
{% if is_owner %} {% if is_owner %}
<section class="card"> <section class="card">
<h2 class="card__title">Add to this base</h2> <h2 class="card__title">{{ t("Add to this base") }}</h2>
<div class="grid grid--2"> <div class="grid grid--2">
<form method="post" action="/api/library/documents" enctype="multipart/form-data"> <form method="post" action="/api/library/documents" enctype="multipart/form-data">
<input type="hidden" name="base_id" value="{{ base.id }}"> <input type="hidden" name="base_id" value="{{ base.id }}">
<div class="field"> <div class="field">
<label class="field__label" for="doc-file">A file</label> <label class="field__label" for="doc-file">{{ t("A file") }}</label>
<input class="input" id="doc-file" type="file" name="file" required <input class="input" id="doc-file" type="file" name="file" required
accept="image/*,.pdf,.txt,.md,.csv,.json,.py,.js,.ts,.rs,.go,.sh,.sql,.yaml,.yml,.toml,.log"> accept="image/*,.pdf,.txt,.md,.csv,.json,.py,.js,.ts,.rs,.go,.sh,.sql,.yaml,.yml,.toml,.log">
<p class="field__hint"> <p class="field__hint">{{ t("Images, PDFs and text. A PDF has its text read once, now.") }}</p>
Images, PDFs and text. A PDF has its text read once, now.
</p>
</div> </div>
<button class="btn btn--primary" type="submit">Upload</button> <button class="btn btn--primary" type="submit">{{ t("Upload") }}</button>
</form> </form>
<form method="post" action="/api/library/documents/link"> <form method="post" action="/api/library/documents/link">
<input type="hidden" name="base_id" value="{{ base.id }}"> <input type="hidden" name="base_id" value="{{ base.id }}">
<div class="field"> <div class="field">
<label class="field__label" for="doc-url">A web page</label> <label class="field__label" for="doc-url">{{ t("A web page") }}</label>
<input class="input" id="doc-url" type="url" name="url" required <input class="input" id="doc-url" type="url" name="url" required
placeholder="https://example.com/article"> placeholder="https://example.com/article">
<p class="field__hint"> <p class="field__hint">{{ t("Fetched now and kept as text, so it survives the page changing.") }}</p>
Fetched now and kept as text, so it survives the page changing.
</p>
</div> </div>
<button class="btn" type="submit">Save page</button> <button class="btn" type="submit">{{ t("Save page") }}</button>
</form> </form>
</div> </div>
</section> </section>
@@ -48,7 +44,7 @@
<form method="get" action="/library/knowledge/{{ base.id }}" class="btn-row" <form method="get" action="/library/knowledge/{{ base.id }}" class="btn-row"
style="margin-bottom: var(--sp-5)"> style="margin-bottom: var(--sp-5)">
<input class="input" type="search" name="q" value="{{ q }}" style="flex: 1" <input class="input" type="search" name="q" value="{{ q }}" style="flex: 1"
placeholder="Search this base…"> placeholder="{{ t('Search this base…') }}">
<button class="btn" type="submit">{{ icon("search", "icon--sm") }} Search</button> <button class="btn" type="submit">{{ icon("search", "icon--sm") }} Search</button>
{% if q %}<a class="btn btn--sm" href="/library/knowledge/{{ base.id }}">Clear</a>{% endif %} {% if q %}<a class="btn btn--sm" href="/library/knowledge/{{ base.id }}">Clear</a>{% endif %}
</form> </form>
@@ -82,7 +78,7 @@
</div> </div>
<div class="btn-row"> <div class="btn-row">
{% if document.extraction_error %} {% if document.extraction_error %}
<span class="badge badge--danger" title="{{ document.extraction_error }}">no text</span> <span class="badge badge--danger" title="{{ document.extraction_error }}">{{ t("no text") }}</span>
{% endif %} {% endif %}
</div> </div>
</li> </li>
@@ -93,15 +89,15 @@
<form method="post" action="/api/library/bases/{{ base.id }}" style="margin-top: var(--sp-8)"> <form method="post" action="/api/library/bases/{{ base.id }}" style="margin-top: var(--sp-8)">
<section class="card"> <section class="card">
<h2 class="card__title">This base</h2> <h2 class="card__title">{{ t("This base") }}</h2>
<div class="grid grid--2"> <div class="grid grid--2">
<div class="field"> <div class="field">
<label class="field__label" for="name">Name</label> <label class="field__label" for="name">{{ t("Name") }}</label>
<input class="input" id="name" name="name" value="{{ base.name }}" maxlength="200" <input class="input" id="name" name="name" value="{{ base.name }}" maxlength="200"
{{ 'disabled' if not is_owner }}> {{ 'disabled' if not is_owner }}>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="description">Description</label> <label class="field__label" for="description">{{ t("Description") }}</label>
<input class="input" id="description" name="description" maxlength="2000" <input class="input" id="description" name="description" maxlength="2000"
value="{{ base.description }}" {{ 'disabled' if not is_owner }}> value="{{ base.description }}" {{ 'disabled' if not is_owner }}>
</div> </div>
@@ -112,12 +108,12 @@
{% if is_owner %} {% if is_owner %}
<div class="form-actions"> <div class="form-actions">
<button class="btn btn--primary" type="submit">Save</button> <button class="btn btn--primary" type="submit">{{ t("Save") }}</button>
<span class="spacer"></span> <span class="spacer"></span>
<button class="btn btn--danger" type="submit" <button class="btn btn--danger" type="submit"
formaction="/api/library/bases/{{ base.id }}/delete" formaction="/api/library/bases/{{ base.id }}/delete"
data-confirm-button="Delete “{{ base.name }}” and the {{ pager.total }} document(s) in it? Messages they were attached to keep their copies." data-confirm-button="Delete “{{ base.name }}” and the {{ pager.total }} document(s) in it? Messages they were attached to keep their copies."
data-confirm-title="Delete knowledge base"> data-confirm-title="{{ t('Delete knowledge base') }}">
{{ icon("trash", "icon--sm") }} Delete base {{ icon("trash", "icon--sm") }} Delete base
</button> </button>
</div> </div>
@@ -6,12 +6,7 @@
{% block heading %}Knowledge{% endblock %} {% block heading %}Knowledge{% endblock %}
{% block library_content %} {% block library_content %}
<p class="admin-lede"> <p class="admin-lede">{{ t("Knowledge bases are collections of documents, images and saved web pages. Keep them separate — one per subject, project or client — and a chat can be pointed at just the ones it should draw on. Sharing happens here too: share a base and everything in it comes with it.") }}</p>
Knowledge bases are collections of documents, images and saved web pages. Keep
them separate — one per subject, project or client — and a chat can be pointed
at just the ones it should draw on. Sharing happens here too: share a base and
everything in it comes with it.
</p>
{# Links rather than a form, so a filtered view is a URL you can keep. #} {# Links rather than a form, so a filtered view is a URL you can keep. #}
<div class="filter-tabs" style="margin-bottom: var(--sp-4)"> <div class="filter-tabs" style="margin-bottom: var(--sp-4)">
@@ -36,7 +31,7 @@
</div> </div>
</div> </div>
<div class="btn-row"> <div class="btn-row">
{% if base.owner_id != user.id %}<span class="badge">shared with you</span>{% endif %} {% if base.owner_id != user.id %}<span class="badge">{{ t("shared with you") }}</span>{% endif %}
</div> </div>
</li> </li>
{% endfor %} {% endfor %}
@@ -44,27 +39,24 @@
{% else %} {% else %}
<div class="empty"> <div class="empty">
{{ icon("archive", "empty__mark") }} {{ icon("archive", "empty__mark") }}
<h2 class="empty__title">No knowledge bases yet</h2> <h2 class="empty__title">{{ t("No knowledge bases yet") }}</h2>
<p class="empty__text"> <p class="empty__text">{{ t("Make one below, then put documents in it. A chat with no base attached searches everything you have; a chat pointed at one searches only that.") }}</p>
Make one below, then put documents in it. A chat with no base attached
searches everything you have; a chat pointed at one searches only that.
</p>
</div> </div>
{% endif %} {% endif %}
<section class="card" style="margin-top: var(--sp-6)"> <section class="card" style="margin-top: var(--sp-6)">
<h2 class="card__title">New knowledge base</h2> <h2 class="card__title">{{ t("New knowledge base") }}</h2>
<form method="post" action="/api/library/bases"> <form method="post" action="/api/library/bases">
<div class="grid grid--2"> <div class="grid grid--2">
<div class="field"> <div class="field">
<label class="field__label" for="base-name">Name</label> <label class="field__label" for="base-name">{{ t("Name") }}</label>
<input class="input" id="base-name" name="name" required maxlength="200" <input class="input" id="base-name" name="name" required maxlength="200"
placeholder="Contracts"> placeholder="{{ t('Contracts') }}">
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="base-description">Description</label> <label class="field__label" for="base-description">{{ t("Description") }}</label>
<input class="input" id="base-description" name="description" maxlength="2000" <input class="input" id="base-description" name="description" maxlength="2000"
placeholder="What belongs in here."> placeholder="{{ t('What belongs in here.') }}">
</div> </div>
</div> </div>
<button class="btn btn--primary" type="submit">{{ icon("plus", "icon--sm") }} Create</button> <button class="btn btn--primary" type="submit">{{ icon("plus", "icon--sm") }} Create</button>
@@ -14,25 +14,23 @@
<form method="post" action="/api/library/documents/{{ document.id }}"> <form method="post" action="/api/library/documents/{{ document.id }}">
<section class="card"> <section class="card">
<h2 class="card__title">Details</h2> <h2 class="card__title">{{ t("Details") }}</h2>
<div class="field"> <div class="field">
<label class="field__label" for="title">Title</label> <label class="field__label" for="title">{{ t("Title") }}</label>
<input class="input" id="title" name="title" value="{{ document.title }}" <input class="input" id="title" name="title" value="{{ document.title }}"
maxlength="300" {{ 'disabled' if not is_owner }}> maxlength="300" {{ 'disabled' if not is_owner }}>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="description">Description</label> <label class="field__label" for="description">{{ t("Description") }}</label>
<textarea class="textarea" id="description" name="description" rows="2" <textarea class="textarea" id="description" name="description" rows="2"
{{ 'disabled' if not is_owner }} {{ 'disabled' if not is_owner }}
placeholder="What this is, and when it is worth reading.">{{ document.description }}</textarea> placeholder="{{ t('What this is, and when it is worth reading.') }}">{{ document.description }}</textarea>
<p class="field__hint"> <p class="field__hint">{{ t("Searched along with the contents, so a line here helps a model find it.") }}</p>
Searched along with the contents, so a line here helps a model find it.
</p>
</div> </div>
{% if document.base %} {% if document.base %}
<div class="field"> <div class="field">
<label class="field__label" for="base_id">Knowledge base</label> <label class="field__label" for="base_id">{{ t("Knowledge base") }}</label>
{# Moving a document changes who can see it, which is the point of bases. {# Moving a document changes who can see it, which is the point of bases.
Only bases this person can write to are offered. #} Only bases this person can write to are offered. #}
<select class="select" id="base_id" name="base_id" {{ 'disabled' if not is_owner }}> <select class="select" id="base_id" name="base_id" {{ 'disabled' if not is_owner }}>
@@ -42,7 +40,7 @@
</option> </option>
{% endfor %} {% endfor %}
</select> </select>
<p class="field__hint">Moving it changes who can see it.</p> <p class="field__hint">{{ t("Moving it changes who can see it.") }}</p>
</div> </div>
{% endif %} {% endif %}
@@ -70,7 +68,7 @@
{% if is_owner %} {% if is_owner %}
<div class="form-actions"> <div class="form-actions">
<button class="btn btn--primary" type="submit">Save</button> <button class="btn btn--primary" type="submit">{{ t("Save") }}</button>
{% if document.stored_name %} {% if document.stored_name %}
<a class="btn" href="/api/library/documents/{{ document.id }}/content">Download</a> <a class="btn" href="/api/library/documents/{{ document.id }}/content">Download</a>
{% endif %} {% endif %}
@@ -78,7 +76,7 @@
<button class="btn btn--danger" type="submit" <button class="btn btn--danger" type="submit"
formaction="/api/library/documents/{{ document.id }}/delete" formaction="/api/library/documents/{{ document.id }}/delete"
data-confirm-button="Delete “{{ document.title }}”? Messages it was already attached to keep their copy." data-confirm-button="Delete “{{ document.title }}”? Messages it was already attached to keep their copy."
data-confirm-title="Delete document"> data-confirm-title="{{ t('Delete document') }}">
{{ icon("trash", "icon--sm") }} Delete {{ icon("trash", "icon--sm") }} Delete
</button> </button>
</div> </div>
@@ -87,14 +85,14 @@
{% if document.is_image and document.stored_name %} {% if document.is_image and document.stored_name %}
<section class="card"> <section class="card">
<h2 class="card__title">Preview</h2> <h2 class="card__title">{{ t("Preview") }}</h2>
<img src="/api/library/documents/{{ document.id }}/content" alt="{{ document.title }}" <img src="/api/library/documents/{{ document.id }}/content" alt="{{ document.title }}"
style="max-width: 100%; border-radius: var(--radius)"> style="max-width: 100%; border-radius: var(--radius)">
</section> </section>
{% elif document.extracted_text %} {% elif document.extracted_text %}
<section class="card"> <section class="card">
<h2 class="card__title">Text</h2> <h2 class="card__title">{{ t("Text") }}</h2>
<p class="card__lede">What a model is given when it reads this.</p> <p class="card__lede">{{ t("What a model is given when it reads this.") }}</p>
<div class="reasoning__body" style="max-height: 30rem">{{ document.extracted_text }}</div> <div class="reasoning__body" style="max-height: 30rem">{{ document.extracted_text }}</div>
</section> </section>
{% endif %} {% endif %}
@@ -14,20 +14,18 @@
action="{{ '/api/library/notes/' ~ note.id if note else '/api/library/notes' }}"> action="{{ '/api/library/notes/' ~ note.id if note else '/api/library/notes' }}">
<section class="card"> <section class="card">
<div class="field"> <div class="field">
<label class="field__label" for="title">Title</label> <label class="field__label" for="title">{{ t("Title") }}</label>
<input class="input" id="title" name="title" maxlength="300" required <input class="input" id="title" name="title" maxlength="300" required
value="{{ note.title if note else '' }}" value="{{ note.title if note else '' }}"
{{ 'disabled' if note and not is_owner }} {{ 'disabled' if note and not is_owner }}
placeholder="What this note is about"> placeholder="{{ t('What this note is about') }}">
<p class="field__hint"> <p class="field__hint">{{ t("Shown in search results, so it is what decides whether a model opens it.") }}</p>
Shown in search results, so it is what decides whether a model opens it.
</p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="body">Body</label> <label class="field__label" for="body">{{ t("Body") }}</label>
<textarea class="textarea" id="body" name="body" rows="18" <textarea class="textarea" id="body" name="body" rows="18"
{{ 'disabled' if note and not is_owner }} {{ 'disabled' if note and not is_owner }}
placeholder="Markdown.">{{ note.body if note else '' }}</textarea> placeholder="{{ t('Markdown.') }}">{{ note.body if note else '' }}</textarea>
</div> </div>
{% if note and note.author == "model" %} {% if note and note.author == "model" %}
<p class="field__hint"> <p class="field__hint">
@@ -47,7 +45,7 @@
<button class="btn btn--danger" type="submit" <button class="btn btn--danger" type="submit"
formaction="/api/library/notes/{{ note.id }}/delete" formaction="/api/library/notes/{{ note.id }}/delete"
data-confirm-button="Delete “{{ note.title }}”?" data-confirm-button="Delete “{{ note.title }}”?"
data-confirm-title="Delete note"> data-confirm-title="{{ t('Delete note') }}">
{{ icon("trash", "icon--sm") }} Delete {{ icon("trash", "icon--sm") }} Delete
</button> </button>
{% endif %} {% endif %}
@@ -57,7 +55,7 @@
{% if note and body_html %} {% if note and body_html %}
<section class="card"> <section class="card">
<h2 class="card__title">Rendered</h2> <h2 class="card__title">{{ t("Rendered") }}</h2>
<div class="msg__body">{{ body_html|safe }}</div> <div class="msg__body">{{ body_html|safe }}</div>
</section> </section>
{% endif %} {% endif %}
+4 -8
View File
@@ -9,11 +9,7 @@
{% endblock %} {% endblock %}
{% block library_content %} {% block library_content %}
<p class="admin-lede"> <p class="admin-lede">{{ t("Longer things worth keeping between conversations. A model writes these itself when it works something out, and you can edit or delete any of them — they are yours, not its.") }}</p>
Longer things worth keeping between conversations. A model writes these itself
when it works something out, and you can edit or delete any of them — they are
yours, not its.
</p>
{# {#
Two views, as links, so a filtered list is a real URL you can keep -- the same Two views, as links, so a filtered list is a real URL you can keep -- the same
@@ -26,7 +22,7 @@
</div> </div>
<form method="get" action="/library/notes" class="btn-row" style="margin-bottom: var(--sp-5)"> <form method="get" action="/library/notes" class="btn-row" style="margin-bottom: var(--sp-5)">
<input class="input" type="search" name="q" value="{{ q }}" style="flex: 1" <input class="input" type="search" name="q" value="{{ q }}" style="flex: 1"
placeholder="Search notes…"> placeholder="{{ t('Search notes…') }}">
<button class="btn" type="submit">{{ icon("search", "icon--sm") }} Search</button> <button class="btn" type="submit">{{ icon("search", "icon--sm") }} Search</button>
{% if q %}<a class="btn btn--sm" href="/library/notes">Clear</a>{% endif %} {% if q %}<a class="btn btn--sm" href="/library/notes">Clear</a>{% endif %}
</form> </form>
@@ -53,8 +49,8 @@
<div class="text-xs faint">{{ note.body[:160] }}{{ "…" if note.body|length > 160 }}</div> <div class="text-xs faint">{{ note.body[:160] }}{{ "…" if note.body|length > 160 }}</div>
</div> </div>
<div class="btn-row"> <div class="btn-row">
{% if note.author == "model" %}<span class="badge badge--leaf">written by a model</span>{% endif %} {% if note.author == "model" %}<span class="badge badge--leaf">{{ t("written by a model") }}</span>{% endif %}
{% if note.owner_id != user.id %}<span class="badge">shared</span>{% endif %} {% if note.owner_id != user.id %}<span class="badge">{{ t("shared") }}</span>{% endif %}
</div> </div>
</li> </li>
{% endfor %} {% endfor %}
@@ -15,33 +15,30 @@
<section class="card"> <section class="card">
{% if not skill %} {% if not skill %}
<div class="field"> <div class="field">
<label class="field__label" for="name">Name</label> <label class="field__label" for="name">{{ t("Name") }}</label>
<input class="input mono" id="name" name="name" required maxlength="60" <input class="input mono" id="name" name="name" required maxlength="60"
placeholder="weekly-report" pattern="[a-zA-Z0-9 _-]+"> placeholder="{{ t('weekly-report') }}" pattern="[a-zA-Z0-9 _-]+">
<p class="field__hint"> <p class="field__hint">{{ t("Lowercase letters, numbers and hyphens. This is how a model asks for it, and it cannot be changed later.") }}</p>
Lowercase letters, numbers and hyphens. This is how a model asks for it,
and it cannot be changed later.
</p>
</div> </div>
{% endif %} {% endif %}
<div class="field"> <div class="field">
<label class="field__label" for="description">When to use it</label> <label class="field__label" for="description">{{ t("When to use it") }}</label>
<textarea class="textarea" id="description" name="description" rows="2" required <textarea class="textarea" id="description" name="description" rows="2" required
{{ 'disabled' if skill and not is_owner }} {{ 'disabled' if skill and not is_owner }}
placeholder="When the user asks for the weekly report.">{{ skill.description if skill else '' }}</textarea> placeholder="{{ t('When the user asks for the weekly report.') }}">{{ skill.description if skill else '' }}</textarea>
<p class="field__hint"> <p class="field__hint">
<strong>The load-bearing field.</strong> This one line is all a model <strong>{{ t("The load-bearing field.") }}</strong> This one line is all a model
sees until it opens the skill, so it has to say when the skill applies — sees until it opens the skill, so it has to say when the skill applies —
not what it does. not what it does.
</p> </p>
</div> </div>
<div class="field"> <div class="field">
<label class="field__label" for="body">Instructions</label> <label class="field__label" for="body">{{ t("Instructions") }}</label>
<textarea class="textarea" id="body" name="body" rows="18" <textarea class="textarea" id="body" name="body" rows="18"
{{ 'disabled' if skill and not is_owner }} {{ 'disabled' if skill and not is_owner }}
placeholder="Markdown. Steps, conventions, things to avoid.">{{ skill.body if skill else '' }}</textarea> placeholder="{{ t('Markdown. Steps, conventions, things to avoid.') }}">{{ skill.body if skill else '' }}</textarea>
</div> </div>
{% if skill %} {% if skill %}
@@ -49,11 +46,9 @@
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="enabled" value="true" {{ 'checked' if skill.enabled }} <input type="checkbox" name="enabled" value="true" {{ 'checked' if skill.enabled }}
{{ 'disabled' if not is_owner }}> {{ 'disabled' if not is_owner }}>
<span>Offer this skill to models</span> <span>{{ t("Offer this skill to models") }}</span>
</label> </label>
<p class="field__hint"> <p class="field__hint">{{ t("Turned off, it stays here but disappears from the list the model sees.") }}</p>
Turned off, it stays here but disappears from the list the model sees.
</p>
</div> </div>
{% endif %} {% endif %}
@@ -61,7 +56,7 @@
<div class="alert alert--warning"> <div class="alert alert--warning">
{{ icon("sparkle", "alert__icon") }} {{ icon("sparkle", "alert__icon") }}
<div> <div>
<strong>A model wrote this version.</strong> <strong>{{ t("A model wrote this version.") }}</strong>
<div class="text-sm" style="margin-top: var(--sp-1)"> <div class="text-sm" style="margin-top: var(--sp-1)">
Worth reading before you rely on it. A model that has just read a web Worth reading before you rely on it. A model that has just read a web
page can be talked into things by that page, and a skill persists. page can be talked into things by that page, and a skill persists.
@@ -82,7 +77,7 @@
<button class="btn btn--danger" type="submit" <button class="btn btn--danger" type="submit"
formaction="/api/library/skills/{{ skill.id }}/delete" formaction="/api/library/skills/{{ skill.id }}/delete"
data-confirm-button="Delete the skill “{{ skill.name }}” and all its history?" data-confirm-button="Delete the skill “{{ skill.name }}” and all its history?"
data-confirm-title="Delete skill"> data-confirm-title="{{ t('Delete skill') }}">
{{ icon("trash", "icon--sm") }} Delete {{ icon("trash", "icon--sm") }} Delete
</button> </button>
{% endif %} {% endif %}
@@ -93,19 +88,16 @@
{% if skill and revisions %} {% if skill and revisions %}
<section class="card"> <section class="card">
<h2 class="card__title">History <span class="badge">{{ revisions|length }}</span></h2> <h2 class="card__title">History <span class="badge">{{ revisions|length }}</span></h2>
<p class="card__lede"> <p class="card__lede">{{ t("What this skill said before each change. This is the whole safety story for a model editing its own instructions: not a gate, but a record and a way back.") }}</p>
What this skill said before each change. This is the whole safety story for a
model editing its own instructions: not a gate, but a record and a way back.
</p>
<ul class="model-list"> <ul class="model-list">
{% for revision in revisions %} {% for revision in revisions %}
<li class="model-list__item"> <li class="model-list__item">
<div style="min-width: 0"> <div style="min-width: 0">
<strong>{{ revision.created_at.strftime("%Y-%m-%d %H:%M") }}</strong> <strong>{{ revision.created_at.strftime("%Y-%m-%d %H:%M") }}</strong>
{% if revision.author == "model" %} {% if revision.author == "model" %}
<span class="badge badge--leaf">model</span> <span class="badge badge--leaf">{{ t("model") }}</span>
{% else %} {% else %}
<span class="badge">you</span> <span class="badge">{{ t("you") }}</span>
{% endif %} {% endif %}
{% if revision.note %}<div class="text-xs faint">{{ revision.note }}</div>{% endif %} {% if revision.note %}<div class="text-xs faint">{{ revision.note }}</div>{% endif %}
<div class="text-xs faint">{{ revision.body[:200] }}{{ "…" if revision.body|length > 200 }}</div> <div class="text-xs faint">{{ revision.body[:200] }}{{ "…" if revision.body|length > 200 }}</div>
@@ -113,8 +105,8 @@
{% if is_owner %} {% if is_owner %}
<form method="post" <form method="post"
action="/api/library/skills/{{ skill.id }}/revert/{{ revision.id }}" action="/api/library/skills/{{ skill.id }}/revert/{{ revision.id }}"
data-confirm="Put the skill back to this version? The current one is kept in the history." data-confirm="{{ t('Put the skill back to this version? The current one is kept in the history.') }}"
data-confirm-label="Revert" data-confirm-danger="false"> data-confirm-label="{{ t('Revert') }}" data-confirm-danger="false">
<button class="btn btn--sm" type="submit">{{ icon("refresh", "icon--sm") }} Revert</button> <button class="btn btn--sm" type="submit">{{ icon("refresh", "icon--sm") }} Revert</button>
</form> </form>
{% endif %} {% endif %}
+5 -10
View File
@@ -9,12 +9,7 @@
{% endblock %} {% endblock %}
{% block library_content %} {% block library_content %}
<p class="admin-lede"> <p class="admin-lede">{{ t("Saved procedures. Every enabled skill's name and description are shown to the model on each turn; it reads the instructions only when it decides one applies. A model may write and revise its own — every version is kept, so any change can be read and undone.") }}</p>
Saved procedures. Every enabled skill's name and description are shown to the
model on each turn; it reads the instructions only when it decides one
applies. A model may write and revise its own — every version is kept, so any
change can be read and undone.
</p>
{# {#
Two views, as links, so a filtered list is a real URL you can keep -- the same Two views, as links, so a filtered list is a real URL you can keep -- the same
@@ -26,7 +21,7 @@
</div> </div>
<form method="get" action="/library/skills" class="btn-row" style="margin-bottom: var(--sp-5)"> <form method="get" action="/library/skills" class="btn-row" style="margin-bottom: var(--sp-5)">
<input class="input" type="search" name="q" value="{{ q }}" style="flex: 1" <input class="input" type="search" name="q" value="{{ q }}" style="flex: 1"
placeholder="Search skills…"> placeholder="{{ t('Search skills…') }}">
<button class="btn" type="submit">{{ icon("search", "icon--sm") }} Search</button> <button class="btn" type="submit">{{ icon("search", "icon--sm") }} Search</button>
{% if q %}<a class="btn btn--sm" href="/library/skills">Clear</a>{% endif %} {% if q %}<a class="btn btn--sm" href="/library/skills">Clear</a>{% endif %}
</form> </form>
@@ -53,9 +48,9 @@
<div class="text-xs faint">{{ skill.description }}</div> <div class="text-xs faint">{{ skill.description }}</div>
</div> </div>
<div class="btn-row"> <div class="btn-row">
{% if not skill.enabled %}<span class="badge">off</span>{% endif %} {% if not skill.enabled %}<span class="badge">{{ t("off") }}</span>{% endif %}
{% if skill.author == "model" %}<span class="badge badge--leaf">written by a model</span>{% endif %} {% if skill.author == "model" %}<span class="badge badge--leaf">{{ t("written by a model") }}</span>{% endif %}
{% if skill.owner_id != user.id %}<span class="badge">shared</span>{% endif %} {% if skill.owner_id != user.id %}<span class="badge">{{ t("shared") }}</span>{% endif %}
</div> </div>
</li> </li>
{% endfor %} {% endfor %}
@@ -24,7 +24,7 @@
hx-target="this" hx-target="this"
hx-swap="outerHTML" hx-swap="outerHTML"
hx-sync="this:drop"> hx-sync="this:drop">
<span class="visually-hidden" role="status">Loading earlier messages</span> <span class="visually-hidden" role="status">{{ t("Loading earlier messages") }}</span>
<div class="history-sentinel__shape" aria-hidden="true"> <div class="history-sentinel__shape" aria-hidden="true">
<div class="skeleton skeleton--line"></div> <div class="skeleton skeleton--line"></div>
<div class="skeleton skeleton--line skeleton--short"></div> <div class="skeleton skeleton--line skeleton--short"></div>
+4 -7
View File
@@ -41,7 +41,7 @@
<span class="text-xs faint">{{ item.summary }}</span> <span class="text-xs faint">{{ item.summary }}</span>
</span> </span>
{% if not item.row.enabled %} {% if not item.row.enabled %}
<span class="badge badge--warning">paused</span> <span class="badge badge--warning">{{ t("paused") }}</span>
{% endif %} {% endif %}
</a> </a>
{% endfor %} {% endfor %}
@@ -59,11 +59,8 @@
{% if not messages %} {% if not messages %}
<div class="thread__intro"> <div class="thread__intro">
{{ mark(cls="empty__mark", uid="messages") }} {{ mark(cls="empty__mark", uid="messages") }}
<h2 class="empty__title">Nothing said yet</h2> <h2 class="empty__title">{{ t("Nothing said yet") }}</h2>
<p class="empty__text"> <p class="empty__text">{{ t("One conversation that keeps going. Anything scheduled to write here will arrive in it.") }}</p>
One conversation that keeps going. Anything scheduled to write here
will arrive in it.
</p>
</div> </div>
{% endif %} {% endif %}
@@ -79,7 +76,7 @@
hx-target="this" hx-target="this"
hx-swap="outerHTML" hx-swap="outerHTML"
hx-sync="this:drop"> hx-sync="this:drop">
<span class="visually-hidden" role="status">Loading earlier messages</span> <span class="visually-hidden" role="status">{{ t("Loading earlier messages") }}</span>
<div class="history-sentinel__shape" aria-hidden="true"> <div class="history-sentinel__shape" aria-hidden="true">
<div class="skeleton skeleton--line"></div> <div class="skeleton skeleton--line"></div>
<div class="skeleton skeleton--line skeleton--short"></div> <div class="skeleton skeleton--line skeleton--short"></div>
+1 -3
View File
@@ -22,9 +22,7 @@
{{ brand.name }} answers from your server, so there is nothing to read until it can {{ brand.name }} answers from your server, so there is nothing to read until it can
be reached again. be reached again.
</p> </p>
<button class="btn btn--primary" type="button" onclick="window.location.reload()"> <button class="btn btn--primary" type="button" onclick="window.location.reload()">{{ t("Try again") }}</button>
Try again
</button>
</div> </div>
</main> </main>
{% endblock %} {% endblock %}

Some files were not shown because too many files have changed in this diff Show More