mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-10 18:07:29 +01:00
The registry used to be built once, inline in build_bot, so every change to the data behind it -- a person tagged in the web UI, an alias, soon a command switched off from the management page -- meant restarting the unit. That is cheap and lossless, but it is a deploy step somebody has to remember, and a 21:37 report can land in the middle of it. Now the registration sequence lives in wiring.build_registry, and RegistryHolder runs it again on POST /_reload: the new table is built whole and swapped in with one assignment, never patched in place, so a duplicate trigger is found before anything the dispatcher reads has changed. Bad data (ConfigError, DuplicateTriggerError) keeps the previous table and answers 409 with the reason; a programming error still surfaces as a 500. scripts/reload.sh wraps it, with --code for the restart a Python change needs, and an optional command to type in testbot so "reloaded" means "answered". No Python hot-reload on purpose. The loader change is what makes deploying this safe: two rows in the live tags.json name files that are no longer in media/, and load_pack refused them, so the next restart would have looped on ConfigError. A stale tag is drift in a file a page edits mid-session, not a broken album -- it is now skipped with a warning naming it. A tag that reaches outside the album is still refused. pack_load.py split at the 250-line cap; pack_tags.py is the half whose checks are not all fatal. Proven offline in scripts/e2e.sh: !delta is unknown, a fifth person is tagged into the synthetic pack, scripts/reload.sh runs, and the same process posts delta's photo. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
189 lines
7.5 KiB
Python
189 lines
7.5 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""Reading a photo pack off disk, and refusing one it cannot serve.
|
|
|
|
Every check here fails startup rather than a command, for the reason
|
|
config_env.py gives: a manifest that names a person who does not exist, a
|
|
trigger the folder can never match, or a file that has since been renamed is
|
|
an answer, not an outage, and no amount of waiting fixes it. What is *not*
|
|
an error lives in pack_tags.py: a pack that has not been tagged yet, and a
|
|
tag whose file has since gone.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING, Any, Final
|
|
|
|
from signal_bot.folding import fold
|
|
from signal_bot.groups import ConfigError
|
|
from signal_bot.pack import PEOPLE_FILE, Entry, Pack
|
|
from signal_bot.pack_custom import load as load_custom
|
|
from signal_bot.pack_tags import document as _document
|
|
from signal_bot.pack_tags import tags as _tags
|
|
|
|
if TYPE_CHECKING:
|
|
from pathlib import Path
|
|
|
|
# "!" plus at least one character to fold.
|
|
MIN_TRIGGER_LENGTH: Final = 2
|
|
|
|
|
|
def load(directory: Path) -> Pack:
|
|
"""Read a pack, or say precisely what is wrong with it.
|
|
|
|
Raises:
|
|
ConfigError: The manifest is missing, malformed, or names a person, a
|
|
trigger or a file the pack cannot honour.
|
|
"""
|
|
document = _document(directory / PEOPLE_FILE)
|
|
entries = _entries(document)
|
|
known = {entry.key for entry in entries}
|
|
named = {key for entry in entries for option in entry.options for key in option}
|
|
unknown = named - known
|
|
if unknown:
|
|
msg = f"{PEOPLE_FILE} refers to unknown people: {sorted(unknown)}"
|
|
raise ConfigError(msg)
|
|
by_trigger = {fold(t): entry for entry in entries for t in entry.triggers}
|
|
# Custom tags are keys tags.json may legitimately name, so they have to
|
|
# be known before it is validated -- and they are checked against the
|
|
# people's triggers so a label can never shadow somebody's command.
|
|
custom = load_custom(directory, frozenset(by_trigger))
|
|
return Pack(
|
|
directory=directory,
|
|
groups=_groups(document),
|
|
entries=entries,
|
|
tags=_tags(directory, named | custom.keys),
|
|
by_trigger=by_trigger,
|
|
custom=custom,
|
|
)
|
|
|
|
|
|
def _groups(document: dict[str, Any]) -> frozenset[str]:
|
|
"""The groups the album may be posted into, which may not be empty.
|
|
|
|
Fail-closed on purpose: the failure mode of defaulting to "every group
|
|
the bot is in" is somebody's private photos in a stranger's chat.
|
|
"""
|
|
groups = document.get("groups")
|
|
if not isinstance(groups, list) or not groups:
|
|
msg = f"{PEOPLE_FILE} needs a non-empty 'groups' list"
|
|
raise ConfigError(msg)
|
|
named = {str(group).strip() for group in groups}
|
|
if "" in named:
|
|
msg = f"{PEOPLE_FILE} has a blank group id"
|
|
raise ConfigError(msg)
|
|
return frozenset(named)
|
|
|
|
|
|
def _entries(document: dict[str, Any]) -> tuple[Entry, ...]:
|
|
"""One entry per person and per combination, validated as it is built."""
|
|
entries = [
|
|
Entry(
|
|
key=_key(person, "people"),
|
|
triggers=_triggers(person, "people"),
|
|
options=(frozenset({_key(person, "people")}),),
|
|
)
|
|
for person in _listing(document, "people")
|
|
]
|
|
entries.extend(
|
|
Entry(
|
|
key=_key(combo, "combos"), triggers=_triggers(combo, "combos"), options=_options(combo)
|
|
)
|
|
for combo in _listing(document, "combos")
|
|
)
|
|
if not entries:
|
|
msg = f"{PEOPLE_FILE} defines no commands"
|
|
raise ConfigError(msg)
|
|
_unique_keys(entries)
|
|
_unique_triggers(entries)
|
|
return tuple(entries)
|
|
|
|
|
|
def _listing(document: dict[str, Any], field: str) -> list[dict[str, Any]]:
|
|
"""One list of manifest objects, defaulting to none at all."""
|
|
entries = document.get(field, [])
|
|
if not isinstance(entries, list) or any(not isinstance(entry, dict) for entry in entries):
|
|
msg = f"{PEOPLE_FILE} field '{field}' must be a list of objects"
|
|
raise ConfigError(msg)
|
|
return entries
|
|
|
|
|
|
def _key(entry: dict[str, Any], field: str) -> str:
|
|
"""The pseudonym for one entry.
|
|
|
|
Rejected when it looks like a name rather than a key, because this is the
|
|
string that ends up in the log and in command_uses: the whole point is
|
|
that reading either tells you nothing about who was asked for.
|
|
"""
|
|
key = str(entry.get("key", "")).strip()
|
|
if not key or not key.replace("_", "").isalnum() or not key.isascii():
|
|
msg = f"{PEOPLE_FILE} {field} entry needs an ascii alphanumeric 'key', got {key!r}"
|
|
raise ConfigError(msg)
|
|
return key
|
|
|
|
|
|
def _triggers(entry: dict[str, Any], field: str) -> tuple[str, ...]:
|
|
"""Every spelling that fires one entry, canonical first."""
|
|
triggers = entry.get("triggers")
|
|
if not isinstance(triggers, list) or not triggers:
|
|
msg = f"{PEOPLE_FILE} {field} entry {entry.get('key')!r} needs a non-empty 'triggers' list"
|
|
raise ConfigError(msg)
|
|
return tuple(_trigger(str(trigger), field) for trigger in triggers)
|
|
|
|
|
|
def _trigger(trigger: str, field: str) -> str:
|
|
"""One trigger, checked against what the registry can actually match."""
|
|
reason = ""
|
|
if not trigger.startswith("!") or len(trigger) < MIN_TRIGGER_LENGTH:
|
|
reason = 'must start with "!" and have something after it'
|
|
elif any(character.isdigit() for character in trigger):
|
|
# folding maps 0134578 onto letters, so "!7dni" would resolve as
|
|
# "!tdni" -- a trigger with a digit is a trigger you cannot type.
|
|
reason = "must not contain a digit, which folding turns into a letter"
|
|
elif not fold(trigger).strip("!"):
|
|
reason = "folds away to nothing, so no message could ever match it"
|
|
if reason:
|
|
msg = f"{PEOPLE_FILE} {field} trigger {trigger!r} {reason}"
|
|
raise ConfigError(msg)
|
|
return trigger
|
|
|
|
|
|
def _options(combo: dict[str, Any]) -> tuple[frozenset[str], ...]:
|
|
"""What a combination stands for: everyone at once, or any one of them."""
|
|
every = combo.get("all_of")
|
|
either = combo.get("any_of")
|
|
if isinstance(every, list) and every and either is None:
|
|
return (frozenset(str(key) for key in every),)
|
|
if isinstance(either, list) and either and every is None:
|
|
return tuple(frozenset({str(key)}) for key in either)
|
|
msg = f"{PEOPLE_FILE} combo {combo.get('key')!r} needs exactly one of 'all_of' or 'any_of'"
|
|
raise ConfigError(msg)
|
|
|
|
|
|
def _unique_keys(entries: list[Entry]) -> None:
|
|
"""Two entries sharing a key would share a cooldown and a log line."""
|
|
seen: set[str] = set()
|
|
for entry in entries:
|
|
if entry.key in seen:
|
|
msg = f"{PEOPLE_FILE} uses the key {entry.key!r} twice"
|
|
raise ConfigError(msg)
|
|
seen.add(entry.key)
|
|
|
|
|
|
def _unique_triggers(entries: list[Entry]) -> None:
|
|
"""Caught here rather than by the registry, which cannot name the file.
|
|
|
|
Skeletons, not spellings: two triggers can look different and fold the
|
|
same, because folding strips diacritics. Within one entry that is normal
|
|
and wanted -- "!celina" and "!celiną" are one person written two ways,
|
|
and the registry collapses them into one frozenset. Across two entries it
|
|
is a manifest that cannot work, and the registry would only be able to
|
|
say which skeleton collided, not which entry to fix.
|
|
"""
|
|
claimed: dict[str, str] = {}
|
|
for entry in entries:
|
|
for trigger in entry.triggers:
|
|
owner = claimed.setdefault(fold(trigger), entry.key)
|
|
if owner != entry.key:
|
|
msg = f"{PEOPLE_FILE} trigger {trigger!r} is claimed by {owner!r} and {entry.key!r}"
|
|
raise ConfigError(msg)
|