Merge branch 'webb/anthropic/async-iterators' into webb/anthropic/exc-on-exit

Author: alexander-alderman-webb

sentry_sdk/integrations/anthropic.py

@@ -217,7 +217,8 @@ def _collect_ai_data(
     usage: "_RecordedUsage",
     content_blocks: "list[str]",
     response_id: "str | None" = None,
-) -> "tuple[str | None, _RecordedUsage, list[str], str | None]":
+    finish_reason: "str | None" = None,
+) -> "tuple[str | None, _RecordedUsage, list[str], str | None, str | None]":
     """
     Collect model information, token usage, and collect content blocks from the AI streaming response.
     """
@@ -255,6 +256,7 @@ def _collect_ai_data(
                     usage,
                     content_blocks,
                     response_id,
+                    finish_reason,
                 )
 
             # Counterintuitive, but message_delta contains cumulative token counts :)
@@ -279,18 +281,17 @@ def _collect_ai_data(
                     usage.cache_read_input_tokens = cache_read_input_tokens
                 # TODO: Record event.usage.server_tool_use
 
-                return (
-                    model,
-                    usage,
-                    content_blocks,
-                    response_id,
-                )
+                if event.delta.stop_reason is not None:
+                    finish_reason = event.delta.stop_reason
+
+                return (model, usage, content_blocks, response_id, finish_reason)
 
     return (
         model,
         usage,
         content_blocks,
         response_id,
+        finish_reason,
     )
 
 
@@ -500,6 +501,7 @@ def _wrap_synchronous_message_iterator(
                     stream._usage,
                     stream._content_blocks,
                     stream._response_id,
+                    stream._finish_reason,
                 )
                 stream._span.__exit__(*exc_info)
                 del stream._span
@@ -550,6 +552,7 @@ async def _wrap_asynchronous_message_iterator(
                     stream._usage,
                     stream._content_blocks,
                     stream._response_id,
+                    stream._finish_reason,
                 )
                 stream._span.__exit__(*exc_info)
                 del stream._span
@@ -565,12 +568,15 @@ def _set_output_data(
     cache_write_input_tokens: "int | None",
     content_blocks: "list[Any]",
     response_id: "str | None" = None,
+    finish_reason: "str | None" = None,
 ) -> None:
     """
     Set output data for the span based on the AI response."""
     span.set_data(SPANDATA.GEN_AI_RESPONSE_MODEL, model)
     if response_id is not None:
         span.set_data(SPANDATA.GEN_AI_RESPONSE_ID, response_id)
+    if finish_reason is not None:
+        span.set_data(SPANDATA.GEN_AI_RESPONSE_FINISH_REASONS, [finish_reason])
     if should_send_default_pii() and integration.include_prompts:
         output_messages: "dict[str, list[Any]]" = {
             "response": [],
@@ -664,6 +670,7 @@ def _sentry_patched_create_common(f: "Any", *args: "Any", **kwargs: "Any") -> "A
                 cache_write_input_tokens=cache_write_input_tokens,
                 content_blocks=content_blocks,
                 response_id=getattr(result, "id", None),
+                finish_reason=getattr(result, "stop_reason", None),
             )
             span.__exit__(None, None, None)
         else:
@@ -720,6 +727,7 @@ def _initialize_data_accumulation_state(stream: "Union[Stream, MessageStream]")
         stream._usage = _RecordedUsage()
         stream._content_blocks = []
         stream._response_id = None
+        stream._finish_reason = None
 
 
 def _accumulate_event_data(
@@ -729,18 +737,20 @@ def _accumulate_event_data(
     """
     Update accumulated output from a single stream event.
     """
-    (model, usage, content_blocks, response_id) = _collect_ai_data(
+    (model, usage, content_blocks, response_id, finish_reason) = _collect_ai_data(
         event,
         stream._model,
         stream._usage,
         stream._content_blocks,
         stream._response_id,
+        stream._finish_reason,
     )
 
     stream._model = model
     stream._usage = usage
     stream._content_blocks = content_blocks
     stream._response_id = response_id
+    stream._finish_reason = finish_reason
 
 
 def _set_streaming_output_data(
@@ -750,6 +760,7 @@ def _set_streaming_output_data(
     usage: "_RecordedUsage",
     content_blocks: "list[str]",
     response_id: "Optional[str]",
+    finish_reason: "Optional[str]",
 ) -> None:
     """
     Set output attributes on the AI Client Span.
@@ -772,6 +783,7 @@ def _set_streaming_output_data(
         cache_write_input_tokens=usage.cache_write_input_tokens,
         content_blocks=[{"text": "".join(content_blocks), "type": "text"}],
         response_id=response_id,
+        finish_reason=finish_reason,
     )
 
 
@@ -821,6 +833,7 @@ def __next__(self: "Stream") -> "RawMessageStreamEvent":
                     self._usage,
                     self._content_blocks,
                     self._response_id,
+                    self._finish_reason,
                 )
                 self._span.__exit__(None, None, None)
                 del self._span
@@ -854,6 +867,7 @@ def close(self: "Stream") -> None:
             self._usage,
             self._content_blocks,
             self._response_id,
+            self._finish_reason,
         )
         self._span.__exit__(None, None, None)
         del self._span
@@ -949,6 +963,7 @@ async def __anext__(self: "AsyncStream") -> "RawMessageStreamEvent":
                     self._usage,
                     self._content_blocks,
                     self._response_id,
+                    self._finish_reason,
                 )
                 self._span.__exit__(None, None, None)
                 del self._span
@@ -982,6 +997,7 @@ async def close(self: "Stream") -> None:
             self._usage,
             self._content_blocks,
             self._response_id,
+            self._finish_reason,
         )
         self._span.__exit__(None, None, None)
         del self._span
@@ -1114,6 +1130,7 @@ def __next__(self: "MessageStream") -> "MessageStreamEvent":
                     self._usage,
                     self._content_blocks,
                     self._response_id,
+                    self._finish_reason,
                 )
                 self._span.__exit__(None, None, None)
                 del self._span
@@ -1147,6 +1164,7 @@ def close(self: "MessageStream") -> None:
             self._usage,
             self._content_blocks,
             self._response_id,
+            self._finish_reason,
         )
         self._span.__exit__(None, None, None)
         del self._span
@@ -1287,6 +1305,7 @@ async def __anext__(self: "AsyncMessageStream") -> "MessageStreamEvent":
                     self._usage,
                     self._content_blocks,
                     self._response_id,
+                    self._finish_reason,
                 )
                 self._span.__exit__(None, None, None)
                 del self._span
@@ -1320,6 +1339,7 @@ async def close(self: "AsyncMessageStream") -> None:
             self._usage,
             self._content_blocks,
             self._response_id,
+            self._finish_reason,
         )
         self._span.__exit__(None, None, None)
         del self._span

sentry_sdk/integrations/langchain.py

@@ -554,7 +554,8 @@ def on_llm_end(
                     finish_reason = generation.generation_info.get("finish_reason")
                     if finish_reason is not None:
                         span.set_data(
-                            SPANDATA.GEN_AI_RESPONSE_FINISH_REASONS, finish_reason
+                            SPANDATA.GEN_AI_RESPONSE_FINISH_REASONS,
+                            [finish_reason],
                         )
                 except AttributeError:
                     pass