After PR #64 (substrate) and PR #65 (content) both landed on main, this test is the promised follow-up that exercises the substrate-callable verify_definitional_closure against the real ratified content rather than fixture packs. It pins three contracts: 1. Substrate-vs-content handshake. The standalone scripts/verify_definitional_closure.py is the agent's dev-loop tool; this test is the gate-callable equivalent the ratification pipeline can invoke. Both must agree on what passes — divergence is a contract bug. 2. Content drift catcher. Any future content edit that adds an unresolved token / non-mounted dependency / silent staging leak fails this test before the edit lands on main. 3. Staging exclusion. en_minimal_v1 is staging per the ADR-0084 pack-content brief and must not be load-bearing for the closure rule. Test-pinned via a production-pool subtest. Substrate fix: allow empty definitional_atoms The substrate's strict parser previously rejected empty definitional_atoms. That stance was wrong: per the ADR-0084 pack- content brief, the per-entry atom list excludes articles, prepositions, and copulas. A gloss whose every content word is a function word (e.g. en_core_temporal_v1/prior → "before") has zero content atoms by construction. The closure rule passes vacuously when atoms is empty — there is nothing to close. The gloss-vs-atoms mismatch check in the standalone verifier is the second-layer gate that distinguishes by-construction emptiness (legitimate) from by-omission emptiness (laziness). Substrate parser shouldn't double-gate the same concern. The corresponding substrate test flipped from test_empty_definitional_atoms_rejected to test_empty_definitional_atoms_accepted, with comment explaining the reasoning. Primitives expansion: can + action Two content entries (en_core_cognition_v1/person → "who can know and do" and en_core_meta_v1/intend → "decide before an action") leaned on 'can' and 'action' as atom references. Today those lemmas resolve ONLY via en_minimal_v1/lexicon.jsonl — the staging pack. That's a production-vs-staging leak: production content should not be load- bearing on staging. Two clean alternatives: (a) rewrite the two glosses to avoid 'can' and 'action' (b) promote 'can' and 'action' to primitives Chose (b): both lemmas are genuinely terminal-feeling (can is a basic capability modal; action is an irreducible "what is done"); the content reads more naturally with them present than with paraphrased substitutes; and the floor was always going to need both eventually. The cost is two primitives.jsonl rows + checksum + count bump. Verification: scripts/verify_definitional_closure.py exit 0 tests/test_adr_0084_integration_closure.py 30/30 pass tests/test_adr_0084_definitional_substrate.py 39/39 pass core test --suite smoke -q 67/67 core test --suite packs -q 6/6 core eval cognition byte-identical (100/91.7/100/100) Two-layer gate now in place: - standalone verifier (dev loop, gloss/atom mismatch check) - substrate verifier (ratification gate, parametrized over every opted-in pack, staging-exclusion test, primitives floor coverage)
312 lines
12 KiB
Python
312 lines
12 KiB
Python
"""ADR-0084 — definitional-layer substrate.
|
|
|
|
Owns the schema and load path for the extended ``glosses.jsonl`` entries
|
|
introduced by ADR-0084. This module is the *substrate* layer only — no
|
|
composer here consumes the new fields, and no surface is generated from
|
|
them. ADR-0085 adds the consumer; ADR-0086 adds predicate licensing at
|
|
ratification.
|
|
|
|
Design notes
|
|
------------
|
|
|
|
- ADR-0084 attaches the definitional block to the per-lemma gloss entry,
|
|
NOT to ``lexicon.jsonl``. The lexicon checksum stays the immutable
|
|
seal; ``glosses.jsonl`` remains the additive overlay that already exists
|
|
for the 9 core packs.
|
|
- Pack-level opt-in via ``LanguagePackManifest.definitional_layer``. A
|
|
pack without the flag parses today exactly as before — the older
|
|
``(pos, gloss)`` two-tuple shape is preserved in
|
|
:mod:`chat.pack_resolver`.
|
|
- Strict-mode parsing (``definitional_layer: true``) enforces:
|
|
* every required field present and well-typed
|
|
* unknown keys inside the gloss entry rejected
|
|
* ``predicates_invited`` may be an empty list (migration aid)
|
|
* ``definition_version`` is a positive int
|
|
- Closure-rule enforcement lives in :func:`verify_definitional_closure`;
|
|
it is invoked by the ratification gate (and by the standalone
|
|
``scripts/verify_definitional_closure.py`` dev tool authored alongside
|
|
the content PR).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from dataclasses import dataclass, field
|
|
from functools import lru_cache
|
|
from pathlib import Path
|
|
from typing import Iterable
|
|
|
|
|
|
_PACK_ROOT = Path(__file__).parent / "data"
|
|
|
|
|
|
# Required keys inside a strict (definitional_layer=True) gloss entry.
|
|
_REQUIRED_KEYS: frozenset[str] = frozenset(
|
|
{
|
|
"lemma",
|
|
"gloss",
|
|
"definitional_atoms",
|
|
"predicates_invited",
|
|
"definition_version",
|
|
"provenance_ids",
|
|
}
|
|
)
|
|
|
|
# All allowed keys inside a strict gloss entry. Any key outside this
|
|
# set is rejected — ADR-0084 §Schema validation, "unrecognised key
|
|
# inside ``definition`` rejected (strict gate)".
|
|
_ALLOWED_KEYS: frozenset[str] = _REQUIRED_KEYS | frozenset({"pos"})
|
|
|
|
|
|
@dataclass(frozen=True, slots=True)
|
|
class GlossEntry:
|
|
"""One parsed ``glosses.jsonl`` entry.
|
|
|
|
Fields beyond ``(lemma, gloss, pos)`` are populated only for entries
|
|
coming from a pack with ``definitional_layer: true``. Legacy
|
|
two-field entries map to default values for the ADR-0084 fields.
|
|
"""
|
|
|
|
lemma: str
|
|
gloss: str
|
|
pos: str = ""
|
|
definitional_atoms: tuple[str, ...] = field(default_factory=tuple)
|
|
predicates_invited: tuple[str, ...] = field(default_factory=tuple)
|
|
definition_version: int = 0
|
|
provenance_ids: tuple[str, ...] = field(default_factory=tuple)
|
|
|
|
|
|
class DefinitionalSchemaError(ValueError):
|
|
"""Raised when a strict-mode gloss entry violates the ADR-0084 schema."""
|
|
|
|
|
|
def _require_nonempty_str(payload: dict, key: str, *, lemma_hint: str) -> str:
|
|
value = payload.get(key)
|
|
if not isinstance(value, str) or not value.strip():
|
|
raise DefinitionalSchemaError(
|
|
f"gloss entry for lemma={lemma_hint!r} requires non-empty string field {key!r}"
|
|
)
|
|
return value.strip()
|
|
|
|
|
|
def _require_str_tuple(
|
|
payload: dict, key: str, *, lemma_hint: str, allow_empty: bool
|
|
) -> tuple[str, ...]:
|
|
raw = payload.get(key)
|
|
if not isinstance(raw, list) or any(not isinstance(x, str) or not x for x in raw):
|
|
raise DefinitionalSchemaError(
|
|
f"gloss entry for lemma={lemma_hint!r} requires {key!r} to be a list of non-empty strings"
|
|
)
|
|
if not raw and not allow_empty:
|
|
raise DefinitionalSchemaError(
|
|
f"gloss entry for lemma={lemma_hint!r} requires non-empty {key!r}"
|
|
)
|
|
return tuple(raw)
|
|
|
|
|
|
def parse_gloss_entry(payload: dict, *, strict: bool) -> GlossEntry:
|
|
"""Parse a single ``glosses.jsonl`` row.
|
|
|
|
``strict=True`` applies the ADR-0084 schema gate: required fields,
|
|
typed lists, no unknown keys, positive ``definition_version``.
|
|
|
|
``strict=False`` preserves the back-compat two-field shape — any
|
|
extra ADR-0084 fields present are read opportunistically but never
|
|
required.
|
|
"""
|
|
if not isinstance(payload, dict):
|
|
raise DefinitionalSchemaError(f"gloss entry must be a JSON object, got {type(payload).__name__}")
|
|
|
|
_maybe_lemma = payload.get("lemma")
|
|
lemma_hint: str = _maybe_lemma if isinstance(_maybe_lemma, str) and _maybe_lemma else "<unknown>"
|
|
|
|
if strict:
|
|
unknown = set(payload.keys()) - _ALLOWED_KEYS
|
|
if unknown:
|
|
raise DefinitionalSchemaError(
|
|
f"gloss entry for lemma={lemma_hint!r} carries unrecognised key(s): {sorted(unknown)}"
|
|
)
|
|
missing = _REQUIRED_KEYS - set(payload.keys())
|
|
if missing:
|
|
raise DefinitionalSchemaError(
|
|
f"gloss entry for lemma={lemma_hint!r} missing required key(s): {sorted(missing)}"
|
|
)
|
|
|
|
lemma = _require_nonempty_str(payload, "lemma", lemma_hint=lemma_hint)
|
|
gloss = _require_nonempty_str(payload, "gloss", lemma_hint=lemma)
|
|
# Empty ``definitional_atoms`` is legal: per the ADR-0084
|
|
# content brief, the per-entry atom list excludes
|
|
# articles/prepositions/copulas. A gloss whose every content
|
|
# word is a function word (e.g. ``prior`` → ``"before"``) has
|
|
# zero content atoms by construction. The closure rule then
|
|
# passes vacuously — which is fine, because there is nothing
|
|
# *to* close. Note the substrate cannot tell whether atoms
|
|
# are empty by-construction (legitimate) or by-omission
|
|
# (laziness); the gloss-vs-atoms mismatch check in the
|
|
# standalone verifier (``scripts/verify_definitional_closure.py``)
|
|
# is the second-layer gate that distinguishes the two.
|
|
definitional_atoms = _require_str_tuple(
|
|
payload, "definitional_atoms", lemma_hint=lemma, allow_empty=True
|
|
)
|
|
predicates_invited = _require_str_tuple(
|
|
payload, "predicates_invited", lemma_hint=lemma, allow_empty=True
|
|
)
|
|
definition_version_raw = payload.get("definition_version")
|
|
if not isinstance(definition_version_raw, int) or isinstance(definition_version_raw, bool) or definition_version_raw < 1:
|
|
raise DefinitionalSchemaError(
|
|
f"gloss entry for lemma={lemma!r} requires positive int definition_version"
|
|
)
|
|
provenance_ids = _require_str_tuple(
|
|
payload, "provenance_ids", lemma_hint=lemma, allow_empty=False
|
|
)
|
|
pos_raw = payload.get("pos", "")
|
|
if not isinstance(pos_raw, str):
|
|
raise DefinitionalSchemaError(
|
|
f"gloss entry for lemma={lemma!r} requires pos to be a string when present"
|
|
)
|
|
return GlossEntry(
|
|
lemma=lemma,
|
|
gloss=gloss,
|
|
pos=pos_raw,
|
|
definitional_atoms=definitional_atoms,
|
|
predicates_invited=predicates_invited,
|
|
definition_version=definition_version_raw,
|
|
provenance_ids=provenance_ids,
|
|
)
|
|
|
|
# Lax / back-compat path: accept the original (lemma, gloss[, pos])
|
|
# shape; surface ADR-0084 fields only if they happen to be present
|
|
# and well-typed. Silently drop malformed extras — never fabricate.
|
|
lemma_raw = payload.get("lemma")
|
|
gloss_raw = payload.get("gloss")
|
|
if not isinstance(lemma_raw, str) or not lemma_raw.strip():
|
|
raise DefinitionalSchemaError("gloss entry missing lemma")
|
|
if not isinstance(gloss_raw, str) or not gloss_raw.strip():
|
|
raise DefinitionalSchemaError(f"gloss entry for lemma={lemma_raw!r} missing gloss")
|
|
|
|
pos_raw = payload.get("pos", "")
|
|
pos = pos_raw if isinstance(pos_raw, str) else ""
|
|
|
|
def _safe_str_tuple(key: str) -> tuple[str, ...]:
|
|
raw = payload.get(key)
|
|
if isinstance(raw, list) and all(isinstance(x, str) and x for x in raw):
|
|
return tuple(raw)
|
|
return ()
|
|
|
|
dv = payload.get("definition_version")
|
|
definition_version = dv if isinstance(dv, int) and not isinstance(dv, bool) and dv > 0 else 0
|
|
|
|
return GlossEntry(
|
|
lemma=lemma_raw.strip(),
|
|
gloss=gloss_raw.strip(),
|
|
pos=pos,
|
|
definitional_atoms=_safe_str_tuple("definitional_atoms"),
|
|
predicates_invited=_safe_str_tuple("predicates_invited"),
|
|
definition_version=definition_version,
|
|
provenance_ids=_safe_str_tuple("provenance_ids"),
|
|
)
|
|
|
|
|
|
@lru_cache(maxsize=64)
|
|
def _load_pack_glosses_cached(pack_id: str, strict: bool) -> tuple[GlossEntry, ...]:
|
|
path = _PACK_ROOT / pack_id / "glosses.jsonl"
|
|
if not path.exists():
|
|
return ()
|
|
out: list[GlossEntry] = []
|
|
for line_no, raw_line in enumerate(path.read_text(encoding="utf-8").splitlines(), start=1):
|
|
line = raw_line.strip()
|
|
if not line:
|
|
continue
|
|
try:
|
|
payload = json.loads(line)
|
|
except json.JSONDecodeError as exc:
|
|
if strict:
|
|
raise DefinitionalSchemaError(
|
|
f"{pack_id}/glosses.jsonl:{line_no}: malformed JSON ({exc})"
|
|
) from exc
|
|
continue
|
|
try:
|
|
out.append(parse_gloss_entry(payload, strict=strict))
|
|
except DefinitionalSchemaError:
|
|
if strict:
|
|
raise
|
|
continue
|
|
return tuple(out)
|
|
|
|
|
|
def load_pack_glosses(pack_id: str, *, strict: bool) -> tuple[GlossEntry, ...]:
|
|
"""Return all parsed gloss entries for *pack_id*.
|
|
|
|
``strict=True`` enforces the ADR-0084 schema gate row-by-row; a
|
|
single violation aborts the load with :class:`DefinitionalSchemaError`.
|
|
Strict callers should pass ``manifest.definitional_layer`` so opt-in
|
|
is driven from the manifest, not from the call site.
|
|
"""
|
|
return _load_pack_glosses_cached(pack_id, strict)
|
|
|
|
|
|
def clear_definitions_cache() -> None:
|
|
"""Drop the gloss-entry cache.
|
|
|
|
Test-only escape hatch — ratified packs are immutable in production
|
|
and this cache is never invalidated outside tests.
|
|
"""
|
|
_load_pack_glosses_cached.cache_clear()
|
|
|
|
|
|
# --------------------------------------------------------------------------- #
|
|
# Closure-rule verifier
|
|
# --------------------------------------------------------------------------- #
|
|
|
|
|
|
@dataclass(frozen=True, slots=True)
|
|
class ClosureViolation:
|
|
"""One unresolved ``definitional_atoms`` reference."""
|
|
|
|
pack_id: str
|
|
lemma: str
|
|
unresolved_token: str
|
|
|
|
|
|
def verify_definitional_closure(
|
|
pack_id: str,
|
|
*,
|
|
mounted_pack_lemmas: Iterable[str],
|
|
primitive_lemmas: Iterable[str],
|
|
strict: bool = True,
|
|
) -> tuple[ClosureViolation, ...]:
|
|
"""Return every unresolved ``definitional_atoms`` reference in *pack_id*.
|
|
|
|
A token resolves if it is (a) another lemma in the same pack's gloss
|
|
set, (b) a lemma in any of *mounted_pack_lemmas* (which the caller
|
|
builds from currently-mounted packs), or (c) a primitive in
|
|
*primitive_lemmas*. Per ADR-0084 §Definitional closure rule,
|
|
cycles are permitted — co-reference between two pack lemmas is
|
|
valid.
|
|
|
|
The empty tuple is a pass. Anything non-empty fails ratification.
|
|
"""
|
|
entries = load_pack_glosses(pack_id, strict=strict)
|
|
if not entries:
|
|
return ()
|
|
|
|
same_pack = {e.lemma.strip().lower() for e in entries}
|
|
mounted = {lem.strip().lower() for lem in mounted_pack_lemmas if lem}
|
|
primitives = {lem.strip().lower() for lem in primitive_lemmas if lem}
|
|
|
|
violations: list[ClosureViolation] = []
|
|
for entry in entries:
|
|
for token in entry.definitional_atoms:
|
|
key = token.strip().lower()
|
|
if not key:
|
|
continue
|
|
if key in same_pack or key in mounted or key in primitives:
|
|
continue
|
|
violations.append(
|
|
ClosureViolation(
|
|
pack_id=pack_id,
|
|
lemma=entry.lemma,
|
|
unresolved_token=token,
|
|
)
|
|
)
|
|
return tuple(violations)
|