Skip to content

Commit 6a90c1d

Browse files
feat(bedrock): Set gen_ai.output.messages for streamed responses
1 parent 444f537 commit 6a90c1d

2 files changed

Lines changed: 549 additions & 19 deletions

File tree

‎sentry_sdk/integrations/boto3/_services/bedrock.py‎

Lines changed: 301 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,37 +93,319 @@ def sentry_patched_iter(
9393
span.set_attribute if isinstance(span, StreamedSpan) else span.set_data
9494
)
9595

96+
role: "Optional[str]" = None
97+
parts: "dict[int, Union[TextPart, ReasoningPart, ToolCallPart, ToolCallResponsePart, UriPart, BlobPart]]" = {}
98+
9699
try:
97100
for event in original_iter(self):
98-
if "metadata" not in event:
101+
if "metadata" in event:
102+
usage = event["metadata"]["usage"]
103+
104+
input_tokens = usage["inputTokens"]
105+
set_on_span(
106+
SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS, usage["outputTokens"]
107+
)
108+
set_on_span(
109+
SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS, usage["totalTokens"]
110+
)
111+
112+
cache_read_tokens = usage.get("cacheReadInputTokens")
113+
if cache_read_tokens is not None:
114+
input_tokens += cache_read_tokens
115+
set_on_span(
116+
SPANDATA.GEN_AI_USAGE_INPUT_TOKENS_CACHED, cache_read_tokens
117+
)
118+
119+
cache_write_tokens = usage.get("cacheWriteInputTokens")
120+
if cache_write_tokens is not None:
121+
input_tokens += cache_write_tokens
122+
set_on_span(
123+
SPANDATA.GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE,
124+
cache_write_tokens,
125+
)
126+
127+
set_on_span(
128+
SPANDATA.GEN_AI_USAGE_INPUT_TOKENS,
129+
input_tokens,
130+
)
131+
99132
yield event
100133
continue
101134

102-
usage = event["metadata"]["usage"]
135+
client = sentry_sdk.get_client()
136+
if (
137+
not has_data_collection_enabled(client.options)
138+
or not client.options["data_collection"]["gen_ai"]["outputs"]
139+
) and (
140+
has_data_collection_enabled(client.options)
141+
or not should_send_default_pii()
142+
):
143+
yield event
144+
continue
103145

104-
input_tokens = usage["inputTokens"]
105-
set_on_span(SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS, usage["outputTokens"])
106-
set_on_span(SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS, usage["totalTokens"])
146+
if "messageStart" in event:
147+
role = event["messageStart"]["role"]
107148

