common.py: fix facts_of valid_only semantics

clerk/common.py

@@ -21,7 +21,7 @@ License: Apache-2.0
 from __future__ import annotations
 
 import json
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Tuple
 
 LEDGER_BUDGET_DEFAULT = 24
@@ -85,7 +85,6 @@ def parse_ops(text: str) -> Tuple[List[Dict[str, Any]], str]:
     """
     text = text.strip()
     if text.startswith("```"):
-        # strip a markdown fence if the model adds one
         text = text.strip("`")
         if text.startswith("json"):
             text = text[4:]
@@ -188,30 +187,29 @@ def salience(slot: Slot, now: int) -> float:
 def enforce_budget(
     ledger: List[Slot], ops: List[Dict[str, Any]], now: int
 ) -> Tuple[List[Slot], List[Dict[str, Any]]]:
-    """After applying gold ADD/UPDATE ops, evict lowest-salience occupied
-    slots until the active-slot count fits the budget. Appends the EVICT ops
-    to the gold program so the policy learns budget-aware behavior."""
+    """Apply ops, then evict lowest-salience occupied slots until the
+    occupied count fits the budget (== number of slots). Appends EVICT ops
+    to the program so the policy learns budget-aware behavior."""
     ledger, _ = apply_ops(ledger, ops, now)
     ops = list(ops)
     occupied = [s for s in ledger if s.occupied]
-    overflow = len(occupied) - len(ledger)
-    for _ in range(max(0, overflow)):
-        victim = min(
-            (s for s in ledger if s.occupied), key=lambda s: salience(s, now)
-        )
+    for _ in range(max(0, len(occupied) - len(ledger))):
+        victim = min((s for s in ledger if s.occupied),
+                     key=lambda s: salience(s, now))
         ops.append({"op": "EVICT", "i": victim.id})
         ledger[victim.id] = Slot(id=victim.id)
     return ledger, ops
 
 
 def facts_of(ledger: List[Slot], valid_only: bool = True) -> Dict[Tuple[str, str], str]:
-    """Current fact map {(subject, predicate): object}."""
+    """Current fact map {(subject, predicate): object}.
+
+    valid_only=True keeps only active slots; False also returns tombstoned
+    slots (last-known value), which backs temporal questions."""
     out: Dict[Tuple[str, str], str] = {}
     for s in ledger:
         if s.occupied and (s.valid or not valid_only):
-            key = (s.subject, s.predicate)
-            if s.valid:
-                out[key] = s.object
+            out[(s.subject, s.predicate)] = s.object
     return out