mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-08-27 14:17:10 -04:00
## Description Fixes #899. The `reread` signal (#853/#854) counts re-served tool results but cannot answer the question that motivated it: **did Headroom cause the re-read?** A re-read after an intact first serve is agent behavior; a re-read after Headroom markerized the first serve is over-compression cost. This PR splits the signal so the actionable part is visible. Request-local, no store lookups: the client resends full history each turn and the pipeline recompresses it deterministically, so the current request already holds the evidence. `TransformPipeline.apply` passes `current_messages` into `parse_messages(compressed_messages=...)`. For each counted reread group, if the transformed copy of the **first serve** carries a CCR retrieval marker and its original text is gone, the group's counted repeats go into `reread_compressed_tokens`. Lossless reshaping (no marker) is deliberately not attributed. Closes #899. ## Type of Change - [x] New feature (non-breaking change that adds functionality) ## Changes Made - `parser.py`: `parse_messages` gains an optional `compressed_messages` param; the content-hash reread loop accumulates per-group `counted_tokens` and attributes them to `reread_compressed_tokens` when the first serve's transformed copy carries a CCR marker (`CCR_RETRIEVAL_MARKER_RE`, kept local to avoid a transforms import cycle). - `transforms/pipeline.py`: pass `current_messages` (post-transform copy) into the existing waste-detection `parse_messages` call. - `config.py`: new `reread_compressed_tokens` WasteSignals field; `dashboard.html` + `reporting/generator.py` surface it. - Tests: `tests/test_reread_attribution.py` + WasteSignals contract update. ## Testing - [x] Unit tests pass (`pytest`) - [x] Linting passes (`ruff check .`) - [x] New tests added for new functionality - [x] New and existing unit tests pass locally with my changes ### Test Output ```text $ pytest tests/test_reread_attribution.py tests/test_parser.py tests/test_gemini_function_response_waste.py tests/test_codex_responses_waste_signals.py -q 122 passed in 1.50s $ pytest tests/ -k "waste or pipeline or reporting or config or reread" -q 348 passed, 33 skipped, 6010 deselected # (1 unrelated env-dependent failure: test_proxy_gemini_native_integration::test_generation_config — 404, reproduces on main without these changes; needs a Gemini key locally) $ ruff check headroom/parser.py headroom/transforms/pipeline.py All checks passed! ``` ## Real Behavior Proof - Environment: local macOS, repo .venv, Python 3.11.9 - Exact command / steps: rebased onto current main to resolve conflicts with #909 (merged), then ran the reread + parser + waste suites above - Observed result: a reread whose first serve is markerized attributes to `reread_compressed_tokens`; an intact first serve and a lossless (no-marker) reshape do not. #909's re-issued-call detection (same call, different bytes) continues to count and dedup correctly alongside it — all 122 targeted tests pass. - Not tested: live proxy traffic; the one gemini-native route test above (environmental 404, not introduced here). ## Review Readiness - [x] I have performed a self-review - [x] This PR is ready for human review ## Additional Notes **Rebased onto current main after #909 merged.** #909 added a re-issued-call reread pass *after* the original content-hash loop this PR modifies — the conflict was textual/adjacent, not a re-architecture. Resolution preserves #909's `counted_results` dedup contract and leaves its new pass unchanged; #901's attribution stays scoped to the content-hash groups it was reviewed against (attributing #909's call-key pass too would be a separate follow-up). The diff differs from the prior approval only by this reshape — worth a quick re-glance.
173 lines
7 KiB
Python
173 lines
7 KiB
Python
"""Over-compression attribution for reread waste (issue #899).
|
|
|
|
``parse_messages(compressed_messages=...)`` splits the existing ``reread``
|
|
signal: repeats whose first serve was replaced by a CCR retrieval marker in
|
|
the transformed output count into ``reread_compressed_tokens`` — re-reads
|
|
attributable to Headroom rather than agent behavior. Lossless reshaping
|
|
(no marker) and intact first serves are deliberately not attributed.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
|
|
import pytest
|
|
|
|
from headroom import OpenAIProvider, Tokenizer
|
|
from headroom.config import HeadroomConfig, WasteSignals
|
|
from headroom.parser import parse_messages
|
|
from headroom.transforms.pipeline import TransformPipeline
|
|
|
|
_provider = OpenAIProvider()
|
|
|
|
|
|
@pytest.fixture
|
|
def tokenizer() -> Tokenizer:
|
|
return Tokenizer(_provider.get_token_counter("gpt-4o"), "gpt-4o")
|
|
|
|
|
|
def _uniform_rows(rows: int = 200) -> str:
|
|
return json.dumps(
|
|
[{"id": i, "name": f"item_{i}", "status": "ok", "score": i * 3.14} for i in range(rows)]
|
|
)
|
|
|
|
|
|
_MARKER = "[200 items compressed to 12. Retrieve more: hash=abc123def4567890abcdef12]"
|
|
|
|
|
|
def _conversation(first_serve: str, repeat: str) -> list[dict]:
|
|
"""First serve at index 1, repeat at index 7 (gap 6 > REREAD_ADJACENT_GAP)."""
|
|
filler = [{"role": "user", "content": f"step {i}"} for i in range(5)]
|
|
return [
|
|
{"role": "user", "content": "read the data"},
|
|
{"role": "tool", "content": first_serve},
|
|
*filler,
|
|
{"role": "tool", "content": repeat},
|
|
]
|
|
|
|
|
|
class TestRereadAttribution:
|
|
def test_markerized_first_serve_attributes(self, tokenizer):
|
|
content = _uniform_rows()
|
|
messages = _conversation(content, content)
|
|
compressed = [dict(m) for m in messages]
|
|
compressed[1] = {"role": "tool", "content": _MARKER}
|
|
|
|
_, _, waste = parse_messages(messages, tokenizer, compressed_messages=compressed)
|
|
assert waste.reread_tokens > 0
|
|
assert waste.reread_compressed_tokens == waste.reread_tokens
|
|
|
|
def test_intact_first_serve_not_attributed(self, tokenizer):
|
|
content = _uniform_rows()
|
|
messages = _conversation(content, content)
|
|
|
|
_, _, waste = parse_messages(
|
|
messages, tokenizer, compressed_messages=[dict(m) for m in messages]
|
|
)
|
|
assert waste.reread_tokens > 0
|
|
assert waste.reread_compressed_tokens == 0
|
|
|
|
def test_lossless_reshape_without_marker_not_attributed(self, tokenizer):
|
|
content = _uniform_rows()
|
|
messages = _conversation(content, content)
|
|
compressed = [dict(m) for m in messages]
|
|
# CSV-style compaction: content reshaped, all data retained, no marker.
|
|
compressed[1] = {"role": "tool", "content": "id,name,status,score\n0,item_0,ok,0.0"}
|
|
|
|
_, _, waste = parse_messages(messages, tokenizer, compressed_messages=compressed)
|
|
assert waste.reread_tokens > 0
|
|
assert waste.reread_compressed_tokens == 0
|
|
|
|
def test_marker_with_original_still_present_not_attributed(self, tokenizer):
|
|
# Marker appended but full original retained (e.g. partial compression
|
|
# of a different span in the same message) — model saw everything.
|
|
content = _uniform_rows()
|
|
messages = _conversation(content, content)
|
|
compressed = [dict(m) for m in messages]
|
|
compressed[1] = {"role": "tool", "content": content + "\n" + _MARKER}
|
|
|
|
_, _, waste = parse_messages(messages, tokenizer, compressed_messages=compressed)
|
|
assert waste.reread_compressed_tokens == 0
|
|
|
|
def test_message_count_mismatch_skips_attribution(self, tokenizer):
|
|
content = _uniform_rows()
|
|
messages = _conversation(content, content)
|
|
compressed = [dict(m) for m in messages]
|
|
compressed[1] = {"role": "tool", "content": _MARKER}
|
|
compressed.pop(0)
|
|
|
|
_, _, waste = parse_messages(messages, tokenizer, compressed_messages=compressed)
|
|
assert waste.reread_tokens > 0
|
|
assert waste.reread_compressed_tokens == 0
|
|
|
|
def test_default_no_compressed_messages(self, tokenizer):
|
|
content = _uniform_rows()
|
|
_, _, waste = parse_messages(_conversation(content, content), tokenizer)
|
|
assert waste.reread_tokens > 0
|
|
assert waste.reread_compressed_tokens == 0
|
|
|
|
def test_polling_repeats_not_attributed(self, tokenizer):
|
|
# Adjacent repeats (gap <= REREAD_ADJACENT_GAP) are polling, not
|
|
# rereads — attribution never runs for groups with no counted waste.
|
|
content = _uniform_rows()
|
|
messages = [
|
|
{"role": "tool", "content": content},
|
|
{"role": "user", "content": "poll"},
|
|
{"role": "tool", "content": content},
|
|
]
|
|
compressed = [dict(m) for m in messages]
|
|
compressed[0] = {"role": "tool", "content": _MARKER}
|
|
|
|
_, _, waste = parse_messages(messages, tokenizer, compressed_messages=compressed)
|
|
assert waste.reread_tokens == 0
|
|
assert waste.reread_compressed_tokens == 0
|
|
|
|
def test_ccr_inline_marker_form_attributes(self, tokenizer):
|
|
content = _uniform_rows()
|
|
messages = _conversation(content, content)
|
|
compressed = [dict(m) for m in messages]
|
|
compressed[1] = {"role": "tool", "content": "<<ccr:a703e0aaa98f,string,1.1KB>>"}
|
|
|
|
_, _, waste = parse_messages(messages, tokenizer, compressed_messages=compressed)
|
|
assert waste.reread_compressed_tokens == waste.reread_tokens > 0
|
|
|
|
|
|
class TestWasteSignalsContract:
|
|
def test_to_dict_exports_reread_compressed(self):
|
|
ws = WasteSignals(reread_tokens=100, reread_compressed_tokens=60)
|
|
d = ws.to_dict()
|
|
assert d["reread"] == 100
|
|
assert d["reread_compressed"] == 60
|
|
|
|
def test_total_excludes_reread_compressed(self):
|
|
# reread_compressed is a subset of reread — adding it to total()
|
|
# would double count.
|
|
ws = WasteSignals(reread_tokens=100, reread_compressed_tokens=60)
|
|
assert ws.total() == 100
|
|
|
|
|
|
class TestPipelineAttribution:
|
|
def test_pipeline_passes_compressed_messages(self, tokenizer):
|
|
# End-to-end through TransformPipeline.apply: a large duplicated tool
|
|
# result far from its first serve produces reread waste, and
|
|
# reread_compressed is consistent (either 0 or the full group —
|
|
# never more than reread).
|
|
content = _uniform_rows(400)
|
|
filler = [{"role": "user", "content": f"working on step {i}"} for i in range(5)]
|
|
messages = [
|
|
{"role": "system", "content": "You are a helpful assistant."},
|
|
{"role": "tool", "content": content},
|
|
*filler,
|
|
{"role": "tool", "content": content},
|
|
{"role": "user", "content": "continue"},
|
|
]
|
|
result = TransformPipeline(HeadroomConfig()).apply(
|
|
[dict(m) for m in messages], model="gpt-4o", model_limit=128000
|
|
)
|
|
assert result.waste_signals is not None
|
|
assert result.waste_signals.reread_tokens > 0
|
|
assert (
|
|
0
|
|
<= result.waste_signals.reread_compressed_tokens
|
|
<= (result.waste_signals.reread_tokens)
|
|
)
|