cleanup

Author: alexander-alderman-webb

tests/integrations/anthropic/test_anthropic.py

@@ -3725,7 +3725,7 @@ def test_message_with_base64_pdf(sentry_init, capture_items):
                     "source": {
                         "type": "base64",
                         "media_type": "application/pdf",
-                        "attributes": "JVBERi0xLjQKJeLj...base64pdfdata",
+                        "data": "JVBERi0xLjQKJeLj...base64pdfdata",
                     },
                 },
             ],
@@ -3859,7 +3859,7 @@ def test_message_with_mixed_content(sentry_init, capture_items):
                     "source": {
                         "type": "base64",
                         "media_type": "image/png",
-                        "attributes": "iVBORw0KGgo...base64imagedata",
+                        "data": "iVBORw0KGgo...base64imagedata",
                     },
                 },
                 {
@@ -3874,7 +3874,7 @@ def test_message_with_mixed_content(sentry_init, capture_items):
                     "source": {
                         "type": "base64",
                         "media_type": "application/pdf",
-                        "attributes": "JVBERi0xLjQK...base64pdfdata",
+                        "data": "JVBERi0xLjQK...base64pdfdata",
                     },
                 },
                 {"type": "text", "text": "Please provide a detailed analysis."},
@@ -3941,7 +3941,7 @@ def test_message_with_multiple_images_different_formats(sentry_init, capture_ite
                     "source": {
                         "type": "base64",
                         "media_type": "image/jpeg",
-                        "attributes": "base64data1...",
+                        "data": "base64data1...",
                     },
                 },
                 {
@@ -4017,7 +4017,7 @@ def test_binary_content_not_stored_when_pii_disabled(sentry_init, capture_items)
                     "source": {
                         "type": "base64",
                         "media_type": "image/jpeg",
-                        "attributes": "base64encodeddatahere...",
+                        "data": "base64encodeddatahere...",
                     },
                 },
             ],
@@ -4056,7 +4056,7 @@ def test_binary_content_not_stored_when_prompts_disabled(sentry_init, capture_it
                     "source": {
                         "type": "base64",
                         "media_type": "image/jpeg",
-                        "attributes": "base64encodeddatahere...",
+                        "data": "base64encodeddatahere...",
                     },
                 },
             ],
@@ -4106,7 +4106,7 @@ def test_cache_tokens_nonstreaming(sentry_init, capture_items):
             model="claude-3-5-sonnet-20241022",
         )
 
-    (span,) = [item.payload for item in items if item.type == "span"]
+    (span,) = (item.payload for item in items if item.type == "span")
     # input_tokens normalized: 100 + 80 (cache_read) + 20 (cache_write) = 200
     assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 200
     assert span["attributes"][SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS] == 50
@@ -4158,7 +4158,7 @@ def test_input_tokens_include_cache_write_nonstreaming(sentry_init, capture_item
             model="claude-sonnet-4-20250514",
         )
 
-    (span,) = [item.payload for item in items if item.type == "span"]
+    (span,) = (item.payload for item in items if item.type == "span")
 
     # input_tokens should be total: 19 (non-cached) + 2846 (cache_write) = 2865
     assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 2865
@@ -4281,7 +4281,7 @@ def test_input_tokens_include_cache_read_streaming(
             ):
                 pass
 
-    (span,) = [item.payload for item in items if item.type == "span"]
+    (span,) = (item.payload for item in items if item.type == "span")
 
     # input_tokens should be total: 19 + 2846 = test_stream_messages_input_tokens_include_cache_read_streaming
     assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 2865
@@ -4351,7 +4351,7 @@ def test_stream_messages_input_tokens_include_cache_read_streaming(
                 for event in stream:
                     pass
 
-    (span,) = [item.payload for item in items if item.type == "span"]
+    (span,) = (item.payload for item in items if item.type == "span")
 
     # input_tokens should be total: 19 + 2846 = 2865
     assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 2865
@@ -4396,7 +4396,7 @@ def test_input_tokens_unchanged_without_caching(sentry_init, capture_items):
             model="claude-sonnet-4-20250514",
         )
 
-    (span,) = [item.payload for item in items if item.type == "span"]
+    (span,) = (item.payload for item in items if item.type == "span")
 
     assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 20
     assert span["attributes"][SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS] == 32  # 20 + 12
@@ -4460,7 +4460,7 @@ def test_cache_tokens_streaming(
             ):
                 pass
 
-    (span,) = [item.payload for item in items if item.type == "span"]
+    (span,) = (item.payload for item in items if item.type == "span")
     # input_tokens normalized: 100 + 80 (cache_read) + 20 (cache_write) = 200
     assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 200
     assert span["attributes"][SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS] == 10