108-
cache_read_tokens = usage.get("cacheReadInputTokens")
109-
if cache_read_tokens is not None:
110-
input_tokens += cache_read_tokens
111-
set_on_span(
112-
SPANDATA.GEN_AI_USAGE_INPUT_TOKENS_CACHED, cache_read_tokens
149+
yield event
150+
continue
151+
152+
if (
153+
"contentBlockStart" in event
154+
and "toolUse" in event["contentBlockStart"]["start"]
155+
):
156+
tool_call_part: "ToolCallPart" = {
157+
"type": "tool_call",
158+
"name": event["contentBlockStart"]["start"]["toolUse"]["name"],
159+
}
160+
parts[event["contentBlockStart"]["contentBlockIndex"]] = (
161+
tool_call_part
162+
)
163+
164+
yield event
165+
continue
166+
167+
if (
168+
"contentBlockStart" in event
169+
and "toolResult" in event["contentBlockStart"]["start"]
170+
):
171+
tool_call_response_part: "ToolCallResponsePart" = {
172+
"type": "tool_call_response",
173+
}
174+
parts[event["contentBlockStart"]["contentBlockIndex"]] = (
175+
tool_call_response_part
113176
)
114177

115-
cache_write_tokens = usage.get("cacheWriteInputTokens")
116-
if cache_write_tokens is not None:
117-
input_tokens += cache_write_tokens
178+
yield event
179+
continue
180+
181+
if (
182+
"contentBlockDelta" in event
183+
and "text" in event["contentBlockDelta"]["delta"]
184+
and event["contentBlockDelta"]["contentBlockIndex"] not in parts
185+
):
186+
parts[event["contentBlockDelta"]["contentBlockIndex"]] = {
187+
"type": "text",
188+
"content": event["contentBlockDelta"]["delta"]["text"],
189+
}
190+
191+
yield event
192+
continue
193+
194+
if (
195+
"contentBlockDelta" in event
196+
and "text" in event["contentBlockDelta"]["delta"]
197+
):
198+
cast(
199+
"TextPart",
200+
parts[event["contentBlockDelta"]["contentBlockIndex"]],
201+
)["content"] += event["contentBlockDelta"]["delta"]["text"]
202+
203+
yield event
204+
continue
205+
206+
if (
207+
"contentBlockDelta" in event
208+
and "toolUse" in event["contentBlockDelta"]["delta"]
209+
and event["contentBlockDelta"]["contentBlockIndex"] not in parts
210+
):
211+
parts[event["contentBlockDelta"]["contentBlockIndex"]] = {
212+
"type": "tool_call",
213+
"arguments": event["contentBlockDelta"]["delta"]["toolUse"][
214+
"input"
215+
],
216+
}
217+
218+
yield event
219+
continue
220+
221+
if (
222+
"contentBlockDelta" in event
223+
and "toolUse" in event["contentBlockDelta"]["delta"]
224+
and "arguments"
225+
in parts[event["contentBlockDelta"]["contentBlockIndex"]]
226+
):
227+
cast(
228+
"ToolCallPart",
229+
parts[event["contentBlockDelta"]["contentBlockIndex"]],
230+
)["arguments"] += event["contentBlockDelta"]["delta"]["toolUse"][
231+
"input"
232+
]
233+
234+
yield event
235+
continue
236+
237+
if (
238+
"contentBlockDelta" in event
239+
and "toolUse" in event["contentBlockDelta"]["delta"]
240+
):
241+
cast(
242+
"ToolCallPart",
243+
parts[event["contentBlockDelta"]["contentBlockIndex"]],
244+
)["arguments"] = event["contentBlockDelta"]["delta"]["toolUse"][
245+
"input"
246+
]
247+
248+
yield event
249+
continue
250+
251+
if (
252+
"contentBlockDelta" in event
253+
and "toolResult" in event["contentBlockDelta"]["delta"]
254+
and event["contentBlockDelta"]["contentBlockIndex"] not in parts
255+
):
256+
parts[event["contentBlockDelta"]["contentBlockIndex"]] = {
257+
"type": "tool_call_response",
258+
"response": [
259+
item
260+
for item in event["contentBlockDelta"]["delta"][
261+
"toolResult"
262+
]
263+
if "json" in item or "text" in item
264+
],
265+
}
266+
267+
yield event
268+
continue
269+
270+
if (
271+
"contentBlockDelta" in event
272+
and "toolResult" in event["contentBlockDelta"]["delta"]
273+
and "response"
274+
in parts[event["contentBlockDelta"]["contentBlockIndex"]]
275+
):
276+
cast(
277+
"ToolCallResponsePart",
278+
parts[event["contentBlockDelta"]["contentBlockIndex"]],
279+
)["response"] += [
280+
item
281+
for item in event["contentBlockDelta"]["delta"]["toolResult"]
282+
if "json" in item or "text" in item
283+
]
284+
285+
yield event
286+
continue
287+
288+
if (
289+
"contentBlockDelta" in event
290+
and "toolResult" in event["contentBlockDelta"]["delta"]
291+
):
292+
cast(
293+
"ToolCallResponsePart",
294+
parts[event["contentBlockDelta"]["contentBlockIndex"]],
295+
)["response"] = [
296+
item
297+
for item in event["contentBlockDelta"]["delta"]["toolResult"]
298+
if "json" in item or "text" in item
299+
]
300+
301+
yield event
302+
continue
303+
304+
if (
305+
"contentBlockDelta" in event
306+
and "reasoningContent" in event["contentBlockDelta"]["delta"]
307+
and event["contentBlockDelta"]["contentBlockIndex"] not in parts
308+
):
309+
parts[event["contentBlockDelta"]["contentBlockIndex"]] = {
310+
"type": "reasoning"
311+
}
312+
313+
if (
314+
"text"
315+
in event["contentBlockDelta"]["delta"]["reasoningContent"]
316+
):
317+
cast(
318+
"ReasoningPart",
319+
parts[event["contentBlockDelta"]["contentBlockIndex"]],
320+
)["content"] = event["contentBlockDelta"]["delta"][
321+
"reasoningContent"
322+
]["text"]
323+
324+
yield event
325+
continue
326+
327+
if (
328+
"contentBlockDelta" in event
329+
and "reasoningContent" in event["contentBlockDelta"]["delta"]
330+
and "text"
331+
in event["contentBlockDelta"]["delta"]["reasoningContent"]
332+
and "content"
333+
in parts[event["contentBlockDelta"]["contentBlockIndex"]]
334+
):
335+
cast(
336+
"ReasoningPart",
337+
parts[event["contentBlockDelta"]["contentBlockIndex"]],
338+
)["content"] += event["contentBlockDelta"]["delta"][
339+
"reasoningContent"
340+
]["text"]
341+
342+
yield event
343+
continue
344+
345+
if (
346+
"contentBlockDelta" in event
347+
and "reasoningContent" in event["contentBlockDelta"]["delta"]
348+
and "text"
349+
in event["contentBlockDelta"]["delta"]["reasoningContent"]
350+
):
351+
cast(
352+
"ReasoningPart",
353+
parts[event["contentBlockDelta"]["contentBlockIndex"]],
354+
)["content"] = event["contentBlockDelta"]["delta"][
355+
"reasoningContent"
356+
]["text"]
357+
358+
yield event
359+
continue
360+
361+
if (
362+
"contentBlockDelta" in event
363+
and "image" in event["contentBlockDelta"]["delta"]
364+
and "source" in event["contentBlockDelta"]["delta"]["image"]
365+
and "s3Location"
366+
in event["contentBlockDelta"]["delta"]["image"]["source"]
367+
):
368+
parts[event["contentBlockDelta"]["contentBlockIndex"]] = {
369+
"type": "uri",
370+
"modality": "image",
371+
"uri": event["contentBlockDelta"]["delta"]["image"]["source"][
372+
"s3Location"
373+
]["uri"],
374+
}
375+
376+
yield event
377+
continue
378+
379+
if (
380+
"contentBlockDelta" in event
381+
and "image" in event["contentBlockDelta"]["delta"]
382+
and "source" in event["contentBlockDelta"]["delta"]["image"]
383+
and "bytes"
384+
in event["contentBlockDelta"]["delta"]["image"]["source"]
385+
):
386+
parts[event["contentBlockDelta"]["contentBlockIndex"]] = {
387+
"type": "blob",
388+
"modality": "image",
389+
}
390+
391+
yield event
392+
continue
393+
394+
if "messageStop" in event and role is not None:
118395
set_on_span(
119-
SPANDATA.GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE,
120-
cache_write_tokens,
396+
SPANDATA.GEN_AI_OUTPUT_MESSAGES,
397+
json.dumps(
398+
[
399+
{
400+
"role": role,
401+
"parts": [parts[index] for index in sorted(parts)],
402+
}
403+
]
404+
),
121405
)
122406

123-
set_on_span(
124-
SPANDATA.GEN_AI_USAGE_INPUT_TOKENS,
125-
input_tokens,
126-
)
407+
yield event
408+
continue
127409

128410
yield event
129411
except GeneratorExit:

0 commit comments

Comments
 (0)