signal-bot/signal_bot/pack_random.py
Krzysztof kuhy Rudnicki aefffb2fd9
Some checks are pending
CI / check (push) Waiting to run
feat: add a photo to the album from the chat, tagged, stripped and verified
Send a photo captioned "!add_photo alfa wakacje" in one of the album's own
groups and it lands in the pack tagged with both, retrievable through !alfa
and the new !losowe immediately -- no restart, and no tagger session on the PC.
A label matching nobody becomes a custom tag, and !losowe is the only door to
one, which is what keeps a live swap a *data* swap: it can never register a
trigger or widen a command's groups.

No typed label travels. Labels become pseudonym keys in a new registry
arg_resolver, at the dispatcher, before the line that logs the command name --
so no handler, journal entry, command_uses row or reply body ever holds a word
somebody typed. The reply is counts and pseudonyms: "dodano · p1: 4 · t1: 1".

Stripping is exiftool with a *positive* check on the output, never an exit
code. ffmpeg was tried first and fails silently on photos: given a JPEG with a
real APP1 Exif segment it returned a byte-identical file, GPS intact, exit 0.
The surviving-tag allowlist is per tag *name* rather than per group, because
measurement showed a group-level "must be empty" rule rejects every format
except JPEG -- a valid PNG always reports its IHDR, an MP4 some fifty QuickTime
tags that are the container itself. Codec configuration (CompressorName,
VendorID, the HEVC parameter set) is on the list by decision: CompressorName
lives in the avc1 sample description and exiftool cannot write it at all, so
the alternative was refusing every video and every iPhone HEIC. Location and
identity tags are still refused, and the e2e run re-reads the stored files to
prove a QuickTime geotag did not survive.

.webm and .svg stay on the format allowlist and are stored *unstripped*:
exiftool 13.55 can write neither, and its SVG reader does not even surface
<metadata>. That is a deliberate, documented hole, not an oversight.

Two things this had to defuse along the way:
- personal_data_sources now reads custom.json, so "!add_photo kot <photo>"
  would have outlawed the word "kot" and refused every future commit, fixable
  only by hand-editing an album the committer cannot see. Minting now refuses
  a word that is already a command, and the gate subtracts the repo's own
  alias vocabulary from custom labels only -- curated people.json names are
  never excused.
- signal_bot/external.py is now the single subprocess site in the repository,
  so ruff's S603 needs exactly one scoped per-file-ignore instead of one per
  module that shells out. A test asserts nothing else imports subprocess.

A failed add changes nothing: media and the three manifests are written, the
album is reloaded, and only a load that succeeds is published; a load that
fails rolls all four back and keeps serving the pack that was already working,
without raising -- Restart=always would turn a ConfigError into a loop.

977 tests, 100% branch coverage, no omits and no suppressions. scripts/e2e.sh
gains 8 scenarios driven against the real exiftool on media generated at run
time, and asserts the invariants a reply cannot: that a refused upload is not
stored, that a message with no attachment leaves custom.json byte-identical,
and that signal-cli's own copy of every ingested attachment is gone.

Closes TODO-add-photo.md.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JqqE22jp94B1ypwxppdr1o
2026-08-31 11:20:00 +02:00

95 lines
3.3 KiB
Python

# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
"""``!random``: a photo from the album, optionally narrowed by custom tags.
Custom tags define no commands of their own -- that is what keeps a hot-swap
a data swap -- so this is the only door to a label ``!add_photo`` minted.
Its resolver is deliberately **not** the one ``!add_photo`` uses. That one
mints a key for a label nobody has; if ``!random`` shared it, every typo here
would quietly create a tag, and the album would fill with keys nobody can
reach. An unknown label resolves to a sentinel instead and is answered with
the same line as a combination nobody photographed -- from the group's side
those are the same question.
Labels only, never people: ``!alfa`` already exists for those, and a second
entrance with an unscoped argument list is one too many.
"""
from __future__ import annotations
import base64
from typing import TYPE_CHECKING, Final
from signal_bot.pack import MAX_NAMES, media_type
from signal_bot.pack_command import NAME_PREFIX, NO_PHOTO, UNKNOWN, pick
if TYPE_CHECKING:
from signal_bot.decorators import Decorator
from signal_bot.pack_holder import PackHolder
from signal_bot.registry import ArgResolver, CommandContext, CommandRegistry, Handler
COMMAND_NAME: Final = f"{NAME_PREFIX}random"
DESCRIPTION: Final = "losowe zdjęcie z albumu, opcjonalnie po etykiecie"
def random_resolver(holder: PackHolder) -> ArgResolver:
"""Turn typed labels into custom-tag keys, minting nothing.
Reads through the holder rather than closing over a Pack, so a tag
minted at 12:00 resolves at 12:01 without a restart.
"""
def resolve(words: tuple[str, ...]) -> tuple[str, ...]:
custom = holder.pack.custom
return tuple(custom.resolve(word) or UNKNOWN for word in words)
return resolve
def random_handler(holder: PackHolder) -> Handler:
"""Build the handler that answers ``!random``."""
async def handler(ctx: CommandContext) -> None:
keys = ctx.args
# The ceiling is applied to the label list directly rather than
# through candidate_keysets, whose ">=" is written against a
# head-plus-tail shape that !random does not have.
if len(keys) > MAX_NAMES or UNKNOWN in keys:
await ctx.reply(NO_PHOTO)
return
pack = holder.pack
# An empty frozenset is a superset test that every file passes, so
# bare !random needs no separate path through here.
viable = pack.matching(frozenset(keys))
if not viable:
await ctx.reply(NO_PHOTO)
return
filename = pick(viable)
payload = base64.b64encode(pack.media_path(filename).read_bytes()).decode("ascii")
await ctx.reply_media(payload, media_type(filename), filename)
return handler
def register_random_command(
registry: CommandRegistry,
holder: PackHolder,
triggers: tuple[str, ...],
*,
decorate: Decorator | None = None,
) -> None:
"""Register ``!random``, scoped to the album's own groups."""
handler = random_handler(holder)
if decorate is not None:
handler = decorate(handler)
registry.register(
COMMAND_NAME,
triggers,
handler,
DESCRIPTION,
groups=holder.pack.groups,
takes_args=True,
arg_resolver=random_resolver(holder),
)