Skip to content

fix(llmobs): fix parsing errors for bedrock converse stream #13238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 1, 2025
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
12 changes: 6 additions & 6 deletions ddtrace/llmobs/_integrations/bedrock.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,18 +186,18 @@ def _extract_output_message_for_converse_stream(

if "messageStart" in chunk:
message_data = chunk["messageStart"]
current_message = {"role": message_data.get("role", "assistant"), "context_block_indices": []}
current_message = {"role": message_data.get("role", "assistant"), "content_block_indicies": []}

# always make sure we have a current message
if current_message is None:
current_message = {"role": "assistant", "context_block_indices": []}
current_message = {"role": "assistant", "content_block_indicies": []}

if "contentBlockStart" in chunk:
block_start = chunk["contentBlockStart"]
index = block_start.get("contentBlockIndex")

if index is not None:
current_message["context_block_indices"].append(index)
current_message["content_block_indicies"].append(index)
if "start" in block_start and "toolUse" in block_start["start"]:
tool_content_blocks[index] = block_start["start"]["toolUse"]

Expand All @@ -206,8 +206,8 @@ def _extract_output_message_for_converse_stream(
index = content_block_delta.get("contentBlockIndex")

if index is not None and "delta" in content_block_delta:
if index not in current_message.get("context_block_indices", []):
current_message["context_block_indices"].append(index)
if index not in current_message.get("content_block_indicies", []):
current_message["content_block_indicies"].append(index)

delta_content = content_block_delta["delta"]
text_content_blocks[index] = text_content_blocks.get(index, "") + delta_content.get("text", "")
Expand All @@ -225,7 +225,7 @@ def _extract_output_message_for_converse_stream(
current_message = None

# Handle the case where we didn't receive an explicit message stop event
if current_message is not None:
if current_message is not None and current_message.get("content_block_indicies"):
messages.append(
get_final_message_converse_stream_message(current_message, text_content_blocks, tool_content_blocks)
)
Expand Down
4 changes: 2 additions & 2 deletions ddtrace/llmobs/_integrations/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ def get_final_message_converse_stream_message(
Returns:
Dict containing the processed message with content and optional tool calls
"""
indices = sorted(message.get("context_block_indices", []))
indices = sorted(message.get("content_block_indicies", []))
message_output = {"role": message["role"]}

text_contents = [text_blocks[idx] for idx in indices if idx in text_blocks]
Expand All @@ -920,7 +920,7 @@ def get_final_message_converse_stream_message(
if not tool_block:
continue
tool_call = {
"name": tool_block.get("toolName", ""),
"name": tool_block.get("name", ""),
"tool_id": tool_block.get("toolUseId", ""),
}
tool_input = tool_block.get("input")
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/converse-parsing-cd9ebb9506f8bbe1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixes:
- |
LLM Observability: This fix resolves an issue where tool call names were not being captured for bedrock `converse_stream` calls.
- |
LLM Observability: This fix resolves an issue where bedrock `converse_stream` calls contained an extra empty output message.
9 changes: 4 additions & 5 deletions tests/contrib/botocore/test_bedrock_llmobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -735,12 +735,12 @@ def test_llmobs_converse(cls, bedrock_client, request_vcr, mock_tracer, llmobs_e
span = mock_tracer.pop_traces()[0][0]
assert len(llmobs_events) == 1

llmobs_events[0] == _expected_llmobs_llm_span_event(
assert llmobs_events[0] == _expected_llmobs_llm_span_event(
span,
model_name="claude-3-sonnet-20240229-v1:0",
model_provider="anthropic",
input_messages=[
{"role": "system", "content": request_params.get("system")},
{"role": "system", "content": request_params.get("system")[0]["text"]},
{"role": "user", "content": request_params.get("messages")[0].get("content")[0].get("text")},
],
output_messages=[
Expand Down Expand Up @@ -813,12 +813,12 @@ def test_llmobs_converse_stream(cls, bedrock_client, request_vcr, mock_tracer, l
span = mock_tracer.pop_traces()[0][0]
assert len(llmobs_events) == 1

llmobs_events[0] == _expected_llmobs_llm_span_event(
assert llmobs_events[0] == _expected_llmobs_llm_span_event(
span,
model_name="claude-3-sonnet-20240229-v1:0",
model_provider="anthropic",
input_messages=[
{"role": "system", "content": request_params.get("system")},
{"role": "system", "content": request_params.get("system")[0]["text"]},
{"role": "user", "content": request_params.get("messages")[0].get("content")[0].get("text")},
],
output_messages=[
Expand All @@ -835,7 +835,6 @@ def test_llmobs_converse_stream(cls, bedrock_client, request_vcr, mock_tracer, l
}
],
metadata={
"stop_reason": "tool_use",
"temperature": request_params.get("inferenceConfig", {}).get("temperature"),
"max_tokens": request_params.get("inferenceConfig", {}).get("maxTokens"),
},
Expand Down
Loading