Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions libs/aws/langchain_aws/chat_models/bedrock_converse.py
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,10 @@ def _parse_stream_event(event: Dict[str, Any]) -> Optional[BaseMessageChunk]:
index=event["contentBlockStart"]["contentBlockIndex"],
)
)
return AIMessageChunk(content=[block], tool_call_chunks=tool_call_chunks)
# always keep block inside a list to preserve merging compatibility
content = [block]

return AIMessageChunk(content=content, tool_call_chunks=tool_call_chunks)
elif "contentBlockDelta" in event:
block = {
**_bedrock_to_lc([event["contentBlockDelta"]["delta"]])[0],
Expand All @@ -1205,19 +1208,20 @@ def _parse_stream_event(event: Dict[str, Any]) -> Optional[BaseMessageChunk]:
index=event["contentBlockDelta"]["contentBlockIndex"],
)
)
return AIMessageChunk(content=[block], tool_call_chunks=tool_call_chunks)
# always keep block inside a list to preserve merging compatibility
content = [block]

return AIMessageChunk(content=content, tool_call_chunks=tool_call_chunks)
elif "contentBlockStop" in event:
# TODO: needed?
return AIMessageChunk(
content=[{"index": event["contentBlockStop"]["contentBlockIndex"]}]
)
return AIMessageChunk(content=[])
elif "messageStop" in event:
# TODO: snake case response metadata?
return AIMessageChunk(content=[], response_metadata=event["messageStop"])
return AIMessageChunk(content="", response_metadata=event["messageStop"])
elif "metadata" in event:
usage = _extract_usage_metadata(event["metadata"])
return AIMessageChunk(
content=[], response_metadata=event["metadata"], usage_metadata=usage
content="", response_metadata=event["metadata"], usage_metadata=usage
)
elif "Exception" in list(event.keys())[0]:
name, info = list(event.items())[0]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ def test_structured_output_thinking_force_tool_use() -> None:
},
}
with pytest.raises(llm.client.exceptions.ValidationException):
response = llm.client.converse(messages=messages, **params)
llm.client.converse(messages=messages, **params)


def test_bedrock_pdf_inputs() -> None:
Expand Down