mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-08-10 14:27:00 -04:00
## Description The OpenAI and Gemini handlers resolved the tokenizer and counted the conversation inline on the event loop. When a model resolves to a HuggingFace tokenizer (the registry routes qwen, deepseek, llama, phi, falcon, and more there) a cold cache runs `AutoTokenizer.from_pretrained` behind a 10s `thread.join`, which freezes the whole server. That is the GH #1701 stall, now reachable from OpenAI and Gemini because `/v1/chat/completions` and `/v1/responses` are documented multi-provider passthroughs and receive those models. Anthropic already routed the same call through a fail-open `_count_tokens_offloaded` helper. This hoists that helper to the shared `HeadroomProxy` base and sends the OpenAI and Gemini sites through it too. No linked issue. This is the OpenAI and Gemini follow-on to #1738, which offloaded the Anthropic and batch paths. GH #1701 is the original freeze report. ## Type of Change - [x] Bug fix (non-breaking change that fixes an issue) - [ ] 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 - Hoisted `_count_tokens_offloaded` from `AnthropicHandlerMixin` to the shared `HeadroomProxy` base, next to `_run_compression_in_executor`. It resolves and counts on the bounded compression executor and fails open to estimation on timeout, error, or executor quarantine. - Routed 6 inline sites through it: `handle_openai_chat`, `handle_openai_responses`, `handle_gemini_generate_content`, `handle_google_cloudcode_stream`, `handle_gemini_count_tokens`, and `handle_gemini_stream_generate_content` (resolve only, keeps its per-part `count_text` loop). - Removed 6 now-dead local `get_tokenizer` imports. - Left batch's per-line counts inline on purpose. They run on an already-warm tokenizer, so offloading them adds executor churn without touching the cold load. Batch's `pipeline.apply` was already offloaded in #1738. - Extended the wiring guard to all 7 provider handlers, added a quarantine fail-open test and a `count_text` fail-open test, and stubbed the method on 2 mixin-only handler doubles. ## 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 $ ruff check headroom/proxy/server.py headroom/proxy/handlers/{anthropic,openai,gemini}.py tests/test_tokenizer_count_offload.py All checks passed! $ pytest tests/test_tokenizer_count_offload.py 6 passed in 4.39s # offload suite + all 26 handler-calling test files + handler-helpers/batch/tokenizers $ pytest tests/test_tokenizer_count_offload.py tests/test_openai_codex_routing.py tests/test_gemini_nonjson_status.py ... tests/test_tokenizers.py 377 passed, 15 skipped, 15 warnings in 86.60s (0:01:26) ``` ## Real Behavior Proof - Environment: macOS (Darwin), Python 3.13, proxy built from this branch. A synthetic tokenizer that sleeps 0.5s on resolve+count stands in for a cold HuggingFace `from_pretrained` load, with a 10ms asyncio loop-canary running alongside. - Exact command / steps: monkeypatch `headroom.tokenizers.get_tokenizer` to the 0.5s-sleeping tokenizer, then time a concurrent canary across two counts, the offloaded `await proxy._count_tokens_offloaded("qwen2.5-coder", messages)` and the old inline `get_tokenizer(model).count_messages(messages)`. - Observed result: the offloaded path kept the loop live at 41 canary ticks during the 509ms count, the inline path froze it to 0 ticks over 502ms, and both returned the same token count. Full run was 377 passed, 15 skipped, 0 failed. The new quarantine test confirms an unrelated compression timeout downgrades counting to estimation instead of raising a 500. - Not tested: live HuggingFace downloads and real qwen/deepseek traffic. No API keys in this environment, so the Gemini and OpenAI integration tests skip on `GEMINI_API_KEY`/`OPENAI_API_KEY`. `mypy headroom` did not finish locally (cold-times-out past 10 minutes on this box), so type-checking is left to CI. ## 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 - [x] 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 - [x] I did **not** edit `CHANGELOG.md` — it is generated by release-please from my Conventional Commit PR title (a CI guard enforces this) ## Additional Notes - No linked issue. Follow-on to #1738. - Batch per-line counts stay inline: they run on an already-warm tokenizer, so offloading them adds executor churn without addressing the cold load. - Found a 6th site mid-implementation. `handle_gemini_stream_generate_content` also resolved the tokenizer inline but counts via a `count_text` loop, so it takes the resolve-only path. Verified `EstimatingTokenCounter.count_text` exists, so its fail-open branch does not crash. - `mypy headroom` cold-times-out locally (server.py pulls the full graph). Deferred to CI's Linux shards, same as prior PRs on this file. `ruff` and `pytest` run clean. - Documentation checkbox left unchecked: this change ships no user-facing doc update. --------- Co-authored-by: JerrettDavis <mxjerrett@gmail.com>
276 lines
11 KiB
Python
276 lines
11 KiB
Python
"""Token counting must run off the event loop (GH #1701): the Anthropic messages
|
|
handler resolved the tokenizer and counted the conversation inline in the async
|
|
handler. For HF-backed models (e.g. deepseek-*) first use triggers an unbounded
|
|
network download, freezing the whole server (610s request, then /livez, /readyz
|
|
and /health hang until kill). The fix routes resolution + counting through
|
|
HeadroomProxy._count_tokens_offloaded (compression executor, bounded by
|
|
COMPRESSION_TIMEOUT_SECONDS, fail-open to estimation) — shared by every provider
|
|
handler (Anthropic, OpenAI, Gemini), since the OpenAI passthrough endpoints
|
|
receive the same HF-backed models — and offloads the inline batch
|
|
pipeline.apply() calls the same way.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import inspect
|
|
import threading
|
|
import time
|
|
|
|
from headroom.proxy.handlers.anthropic import AnthropicHandlerMixin
|
|
from headroom.proxy.handlers.batch import BatchHandlerMixin
|
|
from headroom.proxy.handlers.gemini import GeminiHandlerMixin
|
|
from headroom.proxy.handlers.openai import OpenAIHandlerMixin
|
|
from headroom.proxy.server import (
|
|
CompressionQuarantinedError,
|
|
ProxyConfig,
|
|
create_app,
|
|
)
|
|
from headroom.proxy.token_counting import (
|
|
_count_offloaded,
|
|
count_texts_offloaded,
|
|
count_tokens_offloaded,
|
|
)
|
|
from headroom.tokenizers import EstimatingTokenCounter
|
|
|
|
|
|
def _make_proxy(): # noqa: ANN202 — returns the internal HeadroomProxy
|
|
app = create_app(
|
|
ProxyConfig(
|
|
optimize=True,
|
|
cache_enabled=False,
|
|
rate_limit_enabled=False,
|
|
cost_tracking_enabled=False,
|
|
)
|
|
)
|
|
return app.state.proxy
|
|
|
|
|
|
def test_handlers_offload_token_counting_and_batch_apply() -> None:
|
|
"""Wiring guard: the request paths must use the offloaded helpers, not inline
|
|
get_tokenizer/count_messages or pipeline.apply on the event loop."""
|
|
# Every provider handler that counts the original conversation must route
|
|
# resolution + counting through the shared fail-open helper, never inline on
|
|
# the loop. OpenAI /chat + /responses are multi-provider passthroughs, so an
|
|
# HF-routed model (qwen, deepseek, llama, ...) can reach them and cold-load.
|
|
for mixin, method in (
|
|
(AnthropicHandlerMixin, "handle_anthropic_messages"),
|
|
(OpenAIHandlerMixin, "handle_openai_chat"),
|
|
(OpenAIHandlerMixin, "handle_openai_responses"),
|
|
(GeminiHandlerMixin, "handle_gemini_generate_content"),
|
|
(GeminiHandlerMixin, "handle_google_cloudcode_stream"),
|
|
(GeminiHandlerMixin, "handle_gemini_count_tokens"),
|
|
):
|
|
fn = getattr(mixin, method)
|
|
assert inspect.iscoroutinefunction(fn), f"{method} must be async"
|
|
src = inspect.getsource(fn)
|
|
assert "_count_tokens_offloaded(" in src, f"{method}: token counting not offloaded"
|
|
assert "tokenizer = get_tokenizer(" not in src, (
|
|
f"{method}: tokenizer resolved inline on the loop"
|
|
)
|
|
|
|
fn = GeminiHandlerMixin.handle_gemini_stream_generate_content
|
|
assert inspect.iscoroutinefunction(fn)
|
|
src = inspect.getsource(fn)
|
|
assert "_count_texts_offloaded(" in src, "streaming Gemini text counting not offloaded"
|
|
assert "tokenizer = get_tokenizer(" not in src, "tokenizer resolved inline on the loop"
|
|
assert "count_text(" not in src, "streaming Gemini count_text still runs on the loop"
|
|
assert "_dict_parts(" in src, "streaming Gemini must reuse the shared _dict_parts coercion"
|
|
assert 'isinstance(part.get("text"), str)' in src, (
|
|
"streaming Gemini must skip non-str text so count_text can't 500"
|
|
)
|
|
|
|
for mixin, method in (
|
|
(AnthropicHandlerMixin, "handle_anthropic_batch_create"),
|
|
(BatchHandlerMixin, "handle_google_batch_create"),
|
|
(BatchHandlerMixin, "_compress_batch_jsonl"),
|
|
):
|
|
fn = getattr(mixin, method)
|
|
assert inspect.iscoroutinefunction(fn), f"{method} must be async"
|
|
src = inspect.getsource(fn)
|
|
if "pipeline.apply(" in src:
|
|
assert "_run_compression_in_executor(" in src, f"{method}: apply() not offloaded"
|
|
assert "COMPRESSION_TIMEOUT_SECONDS" in src, f"{method}: offload missing timeout"
|
|
|
|
helper_src = inspect.getsource(_count_offloaded)
|
|
assert "COMPRESSION_TIMEOUT_SECONDS" in helper_src
|
|
assert "EstimatingTokenCounter" in helper_src, "helper must fail open to estimation"
|
|
|
|
|
|
async def test_count_tokens_offloaded_runs_on_worker_thread(monkeypatch) -> None: # noqa: ANN001
|
|
proxy = _make_proxy()
|
|
loop_thread = threading.current_thread().name
|
|
seen: dict[str, str] = {}
|
|
|
|
class _SpyTokenizer(EstimatingTokenCounter):
|
|
def count_messages(self, messages): # noqa: ANN001, ANN201
|
|
seen["thread"] = threading.current_thread().name
|
|
return super().count_messages(messages)
|
|
|
|
monkeypatch.setattr("headroom.tokenizers.get_tokenizer", lambda *a, **k: _SpyTokenizer())
|
|
|
|
_, tokens = await proxy._count_tokens_offloaded("gpt-4", [{"role": "user", "content": "hi"}])
|
|
|
|
assert tokens > 0
|
|
assert seen["thread"].startswith("headroom-compress")
|
|
assert seen["thread"] != loop_thread
|
|
|
|
|
|
async def test_count_tokens_offloaded_keeps_loop_responsive(monkeypatch) -> None: # noqa: ANN001
|
|
"""A slow tokenizer (stand-in for an HF network load) must not starve the loop —
|
|
the pre-fix inline call yielded ~0 ticks here."""
|
|
proxy = _make_proxy()
|
|
ticks = 0
|
|
|
|
async def _ticker() -> None:
|
|
nonlocal ticks
|
|
while True:
|
|
await asyncio.sleep(0.01)
|
|
ticks += 1
|
|
|
|
class _SlowTokenizer(EstimatingTokenCounter):
|
|
def count_messages(self, messages): # noqa: ANN001, ANN201
|
|
time.sleep(0.3)
|
|
return super().count_messages(messages)
|
|
|
|
monkeypatch.setattr("headroom.tokenizers.get_tokenizer", lambda *a, **k: _SlowTokenizer())
|
|
|
|
tick_task = asyncio.create_task(_ticker())
|
|
try:
|
|
_, tokens = await proxy._count_tokens_offloaded("m", [{"role": "user", "content": "hi"}])
|
|
finally:
|
|
tick_task.cancel()
|
|
|
|
assert tokens > 0
|
|
assert ticks >= 5
|
|
|
|
|
|
async def test_count_tokens_offloaded_fails_open(monkeypatch) -> None: # noqa: ANN001
|
|
"""Resolution errors and timeouts downgrade to estimation instead of raising."""
|
|
proxy = _make_proxy()
|
|
|
|
def _boom(*a, **k): # noqa: ANN002, ANN003, ANN202
|
|
raise RuntimeError("tokenizer backend exploded")
|
|
|
|
monkeypatch.setattr("headroom.tokenizers.get_tokenizer", _boom)
|
|
|
|
tokenizer, tokens = await proxy._count_tokens_offloaded(
|
|
"deepseek-chat", [{"role": "user", "content": "hello world"}]
|
|
)
|
|
|
|
assert isinstance(tokenizer, EstimatingTokenCounter)
|
|
assert tokens > 0
|
|
# Logged-once bookkeeping records the downgraded model.
|
|
assert "deepseek-chat" in proxy._token_count_fallback_models
|
|
|
|
|
|
async def test_count_tokens_offloaded_fails_open_on_executor_quarantine() -> None:
|
|
"""Now that OpenAI/Gemini counting shares the compression executor, an
|
|
unrelated request's compression timeout can quarantine it — the next
|
|
``_run_compression_in_executor`` call raises ``CompressionQuarantinedError``
|
|
immediately (process-wide state). A request that is only counting tokens
|
|
must not 500 on that; it fails open to estimation like any other error."""
|
|
# The executor's ``except Exception`` fail-open only catches the quarantine
|
|
# error because it subclasses Exception — pin that contract.
|
|
assert issubclass(CompressionQuarantinedError, Exception)
|
|
|
|
proxy = _make_proxy()
|
|
# Record a concurrent compression as timed out so the real executor guard
|
|
# quarantines the next call — no mock of the helper itself.
|
|
proxy._compression_timed_out_in_flight = 1
|
|
|
|
tokenizer, tokens = await proxy._count_tokens_offloaded(
|
|
"qwen2.5-coder", [{"role": "user", "content": "hello world"}]
|
|
)
|
|
|
|
assert isinstance(tokenizer, EstimatingTokenCounter)
|
|
assert tokens > 0
|
|
assert "qwen2.5-coder" in proxy._token_count_fallback_models
|
|
|
|
|
|
async def test_count_tokens_offloaded_returns_count_text_capable_tokenizer() -> None:
|
|
"""The fail-open tokenizer should still support text counting for callers
|
|
that need per-fragment accounting."""
|
|
proxy = _make_proxy()
|
|
# Quarantine forces the fail-open branch (an EstimatingTokenCounter).
|
|
proxy._compression_timed_out_in_flight = 1
|
|
|
|
# The empty-messages count is intentionally discarded by that handler
|
|
# (it sums text parts itself), so only the tokenizer matters here.
|
|
tokenizer, _ = await proxy._count_tokens_offloaded("qwen2.5-coder", [])
|
|
|
|
assert isinstance(tokenizer, EstimatingTokenCounter)
|
|
# The streaming handler's per-part loop must not raise on the fallback.
|
|
assert tokenizer.count_text("hello world") > 0
|
|
|
|
|
|
async def test_count_texts_offloaded_runs_on_worker_thread(monkeypatch) -> None: # noqa: ANN001
|
|
proxy = _make_proxy()
|
|
loop_thread = threading.current_thread().name
|
|
seen: dict[str, str] = {}
|
|
|
|
class _SpyTokenizer(EstimatingTokenCounter):
|
|
def count_text(self, text): # noqa: ANN001, ANN201
|
|
seen["thread"] = threading.current_thread().name
|
|
return super().count_text(text)
|
|
|
|
monkeypatch.setattr("headroom.tokenizers.get_tokenizer", lambda *a, **k: _SpyTokenizer())
|
|
|
|
_, tokens = await proxy._count_texts_offloaded("gemini-pro", ["hello", "world"])
|
|
|
|
assert tokens > 0
|
|
assert seen["thread"].startswith("headroom-compress")
|
|
assert seen["thread"] != loop_thread
|
|
|
|
|
|
async def test_count_texts_offloaded_fails_open(monkeypatch) -> None: # noqa: ANN001
|
|
"""The texts variant downgrades to estimation on a resolution error, the same
|
|
as the messages variant (its fail-open branch was previously uncovered)."""
|
|
proxy = _make_proxy()
|
|
|
|
def _boom(*a, **k): # noqa: ANN002, ANN003, ANN202
|
|
raise RuntimeError("tokenizer backend exploded")
|
|
|
|
monkeypatch.setattr("headroom.tokenizers.get_tokenizer", _boom)
|
|
|
|
tokenizer, tokens = await proxy._count_texts_offloaded("deepseek-chat", ["hello", "world"])
|
|
|
|
assert isinstance(tokenizer, EstimatingTokenCounter)
|
|
assert tokens > 0
|
|
assert "deepseek-chat" in proxy._token_count_fallback_models
|
|
|
|
|
|
async def test_count_offloaded_without_executor_estimates() -> None:
|
|
"""An owner with no compression executor (a lightweight caller or test double)
|
|
fails open to estimation inline instead of crashing on the missing runner."""
|
|
|
|
class _NoExecutorOwner:
|
|
pass
|
|
|
|
owner = _NoExecutorOwner()
|
|
|
|
tok, n_msg = await count_tokens_offloaded(
|
|
owner, "gpt-4", [{"role": "user", "content": "hello world"}]
|
|
)
|
|
assert isinstance(tok, EstimatingTokenCounter)
|
|
assert n_msg > 0
|
|
|
|
tok2, n_txt = await count_texts_offloaded(owner, "gemini-pro", ["hello", "world"])
|
|
assert isinstance(tok2, EstimatingTokenCounter)
|
|
assert n_txt > 0
|
|
|
|
|
|
async def test_count_texts_offloaded_sums_fragments(monkeypatch) -> None: # noqa: ANN001
|
|
"""The streaming rewrite sums per-fragment counts, matching the old per-part
|
|
count_text loop it replaced."""
|
|
proxy = _make_proxy()
|
|
monkeypatch.setattr(
|
|
"headroom.tokenizers.get_tokenizer", lambda *a, **k: EstimatingTokenCounter()
|
|
)
|
|
fragments = ["hello", "world", "foo"]
|
|
|
|
_, total = await proxy._count_texts_offloaded("gemini-pro", fragments)
|
|
|
|
est = EstimatingTokenCounter()
|
|
assert total == sum(est.count_text(f) for f in fragments)
|
|
assert total > 0
|