@@ -4524,7 +4524,7 @@ def test_stream_messages_cache_tokens(
                 for event in stream:
                     pass
 
-    (span,) = [item.payload for item in items if item.type == "span"]
+    (span,) = (item.payload for item in items if item.type == "span")
     # input_tokens normalized: 100 + 80 (cache_read) + 20 (cache_write) = 200
     assert span["attributes"][SPANDATA.GEN_AI_USAGE_INPUT_TOKENS] == 200
     assert span["attributes"][SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS] == 10

tests/integrations/google_genai/test_google_genai.py

@@ -400,8 +400,6 @@ def test_error_handling(sentry_init, capture_items, mock_genai_client):
                     config=create_test_config(),
                 )
 
-    # Should have both transaction and error events
-    assert len([item for item in items if item.type == "transaction"]) == 1
     (error_event,) = (item.payload for item in items if item.type == "event")
 
     assert error_event["level"] == "error"
@@ -1122,8 +1120,6 @@ def test_embed_content_error_handling(sentry_init, capture_items, mock_genai_cli
                     contents=["This will fail"],
                 )
 
-    # Should have both transaction and error events
-    assert len([item for item in items if item.type == "transaction"]) == 1
     (error_event,) = (item.payload for item in items if item.type == "event")
 
     assert error_event["level"] == "error"
@@ -1352,8 +1348,6 @@ async def test_async_embed_content_error_handling(
                     contents=["This will fail"],
                 )
 
-    # Should have both transaction and error events
-    assert len([item for item in items if item.type == "transaction"]) == 1
     (error_event,) = (item.payload for item in items if item.type == "event")
 
     assert error_event["level"] == "error"
@@ -2186,9 +2180,7 @@ def test_extract_contents_messages_dict_inline_data():
     """Test extract_contents_messages with dict containing inline_data"""
     content_dict = {
         "role": "user",
-        "parts": [
-            {"inline_data": {"attributes": b"binary_data", "mime_type": "image/gif"}}
-        ],
+        "parts": [{"inline_data": {"data": b"binary_data", "mime_type": "image/gif"}}],
     }
     result = extract_contents_messages(content_dict)
 

tests/integrations/langchain/test_langchain.py

@@ -897,7 +897,7 @@ def test_langchain_error(sentry_init, capture_items):
     with start_transaction(), pytest.raises(ValueError):
         list(agent_executor.stream({"input": "How many letters in the word eudca"}))
 
-    error = next(item.payload for item in items if item.type == "event")
+    (error,) = (item.payload for item in items if item.type == "event")
     assert error["level"] == "error"
 
 
@@ -939,7 +939,7 @@ def test_span_status_error(sentry_init, capture_items):
         with pytest.raises(ValueError):
             list(agent_executor.stream({"input": "How many letters in the word eudca"}))
 
-    error = next(item.payload for item in items if item.type == "event")
+    (error,) = (item.payload for item in items if item.type == "event")
     assert error["level"] == "error"
 
     spans = [item.payload for item in items if item.type == "span"]

tests/integrations/openai/test_openai.py

@@ -1462,8 +1462,8 @@ def test_span_status_error(sentry_init, capture_items):
                 model="some-model", messages=[{"role": "system", "content": "hello"}]
             )
 
-    (event,) = (item.payload for item in items if item.type == "event")
-    assert event["level"] == "error"
+    (error,) = (item.payload for item in items if item.type == "event")
+    assert error["level"] == "error"
 
     spans = [item.payload for item in items if item.type == "span"]
     assert spans[0]["status"] == "error"
@@ -1964,8 +1964,8 @@ def test_span_origin_streaming_chat(sentry_init, capture_items):
 
         "".join(map(lambda x: x.choices[0].delta.content, response_stream))
 
-    (transaction,) = (item.payload for item in items if item.type == "transaction")
-    assert transaction["contexts"]["trace"]["origin"] == "manual"
+    (event,) = (item.payload for item in items if item.type == "transaction")
+    assert event["contexts"]["trace"]["origin"] == "manual"
 
     spans = [item.payload for item in items if item.type == "span"]
     assert spans[0]["attributes"]["sentry.origin"] == "auto.ai.openai"

tests/integrations/openai_agents/test_openai_agents.py

@@ -204,9 +204,7 @@ async def test_agent_invocation_span_no_pii(
         span for span in spans if span["attributes"]["sentry.op"] == OP.GEN_AI_CHAT
     )
 
-    transactions = [item.payload for item in items if item.type == "transaction"]
-    assert len(transactions) == 1
-    transaction = transactions[0]
+    (transaction,) = (item.payload for item in items if item.type == "transaction")
     assert transaction["transaction"] == "test_agent workflow"
     assert transaction["contexts"]["trace"]["origin"] == "auto.ai.openai_agents"
 
