fix(ttp): E.3.18a worker hydrates per-lifter rule indexes via watch_store
Each per-source lifter holds its own RuleIndex and exposes an `async watch_store()` that loads the corpus and drains store change events forever. Until this commit nothing called `watch_store()` in production — every dispatch index stayed empty and no rule fired. - Add `WatchableTagger` runtime-checkable Protocol in `decnet.ttp.base`. - `CompositeTagger.iter_watchables()` yields lifters that satisfy it. - `run_ttp_worker_loop` fans out one task per watchable, cancelled and awaited alongside pump/heartbeat/control in the existing finally. - Watch failures log and exit the watch task without taking the worker down — mirrors the pump-task tolerance contract.
This commit is contained in:
@@ -17,7 +17,7 @@ from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import Any, Final, NamedTuple
|
||||
from typing import Any, Final, NamedTuple, Protocol, runtime_checkable
|
||||
|
||||
from decnet.web.db.models.ttp import TTPTag
|
||||
|
||||
@@ -130,9 +130,28 @@ class TolerantTagger(Tagger):
|
||||
"""Real tagging logic — subclasses override this, not :meth:`tag`."""
|
||||
|
||||
|
||||
@runtime_checkable
|
||||
class WatchableTagger(Protocol):
|
||||
"""Structural protocol for taggers that hot-reload from a RuleStore.
|
||||
|
||||
Each per-source lifter (and :class:`RuleEngineTagger`) holds its
|
||||
own :class:`~decnet.ttp.impl._rule_index.RuleIndex` and exposes an
|
||||
``async def watch_store()`` coroutine that loads the initial
|
||||
corpus and drains store change events forever. The worker
|
||||
(E.3.14) starts one task per ``WatchableTagger`` so dispatch
|
||||
indexes hydrate at startup; without this the indexes stay empty
|
||||
and no rule fires. ``runtime_checkable`` so the worker can fan
|
||||
out via :func:`isinstance` without leaking the protocol into the
|
||||
abstract :class:`Tagger` base.
|
||||
"""
|
||||
|
||||
async def watch_store(self) -> None: ...
|
||||
|
||||
|
||||
__all__ = [
|
||||
"KNOWN_SOURCE_KINDS",
|
||||
"TaggerEvent",
|
||||
"Tagger",
|
||||
"TolerantTagger",
|
||||
"WatchableTagger",
|
||||
]
|
||||
|
||||
@@ -23,7 +23,14 @@ import logging
|
||||
import os
|
||||
from typing import Final
|
||||
|
||||
from decnet.ttp.base import KNOWN_SOURCE_KINDS, Tagger, TaggerEvent
|
||||
from collections.abc import Iterator
|
||||
|
||||
from decnet.ttp.base import (
|
||||
KNOWN_SOURCE_KINDS,
|
||||
Tagger,
|
||||
TaggerEvent,
|
||||
WatchableTagger,
|
||||
)
|
||||
from decnet.web.db.models.ttp import TTPTag
|
||||
|
||||
_log = logging.getLogger(__name__)
|
||||
@@ -66,6 +73,19 @@ class CompositeTagger(Tagger):
|
||||
self._warned_known: set[str] = set()
|
||||
self._informed_unknown: set[str] = set()
|
||||
|
||||
def iter_watchables(self) -> Iterator[WatchableTagger]:
|
||||
"""Yield every child lifter that hot-reloads from a RuleStore.
|
||||
|
||||
The worker (E.3.14) starts one ``asyncio.Task`` per yielded
|
||||
lifter so its dispatch index hydrates at startup; without this
|
||||
every index stays empty and no rule fires in production.
|
||||
Filtering on the structural :class:`WatchableTagger` protocol
|
||||
keeps the worker free of per-lifter type knowledge.
|
||||
"""
|
||||
for lifter in self._lifters:
|
||||
if isinstance(lifter, WatchableTagger):
|
||||
yield lifter
|
||||
|
||||
async def tag(self, event: TaggerEvent) -> list[TTPTag]:
|
||||
lifters = self._by_kind.get(event.source_kind, [])
|
||||
if not lifters:
|
||||
|
||||
@@ -40,7 +40,7 @@ from decnet.bus.publish import (
|
||||
)
|
||||
from decnet.logging import get_logger
|
||||
from decnet.ttp.base import Tagger, TaggerEvent
|
||||
from decnet.ttp.factory import get_tagger
|
||||
from decnet.ttp.factory import CompositeTagger, get_tagger
|
||||
from decnet.web.db.models.ttp import TTPTag
|
||||
from decnet.web.db.repository import BaseRepository
|
||||
|
||||
@@ -186,8 +186,23 @@ async def run_ttp_worker_loop(
|
||||
owned_bus = False
|
||||
queue: asyncio.Queue[tuple[str, Event] | None] = asyncio.Queue()
|
||||
pump_tasks: list[asyncio.Task[None]] = []
|
||||
watch_tasks: list[asyncio.Task[None]] = []
|
||||
heartbeat_task: Optional[asyncio.Task[None]] = None
|
||||
control_task: Optional[asyncio.Task[None]] = None
|
||||
|
||||
# Hydrate per-lifter rule indexes. Each WatchableTagger
|
||||
# (CompositeTagger children + the RuleEngineTagger) owns its own
|
||||
# RuleIndex and drains store change events forever via
|
||||
# `watch_store`. Without these tasks every dispatch index stays
|
||||
# empty and no rule fires — the bus subscriptions work, the
|
||||
# pump tasks run, and tagger.tag() returns [] every call. Tasks
|
||||
# are independent of the bus, so this fan-out runs even in
|
||||
# poll-only mode.
|
||||
if isinstance(tagger, CompositeTagger):
|
||||
for watchable in tagger.iter_watchables():
|
||||
watch_tasks.append(asyncio.create_task(
|
||||
_run_watch(watchable),
|
||||
))
|
||||
try:
|
||||
if bus is None:
|
||||
try:
|
||||
@@ -237,6 +252,8 @@ async def run_ttp_worker_loop(
|
||||
finally:
|
||||
for task in pump_tasks:
|
||||
task.cancel()
|
||||
for task in watch_tasks:
|
||||
task.cancel()
|
||||
if heartbeat_task is not None:
|
||||
heartbeat_task.cancel()
|
||||
if control_task is not None:
|
||||
@@ -244,6 +261,9 @@ async def run_ttp_worker_loop(
|
||||
for task in pump_tasks:
|
||||
with contextlib.suppress(asyncio.CancelledError, Exception):
|
||||
await task
|
||||
for task in watch_tasks:
|
||||
with contextlib.suppress(asyncio.CancelledError, Exception):
|
||||
await task
|
||||
for opt in (heartbeat_task, control_task):
|
||||
if opt is None:
|
||||
continue
|
||||
@@ -342,6 +362,26 @@ async def _publish_tagged(bus: BaseBus, tags: list[TTPTag]) -> None:
|
||||
)
|
||||
|
||||
|
||||
async def _run_watch(watchable: Any) -> None:
|
||||
"""Drive one lifter's ``watch_store()`` coroutine forever.
|
||||
|
||||
Mirrors :func:`_pump`'s tolerance contract: a transient store error
|
||||
logs and exits the watch task without taking the worker down. The
|
||||
main loop's poll-interval fallback continues to heartbeat; a
|
||||
subsequent worker restart re-runs the watch fan-out and rehydrates.
|
||||
"""
|
||||
name = getattr(watchable, "name", watchable.__class__.__name__)
|
||||
try:
|
||||
await watchable.watch_store()
|
||||
except asyncio.CancelledError:
|
||||
raise
|
||||
except Exception as exc: # noqa: BLE001
|
||||
log.warning(
|
||||
"ttp worker: watch_store for %s died (%s); index will not "
|
||||
"hot-reload until next worker restart", name, exc,
|
||||
)
|
||||
|
||||
|
||||
async def _pump(
|
||||
bus: BaseBus,
|
||||
queue: "asyncio.Queue[tuple[str, Event] | None]",
|
||||
|
||||
Reference in New Issue
Block a user