mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-08-10 14:27:00 -04:00
## Description Fixes four real bugs that made CODE_AWARE (AST-based) compression silently non-functional for Go, plus the product-behavior change to make CODE_AWARE the default for code (previously in #1670, now consolidated here per review). Closes # ## Type of Change - [x] Bug fix (non-breaking change that fixes an issue) - [x] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Documentation update - [ ] Performance improvement - [ ] Code refactoring (no functional changes) ## Changes Made - `code_compressor.py`: unwrap tree-sitter-go's single `statement_list` wrapper node when building `body_stmts` — its row range was swallowing the block's own closing-brace row, producing a duplicated `}` in compressed Go output. - `code_compressor.py`: match opening-brace lines by `endswith("{")` instead of `startswith("{")`, so multi-line Go signatures (e.g. `) error {`) aren't silently dropped from the compressed output. - `content_router.py`: normalize CODE_AWARE's `compressed_tokens` to `len(compressed.split())`, matching the word-split convention every other strategy (search/log/tabular/diff) already uses for `original_tokens`. Previously the mismatched scales made genuinely-good compressions look like "no savings" and get discarded for the Kompress fallback. - `content_router.py`: default `prefer_code_aware_for_code` to `True` (was `False`) — CODE_AWARE gives higher, syntax-safe compression than Kompress for code, so now that the bugs above are fixed it should be the default path. (Consolidated from #1670, now closed.) - `server.py`: add `HEADROOM_PREFER_CODE_AWARE_FOR_CODE` env override for `ContentRouterConfig.prefer_code_aware_for_code`, mirroring the existing `HEADROOM_CODE_AWARE_ENABLED` pattern, defaulting to `True`. - Formatting: ran `ruff format` on `server.py` and `content_router.py` (CI was failing on this). - `tests/test_code_aware_regressions.py` (new): 5 regression tests — - Go `statement_list` unwrap: no duplicated closing brace after truncation. - Multi-line Go signature: `) error {` line survives truncation. - ContentRouter CODE_AWARE token accounting: `compressed_tokens` matches `len(compressed.split())`, and a real compression doesn't trigger a needless Kompress fallback. - `prefer_code_aware_for_code` defaults to `True` on the `ContentRouterConfig` dataclass. - `prefer_code_aware_for_code` defaults to `True` via the `HEADROOM_PREFER_CODE_AWARE_FOR_CODE` env var (through a real `HeadroomProxy` construction). ## Testing - [x] Unit tests pass (`pytest`) - [x] Linting passes (`ruff check .`) - [ ] Type checking passes (`mypy headroom`) - [x] New tests added for new functionality - [x] Manual testing performed ### Test Output ```text $ python -m ruff check headroom/proxy/server.py headroom/transforms/code_compressor.py headroom/transforms/content_router.py tests/test_code_aware_regressions.py All checks passed! $ python -m ruff format --check headroom/proxy/server.py headroom/transforms/code_compressor.py headroom/transforms/content_router.py tests/test_code_aware_regressions.py 4 files already formatted $ python -m mypy ... Not run — mypy not installed in this environment. $ python -m pytest tests/test_code_compressor_thread_safety.py tests/test_content_router_exclude_tools.py \ tests/test_content_router_tool_role_reversibility.py tests/test_compression_units.py \ tests/test_compression_determinism.py tests/test_compression_safety_rails.py tests/test_netcost_gate.py \ tests/test_code_aware_regressions.py -q 15 failed, 66 passed, 1 warning in 7.17s # The 15 failures are the same pre-existing/environment-specific ones from # before (reproduced identically on a clean upstream/main checkout with no # code changes — missing torch/trafilatura/playwright, stale Rust _core # build in this checkout), not caused by this change. All 5 new regression # tests in test_code_aware_regressions.py pass. ``` ## Real Behavior Proof - Environment: Windows, Python 3.11.9, headroom-ai pipx install (0.28.0) with the same fixes applied, plus this fork's checkout for lint/test verification. - Exact command / steps: ran `CodeAwareCompressor.compress()` directly against real `.go` files from an external ~100-file Go codebase, and separately routed the same files through the full `ContentRouter` with `HEADROOM_PREFER_CODE_AWARE_FOR_CODE=1`. - Observed result: 72/97 files routed to `code_aware` and compressed with syntactically valid Go output (parsed via tree-sitter re-check), 0 invalid-syntax fallbacks, 0 "routed but unchanged" cases, 14641 total tokens saved. Before the fix: 0 tokens saved via this path (all bugs combined made it a no-op). - Not tested: `mypy`, and the full repo test suite (blocked by unrelated pre-existing environment issues — see Test Output). ## Review Readiness - [x] I have performed a self-review - [x] This PR is ready for human review ## Checklist - [x] My code follows the project's style guidelines - [x] I have performed a self-review of my code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] I have updated the CHANGELOG.md if applicable ## Additional Notes Per @JerrettDavis's review: consolidated #1670 (the `prefer_code_aware_for_code` default flip) into this PR and closed #1670 as the duplicate; fixed the `ruff format` CI failure; added the 4 requested regression tests (Go statement_list dedup, multiline-signature brace preservation, content-router token-accounting parity, and the config-default pin). --------- Co-authored-by: shekharcharles <shekhar.aegis@gmail.com>
143 lines
4.9 KiB
Python
143 lines
4.9 KiB
Python
"""Regression tests requested in review of PR #1668 (Go AST compression bugs
|
|
and CODE_AWARE token accounting) and PR #1670 (prefer_code_aware_for_code
|
|
default flip).
|
|
|
|
1. Go `statement_list` unwrapping — a Go function body no longer produces a
|
|
duplicated closing brace when truncated.
|
|
2. Multi-line Go signature (`) error {`) — the brace-bearing signature line
|
|
survives truncation instead of being silently dropped.
|
|
3. ContentRouter CODE_AWARE token accounting — compressed_tokens must come
|
|
from the same word-count metric as original_tokens, not the compressor's
|
|
own (differently-scaled) estimator, or real savings get misread as none.
|
|
4. prefer_code_aware_for_code defaults to True, both on the dataclass and via
|
|
the HEADROOM_PREFER_CODE_AWARE_FOR_CODE env var.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from headroom.proxy.server import HeadroomProxy, ProxyConfig
|
|
from headroom.transforms.code_compressor import (
|
|
CodeAwareCompressor,
|
|
CodeCompressorConfig,
|
|
_check_tree_sitter_available,
|
|
)
|
|
from headroom.transforms.content_router import (
|
|
CompressionStrategy,
|
|
ContentRouter,
|
|
ContentRouterConfig,
|
|
)
|
|
|
|
pytestmark = pytest.mark.skipif(
|
|
not _check_tree_sitter_available(),
|
|
reason="tree-sitter not installed (pip install headroom-ai[code])",
|
|
)
|
|
|
|
GO_FUNC = """package main
|
|
|
|
func Compute(
|
|
\ta int,
|
|
\tb int,
|
|
) error {
|
|
\tx := a + b
|
|
\ty := x * 2
|
|
\tz := y - a
|
|
\tw := z + b
|
|
\treturn nil
|
|
}
|
|
"""
|
|
|
|
|
|
def _compress_go(**config_overrides: object):
|
|
config = CodeCompressorConfig(
|
|
min_tokens_for_compression=0,
|
|
max_body_lines=2,
|
|
semantic_analysis=False,
|
|
**config_overrides,
|
|
)
|
|
compressor = CodeAwareCompressor(config)
|
|
return compressor.compress(GO_FUNC, language="go")
|
|
|
|
|
|
def test_go_statement_list_unwrap_no_duplicate_closing_brace() -> None:
|
|
"""Go wraps a block's statements in one `statement_list` node; treating
|
|
that as a single statement made its row range swallow the block's own
|
|
closing brace, producing a duplicate `}` in the compressed output."""
|
|
result = _compress_go()
|
|
|
|
closing_braces = [line for line in result.compressed.splitlines() if line.strip() == "}"]
|
|
assert len(closing_braces) == 1, (
|
|
f"expected exactly one closing brace line, got {len(closing_braces)}:\n{result.compressed}"
|
|
)
|
|
|
|
|
|
def test_go_multiline_signature_brace_preserved() -> None:
|
|
"""The multi-line signature's closing line (`) error {`) shares its row
|
|
with the brace instead of starting one of its own. Detecting the brace
|
|
via startswith("{") missed this and silently dropped the line; it must
|
|
survive truncation via endswith("{")."""
|
|
result = _compress_go()
|
|
|
|
assert result.compressed.count(") error {") == 1, (
|
|
f"multi-line signature line missing or duplicated:\n{result.compressed}"
|
|
)
|
|
|
|
|
|
class _FakeCodeCompressor:
|
|
def __init__(self, compressed: str) -> None:
|
|
self._compressed = compressed
|
|
|
|
def compress(self, content: str, language=None, context=""):
|
|
class _Result:
|
|
pass
|
|
|
|
r = _Result()
|
|
r.compressed = self._compressed
|
|
# Deliberately inflated/differently-scaled "own" token estimate —
|
|
# simulates a compressor whose internal counter isn't comparable to
|
|
# the router's len(text.split()) word count.
|
|
r.compressed_tokens = 10_000_000
|
|
return r
|
|
|
|
|
|
def test_content_router_code_aware_token_accounting_matches_word_count() -> None:
|
|
"""compressed_tokens must be derived from len(result.compressed.split()),
|
|
the same metric as original_tokens, not the compressor's own estimator.
|
|
Using the mismatched estimator made a real compression look like "no
|
|
savings" and forced a needless fallback to Kompress."""
|
|
original = "word " * 200 # 200 words
|
|
compressed_text = "word " * 50 # a real, large reduction
|
|
|
|
router = ContentRouter(ContentRouterConfig(enable_code_aware=True))
|
|
router._code_compressor = _FakeCodeCompressor(compressed_text)
|
|
|
|
compressed, compressed_tokens, strategy_chain = router._apply_strategy_to_content(
|
|
original, CompressionStrategy.CODE_AWARE, context=""
|
|
)
|
|
|
|
assert compressed == compressed_text
|
|
assert compressed_tokens == len(compressed_text.split())
|
|
assert strategy_chain == ["code_aware"], (
|
|
f"real compression must not trigger a Kompress fallback, got {strategy_chain}"
|
|
)
|
|
|
|
|
|
def test_prefer_code_aware_for_code_dataclass_defaults_true() -> None:
|
|
assert ContentRouterConfig().prefer_code_aware_for_code is True
|
|
|
|
|
|
def test_prefer_code_aware_for_code_env_var_defaults_true(monkeypatch) -> None:
|
|
monkeypatch.delenv("HEADROOM_PREFER_CODE_AWARE_FOR_CODE", raising=False)
|
|
|
|
config = ProxyConfig(
|
|
optimize=False,
|
|
cache_enabled=False,
|
|
rate_limit_enabled=False,
|
|
cost_tracking_enabled=False,
|
|
code_aware_enabled=False,
|
|
)
|
|
proxy = HeadroomProxy(config)
|
|
router = proxy.anthropic_pipeline.transforms[-1]
|
|
|
|
assert router.config.prefer_code_aware_for_code is True
|