mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-08-27 14:17:10 -04:00
PR-A4 of the Realignment Phase A lockdown
(REALIGNMENT/03-phase-A-lockdown.md). Eliminates P0-3 (Rust proxy
ignores customer cache_control markers) and P0-5 (numeric precision
lost via serde_json::Value round-trip) at the library level; Phase B
PR-B2 wires the helper into the live-zone block dispatcher.
Cargo.toml — add `arbitrary_precision` and `raw_value` to
`serde_json` workspace features. `arbitrary_precision` keeps `1.0`
from collapsing to `1` and preserves >2^53 integers; `raw_value`
exposes `&RawValue` so PR-B2 can forward unmodified `messages[*]`
entries as exact byte copies.
crates/headroom-core/src/cache_control.rs (new) — `compute_frozen_count`
walks `messages[i].content[*].cache_control` via serde_json
accessors only (no regex) and returns the smallest N such that
`messages[i]` is frozen for every i < N. Markers in `system` or
`tools[*]` log at debug! but never bump the floor (those fields are
unconditionally cache-hot per invariant I2). TTL ordering violations
(5m before 1h, guide §2.19) emit `tracing::warn!` but the function
computes the correct count regardless — the customer's request, not
ours to reject.
crates/headroom-core/src/lib.rs — re-export `compute_frozen_count` at
crate root so the proxy crate has a stable import path.
crates/headroom-proxy/src/compression/anthropic.rs — add
`resolve_frozen_count` thin wrapper that consults the
`cache_control_auto_frozen` config flag. When `disabled`, returns 0
regardless of body content (operator opt-out for benchmarking).
crates/headroom-proxy/src/config.rs — add `CacheControlAutoFrozen`
enum and the matching CLI flag `--cache-control-auto-frozen` /
env var `HEADROOM_PROXY_CACHE_CONTROL_AUTO_FROZEN`. Default is
`enabled`. Documented in the doc comments.
Tests
- crates/headroom-core/src/cache_control.rs (inline): 11 unit tests
covering marker detection, system/tools negative cases, ordering
state machine, defensive (missing fields, non-array messages,
non-object content blocks).
- crates/headroom-core/tests/cache_control.rs: 11 unit + 3 property
tests (monotonic non-decrease as markers are added; system/tools
markers don't change count; empty messages → 0).
- crates/headroom-proxy/tests/integration_cache_control.rs: 8 tests
exercising the proxy wrapper (configurability gate; tracing
capture for the 5m-before-1h warn path).
Acceptance gates: `cargo build --workspace`, `cargo test --workspace`
(33 new tests green), `cargo clippy --workspace -- -D warnings`,
`cargo fmt --all --check` all clean. No new `regex::` imports;
`git grep -n 'regex::' crates/{headroom-core/src/cache_control.rs,
headroom-core/tests/cache_control.rs, headroom-proxy/tests/
integration_cache_control.rs}` empty.
Honors the realignment build constraints: configurable (CLI + env),
no hardcodes (TTL strings live as const), no regex (serde_json
accessor walk), no fallbacks (one impl), structured logging
(debug!/warn! with field/index/ttl/rule context), tests
comprehensive (unit + property + integration + tracing capture).
297 lines
12 KiB
Rust
297 lines
12 KiB
Rust
//! Unit + property tests for the `cache_control` walker (PR-A4).
|
|
//!
|
|
//! These tests exercise [`headroom_core::compute_frozen_count`] in
|
|
//! isolation — no proxy, no upstream, no I/O. Integration tests that
|
|
//! drive the walker through the proxy live in
|
|
//! `crates/headroom-proxy/tests/integration_cache_control.rs`.
|
|
|
|
use headroom_core::compute_frozen_count;
|
|
use proptest::prelude::*;
|
|
use serde_json::{json, Value};
|
|
|
|
/// Marker placement table-driven cases. Spec (PR-A4):
|
|
/// - markers in `messages[i].content[*]` bump frozen_count to ≥ i+1
|
|
/// - markers in `system` or `tools[*]` do NOT bump
|
|
/// - returns max(i+1) across all messages, or 0 if no markers
|
|
#[test]
|
|
fn cache_control_marker_at_message_3_yields_frozen_count_4() {
|
|
// Spec: marker on messages[3] => frozen_count = 4.
|
|
// (4 messages are in the cache hot zone: indices 0, 1, 2, 3.)
|
|
let body = json!({
|
|
"messages": [
|
|
{"role": "user", "content": "first"},
|
|
{"role": "assistant", "content": "second"},
|
|
{"role": "user", "content": "third"},
|
|
{"role": "assistant", "content": [
|
|
{"type": "text", "text": "fourth", "cache_control": {"type": "ephemeral"}},
|
|
]},
|
|
{"role": "user", "content": "fifth"},
|
|
],
|
|
});
|
|
assert_eq!(compute_frozen_count(&body), 4);
|
|
}
|
|
|
|
#[test]
|
|
fn cache_control_in_system_blocks_does_not_bump_frozen_count() {
|
|
// Spec: markers in `system` are unconditionally cache-hot;
|
|
// they don't raise the message-index floor.
|
|
let body = json!({
|
|
"system": [
|
|
{"type": "text", "text": "you are helpful", "cache_control": {"type": "ephemeral"}},
|
|
{"type": "text", "text": "cite sources", "cache_control": {"type": "ephemeral", "ttl": "1h"}},
|
|
],
|
|
"messages": [
|
|
{"role": "user", "content": "hi"},
|
|
{"role": "assistant", "content": "hello"},
|
|
],
|
|
});
|
|
assert_eq!(compute_frozen_count(&body), 0);
|
|
}
|
|
|
|
#[test]
|
|
fn cache_control_in_tools_does_not_bump_frozen_count() {
|
|
let body = json!({
|
|
"tools": [
|
|
{"name": "search", "description": "search the web", "cache_control": {"type": "ephemeral"}},
|
|
{"name": "calc", "description": "calculator", "cache_control": {"type": "ephemeral", "ttl": "1h"}},
|
|
],
|
|
"messages": [
|
|
{"role": "user", "content": "what is 2+2?"},
|
|
],
|
|
});
|
|
assert_eq!(compute_frozen_count(&body), 0);
|
|
}
|
|
|
|
#[test]
|
|
fn cache_control_ttl_1h_before_5m_passes_no_warn() {
|
|
// Per guide §2.19, `1h` markers must precede `5m` markers.
|
|
// This ordering is the *correct* one; the function must return
|
|
// the right frozen_count and emit no warning.
|
|
//
|
|
// We don't assert "no warning" here directly — capturing tracing
|
|
// output requires a global subscriber that conflicts with other
|
|
// tests. The "warning is emitted on violation" path is covered
|
|
// by `cache_control_ttl_5m_before_1h_warns_and_passes` below
|
|
// with a dedicated capture; here we just confirm the function
|
|
// returns the correct floor under a legal ordering.
|
|
let body = json!({
|
|
"messages": [
|
|
{"role": "user", "content": [
|
|
{"type": "text", "text": "first 1h", "cache_control": {"type": "ephemeral", "ttl": "1h"}},
|
|
]},
|
|
{"role": "assistant", "content": [
|
|
{"type": "text", "text": "second 5m", "cache_control": {"type": "ephemeral"}},
|
|
]},
|
|
],
|
|
});
|
|
// Both messages have markers; highest index is 1, so floor = 2.
|
|
assert_eq!(compute_frozen_count(&body), 2);
|
|
}
|
|
|
|
#[test]
|
|
fn cache_control_no_markers_yields_zero() {
|
|
let body = json!({
|
|
"model": "claude-3-5-sonnet-20241022",
|
|
"max_tokens": 1024,
|
|
"messages": [
|
|
{"role": "user", "content": "no marker here"},
|
|
{"role": "assistant", "content": [
|
|
{"type": "text", "text": "no marker either"},
|
|
]},
|
|
],
|
|
});
|
|
assert_eq!(compute_frozen_count(&body), 0);
|
|
}
|
|
|
|
#[test]
|
|
fn cache_control_multiple_markers_in_messages_returns_max_index() {
|
|
// Multiple markers across non-adjacent indices — function
|
|
// returns max(i+1) per spec.
|
|
let body = json!({
|
|
"messages": [
|
|
{"role": "user", "content": [
|
|
{"type": "text", "text": "m0", "cache_control": {"type": "ephemeral"}},
|
|
]},
|
|
{"role": "assistant", "content": "m1 string"},
|
|
{"role": "user", "content": [
|
|
{"type": "text", "text": "m2", "cache_control": {"type": "ephemeral"}},
|
|
]},
|
|
{"role": "assistant", "content": [
|
|
{"type": "text", "text": "m3"},
|
|
]},
|
|
{"role": "user", "content": [
|
|
{"type": "text", "text": "m4", "cache_control": {"type": "ephemeral", "ttl": "1h"}},
|
|
]},
|
|
{"role": "assistant", "content": "m5 string"},
|
|
],
|
|
});
|
|
// Highest marker is on index 4; floor = 5.
|
|
assert_eq!(compute_frozen_count(&body), 5);
|
|
}
|
|
|
|
#[test]
|
|
fn cache_control_marker_on_multiple_blocks_within_one_message() {
|
|
// Marker on multiple blocks of the SAME message — the message
|
|
// index is what matters, not the block count. Floor = i+1 once.
|
|
let body = json!({
|
|
"messages": [
|
|
{"role": "user", "content": "first"},
|
|
{"role": "assistant", "content": [
|
|
{"type": "text", "text": "block A", "cache_control": {"type": "ephemeral"}},
|
|
{"type": "text", "text": "block B", "cache_control": {"type": "ephemeral", "ttl": "1h"}},
|
|
{"type": "text", "text": "block C", "cache_control": {"type": "ephemeral"}},
|
|
]},
|
|
],
|
|
});
|
|
assert_eq!(compute_frozen_count(&body), 2);
|
|
}
|
|
|
|
#[test]
|
|
fn cache_control_string_content_skipped() {
|
|
// Anthropic accepts both string and block-list `content`. The
|
|
// walker must skip string content without panicking and without
|
|
// hallucinating markers.
|
|
let body = json!({
|
|
"messages": [
|
|
{"role": "user", "content": "plain string"},
|
|
{"role": "assistant", "content": "another plain string"},
|
|
{"role": "user", "content": [
|
|
{"type": "text", "text": "now with marker", "cache_control": {"type": "ephemeral"}},
|
|
]},
|
|
],
|
|
});
|
|
assert_eq!(compute_frozen_count(&body), 3);
|
|
}
|
|
|
|
#[test]
|
|
fn cache_control_missing_messages_field_yields_zero() {
|
|
// Body has no `messages` field at all — walker tolerates and
|
|
// returns 0.
|
|
let body = json!({"model": "claude", "system": "you are helpful"});
|
|
assert_eq!(compute_frozen_count(&body), 0);
|
|
}
|
|
|
|
#[test]
|
|
fn cache_control_messages_not_an_array_yields_zero() {
|
|
// Defensive: malformed body where `messages` is a string.
|
|
// Walker tolerates and returns 0 (no markers possible).
|
|
let body = json!({"messages": "not an array"});
|
|
assert_eq!(compute_frozen_count(&body), 0);
|
|
}
|
|
|
|
#[test]
|
|
fn cache_control_marker_with_non_object_content_block_skipped() {
|
|
// Defensive: a content block isn't an object (shouldn't happen
|
|
// per Anthropic spec, but we don't crash).
|
|
let body = json!({
|
|
"messages": [
|
|
{"role": "user", "content": [
|
|
"not an object",
|
|
42,
|
|
null,
|
|
{"type": "text", "text": "real block", "cache_control": {"type": "ephemeral"}},
|
|
]},
|
|
],
|
|
});
|
|
assert_eq!(compute_frozen_count(&body), 1);
|
|
}
|
|
|
|
// ─── Property tests ───────────────────────────────────────────────────
|
|
|
|
proptest! {
|
|
#![proptest_config(ProptestConfig {
|
|
cases: 256,
|
|
.. ProptestConfig::default()
|
|
})]
|
|
|
|
/// Monotonic non-decrease: adding more markers to a body never
|
|
/// *lowers* the frozen_count. Specifically, if we take a body with
|
|
/// markers on a subset of indices and add a new marker on a
|
|
/// higher index, the frozen_count grows; adding markers on an
|
|
/// equal-or-lower index keeps the count.
|
|
#[test]
|
|
fn frozen_count_monotonic_non_decreasing(
|
|
// Bound message count so proptest can shrink predictably.
|
|
// We pick indices in 0..32 and unique-sort them so the test
|
|
// exercises both adjacent and non-adjacent markers.
|
|
marker_indices in proptest::collection::vec(0usize..32, 0..16),
|
|
message_count in 32usize..=32,
|
|
) {
|
|
// Build a body with markers on the deduplicated indices.
|
|
let initial = build_body_with_markers(&marker_indices, message_count);
|
|
let initial_count = compute_frozen_count(&initial);
|
|
|
|
// Add a marker on a strictly higher index (max+1, or 0 if
|
|
// empty) and recompute. The new floor must be >= old.
|
|
let new_index = marker_indices.iter().copied().max().map(|m| m + 1).unwrap_or(0);
|
|
if new_index < message_count {
|
|
let mut more_indices = marker_indices.clone();
|
|
more_indices.push(new_index);
|
|
let augmented = build_body_with_markers(&more_indices, message_count);
|
|
let augmented_count = compute_frozen_count(&augmented);
|
|
prop_assert!(
|
|
augmented_count >= initial_count,
|
|
"monotonicity broken: initial={} augmented={} new_index={}",
|
|
initial_count, augmented_count, new_index
|
|
);
|
|
}
|
|
}
|
|
|
|
/// Adding a marker to `system` or `tools` never changes
|
|
/// frozen_count — those fields don't bump the message-index
|
|
/// floor regardless of marker placement.
|
|
#[test]
|
|
fn system_and_tools_markers_dont_change_count(
|
|
marker_indices in proptest::collection::vec(0usize..16, 0..8),
|
|
message_count in 16usize..=16,
|
|
) {
|
|
let bare = build_body_with_markers(&marker_indices, message_count);
|
|
let bare_count = compute_frozen_count(&bare);
|
|
|
|
// Same body but with system markers added.
|
|
let mut with_system = bare.clone();
|
|
with_system["system"] = json!([
|
|
{"type": "text", "text": "sys", "cache_control": {"type": "ephemeral"}},
|
|
{"type": "text", "text": "sys2", "cache_control": {"type": "ephemeral", "ttl": "1h"}},
|
|
]);
|
|
prop_assert_eq!(compute_frozen_count(&with_system), bare_count);
|
|
|
|
// And with tools markers.
|
|
let mut with_tools = bare.clone();
|
|
with_tools["tools"] = json!([
|
|
{"name": "t", "description": "tool", "cache_control": {"type": "ephemeral"}},
|
|
]);
|
|
prop_assert_eq!(compute_frozen_count(&with_tools), bare_count);
|
|
}
|
|
|
|
/// Empty messages array always yields 0.
|
|
#[test]
|
|
fn empty_messages_yields_zero(_dummy in 0u8..1) {
|
|
let body = json!({"messages": []});
|
|
prop_assert_eq!(compute_frozen_count(&body), 0);
|
|
}
|
|
}
|
|
|
|
/// Build a request body with markers on the given message indices.
|
|
/// Indices outside `0..message_count` are ignored; duplicates are
|
|
/// fine. Used by the property tests above.
|
|
fn build_body_with_markers(marker_indices: &[usize], message_count: usize) -> Value {
|
|
let messages: Vec<Value> = (0..message_count)
|
|
.map(|i| {
|
|
if marker_indices.contains(&i) {
|
|
json!({
|
|
"role": if i % 2 == 0 { "user" } else { "assistant" },
|
|
"content": [
|
|
{"type": "text", "text": format!("m{i}"), "cache_control": {"type": "ephemeral"}},
|
|
],
|
|
})
|
|
} else {
|
|
json!({
|
|
"role": if i % 2 == 0 { "user" } else { "assistant" },
|
|
"content": format!("m{i}"),
|
|
})
|
|
}
|
|
})
|
|
.collect();
|
|
json!({"messages": messages})
|
|
}
|