fix(profiles,materialize,structure,consume): a block sources sequence is decoded, not skipped
One grammar, four call sites. `read_block_mappings` moves out of `consume.read_sources` -- where it was written and measured -- into `profiles`, the module both the flat readers and `consume` already import, and the three copies of the line-oriented frontmatter grammar now decode a block sequence for the keys `STRUCTURED_BLOCK_KEYS` names. Two copies of a block grammar would be two answers to one question. The value TYPE was the real choice and it was measured, not argued. `parse_frontmatter` is public API (`okf.parse_frontmatter`) returning `dict[str, str]`, and a list of mappings is not a `str`. Widening the return type to `str | list[dict[str, str]]` costs 15 `mypy --strict` errors across four of the five modules that touch the reader, plus a signature every caller outside this repository would have to follow. Rendering the entries back into the flow form those same readers already round-trip costs 0. The rendering is a READING projection and says so: it is not a claim that the value is writable -- `yaml_flow_plain` still refuses a `?` and the guard still refuses a quote inside a flow mapping, which is why the producer writes block in the first place. `STRUCTURED_BLOCK_KEYS` is one key wide. `sources` is the key `read_sources` already knows how to read; a fixture in this tree carries a block `verified:` that still reads as an empty value, and a test pins that state so the next widening is a decision rather than a side effect. Nothing nested reaches the document's namespace: the entries land inside their own value, and the K3-20 substitution guarantee is asserted per reader copy. Three tests that pinned the old behaviour are rewritten to what is now true, none weakened on its other half: the block round trip in `test_multi_source_provenance` (the evidence behind `_render_sources`' reason 1), the v0.2 characterization (whose key-space assertion is the half that must never weaken), and K3-22's shipped-file known-positive, where the one difference is counted and pinned at 1. Suite 1807 passed / 1 skipped, rc 0, 94 s -- 1782/1 before plus 25 new. ruff clean, `mypy --strict` clean over 21 files, `uv.lock` untouched. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
parent
eb327bfd0c
commit
28f9a4b540
8 changed files with 211 additions and 65 deletions
|
|
@ -26,6 +26,7 @@ from llm_ingestion_guard import okf as guard_okf
|
|||
|
||||
from llm_ingestion_okf.consume import _frontmatter_lines, _parse_flow_mappings, read_sources
|
||||
from llm_ingestion_okf.materialize import parse_frontmatter
|
||||
from llm_ingestion_okf.profiles import STRUCTURED_BLOCK_KEYS
|
||||
from llm_ingestion_okf.profiles import _split_frontmatter as _profiles_split
|
||||
from llm_ingestion_okf.structure import _split_frontmatter as _structure_split
|
||||
|
||||
|
|
@ -278,7 +279,7 @@ def test_every_fixture_frontmatter_keeps_every_value_a_reference_reader_finds()
|
|||
cannot turn this green over an empty set."""
|
||||
paths = _fixture_frontmatters()
|
||||
assert len(paths) == 12
|
||||
carrying_block_sources = 0
|
||||
carrying_sources_list = 0
|
||||
for path in paths:
|
||||
text = path.read_text(encoding="utf-8")
|
||||
flat = parse_frontmatter(path)
|
||||
|
|
@ -290,13 +291,15 @@ def test_every_fixture_frontmatter_keeps_every_value_a_reference_reader_finds()
|
|||
for key, value in reference.items():
|
||||
if value in (None, "", [], {}):
|
||||
continue
|
||||
if isinstance(value, (list, dict)) and key != "sources":
|
||||
if isinstance(value, (list, dict)) and key not in STRUCTURED_BLOCK_KEYS:
|
||||
continue
|
||||
assert flat.get(key, "") != "", f"{path.name}: {key} lost"
|
||||
if isinstance(reference.get("sources"), list):
|
||||
carrying_block_sources += 1
|
||||
carrying_sources_list += 1
|
||||
assert _parse_flow_mappings(flat["sources"]) == reference["sources"]
|
||||
assert carrying_block_sources == 1
|
||||
# Two of the twelve: one block form and one flow form, both read by
|
||||
# PyYAML as a list and both required to decode to the same entries here.
|
||||
assert carrying_sources_list == 2
|
||||
|
||||
|
||||
def test_a_block_key_outside_the_named_set_is_still_empty() -> None:
|
||||
|
|
@ -308,6 +311,7 @@ def test_a_block_key_outside_the_named_set_is_still_empty() -> None:
|
|||
measurement covers. A fixture in this tree carries a block `verified:` for
|
||||
exactly this reason, and it still reads as an empty value. Whoever widens
|
||||
the set will see this test, which is the point of pinning it."""
|
||||
assert STRUCTURED_BLOCK_KEYS == frozenset({"sources"})
|
||||
path = FIXTURES / "consume-bundle" / "dyp" / "nivaa" / "blokkform-verifisert.md"
|
||||
reference = yaml.safe_load(path.read_text(encoding="utf-8").split("---\n")[1])
|
||||
assert isinstance(reference["verified"], list)
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ from pathlib import Path
|
|||
|
||||
import pytest
|
||||
|
||||
from llm_ingestion_okf.consume import _frontmatter_lines, _parse_flow_mappings, read_sources
|
||||
from llm_ingestion_okf.errors import MaterializationError
|
||||
from llm_ingestion_okf.manifest import FileSource, HttpSource, Source, SqlSource
|
||||
from llm_ingestion_okf.materialize import _render_sources, parse_frontmatter
|
||||
|
|
@ -100,11 +101,19 @@ def test_two_sources_round_trip_through_our_own_parser(tmp_path: Path) -> None:
|
|||
assert sorted(frontmatter) == ["generated", "sources", "title", "type"]
|
||||
|
||||
|
||||
def test_the_block_form_round_trips_to_nothing(tmp_path: Path) -> None:
|
||||
"""The NEGATIVE CONTROL, and the measured reason the block form is not
|
||||
emitted. Two entries go in; an empty string comes back, and no error is
|
||||
raised anywhere. This test must stay green: it is the evidence, not a
|
||||
regression guard."""
|
||||
def test_the_block_form_round_trips_through_the_flat_reader(tmp_path: Path) -> None:
|
||||
"""Two entries go in and BOTH come back (K3-24).
|
||||
|
||||
This test carried the opposite assertion until 2026-09-12, and it was the
|
||||
evidence behind the first of the three reasons `_render_sources` gives for
|
||||
not emitting the block form: a block list round-tripped to an EMPTY value
|
||||
with every entry gone, silently. That reason is now false, and the test
|
||||
says what is true instead of standing as a justification nothing measures.
|
||||
|
||||
It is still a control and not a regression guard: what it pins is that
|
||||
the flat reader and `read_sources` return the same entries from the same
|
||||
bytes. The emission rule did not move with it -- reasons 2 and 3 are
|
||||
separate measurements and live in the docstring they belong to."""
|
||||
path = tmp_path / "concept.md"
|
||||
path.write_text(
|
||||
"---\n"
|
||||
|
|
@ -120,9 +129,16 @@ def test_the_block_form_round_trips_to_nothing(tmp_path: Path) -> None:
|
|||
)
|
||||
|
||||
frontmatter = parse_frontmatter(path)
|
||||
entries, present = read_sources(_frontmatter_lines(path))
|
||||
|
||||
assert frontmatter["sources"] == ""
|
||||
assert "golden-db" not in "".join(frontmatter.values())
|
||||
assert present
|
||||
assert _parse_flow_mappings(frontmatter["sources"]) == [
|
||||
{"id": "golden-catalogue", "resource": "fixture"},
|
||||
{"id": "golden-db", "resource": "OKF_GOLDEN_SQL_DB"},
|
||||
]
|
||||
assert _parse_flow_mappings(frontmatter["sources"]) == [dict(entry) for entry in entries]
|
||||
# The quieter half, unchanged: an entry's keys stay inside the value.
|
||||
assert set(frontmatter) == {"type", "sources"}
|
||||
|
||||
|
||||
# --- the refusal applies to every entry, not only the first -----------------
|
||||
|
|
|
|||
|
|
@ -66,22 +66,22 @@ def test_an_inline_flow_mapping_survives_the_scalar_parser_verbatim(tmp_path: Pa
|
|||
|
||||
|
||||
def test_a_block_list_is_dropped_without_polluting_the_key_space(tmp_path: Path) -> None:
|
||||
"""The measured reason `sources` is emitted as an inline flow sequence.
|
||||
"""Upstream's canonical `sources` is a block list of multi-key mappings,
|
||||
and this line-oriented parser now READS one -- without letting a single
|
||||
entry key into the document's namespace.
|
||||
|
||||
Upstream's canonical `sources` is a block list of multi-key mappings, and
|
||||
this line-oriented parser still cannot READ one: the list value comes back
|
||||
empty. That is unchanged, and it remains the whole reason this library
|
||||
emits the flow form -- a value it can write is a value it can read back.
|
||||
Two halves, taken in two different rounds. The quieter one (2026-08-31,
|
||||
order `...4733930312`) is unchanged and is what this test still guards:
|
||||
`- id` and `resource` are indented, belong to the block above them, and
|
||||
must never be flattened into the document's keys, because
|
||||
`_is_ingest_owned` reads through this same parser and a fabricated
|
||||
top-level key is a fact no document declared.
|
||||
|
||||
What changed (2026-08-31, order `...4733930312`) is the second, quieter
|
||||
half. The item lines no longer become KEYS. `- id` and `resource` are
|
||||
indented, so they belong to the block above them and are refused rather
|
||||
than flattened into the document's namespace. The distinction matters
|
||||
because `_is_ingest_owned` reads through this same parser: a fabricated
|
||||
top-level key is a fact about the document that no document declared.
|
||||
|
||||
Refusing is not parsing. The block form stays unreadable; it is now
|
||||
unreadable LOUDLY rather than by substitution. Reading it is D1b.
|
||||
The louder one moved 2026-09-12 (K3-24). The value no longer comes back
|
||||
empty: a `sources:` block sequence is decoded into the flow form this
|
||||
library's readers round-trip, measured against PyYAML and the pinned
|
||||
guard. `set(parsed)` below is the assertion that carries the first half,
|
||||
and it is the one that must never weaken.
|
||||
"""
|
||||
path = tmp_path / "concept.md"
|
||||
path.write_bytes(
|
||||
|
|
@ -91,7 +91,7 @@ def test_a_block_list_is_dropped_without_polluting_the_key_space(tmp_path: Path)
|
|||
|
||||
parsed = parse_frontmatter(path)
|
||||
|
||||
assert parsed["sources"] == ""
|
||||
assert parsed["sources"] == "[{ id: margin-standard, resource: policies/margin-standard.md }]"
|
||||
assert "- id" not in parsed
|
||||
assert "resource" not in parsed
|
||||
assert set(parsed) == {"type", "sources"}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ from llm_ingestion_okf.errors import MaterializationError
|
|||
from llm_ingestion_okf.inbox import render_inbox_concept
|
||||
from llm_ingestion_okf.manifest import FileSource
|
||||
from llm_ingestion_okf.materialize import _render_sources, parse_frontmatter
|
||||
from llm_ingestion_okf.profiles import DEFAULT, SEGMENTED_OKF_V0_2
|
||||
from llm_ingestion_okf.profiles import DEFAULT, SEGMENTED_OKF_V0_2, STRUCTURED_BLOCK_KEYS
|
||||
from llm_ingestion_okf.profiles import _split_frontmatter as _profiles_split
|
||||
from llm_ingestion_okf.structure import _split_frontmatter as _structure_split
|
||||
|
||||
|
|
@ -275,7 +275,14 @@ def _strip_only(path: Path) -> dict[str, str]:
|
|||
|
||||
def test_every_shipped_frontmatter_reads_exactly_as_before() -> None:
|
||||
"""Known-positive: the unquoting must be a no-op on every file this
|
||||
repository ships, because none of them carries a `"`-wrapped value."""
|
||||
repository ships, because none of them carries a `"`-wrapped value.
|
||||
|
||||
K3-24 added ONE difference on purpose and it is counted rather than waved
|
||||
through: a `sources:` block sequence is now decoded where the pre-K3-22
|
||||
reader left the key empty. Every other key on every shipped file must
|
||||
still read identically, and the count is pinned so a wider change cannot
|
||||
hide inside this exemption.
|
||||
"""
|
||||
paths = [
|
||||
path
|
||||
for root in (PROJECT_ROOT / "tests" / "fixtures", PROJECT_ROOT / "examples")
|
||||
|
|
@ -283,8 +290,16 @@ def test_every_shipped_frontmatter_reads_exactly_as_before() -> None:
|
|||
if path.read_text(encoding="utf-8").startswith("---\n")
|
||||
]
|
||||
assert len(paths) >= 26
|
||||
decoded = 0
|
||||
for path in paths:
|
||||
assert parse_frontmatter(path) == _strip_only(path), path
|
||||
before, now = _strip_only(path), parse_frontmatter(path)
|
||||
assert set(before) == set(now), path
|
||||
for key in before:
|
||||
if key in STRUCTURED_BLOCK_KEYS and before[key] == "" and now[key] != "":
|
||||
decoded += 1
|
||||
continue
|
||||
assert before[key] == now[key], (path, key)
|
||||
assert decoded == 1
|
||||
|
||||
|
||||
# --- the rules, validated against the reader --------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue