mirror of
https://github.com/hwchase17/langchain.git
synced 2026-06-09 10:17:00 +00:00
fix(core): preserve reasoning blocks alongside tool_call in v3 stream (#37434)
Closes #37420 --- `stream_events(version="v3")` (and the `astream_events` async twin) silently dropped reasoning content from the final assembled `AIMessage` whenever the same message also produced a tool_call. The bug reproduces against Gemini 2.5 Pro with `include_thoughts=True`: reasoning streams correctly through `ChatModelStream.reasoning`, but the persisted message in the final graph state carries only the `tool_call` block. ## Root cause `_iter_protocol_blocks` in the compat bridge groups per-chunk content blocks by source-side identifier. When a provider doesn't supply an `index` field on its content blocks — which the Google GenAI translator does not for either `reasoning` or `tool_call` blocks — the bridge falls back to positional `i` as the bucket key. Because Gemini typically emits one block per chunk, every reasoning chunk and the later tool_call chunk all key to `0`, and the type mismatch trips `_accumulate`'s self-contained `else` branch. That branch clears accumulated reasoning state and replaces it with the incoming tool_call, so reasoning never reaches `content-block-finish`. ## Fix When a block has no source-side `index`, key it by `("__lc_no_index__", block_type, positional_i)` instead of bare `i`. Same-type chunks at the same position still share a bucket and merge cleanly (streaming text and reasoning unchanged); different-type chunks at the same position now occupy distinct wire blocks and both reach `content-block-finish`. Providers that supply explicit indices (Anthropic, OpenAI Responses) are unaffected. ## Verification Unit-tested at the compat-bridge layer for both sync (`chunks_to_events`) and async (`achunks_to_events`) paths. Verified live against Gemini 2.5 Pro `gemini-2.5-pro` with `thinking_budget=2048`, `include_thoughts=True`, and a single `get_weather` tool. Pre-fix: `final_state.messages[tool_calling_ai_message].content == [{type: tool_call, ...}]`. Post-fix: `[..., {type: reasoning, reasoning: "..."}, {type: tool_call, ...}]`, matching the shape `ainvoke` returns on the same input.
This commit is contained in:
@@ -189,7 +189,21 @@ def _iter_protocol_blocks(msg: BaseMessage) -> list[tuple[Any, CompatBlock]]:
|
||||
for i, block in enumerate(raw):
|
||||
if not isinstance(block, dict):
|
||||
continue
|
||||
key = block.get("index", i)
|
||||
explicit_idx = block.get("index")
|
||||
if explicit_idx is None:
|
||||
# No source-side identity. Bucket by (sentinel, block type,
|
||||
# positional `i`) so two blocks of different types at the
|
||||
# same position across chunks (e.g. Gemini emitting a
|
||||
# reasoning block in one chunk and a `tool_call` in the
|
||||
# next, both at positional 0 because each chunk carries one
|
||||
# block) get distinct wire blocks. Without this, the second
|
||||
# type's incoming block hits `_accumulate`'s self-contained
|
||||
# `else` branch and clobbers the first. Same-type chunks
|
||||
# still share the bucket and merge cleanly, which is what
|
||||
# streaming text / reasoning relies on.
|
||||
key: Any = ("__lc_no_index__", block.get("type"), i)
|
||||
else:
|
||||
key = explicit_idx
|
||||
result.append((key, dict(block)))
|
||||
|
||||
if not isinstance(msg, AIMessageChunk):
|
||||
|
||||
Reference in New Issue
Block a user