didericis
27a122e24b
tracker-policy-pr / check-pr (pull_request) Successful in 10s
test / integration-docker (pull_request) Successful in 17s
lint / lint (push) Failing after 59s
test / unit (pull_request) Successful in 2m3s
test / integration-firecracker (pull_request) Successful in 3m28s
test / coverage (pull_request) Successful in 16s
test / publish-infra (pull_request) Has been skipped
Remove the supervise queue helpers that no live path uses anymore — they're
mechanisms the PRD-0070 / idempotent-poll migration superseded:
- archive_proposal (+ QueueStore.archive_proposal): the poll stopped archiving
on read (#469 review), so single-proposal archiving has no caller; decided
proposals drop off the pending list via their response row and are reaped in
bulk by archive_all_proposals on teardown/reconcile.
- wait_for_response: the data plane polls the queue over the control-plane RPC
now, so nothing block-waits on it.
- audit_dir / audit_log_path: file-based audit paths, replaced by the SQLite
AuditStore.
Also drops the tests that covered those obsolete helpers. Kept the prod-unused
read accessors list_pending_proposals and read_audit_entries: those aren't dead
mechanisms — they're the read side of live write paths that many tests use to
verify real queue/audit behavior.
Full unit suite green (2243).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
94 lines
3.1 KiB
Python
94 lines
3.1 KiB
Python
"""Orchestrator-side supervise queue + audit I/O and diff rendering.
|
|
|
|
The host-side library the orchestrator uses to drive the supervise flow: read /
|
|
write proposals and responses against the queue store, append audit entries,
|
|
and render operator diffs. Only the orchestrator opens `bot-bottle.db` (PRD
|
|
0070), so this lives under `orchestrator/` — the data plane reaches it over the
|
|
control-plane RPC, never by importing this module.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import difflib
|
|
import hashlib
|
|
from pathlib import Path
|
|
|
|
from ...supervisor.types import AuditEntry, Proposal, Response
|
|
from ..store.queue_store import QueueStore
|
|
from ...store.audit_store import AuditStore
|
|
|
|
|
|
# --- Queue I/O -------------------------------------------------------------
|
|
|
|
|
|
def write_proposal(proposal: Proposal) -> Path:
|
|
"""Persist `proposal` in the queue database, mode 0o600.
|
|
Directory is created if missing."""
|
|
return QueueStore(proposal.bottle_slug).write_proposal(proposal)
|
|
|
|
|
|
def read_proposal(bottle_slug: str, proposal_id: str) -> Proposal:
|
|
return QueueStore(bottle_slug).read_proposal(proposal_id)
|
|
|
|
|
|
def list_pending_proposals(bottle_slug: str) -> list[Proposal]:
|
|
"""All proposals for `bottle_slug` that do not yet have a matching
|
|
response. Sorted by `arrival_timestamp` so the operator sees the queue
|
|
FIFO."""
|
|
return QueueStore(bottle_slug).list_pending_proposals()
|
|
|
|
|
|
def list_all_pending_proposals() -> list[Proposal]:
|
|
"""All pending proposals across bottles, sorted FIFO."""
|
|
return QueueStore("").list_all_pending_proposals()
|
|
|
|
|
|
def write_response(bottle_slug: str, response: Response) -> Path:
|
|
return QueueStore(bottle_slug).write_response(response)
|
|
|
|
|
|
def read_response(bottle_slug: str, proposal_id: str) -> Response:
|
|
return QueueStore(bottle_slug).read_response(proposal_id)
|
|
|
|
|
|
def archive_all_proposals(bottle_slug: str) -> None:
|
|
"""Archive every proposal + response for `bottle_slug` (bottle teardown /
|
|
reconcile cleanup). Idempotent."""
|
|
QueueStore(bottle_slug).archive_all()
|
|
|
|
|
|
# --- Audit log -------------------------------------------------------------
|
|
|
|
|
|
def write_audit_entry(entry: AuditEntry) -> Path:
|
|
"""Append `entry` to the host supervise audit table."""
|
|
return AuditStore().write_audit_entry(entry)
|
|
|
|
|
|
def read_audit_entries(component: str, slug: str) -> list[AuditEntry]:
|
|
"""Load all audit entries for the given component+slug."""
|
|
return AuditStore().read_audit_entries(component, slug)
|
|
|
|
|
|
# --- Diff rendering --------------------------------------------------------
|
|
|
|
|
|
def render_diff(before: str, after: str, *, label: str = "config") -> str:
|
|
"""Unified diff suitable for the audit log + TUI. Empty diff (no changes)
|
|
renders as the empty string."""
|
|
diff = difflib.unified_diff(
|
|
before.splitlines(keepends=True),
|
|
after.splitlines(keepends=True),
|
|
fromfile=f"{label} (current)",
|
|
tofile=f"{label} (proposed)",
|
|
lineterm="",
|
|
)
|
|
parts = list(diff)
|
|
if not parts:
|
|
return ""
|
|
return "".join(p if p.endswith("\n") else p + "\n" for p in parts).rstrip("\n")
|
|
|
|
|
|
def sha256_hex(content: str) -> str:
|
|
return hashlib.sha256(content.encode("utf-8")).hexdigest()
|