mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-12 08:31:06 +01:00
One row per command attempt, not two aggregates written only on success. command_uses holds last-use only and daily_uses counts successes; both are rate-limiter state and both are written by store.record_use, which the dispatcher calls only when a handler returns cleanly. A gate refusal and a crash returned before it, so a command that failed every time looked exactly like one nobody ran, and nothing knew which command a counted message was. command_events now takes every attempt with its outcome, its duration and the item it served; upstream_calls takes every outbound request made while serving one. The two writes stay separate on purpose -- recording a refusal as a use is what slid the cooldown window forward every time somebody was told to wait -- and test_dispatcher_outcomes asserts last_used does not move. Backfilled from journald joined against message_events, with daily_uses filling the residual so the two sources cannot double-count. Two things were wrong on the first attempt and both were found by measuring rather than by reasoning: the window has to be symmetric, because sent_at_ms comes from the sender's phone and the journal stamp from this host (194 of 299 lines landed *before* their own message, by up to 3.2 s); and matching has to be a global closest-pair assignment, because per-row greedy cannot separate two commands seconds apart. Together those took the dropped rows from 137 to zero, and recovered 418 invocations back to 29 August. Also: !analityka in the group, twelve Polish lines, naming at most three people and only ones whose display name has been seen; an Analytics tab with Nivo charts; and continuous latency measurement, which answers the open question in DOCS-latency.md -- a text send is 235 ms and an image send about 2.2 s, so the upload really is where the time goes. EPHEMERAL_TABLES was doing two unrelated jobs and is now two tuples: what a schema bump rebuilds, and what leaving a group clears. daily_uses left the first (it is a backfill source now) and stayed in the second, and _drop_reshaped took over the repair a bump used to do for it. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01T4QTp3h5Q3MvfrwGV8xqPf
134 lines
4.1 KiB
Python
134 lines
4.1 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""Every attempt becomes a row, and a refusal still does not move the cooldown.
|
|
|
|
The second half is the one that matters. ``CommandRefusedError``'s docstring
|
|
records the bug: recording a refused run slid the cooldown window forward
|
|
every time somebody was told to wait, so waiting the stated time never
|
|
helped. The command history now takes refusals *and* crashes, which makes
|
|
merging the two writes look like an obvious simplification. It is not, and
|
|
test_a_refusal_does_not_move_the_cooldown is what says so.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import datetime as dt
|
|
from typing import TYPE_CHECKING, Any
|
|
|
|
import pytest
|
|
|
|
from signal_bot.analytics import probe
|
|
from signal_bot.dispatcher import Dispatcher
|
|
from signal_bot.registry import CommandRegistry
|
|
from tests.conftest import WATCHED_GROUP, envelope
|
|
|
|
if TYPE_CHECKING:
|
|
from signal_bot.config import Config
|
|
from signal_bot.context import CommandContext
|
|
from signal_bot.discovery import GroupDirectory
|
|
from signal_bot.store import Store
|
|
from signal_bot.transport_fake import FakeTransport
|
|
|
|
NOW = dt.datetime(2026, 8, 29, 12, 0, tzinfo=dt.UTC)
|
|
SENDER = "uuid-alice"
|
|
|
|
|
|
def history(store: Store) -> list[dict[str, Any]]:
|
|
"""Every recorded attempt, oldest first."""
|
|
return [
|
|
dict(row)
|
|
for row in store.commands.connection.execute(
|
|
"SELECT * FROM command_events ORDER BY invoked_at_ms"
|
|
)
|
|
]
|
|
|
|
|
|
def calls(store: Store) -> list[dict[str, Any]]:
|
|
"""Every recorded upstream call."""
|
|
return [
|
|
dict(row)
|
|
for row in store.commands.connection.execute("SELECT * FROM upstream_calls ORDER BY seq")
|
|
]
|
|
|
|
|
|
def build(
|
|
config: Config,
|
|
directory: GroupDirectory,
|
|
registry: CommandRegistry,
|
|
store: Store,
|
|
transport: FakeTransport,
|
|
) -> Dispatcher:
|
|
"""A dispatcher over one caller-supplied registry."""
|
|
return Dispatcher(
|
|
config=config,
|
|
directory=directory,
|
|
registry=registry,
|
|
store=store,
|
|
transport=transport,
|
|
clock=lambda: NOW,
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def ok_registry() -> CommandRegistry:
|
|
"""One command that succeeds and reports what it did on the way."""
|
|
|
|
async def handler(_ctx: CommandContext) -> None:
|
|
probe.note_upstream("api.example.test", 200, 40)
|
|
probe.note_send(120)
|
|
probe.note_item("Q42")
|
|
|
|
reg = CommandRegistry()
|
|
reg.register("cat", ["!cat"], handler, "kot")
|
|
return reg
|
|
|
|
|
|
async def test_a_success_is_recorded_with_what_it_cost(
|
|
config: Config,
|
|
directory: GroupDirectory,
|
|
ok_registry: CommandRegistry,
|
|
store: Store,
|
|
transport: FakeTransport,
|
|
) -> None:
|
|
"""The row nothing wrote before: outcome, item, and where the time went."""
|
|
dispatcher = build(config, directory, ok_registry, store, transport)
|
|
await dispatcher.handle(envelope(text="!cat"))
|
|
|
|
(row,) = history(store)
|
|
assert row["command"] == "cat"
|
|
assert row["outcome"] == "ok"
|
|
assert row["item_id"] == "Q42"
|
|
assert row["send_ms"] == 120
|
|
assert row["source"] == "live"
|
|
assert row["handler_ms"] >= 0
|
|
assert calls(store) == [
|
|
{
|
|
"group_id": WATCHED_GROUP,
|
|
"invoked_at_ms": row["invoked_at_ms"],
|
|
"command": "cat",
|
|
"host": "api.example.test",
|
|
"status": 200,
|
|
"duration_ms": 40,
|
|
"seq": 0,
|
|
}
|
|
]
|
|
|
|
|
|
async def test_the_history_and_the_message_share_a_key(
|
|
config: Config,
|
|
directory: GroupDirectory,
|
|
ok_registry: CommandRegistry,
|
|
store: Store,
|
|
transport: FakeTransport,
|
|
) -> None:
|
|
"""Both tables key on the envelope's own timestamp, or nothing joins."""
|
|
dispatcher = build(config, directory, ok_registry, store, transport)
|
|
await dispatcher.handle(envelope(text="!cat"))
|
|
|
|
(event,) = history(store)
|
|
row = store.events.connection.execute(
|
|
"SELECT sent_at_ms, local_hour, day FROM message_events WHERE is_command = 1"
|
|
).fetchone()
|
|
assert event["invoked_at_ms"] == row["sent_at_ms"]
|
|
assert event["local_hour"] == row["local_hour"]
|
|
assert event["day"] == row["day"]
|