757ab305ee
Three pieces, and the first one is that they are all optional. Extraction stops being constants. Upload size, image edge, JPEG quality, PDF pages, extracted characters, orphan age and the text-extension list are settings now, read through a process-level snapshot rather than a session -- `prepare` and everything under it are called from routes, tool runners and the startup sweep, and several of those have no session in hand. Two things deliberately stayed constants: the decompression-bomb guard, which is a guard and not a preference, and ORPHAN_AGE, which would have been evaluated at import if it stayed in the signature and pinned the shipped 24 hours whatever anybody set. An embedding model is picked from the models an administrator flagged for it, and one that has since lost its flag is *named* rather than dropped from the picker: a setting that vanishes is one nobody can tell from a setting never made. Nothing here is required. Choosing none means no chunk rows, no requests, and retrieval.search returning exactly what fts.search_ids returns in exactly that order -- asserted, because it is what makes this safe to land on an instance that never asked for it. The two rankings are fused by reciprocal rank fusion: ranks and not scores, because bm25 is a corpus-dependent negative and cosine is 0..1, and normalising them onto one scale means picking a constant nobody can tune without a labelled set they do not have. RRF's one constant is famously insensitive and degrades to whichever list is non-empty -- which is what turns "no embedding model" into a branch that does not exist. A record scores as its best chunk rather than its average, or a long document about something else outranks a short one that says the thing. Width and model are stored beside every vector and a mismatch is skipped, because vectors from two spaces score against each other perfectly happily and mean nothing -- a search that works and is wrong is the worst failure this can have, and a model change now leaves stale rows ignored rather than trusted. Indexing is fired and forgotten, and how a change is noticed is a session event rather than a call in each of the ten library writers. That is a departure from this codebase's taste for explicit seams, for the reason tool_label is a Jinja global: a step every writer has to remember is one that gets forgotten, and here forgetting is silent -- the record saves, keyword search still finds it, and only its recall goes stale. Chunks are embedded before anything is deleted, so a failure leaves the old index rather than half a new one. Also: `embeddings` joins the model capabilities, and the three tool flags that had shipped with no checkbox -- canvas, scheduling and helpers -- have one. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
239 lines
7.7 KiB
Python
239 lines
7.7 KiB
Python
"""Skills: named instructions the model can choose to follow.
|
|
|
|
Two fields carry the design.
|
|
|
|
`description` is what gets injected -- one line per skill, for every skill --
|
|
and is therefore the only thing the model has to go on when deciding whether a
|
|
skill is relevant. A description that does not say *when* to use the skill makes
|
|
it invisible in practice.
|
|
|
|
`body` is fetched only when the model decides to use it. That split is what
|
|
makes a hundred skills affordable: the index costs a line each, the instructions
|
|
cost nothing until wanted.
|
|
|
|
**A model may rewrite its own skills**, which is the point -- it is how it
|
|
learns a procedure once instead of being told every time. The safety story is
|
|
not a gate but a record: every write snapshots what was there first, so a change
|
|
can be read and undone. A skill written after reading a hostile web page is a
|
|
real risk, and the honest mitigation is that it is visible, attributed and
|
|
revertible rather than that it was somehow prevented.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import re
|
|
from collections.abc import Iterable
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.orm import Session as DBSession
|
|
|
|
from lembas.db.models import AUTHOR_MODEL, AUTHOR_USER, CHUNK_SKILL, Skill, SkillRevision, User
|
|
from lembas.services import sharing
|
|
from lembas.services.library import retrieval
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
INDEX = "skills_fts"
|
|
|
|
# A name the model can quote back without getting it wrong.
|
|
SKILL_NAME_PATTERN = re.compile(r"^[a-z0-9][a-z0-9-]{1,60}$")
|
|
|
|
MAX_DESCRIPTION_CHARS = 400
|
|
MAX_BODY_CHARS = 20_000
|
|
|
|
# The index goes into every request, so it has a ceiling like memory does.
|
|
MAX_INDEX_SKILLS = 60
|
|
|
|
|
|
class SkillError(Exception):
|
|
"""A rejected skill write, with a message fit for the model or the user."""
|
|
|
|
|
|
def slugify(name: str) -> str:
|
|
cleaned = re.sub(r"[^a-z0-9]+", "-", (name or "").strip().lower()).strip("-")
|
|
return cleaned[:60]
|
|
|
|
|
|
def visible(db: DBSession, user: User | None):
|
|
return select(Skill).where(sharing.visible_to(Skill, user))
|
|
|
|
|
|
def get(db: DBSession, skill_id: str, user: User | None) -> Skill | None:
|
|
skill = db.get(Skill, skill_id)
|
|
if skill is None or not sharing.can_read(db, skill, user):
|
|
return None
|
|
return skill
|
|
|
|
|
|
def by_name(db: DBSession, name: str, user: User | None) -> Skill | None:
|
|
"""Look one up the way the model refers to it."""
|
|
if user is None:
|
|
return None
|
|
return db.scalar(visible(db, user).where(Skill.name == slugify(name)))
|
|
|
|
|
|
def enabled_for(
|
|
db: DBSession, user: User | None, *, exclude: Iterable[str] = ()
|
|
) -> list[Skill]:
|
|
"""Skills that should appear in the index, oldest first for a stable order.
|
|
|
|
`exclude` is what one chat has switched off by name -- a narrowing of what
|
|
the library already allows, never a widening of it.
|
|
"""
|
|
if user is None:
|
|
return []
|
|
hidden = {slugify(name) for name in exclude}
|
|
rows = db.scalars(
|
|
visible(db, user)
|
|
.where(Skill.enabled.is_(True))
|
|
.order_by(Skill.name)
|
|
.limit(MAX_INDEX_SKILLS + len(hidden))
|
|
)
|
|
return [skill for skill in rows if skill.name not in hidden][:MAX_INDEX_SKILLS]
|
|
|
|
|
|
def count_enabled(db: DBSession, user: User | None, *, exclude: Iterable[str] = ()) -> int:
|
|
"""How many skills are available here at all.
|
|
|
|
Zero is what withdraws `skill_get` and `skill_edit`: reading and improving
|
|
are meaningless with nothing to read, and a model told to "read one with
|
|
skill_get" above a list that is not there spends a round finding out.
|
|
"""
|
|
return len(enabled_for(db, user, exclude=exclude))
|
|
|
|
|
|
def search(
|
|
db: DBSession,
|
|
user: User | None,
|
|
needle: str,
|
|
*,
|
|
limit: int = 10,
|
|
vector: list[float] | None = None,
|
|
) -> list[Skill]:
|
|
"""Skills matching `needle` that this user may see, best match first.
|
|
|
|
`vector` is the query already embedded, or None. It comes from the caller
|
|
rather than being worked out here because this is synchronous and embedding
|
|
is an HTTP request -- see `services/library/retrieval.py`. None means the
|
|
keyword search exactly as it always was.
|
|
"""
|
|
hits = retrieval.search(db, INDEX, needle, kind=CHUNK_SKILL, vector=vector, limit=limit * 4)
|
|
if not hits:
|
|
return []
|
|
order = {hit.id: position for position, hit in enumerate(hits)}
|
|
rows = list(db.scalars(visible(db, user).where(Skill.id.in_(list(order)))))
|
|
rows.sort(key=lambda skill: order.get(skill.id, len(order)))
|
|
return rows[:limit]
|
|
|
|
|
|
def snapshot(db: DBSession, skill: Skill, *, author: str, note: str = "") -> SkillRevision:
|
|
"""Record what a skill looked like before it is changed."""
|
|
revision = SkillRevision(
|
|
skill_id=skill.id,
|
|
description=skill.description,
|
|
body=skill.body,
|
|
author=author,
|
|
note=note[:200],
|
|
)
|
|
db.add(revision)
|
|
return revision
|
|
|
|
|
|
def create(
|
|
db: DBSession,
|
|
*,
|
|
owner: User,
|
|
name: str,
|
|
description: str,
|
|
body: str,
|
|
author: str = AUTHOR_USER,
|
|
) -> Skill:
|
|
slug = slugify(name)
|
|
if not SKILL_NAME_PATTERN.match(slug):
|
|
raise SkillError(
|
|
"A skill name must be two or more letters, numbers or hyphens, "
|
|
"such as 'weekly-report'."
|
|
)
|
|
if by_name(db, slug, owner) is not None:
|
|
raise SkillError(f"A skill called {slug!r} already exists. Edit it instead.")
|
|
if not description.strip():
|
|
raise SkillError(
|
|
"A skill needs a description saying when to use it — it is the only "
|
|
"thing shown until the skill is opened."
|
|
)
|
|
|
|
skill = Skill(
|
|
owner_id=owner.id,
|
|
name=slug,
|
|
description=description.strip()[:MAX_DESCRIPTION_CHARS],
|
|
body=body.strip()[:MAX_BODY_CHARS],
|
|
author=author if author in (AUTHOR_USER, AUTHOR_MODEL) else AUTHOR_USER,
|
|
)
|
|
db.add(skill)
|
|
db.commit()
|
|
log.info("skill %r created by %s", slug, author)
|
|
return skill
|
|
|
|
|
|
def update(
|
|
db: DBSession,
|
|
skill: Skill,
|
|
*,
|
|
description: str | None = None,
|
|
body: str | None = None,
|
|
enabled: bool | None = None,
|
|
author: str = AUTHOR_USER,
|
|
note: str = "",
|
|
) -> Skill:
|
|
"""Change a skill, keeping what it was.
|
|
|
|
The snapshot happens before the change and in the same transaction, so
|
|
there is no window where a skill has been rewritten with no record of what
|
|
it used to say.
|
|
"""
|
|
changing = (description is not None and description.strip() != skill.description) or (
|
|
body is not None and body.strip() != skill.body
|
|
)
|
|
if changing:
|
|
snapshot(db, skill, author=author, note=note)
|
|
|
|
if description is not None and description.strip():
|
|
skill.description = description.strip()[:MAX_DESCRIPTION_CHARS]
|
|
if body is not None:
|
|
skill.body = body.strip()[:MAX_BODY_CHARS]
|
|
if enabled is not None:
|
|
skill.enabled = enabled
|
|
if changing:
|
|
skill.author = author if author in (AUTHOR_USER, AUTHOR_MODEL) else skill.author
|
|
|
|
db.commit()
|
|
return skill
|
|
|
|
|
|
def revert(db: DBSession, skill: Skill, revision: SkillRevision, *, author: str) -> Skill:
|
|
"""Put a skill back to an earlier revision.
|
|
|
|
The revert is itself a change, so the current state is snapshotted first --
|
|
going back is undoable too.
|
|
"""
|
|
snapshot(db, skill, author=author, note="before revert")
|
|
skill.description = revision.description
|
|
skill.body = revision.body
|
|
db.commit()
|
|
return skill
|
|
|
|
|
|
def delete(db: DBSession, skill: Skill) -> None:
|
|
sharing.forget_resource(db, skill)
|
|
db.delete(skill)
|
|
db.commit()
|
|
|
|
|
|
def index_block(db: DBSession, user: User | None, *, exclude: Iterable[str] = ()) -> str:
|
|
"""The one-line-per-skill listing that goes into the prompt."""
|
|
skills = enabled_for(db, user, exclude=exclude)
|
|
if not skills:
|
|
return ""
|
|
return "\n".join(f"- {skill.name}: {skill.description}" for skill in skills)
|