Files
chopratejas--headroom/tests/test_issue_728_empty_tools_injection.py
wehub-resource-sync 0ef5fcb1c5
Security / Dependency audit (pip-audit) (push) Has been cancelled
Security / CodeQL (javascript-typescript) (push) Has been cancelled
Security / CodeQL (python) (push) Has been cancelled
Security / Secret scan (gitleaks) (push) Has been cancelled
rust / test (ubuntu) (push) Has been cancelled
rust / simulator e2e (macos-latest) (push) Has been cancelled
rust / simulator e2e (ubuntu-latest) (push) Has been cancelled
rust / simulator e2e (windows-latest) (push) Has been cancelled
rust / wheels (aarch64-apple-darwin) (push) Has been cancelled
rust / wheels (x86_64-unknown-linux-gnu) (push) Has been cancelled
rust / wheels (x86_64-apple-darwin) (push) Has been cancelled
rust / audit (push) Has been cancelled
rust / parity (nightly, allowed to fail during Phase 0) (push) Has been cancelled
CI / commitlint (push) Has been skipped
Dev Containers / validate (.devcontainer/devcontainer.json, default) (push) Failing after 0s
Dev Containers / validate (.devcontainer/memory-stack/devcontainer.json, memory-stack) (push) Failing after 0s
Dev Containers / validate-worktree (push) Failing after 0s
CI / changes (push) Failing after 4s
Deploy Documentation / validate (push) Has been skipped
Deploy Documentation / deploy (push) Failing after 1s
Init Native E2E / init-native (ubuntu-latest, claude) (push) Failing after 1s
Init Native E2E / init-native (ubuntu-latest, codex) (push) Failing after 1s
Install Native E2E / install-native (ubuntu-latest) (push) Failing after 1s
OpenCode Plugin / typecheck + build + test (push) Failing after 1s
Init Native E2E / init-native (ubuntu-latest, copilot) (push) Failing after 1s
Release Please / release-please (push) Failing after 1s
Wrap E2E / docker-wrap-e2e (push) Failing after 1s
Wrap Native E2E / wrap-native (ubuntu-latest) (push) Failing after 1s
Init E2E / docker-init-e2e (push) Failing after 4s
Merge Conflicts / merge-conflicts (push) Failing after 4s
CI / lint (push) Has been cancelled
CI / build-wheel (push) Has been cancelled
CI / build-wheel-windows (push) Has been cancelled
CI / prefetch-model (push) Has been cancelled
CI / test-dashboard-ui (push) Has been cancelled
CI / test (1) (push) Has been cancelled
CI / test (2) (push) Has been cancelled
CI / test (3) (push) Has been cancelled
CI / test (4) (push) Has been cancelled
CI / test-extras (push) Has been cancelled
CI / test-agno (push) Has been cancelled
CI / build (push) Has been cancelled
CI / workflow-validation (push) Has been cancelled
CI / docker-native-e2e (push) Has been cancelled
CI / windows-native-wrapper (push) Has been cancelled
CI / macos-native-wrapper (push) Has been cancelled
Docker / docker-build (map[name:arm64 platform:linux/arm64 runs_on:ubuntu-24.04-arm], map[bake_target:runtime-code-nonroot name:code-nonroot]) (push) Has been cancelled
Docker / docker-build (map[name:arm64 platform:linux/arm64 runs_on:ubuntu-24.04-arm], map[bake_target:runtime-code-slim name:code-slim]) (push) Has been cancelled
Docker / docker-build (map[name:arm64 platform:linux/arm64 runs_on:ubuntu-24.04-arm], map[bake_target:runtime-code-slim-nonroot name:code-slim-nonroot]) (push) Has been cancelled
Docker / docker-build (map[name:arm64 platform:linux/arm64 runs_on:ubuntu-24.04-arm], map[bake_target:runtime-nonroot name:nonroot]) (push) Has been cancelled
Docker / docker-build (map[name:arm64 platform:linux/arm64 runs_on:ubuntu-24.04-arm], map[bake_target:runtime-slim name:slim]) (push) Has been cancelled
Docker / docker-build (map[name:arm64 platform:linux/arm64 runs_on:ubuntu-24.04-arm], map[bake_target:runtime-slim-nonroot name:slim-nonroot]) (push) Has been cancelled
Docker / docker-manifest (map[bake_target:runtime name:]) (push) Has been cancelled
Docker / docker-manifest (map[bake_target:runtime-code name:code]) (push) Has been cancelled
Docker / docker-manifest (map[bake_target:runtime-code-nonroot name:code-nonroot]) (push) Has been cancelled
Docker / docker-manifest (map[bake_target:runtime-code-slim name:code-slim]) (push) Has been cancelled
Docker / docker-manifest (map[bake_target:runtime-code-slim-nonroot name:code-slim-nonroot]) (push) Has been cancelled
Docker / docker-manifest (map[bake_target:runtime-nonroot name:nonroot]) (push) Has been cancelled
Docker / docker-manifest (map[bake_target:runtime-slim name:slim]) (push) Has been cancelled
Docker / docker-manifest (map[bake_target:runtime-slim-nonroot name:slim-nonroot]) (push) Has been cancelled
Docker / docker-build (map[name:amd64 platform:linux/amd64 runs_on:ubuntu-24.04], map[bake_target:runtime name:]) (push) Has been cancelled
Docker / docker-build (map[name:amd64 platform:linux/amd64 runs_on:ubuntu-24.04], map[bake_target:runtime-code name:code]) (push) Has been cancelled
Docker / docker-build (map[name:amd64 platform:linux/amd64 runs_on:ubuntu-24.04], map[bake_target:runtime-code-nonroot name:code-nonroot]) (push) Has been cancelled
Docker / docker-build (map[name:amd64 platform:linux/amd64 runs_on:ubuntu-24.04], map[bake_target:runtime-code-slim name:code-slim]) (push) Has been cancelled
Docker / docker-build (map[name:amd64 platform:linux/amd64 runs_on:ubuntu-24.04], map[bake_target:runtime-code-slim-nonroot name:code-slim-nonroot]) (push) Has been cancelled
Docker / docker-build (map[name:amd64 platform:linux/amd64 runs_on:ubuntu-24.04], map[bake_target:runtime-nonroot name:nonroot]) (push) Has been cancelled
Docker / docker-build (map[name:amd64 platform:linux/amd64 runs_on:ubuntu-24.04], map[bake_target:runtime-slim name:slim]) (push) Has been cancelled
Docker / docker-build (map[name:amd64 platform:linux/amd64 runs_on:ubuntu-24.04], map[bake_target:runtime-slim-nonroot name:slim-nonroot]) (push) Has been cancelled
Docker / docker-build (map[name:arm64 platform:linux/arm64 runs_on:ubuntu-24.04-arm], map[bake_target:runtime name:]) (push) Has been cancelled
Docker / docker-build (map[name:arm64 platform:linux/arm64 runs_on:ubuntu-24.04-arm], map[bake_target:runtime-code name:code]) (push) Has been cancelled
Docker / promote-latest (push) Has been cancelled
Init Native E2E / init-native (macos-latest, claude) (push) Has been cancelled
Init Native E2E / init-native (macos-latest, codex) (push) Has been cancelled
Init Native E2E / init-native (macos-latest, copilot) (push) Has been cancelled
Install Native E2E / install-native (macos-latest) (push) Has been cancelled
Wrap Native E2E / wrap-native (macos-latest) (push) Has been cancelled
chore: import upstream snapshot with attribution
2026-07-13 12:03:20 +08:00

