`uv sync --frozen` resolved ruff 0.15.22 and the tree read clean. A loose install resolves 0.16.6, under which the SAME untouched code reports 148 findings -- 4 more than round 9 counted, because this round added four files. All of them are new rules rather than new defects: 0.16 widened the default rule set to whole families (YTT, ASYNC, PL, ISC, C4, UP, B, SIM, FURB, ...). (`[skip-docs]` is for CLAUDE.md, which a lint-configuration change does not reach. README's developer section IS updated in this commit.) THE DEFECT IS NOT THE 148, IT IS THAT NOBODY CHOSE THEM. `[tool.ruff]` set only `line-length` and `target-version`, so the acceptance was ruff's default, and the tree stayed green only as long as the lockfile froze an old ruff. `select` is now written down: `E4`, `E7`, `E9`, `F` (the historical default), `I` because this tree already keeps imports sorted, and `RUF100` so a `noqa` that has stopped meaning anything is caught rather than left as decoration. Pin `ruff>=0.9` -> `ruff>=0.16.6,<0.17`. Per rule, before -> after: RUF100 50 -> 0, I001 20 -> 0, ISC004 19, PLW1510 8, C408 8, EXE001 6, RUF007 5, PLE2515 4, UP031 3, B017 3, and fourteen more with 2 or fewer -- the families out of the declared set are 0 by selection, and 148 is the number to start from if they are adopted, which is a separate decision and not one to take inside a version-pin commit. 57 were auto-fixed; one E402 was reintroduced by the import-sorting fix merging a block away from its `noqa`, and got the directive back rather than a bare one. `S` IS MEASURED OUT, NOT ASSUMED OUT: it reports 2657 `S101` on a suite whose every assertion is an `assert`, and `S603` flags 19 subprocess calls of which one was ever marked -- selecting it buys 18 suppressions and no defect. Two `noqa` directives naming non-selected rules were dropped with that reason recorded in the configuration instead. THE TWO FILES 0.16 WOULD REFORMAT ARE MARKDOWN, NOT PYTHON: `README.md` and `docs/2026-09-08-blindsone-below-k-k2.md`. 0.16 formats fenced Python inside markdown, and both blocks are RECORDS -- the second is a quotation of `COST_VOCABULARY` as it stood when that measurement was taken. Reformatting a quotation makes it stop being one, so markdown is excluded from the formatter and `ruff format --check .` stays in the acceptance over `.py`. `tools/okf_consume_measure.py` is fenced by the order as run-not-edited, so its three findings are exempted by path with the reason and the debt named, and its bytes are untouched. THE LOCKFILE TRAP IS CLOSED, NOT AVOIDED. `uv.lock` predated the `[ocr]` extra, so any unlocked resolve wrote that extra's transitive tree back into it -- 681 insertions over 4 deletions, twice now, and round 9 recorded the cause as `uv run` OUTSIDE the project when it is `uv run` without `--frozen` INSIDE it. The relock is complete for every declared extra (703 insertions, 26 deletions), and measured after it, an unfrozen `uv run` leaves the file alone. `ruff check src tests tools`, `ruff format --check .` (0.16.6), `mypy src` over 21 files and 1535 tests, all green. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
189 lines
8.3 KiB
Python
189 lines
8.3 KiB
Python
"""The fusion's tie-break, measured rather than assumed.
|
|
|
|
`concept_scores` fuses three signals by RRF, and RRF consumes RANKS ONLY. A
|
|
rank is therefore produced for every concept in every signal -- including a
|
|
signal that does not separate them. The tie-break is declared
|
|
(`(-score, concept_id)`), so when a signal gives 269 of 270 concepts the same
|
|
score, that signal's contribution to the fusion is the concepts' own ids in
|
|
lexicographic order: a UUID, which is noise, weighted exactly as heavily as
|
|
the two signals that did the measuring.
|
|
|
|
MEASURED 2026-09-08 on the N500 bundle (270 concepts, `feae0c8`), for the
|
|
question about `vann- og frostsikring` in a subsea tunnel: the document prior
|
|
has **two** distinct values over the bundle, and 269 concepts share one of
|
|
them. The best covering concept answered **7 of 7** question tokens and led
|
|
the body signal at rank 6, and it fused to rank **14** -- outside the cut --
|
|
while concepts answering fewer tokens fused ahead of it on nothing but an
|
|
earlier id.
|
|
|
|
This file holds the two halves apart:
|
|
|
|
- The matcher is CHARACTERISED, not fixed. `normalise` already resolves the
|
|
hyphen-and-`og` coordination, so the alternative that would have widened the
|
|
tokeniser has nothing to widen. That is asserted here so the choice stays
|
|
falsifiable rather than remembered.
|
|
- The fusion gets one rule, behind one flag, off by default.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
PROJECT_ROOT = Path(__file__).resolve().parents[1]
|
|
sys.path.insert(0, str(PROJECT_ROOT / "tools"))
|
|
|
|
import okf_consume # noqa: E402
|
|
|
|
QUESTION = "Hvilke krav gjelder vann- og frostsikring i undersjoeisk tunnel?"
|
|
|
|
_FRONTMATTER = (
|
|
"---\ntype: reference\ntitle: {title}\nsource_file: {slug}.md\n"
|
|
"source_sha256: {digest}\ningested_at: 2026-09-01T00:00:00Z\n"
|
|
"adjudication: proposed\nbundle_id: tie-fixture\n"
|
|
"verified: [{{ by: process:okf-check, at: 2026-09-01T00:00:00Z }}]\n---\n\n"
|
|
)
|
|
|
|
|
|
def _tie_bundle(root: Path, *, fillers: int = 30) -> Path:
|
|
"""One document, so the document prior cannot separate anything.
|
|
|
|
The gold concept's id sorts LAST and the fillers' ids sort first, which is
|
|
what makes the degenerate signal's tie-break work against the concept that
|
|
answers the question. The fillers answer `krav`, `gjelder`, `vann` and
|
|
`tunnel`; only the gold answers `frostsikring` and `undersjoeisk` too.
|
|
"""
|
|
(root / "krav").mkdir(parents=True)
|
|
(root / "index.md").write_text(
|
|
"---\nokf_version: 0.2\nbundle_id: tie-fixture\n---\n\n- [krav (index)](krav/index.md)\n",
|
|
encoding="utf-8",
|
|
)
|
|
entries: list[str] = []
|
|
|
|
def add(slug: str, title: str, body: str) -> None:
|
|
entries.append(f"- [{title}]({slug}.md) — adjudication: proposed\n")
|
|
(root / "krav" / f"{slug}.md").write_text(
|
|
_FRONTMATTER.format(title=title, slug=slug, digest="1" * 64) + f"## {title}\n\n" + body,
|
|
encoding="utf-8",
|
|
)
|
|
|
|
add(
|
|
"zz-gull",
|
|
"Krav om vann- og frostsikring i undersjoeisk tunnel",
|
|
"Kravet gjelder vannsikring og frostsikring i undersjoeisk tunnel.\n" * 4,
|
|
)
|
|
for number in range(1, fillers + 1):
|
|
add(
|
|
f"aa-{number:02d}",
|
|
f"Krav om tunnel og vann {number:02d}",
|
|
"Kravet gjelder tunnel og vann i anlegget.\n" * 4,
|
|
)
|
|
(root / "krav" / "index.md").write_text("".join(entries), encoding="utf-8")
|
|
return root
|
|
|
|
|
|
def _gold_rank(root: Path, *, tie_shared_rank: bool) -> int:
|
|
concepts = [
|
|
okf_consume.read_concept(
|
|
root / f"{concept_id}.md", bundle_root=root, root_bundle_id="tie-fixture"
|
|
)
|
|
for concept_id in okf_consume.enumerate_concepts(root)
|
|
]
|
|
ranked = okf_consume.concept_scores(
|
|
concepts,
|
|
QUESTION,
|
|
okf_consume.document_scores(root, QUESTION),
|
|
tie_shared_rank=tie_shared_rank,
|
|
)
|
|
for position, (concept, _, _) in enumerate(ranked, start=1):
|
|
if concept.concept_id.endswith("zz-gull"):
|
|
return position
|
|
raise AssertionError("the gold concept is not in the ranking at all")
|
|
|
|
|
|
# --- The half that is characterised, not fixed --------------------------------
|
|
|
|
|
|
def test_the_hyphen_and_og_coordination_is_already_resolved_by_the_tokeniser() -> None:
|
|
# CHARACTERISATION, green on HEAD. This is the measurement that ruled the
|
|
# tokeniser out as the site of the fix: there is no coordination left to
|
|
# resolve, so a rule widening it could not have moved the miss.
|
|
assert okf_consume.normalise("vann- og frostsikring") == ("vann", "frostsikring")
|
|
assert okf_consume.tokens_match("frostsikring", "frostsikringen")
|
|
assert okf_consume.tokens_match("vann", "vannsikring")
|
|
|
|
|
|
def test_a_signal_that_separates_nothing_still_ranks_every_concept(tmp_path: Path) -> None:
|
|
# CHARACTERISATION of the defect's mechanism: one distinct score, and one
|
|
# rank per concept all the same. The second number is the noise.
|
|
root = _tie_bundle(tmp_path / "bundle")
|
|
prior = okf_consume.document_scores(root, QUESTION)
|
|
concepts = okf_consume.enumerate_concepts(root)
|
|
scores = {prior[concept_id.split("/", 1)[0]] for concept_id in concepts}
|
|
assert len(scores) == 1
|
|
assert len(concepts) == 31
|
|
|
|
|
|
# --- The half that gets the rule ----------------------------------------------
|
|
|
|
|
|
def test_shared_rank_lifts_the_concept_the_measuring_signals_lead(tmp_path: Path) -> None:
|
|
root = _tie_bundle(tmp_path / "bundle")
|
|
# Two DIFFERENT numbers, not one predicate two branches share: the concept
|
|
# answering every question token sits at 8 while the degenerate signal
|
|
# orders by id, and at 1 once that signal stops ordering.
|
|
assert _gold_rank(root, tie_shared_rank=False) == 8
|
|
assert _gold_rank(root, tie_shared_rank=True) == 1
|
|
|
|
|
|
def test_the_payload_is_byte_identical_with_the_flag_on(tmp_path: Path) -> None:
|
|
"""The rule became the default 2026-09-10; saying so explicitly changes nothing.
|
|
|
|
The assertion is unchanged in kind -- the implicit and the explicit value
|
|
must produce the same bytes -- only the value it names moved.
|
|
"""
|
|
root = _tie_bundle(tmp_path / "bundle")
|
|
without = okf_consume.serialise(okf_consume.build_payload(root, question=QUESTION))
|
|
explicit_on = okf_consume.serialise(
|
|
okf_consume.build_payload(root, question=QUESTION, tie_shared_rank=True)
|
|
)
|
|
assert without == explicit_on
|
|
|
|
|
|
def test_the_opt_out_reproduces_the_order_the_default_used_to_give(tmp_path: Path) -> None:
|
|
"""The other half: a consumer needing the pre-2026-09-10 order can have it.
|
|
|
|
Load-bearing rather than symmetric. `--no-tie-shared-rank` is the only
|
|
thing standing between a consumer pinned to the old excerpt order and a
|
|
silent reordering, so the opt-out needs a test that goes red if it stops
|
|
being a real alternative -- which it would be if it produced the same
|
|
bytes as the default on the very fixture built to separate them.
|
|
"""
|
|
root = _tie_bundle(tmp_path / "bundle")
|
|
default = okf_consume.serialise(okf_consume.build_payload(root, question=QUESTION, k=3))
|
|
opted_out = okf_consume.serialise(
|
|
okf_consume.build_payload(root, question=QUESTION, k=3, tie_shared_rank=False)
|
|
)
|
|
assert default != opted_out
|
|
|
|
|
|
def test_the_flag_changes_the_payload_it_is_meant_to_change(tmp_path: Path) -> None:
|
|
root = _tie_bundle(tmp_path / "bundle")
|
|
off = okf_consume.build_payload(root, question=QUESTION, k=3, tie_shared_rank=False)
|
|
on = okf_consume.build_payload(root, question=QUESTION, k=3)
|
|
delivered_off = [excerpt["concept_id"] for excerpt in off["excerpts"]] # type: ignore[index]
|
|
delivered_on = [excerpt["concept_id"] for excerpt in on["excerpts"]] # type: ignore[index]
|
|
assert not any(str(cid).endswith("zz-gull") for cid in delivered_off)
|
|
assert str(delivered_on[0]).endswith("zz-gull")
|
|
|
|
|
|
def test_the_cli_exposes_the_flag_and_defaults_it_on(tmp_path: Path) -> None:
|
|
root = _tie_bundle(tmp_path / "bundle")
|
|
parsed = okf_consume.parse_args([str(root), "--question", QUESTION])
|
|
assert parsed.tie_shared_rank is True
|
|
parsed_off = okf_consume.parse_args([str(root), "--question", QUESTION, "--no-tie-shared-rank"])
|
|
assert parsed_off.tie_shared_rank is False
|
|
# `--withheld-titles` did NOT move with it, asserted here so the two are
|
|
# one measurement rather than two files' worth of trust: it is off for a
|
|
# reason of BYTES, which nothing this round touched.
|
|
assert parsed.withheld_titles is False
|