mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-08 03:08:45 +00:00
fix(databricks): replay extended thinking as a reasoning content block
Databricks rejects LiteLLM's message-level thinking_blocks and reasoning_content keys with "Extra inputs are not permitted", so any multi-turn conversation using extended thinking failed as soon as an assistant turn carrying thinking was replayed as history. Converts them to the reasoning content block the endpoint accepts. Verified against a live endpoint: exactly one reasoning block holding exactly one summary entry, whose signature is required and whose text may be empty. Sending two of either, an Anthropic-native thinking block, or the content/reasoning_text shape in Databricks' docs are all rejected. reasoning_content arrives as an empty string, so it needs a key-presence check rather than a truthiness one.
This commit is contained in:
parent
0a5fa4fdc6
commit
3282d1453f
2 changed files with 160 additions and 0 deletions
|
|
@ -428,6 +428,8 @@ class DatabricksConfig(DatabricksBase, OpenAILikeChatConfig, AnthropicConfig):
|
|||
# Move message-level cache_control into a content block when content is a string.
|
||||
if "cache_control" in _message and isinstance(_message.get("content"), str):
|
||||
_message = self._move_cache_control_into_string_content_block(_message)
|
||||
if "thinking_blocks" in _message or "reasoning_content" in _message:
|
||||
_message = self._move_reasoning_into_content_block(_message)
|
||||
_sanitize_empty_content(cast(dict[str, Any], _message))
|
||||
new_messages.append(_message)
|
||||
|
||||
|
|
@ -464,6 +466,54 @@ class DatabricksConfig(DatabricksBase, OpenAILikeChatConfig, AnthropicConfig):
|
|||
]
|
||||
return cast(AllMessageValues, transformed_message)
|
||||
|
||||
def _move_reasoning_into_content_block(self, message: AllMessageValues) -> AllMessageValues:
|
||||
"""
|
||||
Converts LiteLLM's message-level reasoning fields into the reasoning content block
|
||||
Databricks accepts, so extended thinking survives a multi-turn round trip.
|
||||
|
||||
Transforms:
|
||||
{"role": "assistant", "content": "text", "thinking_blocks": [{"thinking": "t", "signature": "s"}]}
|
||||
Into:
|
||||
{"role": "assistant", "content": [
|
||||
{"type": "reasoning", "summary": [{"type": "summary_text", "text": "t", "signature": "s"}]},
|
||||
{"type": "text", "text": "text"},
|
||||
]}
|
||||
|
||||
Databricks rejects both message-level keys outright, and constrains the replacement to
|
||||
exactly one reasoning block holding exactly one summary entry, whose signature is
|
||||
required. Blocks without a signature cannot be replayed, so the keys are dropped rather
|
||||
than sent in a form the API refuses. reasoning_content is a plain-text mirror of the
|
||||
same thinking, so it carries nothing the signed summary does not.
|
||||
"""
|
||||
transformed_message: Final = cast(dict[str, Any], message.copy())
|
||||
thinking_blocks: Final = transformed_message.pop("thinking_blocks", None)
|
||||
transformed_message.pop("reasoning_content", None)
|
||||
signed_block: Final = next(
|
||||
(block for block in thinking_blocks or [] if isinstance(block, dict) and block.get("signature")),
|
||||
None,
|
||||
)
|
||||
if signed_block is None:
|
||||
return cast(AllMessageValues, transformed_message)
|
||||
|
||||
content: Final = transformed_message.get("content")
|
||||
existing_blocks: Final = (
|
||||
[{"type": "text", "text": content}] if isinstance(content, str) and content else list(content or [])
|
||||
)
|
||||
transformed_message["content"] = [
|
||||
{
|
||||
"type": "reasoning",
|
||||
"summary": [
|
||||
{
|
||||
"type": "summary_text",
|
||||
"text": signed_block.get("thinking") or "",
|
||||
"signature": signed_block["signature"],
|
||||
}
|
||||
],
|
||||
},
|
||||
*existing_blocks,
|
||||
]
|
||||
return cast(AllMessageValues, transformed_message)
|
||||
|
||||
@staticmethod
|
||||
def extract_content_str(
|
||||
content: AllDatabricksContentValues | None,
|
||||
|
|
|
|||
|
|
@ -496,3 +496,113 @@ def test_chunk_parser_without_usage_still_parses_content():
|
|||
assert result.id == "chatcmpl-test"
|
||||
assert result.model == "databricks-claude-sonnet-5"
|
||||
assert result.choices[0]["delta"]["content"] == "hi"
|
||||
def _thinking_message(thinking_blocks, content="391"):
|
||||
return {"role": "assistant", "content": content, "thinking_blocks": thinking_blocks}
|
||||
|
||||
|
||||
def test_thinking_blocks_become_a_reasoning_content_block():
|
||||
"""Databricks rejects the message-level thinking_blocks key outright, so extended
|
||||
thinking never survived a second turn. It must become a reasoning content block
|
||||
carrying exactly one signed summary entry."""
|
||||
result = DatabricksConfig()._move_reasoning_into_content_block(
|
||||
_thinking_message([{"type": "thinking", "thinking": "let me work it out", "signature": "sig-abc"}])
|
||||
)
|
||||
|
||||
assert "thinking_blocks" not in result
|
||||
assert result["content"] == [
|
||||
{
|
||||
"type": "reasoning",
|
||||
"summary": [{"type": "summary_text", "text": "let me work it out", "signature": "sig-abc"}],
|
||||
},
|
||||
{"type": "text", "text": "391"},
|
||||
]
|
||||
|
||||
|
||||
def test_thinking_blocks_conversion_preserves_existing_content_blocks():
|
||||
result = DatabricksConfig()._move_reasoning_into_content_block(
|
||||
_thinking_message(
|
||||
[{"type": "thinking", "thinking": "", "signature": "sig-abc"}],
|
||||
content=[{"type": "text", "text": "391"}, {"type": "text", "text": "trailing"}],
|
||||
)
|
||||
)
|
||||
|
||||
assert result["content"][0]["type"] == "reasoning"
|
||||
assert result["content"][1:] == [{"type": "text", "text": "391"}, {"type": "text", "text": "trailing"}]
|
||||
|
||||
|
||||
def test_thinking_blocks_collapse_to_a_single_summary_entry():
|
||||
"""Databricks accepts exactly one reasoning block with one summary entry; sending two
|
||||
of either is rejected, so extra blocks are dropped rather than sent in a refused shape."""
|
||||
result = DatabricksConfig()._move_reasoning_into_content_block(
|
||||
_thinking_message(
|
||||
[
|
||||
{"type": "thinking", "thinking": "first", "signature": "sig-1"},
|
||||
{"type": "thinking", "thinking": "second", "signature": "sig-2"},
|
||||
]
|
||||
)
|
||||
)
|
||||
|
||||
reasoning_blocks = [b for b in result["content"] if b.get("type") == "reasoning"]
|
||||
assert len(reasoning_blocks) == 1
|
||||
assert reasoning_blocks[0]["summary"] == [{"type": "summary_text", "text": "first", "signature": "sig-1"}]
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"thinking_blocks",
|
||||
[
|
||||
None,
|
||||
[],
|
||||
[{"type": "redacted_thinking", "data": "opaque"}],
|
||||
],
|
||||
ids=["none", "empty", "unsigned_only"],
|
||||
)
|
||||
def test_unreplayable_thinking_blocks_are_dropped(thinking_blocks):
|
||||
"""A signature is mandatory, so blocks that lack one cannot be replayed. The key is
|
||||
still removed, since leaving it would fail the request outright."""
|
||||
result = DatabricksConfig()._move_reasoning_into_content_block(_thinking_message(thinking_blocks))
|
||||
|
||||
assert "thinking_blocks" not in result
|
||||
assert result["content"] == "391"
|
||||
|
||||
|
||||
def test_transform_messages_strips_thinking_blocks():
|
||||
messages = [
|
||||
{"role": "user", "content": "what is 17 * 23?"},
|
||||
_thinking_message([{"type": "thinking", "thinking": "t", "signature": "sig-abc"}]),
|
||||
{"role": "user", "content": "now double it"},
|
||||
]
|
||||
|
||||
result = DatabricksConfig()._transform_messages(messages=messages, model="databricks-claude-opus-5")
|
||||
|
||||
assert all("thinking_blocks" not in m for m in result)
|
||||
assert result[1]["content"][0]["type"] == "reasoning"
|
||||
|
||||
|
||||
def test_reasoning_content_is_dropped_even_when_empty():
|
||||
"""reasoning_content is an empty string on Databricks responses, so a truthiness check
|
||||
would leave it in place and the request would still be rejected."""
|
||||
result = DatabricksConfig()._move_reasoning_into_content_block(
|
||||
{"role": "assistant", "content": "391", "reasoning_content": ""}
|
||||
)
|
||||
|
||||
assert "reasoning_content" not in result
|
||||
assert result["content"] == "391"
|
||||
|
||||
|
||||
def test_transform_messages_strips_both_reasoning_fields():
|
||||
"""A verbatim assistant turn from a Databricks thinking response carries both keys."""
|
||||
messages = [
|
||||
{"role": "user", "content": "what is 17 * 23?"},
|
||||
{
|
||||
"role": "assistant",
|
||||
"content": "391",
|
||||
"reasoning_content": "",
|
||||
"thinking_blocks": [{"type": "thinking", "thinking": "", "signature": "sig-abc"}],
|
||||
},
|
||||
{"role": "user", "content": "now double it"},
|
||||
]
|
||||
|
||||
result = DatabricksConfig()._transform_messages(messages=messages, model="databricks-claude-opus-5")
|
||||
|
||||
assert all("thinking_blocks" not in m and "reasoning_content" not in m for m in result)
|
||||
assert result[1]["content"][0]["summary"][0]["signature"] == "sig-abc"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue