fix swalling exception bug

Author: shellmayr

sentry_sdk/integrations/cohere/v1.py

@@ -101,8 +101,8 @@ def new_chat(*args, **kwargs):
 
 def _iter_stream_events(old_iterator, span, include_pii):
     # type: (Any, Any, bool) -> Iterator[StreamedChatResponse]
-    with capture_internal_exceptions():
-        for x in old_iterator:
+    for x in old_iterator:
+        with capture_internal_exceptions():
             if isinstance(x, ChatStreamEndEvent) or isinstance(
                 x, StreamEndStreamedChatResponse
             ):
@@ -113,4 +113,4 @@ def _iter_stream_events(old_iterator, span, include_pii):
                     set_response_span_data(
                         span, response, include_pii, COHERE_V1_CHAT_CONFIG["response"]
                     )
-            yield x
+        yield x

sentry_sdk/integrations/cohere/v2.py

@@ -102,8 +102,8 @@ def new_chat(*args, **kwargs):
 def _iter_v2_stream_events(old_iterator, span, include_pii):
     # type: (Any, Span, bool) -> Iterator[V2ChatStreamResponse]
     collected_text = []  # type: list[str]
-    with capture_internal_exceptions():
-        for x in old_iterator:
+    for x in old_iterator:
+        with capture_internal_exceptions():
             _append_stream_delta_text(collected_text, x)
             if isinstance(x, MessageEndV2ChatStreamResponse):
                 set_response_span_data(
@@ -113,7 +113,7 @@ def _iter_v2_stream_events(old_iterator, span, include_pii):
                     COHERE_V2_CHAT_CONFIG["stream_response"],
                     collected_text,
                 )
-            yield x
+        yield x
 
 
 def _append_stream_delta_text(collected_text, event):

tests/integrations/cohere/test_cohere.py

@@ -182,6 +182,24 @@ def test_v1_bad_chat(sentry_init, capture_events):
     assert event["level"] == "error"
 
 
+def test_v1_streaming_error_propagates(sentry_init, capture_events):
+    """Stream errors must not be silently swallowed by capture_internal_exceptions."""
+    sentry_init(integrations=[CohereIntegration()], traces_sample_rate=1.0)
+    events = capture_events()
+
+    from sentry_sdk.integrations.cohere.v1 import _iter_stream_events
+
+    def failing_iterator():
+        yield "event1"
+        raise ConnectionError("stream interrupted")
+
+    with start_transaction(name="cohere tx") as tx:
+        span = tx.start_child(op="gen_ai.chat")
+        with pytest.raises(ConnectionError, match="stream interrupted"):
+            list(_iter_stream_events(failing_iterator(), span, False))
+        span.finish()
+
+
 def test_v1_span_status_error(sentry_init, capture_events):
     sentry_init(integrations=[CohereIntegration()], traces_sample_rate=1.0)
     events = capture_events()
@@ -410,6 +428,25 @@ def test_v2_streaming_chat(
 # --- V2 Error ---
 
 
+@pytest.mark.skipif(not has_v2, reason="Cohere V2 client not available")
+def test_v2_streaming_error_propagates(sentry_init, capture_events):
+    """Stream errors must not be silently swallowed by capture_internal_exceptions."""
+    sentry_init(integrations=[CohereIntegration()], traces_sample_rate=1.0)
+    events = capture_events()
+
+    from sentry_sdk.integrations.cohere.v2 import _iter_v2_stream_events
+
+    def failing_iterator():
+        yield "event1"
+        raise ConnectionError("stream interrupted")
+
+    with start_transaction(name="cohere tx") as tx:
+        span = tx.start_child(op="gen_ai.chat")
+        with pytest.raises(ConnectionError, match="stream interrupted"):
+            list(_iter_v2_stream_events(failing_iterator(), span, False))
+        span.finish()
+
+
 @pytest.mark.skipif(not has_v2, reason="Cohere V2 client not available")
 def test_v2_bad_chat(sentry_init, capture_events):
     sentry_init(integrations=[CohereIntegration()], traces_sample_rate=1.0)