fix(anthropic): also enforce leading-user + empty-array recovery
Extend `_merge_consecutive` so the three invariants from `LLMProvider._enforce_role_alternation` all hold for Anthropic: 1. collapse consecutive same-role turns (unchanged) 2. no trailing assistant — Anthropic rejects prefill (unchanged) 3. no leading assistant — Anthropic requires the first turn be user 4. non-empty messages array — recover the last stripped assistant as a user turn when every turn got stripped, so callers don't hit a secondary "messages array empty" 400 Anthropic-specific wrinkle: `tool_use` blocks live inside `content` (not a separate `tool_calls` field) and are illegal inside user turns, so both recovery paths skip any message carrying them rather than silently producing a malformed request. Adds 4 unit tests covering the new branches, including the tool_use opt-outs, and updates the existing `test_single_assistant_stripped` to reflect the new rerouting contract. Made-with: Cursor
This commit is contained in:
@@ -246,12 +246,39 @@ class AnthropicProvider(LLMProvider):
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def _merge_consecutive(msgs: list[dict[str, Any]]) -> list[dict[str, Any]]:
|
||||
"""Anthropic requires alternating user/assistant roles.
|
||||
def _has_tool_use(msg: dict[str, Any]) -> bool:
|
||||
"""True if ``msg.content`` carries any ``tool_use`` block.
|
||||
|
||||
Also strips trailing assistant messages since Anthropic does not
|
||||
support assistant-message prefill and will reject the request with
|
||||
a 400 error if the conversation ends with an assistant turn.
|
||||
Anthropic forbids ``tool_use`` inside ``user`` turns, so messages that
|
||||
issued a tool call cannot be safely rerouted when we patch the role.
|
||||
"""
|
||||
content = msg.get("content")
|
||||
if not isinstance(content, list):
|
||||
return False
|
||||
return any(
|
||||
isinstance(block, dict) and block.get("type") == "tool_use"
|
||||
for block in content
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def _merge_consecutive(msgs: list[dict[str, Any]]) -> list[dict[str, Any]]:
|
||||
"""Normalize a message sequence for Anthropic's ``/messages`` endpoint.
|
||||
|
||||
Anthropic's contract is stricter than OpenAI's:
|
||||
|
||||
1. Consecutive same-role turns must be collapsed into one.
|
||||
2. The conversation cannot end with an ``assistant`` turn — Anthropic
|
||||
does not support assistant-message prefill and returns 400.
|
||||
3. The conversation cannot start with an ``assistant`` turn — the
|
||||
first message must be ``user``.
|
||||
|
||||
Rules 2 and 3 mirror ``LLMProvider._enforce_role_alternation`` in
|
||||
``base.py``, which applies the equivalent invariants to OpenAI-compat
|
||||
providers. The only Anthropic-specific wrinkle: ``tool_use`` blocks
|
||||
live inside ``content`` (not a separate ``tool_calls`` field) and are
|
||||
invalid inside ``user`` turns, so the recovery paths below must skip
|
||||
any message carrying them rather than silently producing a malformed
|
||||
request.
|
||||
"""
|
||||
merged: list[dict[str, Any]] = []
|
||||
for msg in msgs:
|
||||
@@ -268,10 +295,34 @@ class AnthropicProvider(LLMProvider):
|
||||
else:
|
||||
merged.append(msg)
|
||||
|
||||
# Drop trailing assistant messages to avoid Anthropic's
|
||||
# "does not support assistant message prefill" 400 error.
|
||||
# Rule 2: strip trailing assistant turns — Anthropic rejects prefill.
|
||||
last_popped: dict[str, Any] | None = None
|
||||
while merged and merged[-1].get("role") == "assistant":
|
||||
merged.pop()
|
||||
last_popped = merged.pop()
|
||||
|
||||
# Recovery for rule 2: if stripping removed every turn, reroute the
|
||||
# last popped assistant as a user turn so upstream code still gets a
|
||||
# valid request instead of a secondary "messages array empty" 400.
|
||||
# Skip when the message carried ``tool_use`` blocks (see _has_tool_use).
|
||||
if (
|
||||
not merged
|
||||
and last_popped is not None
|
||||
and not AnthropicProvider._has_tool_use(last_popped)
|
||||
):
|
||||
merged.append({"role": "user", "content": last_popped.get("content")})
|
||||
|
||||
# Rule 3: prepend a synthetic opener if the first surviving turn is an
|
||||
# assistant (e.g. upstream history truncation dropped the original
|
||||
# user request). ``tool_use``-carrying assistants are left alone —
|
||||
# that message will still fail validation, but injecting an opener
|
||||
# before it would orphan the tool_use/tool_result pair that follows,
|
||||
# turning a recoverable 400 into a harder-to-diagnose one.
|
||||
if (
|
||||
merged
|
||||
and merged[0].get("role") == "assistant"
|
||||
and not AnthropicProvider._has_tool_use(merged[0])
|
||||
):
|
||||
merged.insert(0, {"role": "user", "content": "(conversation continued)"})
|
||||
|
||||
return merged
|
||||
|
||||
|
||||
Reference in New Issue
Block a user