185 lines
7.8 KiB
Python

"""Issue #728: proxy must not inject ``tools: []`` when the client omitted the tools field.
vLLM-based providers (Venice.ai, etc.) reject requests containing an empty ``tools``
array. The bug: ``apply_session_sticky_ccr_tool`` / ``apply_session_sticky_memory_tools``
always return a list (empty when no tools exist and none were injected), and the
old handler guard ``if tools is not None`` evaluated True for ``[]``, causing
``body["tools"] = []`` to be sent upstream unconditionally.
Fix: the guard was changed to ``if tools or _original_tools is not None`` in both
the OpenAI and Anthropic handlers so that an empty result list only reaches the
outgoing body when the original request already carried a ``tools`` field.
"""
from __future__ import annotations
import pytest
from headroom.ccr.tool_injection import CCR_TOOL_NAME
from headroom.proxy.handlers.anthropic import AnthropicHandlerMixin
from headroom.proxy.helpers import (
_reset_session_ccr_tracker_for_test,
apply_session_sticky_ccr_tool,
)
@pytest.fixture(autouse=True)
def _reset_tracker():
_reset_session_ccr_tracker_for_test()
yield
_reset_session_ccr_tracker_for_test()
# ---------------------------------------------------------------------------
# Guard-condition logic (the actual fix)
# ---------------------------------------------------------------------------
def _should_set_body_tools(tools: list | None, original_tools: list | None) -> bool:
"""Mirror the fixed handler condition: ``if tools or _original_tools is not None``."""
return bool(tools or original_tools is not None)
def _should_apply_presend_tools(presend_tools: list | None, original_tools: list | None) -> bool:
"""Mirror the fixed PRE_SEND write-back condition in the OpenAI handler."""
return bool(presend_tools or original_tools is not None)
def _sort_tools(tools: list | None) -> list | None:
return AnthropicHandlerMixin._sort_tools_deterministically(tools)
def _should_set_body_tools_after_sort(tools: list | None, original_tools: list | None) -> bool:
"""Mirror fixed logic when candidate tools may already be sorted."""
if not _should_set_body_tools(tools, original_tools):
return False
sorted_tools = _sort_tools(tools)
if sorted_tools != tools:
tools = sorted_tools
return tools != original_tools
def _legacy_should_set_body_tools_after_sort(
tools: list | None, original_tools: list | None
) -> bool:
"""Older comparator that only wrote when sorting reordered."""
if not _should_set_body_tools(tools, original_tools):
return False
return _sort_tools(tools) != tools
class TestHandlerGuardCondition:
"""Verify the guard condition that decides whether to write body['tools']."""
def test_no_tools_no_injection_does_not_inject(self):
"""Client sent no tools and nothing was injected → body must stay tools-free."""
original_tools = None # client did not send tools
tools_after_helpers = [] # helpers return [] when existing_tools=None and no inject
assert not _should_set_body_tools(tools_after_helpers, original_tools), (
"Empty tools from helpers + no original tools must NOT write body['tools']"
)
def test_client_sent_empty_tools_is_preserved(self):
"""Client explicitly sent ``tools: []`` → preserve that field (their choice)."""
original_tools = [] # client explicitly sent an empty array
tools_after_helpers = [] # nothing injected
assert _should_set_body_tools(tools_after_helpers, original_tools), (
"Client's explicit tools:[] should be preserved in body"
)
def test_ccr_injection_sets_body_tools(self):
"""When CCR injects a tool into an originally tool-free request → set body."""
original_tools = None
from headroom.ccr.tool_injection import create_ccr_tool_definition
tools_after_helpers = [create_ccr_tool_definition("openai")]
assert _should_set_body_tools(tools_after_helpers, original_tools), (
"Injected CCR tool must reach body['tools']"
)
def test_client_tools_always_set(self):
"""Client provided real tools → always write body['tools']."""
original_tools = [{"type": "function", "function": {"name": "my_tool"}}]
tools_after_helpers = original_tools[:]
assert _should_set_body_tools(tools_after_helpers, original_tools)
def test_sorted_replacement_reaches_body(self):
"""A sorted replacement that differs from payload still needs to be written."""
original_tools = [{"name": "zeta"}, {"name": "alpha"}]
tools_after_helpers = [{"name": "alpha"}, {"name": "zeta"}]
assert not _legacy_should_set_body_tools_after_sort(tools_after_helpers, original_tools)
assert _should_set_body_tools_after_sort(tools_after_helpers, original_tools)
def test_presend_empty_list_stays_omitted_when_client_omitted_tools(self):
"""PRE_SEND must not re-introduce ``tools: []`` for a tools-free request."""
assert not _should_apply_presend_tools([], None)
def test_presend_preserves_explicit_client_empty_tools(self):
"""PRE_SEND must still preserve an explicit client ``tools: []`` field."""
assert _should_apply_presend_tools([], [])
def test_presend_can_clear_previously_present_tools(self):
"""PRE_SEND may deliberately replace a real tool list with ``[]``."""
original_tools = [{"type": "function", "function": {"name": "my_tool"}}]
assert _should_apply_presend_tools([], original_tools)
# ---------------------------------------------------------------------------
# apply_session_sticky_ccr_tool behaviour with no existing tools
# ---------------------------------------------------------------------------
class TestCCRHelperNoToolsNoCompression:
"""Verify what the helper returns when there are no tools and no CCR happened."""
def test_returns_empty_list_and_false_when_no_session_ccr(self):
"""No session CCR history + no compression this turn → ([], False)."""
tools_out, was_injected = apply_session_sticky_ccr_tool(
provider="openai",
session_id="fresh-session-728",
request_id="req-1",
existing_tools=None,
has_compressed_content_this_turn=False,
)
assert was_injected is False
# Helper still returns [] — the guard in the handler is what prevents injection.
assert tools_out == []
def test_returns_tool_list_when_compression_occurred(self):
"""First turn with CCR → helper returns the CCR tool definition."""
tools_out, was_injected = apply_session_sticky_ccr_tool(
provider="openai",
session_id="ccr-session-728",
request_id="req-1",
existing_tools=None,
has_compressed_content_this_turn=True,
)
assert was_injected is True
tool_names = [t.get("function", {}).get("name") or t.get("name") for t in tools_out]
assert CCR_TOOL_NAME in tool_names
def test_no_double_injection_when_client_pre_registered_ccr_tool(self):
"""If the client already included the CCR tool, the helper must not duplicate it."""
from headroom.ccr.tool_injection import create_ccr_tool_definition
existing = [create_ccr_tool_definition("openai")]
tools_out, was_injected = apply_session_sticky_ccr_tool(
provider="openai",
session_id="pre-reg-session-728",
request_id="req-1",
existing_tools=existing,
has_compressed_content_this_turn=True,
)
assert was_injected is False
ccr_count = sum(
1
for t in tools_out
if (t.get("function", {}).get("name") or t.get("name")) == CCR_TOOL_NAME
)
assert ccr_count == 1, "CCR tool should appear exactly once"