CI & Build / TypeScript typecheck (push) Successful in 41s
CI & Build / Plugin hooks (push) Successful in 17s
CI & Build / Python lint (push) Successful in 3s
CI & Build / Python tests (push) Failing after 1m41s
CI & Build / integration (push) Successful in 1m59s
CI & Build / Build & push image (push) Skipped
Every rule arm now ranks what it delivers with one function (services/rule_order.py): enforcement, then salience, then how narrowly the rule was reached, then first mention before reminder, then the rule's own open rate at that moment, then similarity. A crowded moment drops the same rules whichever arm brought them, and a rule that holds is never cut for a line beside it. The open rate comes from a new table, rule_deliveries (migration 0129): one row per rule line a plugin session is shown, full or repeat, with the open stamped on the latest delivery it followed. The plugin routes bind the session per request; the prompt, pre-tool and write-path hooks now send it, and the opened hook reports every open, with its acts only when no hook had just named the rule. Rows are pruned daily after 180 days. Also fixes the TypeScript check: the store's list row now carries the new enforcement field. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
108 lines
4.3 KiB
Python
108 lines
4.3 KiB
Python
"""Real-Postgres tests for `rule_deliveries`: a delivery recorded against a
|
|
session, the open stamped on the one it followed, and the history read back."""
|
|
import asyncio
|
|
from datetime import datetime, timedelta, timezone
|
|
|
|
import pytest
|
|
from sqlalchemy import delete, select, update
|
|
|
|
from grimoire.models import async_session
|
|
from grimoire.models.rule_delivery import RuleDelivery
|
|
from grimoire.services import background, rule_deliveries
|
|
from tests.helpers import ensure_user
|
|
|
|
pytestmark = [pytest.mark.integration, pytest.mark.usefixtures("_dispose_engine")]
|
|
|
|
RULE = 9_100_001
|
|
OTHER = 9_100_002
|
|
|
|
|
|
async def _user() -> int:
|
|
async with async_session() as s:
|
|
user = await ensure_user(s, "rule_delivery_owner")
|
|
uid = user.id
|
|
await s.commit()
|
|
await s.execute(delete(RuleDelivery).where(RuleDelivery.user_id == uid))
|
|
await s.commit()
|
|
return uid
|
|
|
|
|
|
async def _rows(uid: int) -> list[RuleDelivery]:
|
|
async with async_session() as s:
|
|
return list((await s.execute(
|
|
select(RuleDelivery).where(RuleDelivery.user_id == uid).order_by(RuleDelivery.id)
|
|
)).scalars().all())
|
|
|
|
|
|
async def _record(uid, sid, source, lines):
|
|
rule_deliveries.record(uid, sid, source, lines)
|
|
await background.drain()
|
|
|
|
|
|
async def test_an_open_is_stamped_on_the_sessions_latest_delivery_only():
|
|
uid = await _user()
|
|
await _record(uid, "s-1", "moment_rule", [(RULE, "work.finish", "full")])
|
|
await asyncio.sleep(0.01)
|
|
await _record(uid, "s-1", "moment_rule", [(RULE, "work.finish", "repeat")])
|
|
await _record(uid, "s-2", "moment_rule", [(RULE, "work.finish", "full")])
|
|
|
|
assert await rule_deliveries.mark_opened(uid, "s-1", RULE) is True
|
|
rows = await _rows(uid)
|
|
opened = [(r.session_id, r.form) for r in rows if r.opened_at is not None]
|
|
assert opened == [("s-1", "repeat")]
|
|
# A second open with nothing left unopened in the session stamps the earlier one.
|
|
assert await rule_deliveries.mark_opened(uid, "s-1", RULE) is True
|
|
assert await rule_deliveries.mark_opened(uid, "s-1", RULE) is False
|
|
|
|
|
|
async def test_an_open_with_no_delivery_behind_it_stamps_nothing():
|
|
uid = await _user()
|
|
assert await rule_deliveries.mark_opened(uid, "s-1", OTHER) is False
|
|
assert await rule_deliveries.mark_opened(uid, "", RULE) is False
|
|
|
|
|
|
async def test_without_a_session_nothing_is_recorded():
|
|
uid = await _user()
|
|
rule_deliveries.bind_session("")
|
|
await _record(uid, None, "prompt_rule", [(RULE, "prompt_rule", "full")])
|
|
assert await _rows(uid) == []
|
|
|
|
|
|
async def test_a_bound_session_is_the_one_recorded():
|
|
uid = await _user()
|
|
rule_deliveries.bind_session("bound s/3")
|
|
await _record(uid, None, "prompt_rule", [(RULE, "prompt_rule", "full")])
|
|
# The plugin's filename-safe form, so the raw and safe ids agree.
|
|
assert [r.session_id for r in await _rows(uid)] == ["bound_s_3"]
|
|
rule_deliveries.bind_session("")
|
|
|
|
|
|
async def test_history_is_the_smoothed_open_rate_at_each_place():
|
|
uid = await _user()
|
|
await _record(uid, "s-1", "moment_rule", [(RULE, "work.finish", "full")] * 3
|
|
+ [(RULE, "work.deliver", "full"), (OTHER, "work.finish", "full")])
|
|
await rule_deliveries.mark_opened(uid, "s-1", RULE) # one of the five RULE rows
|
|
|
|
history = await rule_deliveries.history(uid, [(RULE, "work.finish"), (OTHER, "work.finish")])
|
|
rows = await _rows(uid)
|
|
stamped_at = next(r.at for r in rows if r.opened_at is not None)
|
|
finish_opened = 1 if stamped_at == "work.finish" else 0
|
|
assert history[RULE] == pytest.approx((finish_opened + 1) / (3 + 2))
|
|
assert history[OTHER] == pytest.approx(1 / 3)
|
|
# A place with no delivery is unknown, not zero.
|
|
assert await rule_deliveries.history(uid, [(RULE, "reply.report")]) == {}
|
|
|
|
|
|
async def test_old_deliveries_are_pruned():
|
|
uid = await _user()
|
|
await _record(uid, "s-1", "moment_rule", [(RULE, "work.finish", "full"), (OTHER, "work.finish", "full")])
|
|
async with async_session() as s:
|
|
await s.execute(
|
|
update(RuleDelivery)
|
|
.where(RuleDelivery.user_id == uid, RuleDelivery.rule_id == RULE)
|
|
.values(delivered_at=datetime.now(timezone.utc) - timedelta(days=rule_deliveries.RETAIN_DAYS + 1))
|
|
)
|
|
await s.commit()
|
|
assert await rule_deliveries.prune() >= 1
|
|
assert [r.rule_id for r in await _rows(uid)] == [OTHER]
|