@@ -354,9 +352,7 @@ async def test_agent_invocation_span(
         assert result is not None
         assert result.final_output == "Hello, how can I help you?"
 
-    transactions = [item.payload for item in items if item.type == "transaction"]
-    assert len(transactions) == 1
-    transaction = transactions[0]
+    (transaction,) = (item.payload for item in items if item.type == "transaction")
     assert transaction["transaction"] == "test_agent workflow"
     assert transaction["contexts"]["trace"]["origin"] == "auto.ai.openai_agents"
 
@@ -583,9 +579,7 @@ def test_agent_invocation_span_sync_no_pii(
         assert result is not None
         assert result.final_output == "Hello, how can I help you?"
 
-    transactions = [item.payload for item in items if item.type == "transaction"]
-    assert len(transactions) == 1
-    transaction = transactions[0]
+    (transaction,) = (item.payload for item in items if item.type == "transaction")
     assert transaction["transaction"] == "test_agent workflow"
     assert transaction["contexts"]["trace"]["origin"] == "auto.ai.openai_agents"
 
@@ -739,9 +733,7 @@ def test_agent_invocation_span_sync(
         assert result is not None
         assert result.final_output == "Hello, how can I help you?"
 
-    transactions = [item.payload for item in items if item.type == "transaction"]
-    assert len(transactions) == 1
-    transaction = transactions[0]
+    (transaction,) = (item.payload for item in items if item.type == "transaction")
     assert transaction["transaction"] == "test_agent workflow"
     assert transaction["contexts"]["trace"]["origin"] == "auto.ai.openai_agents"
 
@@ -1208,9 +1200,7 @@ def simple_test_tool(message: str) -> str:
             run_config=test_run_config,
         )
 
-    transactions = [item.payload for item in items if item.type == "transaction"]
-    assert len(transactions) == 1
-    transaction = transactions[0]
+    (transaction,) = (item.payload for item in items if item.type == "transaction")
     assert transaction["transaction"] == "test_agent workflow"
     assert transaction["contexts"]["trace"]["origin"] == "auto.ai.openai_agents"
 
@@ -1700,9 +1690,7 @@ def simple_test_tool(message: str) -> str:
                     run_config=test_run_config,
                 )
 
-    transactions = [item.payload for item in items if item.type == "transaction"]
-    assert len(transactions) == 1
-    transaction = transactions[0]
+    (transaction,) = (item.payload for item in items if item.type == "transaction")
     assert transaction["transaction"] == "test_agent workflow"
     assert transaction["contexts"]["trace"]["origin"] == "auto.ai.openai_agents"
 
@@ -1747,16 +1735,12 @@ async def test_error_handling(sentry_init, capture_items, test_agent):
                     test_agent, "Test input", run_config=test_run_config
                 )
 
-    error_events = [item.payload for item in items if item.type == "event"]
-    assert len(error_events) == 1
-    error_event = error_events[0]
+    (error_event,) = (item.payload for item in items if item.type == "event")
     assert error_event["exception"]["values"][0]["type"] == "Exception"
     assert error_event["exception"]["values"][0]["value"] == "Model Error"
     assert error_event["exception"]["values"][0]["mechanism"]["type"] == "openai_agents"
 
-    transactions = [item.payload for item in items if item.type == "transaction"]
-    assert len(transactions) == 1
-    transaction = transactions[0]
+    (transaction,) = (item.payload for item in items if item.type == "transaction")
     assert transaction["transaction"] == "test_agent workflow"
     assert transaction["contexts"]["trace"]["origin"] == "auto.ai.openai_agents"
 
@@ -1811,9 +1795,7 @@ async def test_error_captures_input_data(sentry_init, capture_items, test_agent)
         with pytest.raises(InternalServerError, match="Error code: 500"):
             await agents.Runner.run(agent, "Test input", run_config=test_run_config)
 
-    error_events = [item.payload for item in items if item.type == "event"]
-    assert len(error_events) == 1
-    error_event = error_events[0]
+    (error_event,) = (item.payload for item in items if item.type == "event")
     assert error_event["exception"]["values"][0]["type"] == "InternalServerError"
     assert error_event["exception"]["values"][0]["value"] == "Error code: 500"
 
@@ -3574,9 +3556,7 @@ async def test_no_conversation_id_when_not_provided(
 
         assert result is not None
 
-    transactions = [item.payload for item in items if item.type == "transaction"]
-    assert len(transactions) == 1
-    transaction = transactions[0]
+    (transaction,) = (item.payload for item in items if item.type == "transaction")
 
     spans = [item.payload for item in items if item.type == "span"]
     invoke_agent_span = next(

tests/integrations/pydantic_ai/test_pydantic_ai.py

@@ -798,6 +798,7 @@ async def run_agent(input_text):
 
     # Verify each transaction is separate
     events = [item.payload for item in items if item.type == "transaction"]
+    assert len(events) == 3
     for i, transaction in enumerate(events):
         assert transaction["transaction"] == "invoke_agent test_agent"