merge

Author: alexander-alderman-webb

sentry_sdk/client.py

@@ -149,12 +149,6 @@ def _serialized_v1_attribute_to_serialized_v2_attribute(
             "type": "string",
         }
 
-    if attribute_value is None:
-        return {
-            "value": "None",
-            "type": "string",
-        }
-
     return None
 
 

tests/integrations/google_genai/test_google_genai.py

@@ -427,7 +427,6 @@ def get_weather(location: str) -> str:
         tools_data_str = invoke_span["attributes"][
             SPANDATA.GEN_AI_REQUEST_AVAILABLE_TOOLS
         ]
-
         # Parse the JSON string to verify content
         tools_data = json.loads(tools_data_str)
         assert len(tools_data) == 2
@@ -452,7 +451,6 @@ def get_weather(location: str) -> str:
 
         # Check that tools are recorded (data is serialized as a string)
         tools_data_str = invoke_span["data"][SPANDATA.GEN_AI_REQUEST_AVAILABLE_TOOLS]
-
         # Parse the JSON string to verify content
         tools_data = json.loads(tools_data_str)
         assert len(tools_data) == 2
@@ -701,14 +699,10 @@ def test_streaming_generate_content(
         # Verify accumulated response text (all chunks combined)
         expected_full_text = "Hello! How can I help you today?"
         # Response text is stored as a JSON string
-        if stream_gen_ai_spans:
-            chat_response_text = json.loads(
-                chat_span["attributes"][SPANDATA.GEN_AI_RESPONSE_TEXT]
-            )
-        else:
-            chat_response_text = json.loads(
-                chat_span["data"][SPANDATA.GEN_AI_RESPONSE_TEXT]
-            )
+        chat_response_text = json.loads(
+            chat_span["attributes"][SPANDATA.GEN_AI_RESPONSE_TEXT]
+        )
+
         assert chat_response_text == [expected_full_text]
 
         # Verify finish reasons (only the final chunk has a finish reason)
@@ -762,14 +756,9 @@ def test_streaming_generate_content(
         # Verify accumulated response text (all chunks combined)
         expected_full_text = "Hello! How can I help you today?"
         # Response text is stored as a JSON string
-        if stream_gen_ai_spans:
-            chat_response_text = json.loads(
-                chat_span["attributes"][SPANDATA.GEN_AI_RESPONSE_TEXT]
-            )
-        else:
-            chat_response_text = json.loads(
-                chat_span["data"][SPANDATA.GEN_AI_RESPONSE_TEXT]
-            )
+        chat_response_text = json.loads(
+            chat_span["data"][SPANDATA.GEN_AI_RESPONSE_TEXT]
+        )
         assert chat_response_text == [expected_full_text]
 
         # Verify finish reasons (only the final chunk has a finish reason)
@@ -1569,7 +1558,6 @@ def test_embed_content(
         (event,) = events
 
         assert event["type"] == "transaction"
-
         assert event["transaction"] == "google_genai_embeddings"
 
         # Should have 1 span for embeddings
@@ -1674,7 +1662,6 @@ def test_embed_content_string_input(
 
         # Check that single string is handled correctly
         input_texts = json.loads(embed_span["data"][SPANDATA.GEN_AI_EMBEDDINGS_INPUT])
-
         assert input_texts == ["Single text input"]
         # Should use token_count from statistics (5), not billable_character_count (10)
         # Note: Only available in newer versions with ContentEmbeddingStatistics
@@ -2041,7 +2028,6 @@ async def test_async_embed_content_string_input(
         input_texts = json.loads(
             embed_span["attributes"][SPANDATA.GEN_AI_EMBEDDINGS_INPUT]
         )
-
         assert input_texts == ["Single text input"]
         # Should use token_count from statistics (5), not billable_character_count (10)
         # Note: Only available in newer versions with ContentEmbeddingStatistics
@@ -2065,7 +2051,6 @@ async def test_async_embed_content_string_input(
 
         # Check that single string is handled correctly
         input_texts = json.loads(embed_span["data"][SPANDATA.GEN_AI_EMBEDDINGS_INPUT])
-
         assert input_texts == ["Single text input"]
         # Should use token_count from statistics (5), not billable_character_count (10)
         # Note: Only available in newer versions with ContentEmbeddingStatistics

tests/integrations/huggingface_hub/test_huggingface_hub.py

@@ -17,7 +17,7 @@
 
 
 if TYPE_CHECKING:
-    pass
+    from typing import Any
 
 
 HF_VERSION = package_version("huggingface-hub")
@@ -471,14 +471,14 @@ def mock_hf_chat_completion_api_streaming_tools(httpx_mock):
 @pytest.mark.parametrize("send_default_pii", [True, False])
 @pytest.mark.parametrize("include_prompts", [True, False])
 def test_text_generation(
-    sentry_init,
-    capture_events,
-    capture_items,
-    send_default_pii,
-    include_prompts,
-    mock_hf_text_generation_api,
-    stream_gen_ai_spans,
-):
+    sentry_init: "Any",
+    capture_events: "Any",
+    capture_items: "Any",
+    send_default_pii: "Any",
+    include_prompts: "Any",
+    mock_hf_text_generation_api: "Any",
+    stream_gen_ai_spans: "Any",
+) -> None:
     sentry_init(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
@@ -606,14 +606,14 @@ def test_text_generation(
 @pytest.mark.parametrize("send_default_pii", [True, False])
 @pytest.mark.parametrize("include_prompts", [True, False])
 def test_text_generation_streaming(
-    sentry_init,
-    capture_events,
-    capture_items,
-    send_default_pii,
-    include_prompts,
-    mock_hf_text_generation_api_streaming,
-    stream_gen_ai_spans,
-):
+    sentry_init: "Any",
+    capture_events: "Any",
+    capture_items: "Any",
+    send_default_pii: "Any",
+    include_prompts: "Any",
+    mock_hf_text_generation_api_streaming: "Any",
+    stream_gen_ai_spans: "Any",
+) -> None:
     sentry_init(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
@@ -739,14 +739,14 @@ def test_text_generation_streaming(
 @pytest.mark.parametrize("send_default_pii", [True, False])
 @pytest.mark.parametrize("include_prompts", [True, False])
 def test_chat_completion(
-    sentry_init,
-    capture_events,
-    capture_items,
-    send_default_pii,
-    include_prompts,
-    mock_hf_chat_completion_api,
-    stream_gen_ai_spans,
-):
+    sentry_init: "Any",
+    capture_events: "Any",
+    capture_items: "Any",
+    send_default_pii: "Any",
+    include_prompts: "Any",
+    mock_hf_chat_completion_api: "Any",
+    stream_gen_ai_spans: "Any",
+) -> None:
     sentry_init(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
@@ -876,14 +876,14 @@ def test_chat_completion(
 @pytest.mark.parametrize("send_default_pii", [True, False])
 @pytest.mark.parametrize("include_prompts", [True, False])
 def test_chat_completion_streaming(
-    sentry_init,
-    capture_events,
-    capture_items,
-    send_default_pii,
-    include_prompts,
-    mock_hf_chat_completion_api_streaming,
-    stream_gen_ai_spans,
-):
+    sentry_init: "Any",
+    capture_events: "Any",
+    capture_items: "Any",
+    send_default_pii: "Any",
+    include_prompts: "Any",
+    mock_hf_chat_completion_api_streaming: "Any",
+    stream_gen_ai_spans: "Any",
+) -> None:
     sentry_init(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,
@@ -938,7 +938,6 @@ def test_chat_completion_streaming(
             "thread.id": mock.ANY,
             "thread.name": mock.ANY,
         }
-
         # usage is not available in older versions of the library
         if HF_VERSION and HF_VERSION >= (0, 26, 0):
             expected_data["gen_ai.usage.input_tokens"] = 183
@@ -1016,12 +1015,12 @@ def test_chat_completion_streaming(
 @pytest.mark.parametrize("stream_gen_ai_spans", [True, False])
 @pytest.mark.httpx_mock(assert_all_requests_were_expected=False)
 def test_chat_completion_api_error(
-    sentry_init,
-    capture_events,
-    capture_items,
-    mock_hf_api_with_errors,
-    stream_gen_ai_spans,
-):
+    sentry_init: "Any",
+    capture_events: "Any",
+    capture_items: "Any",
+    mock_hf_api_with_errors: "Any",
+    stream_gen_ai_spans: "Any",
+) -> None:
     sentry_init(
         traces_sample_rate=1.0,
         stream_gen_ai_spans=stream_gen_ai_spans,
@@ -1130,12 +1129,12 @@ def test_chat_completion_api_error(
 @pytest.mark.parametrize("stream_gen_ai_spans", [True, False])
 @pytest.mark.httpx_mock(assert_all_requests_were_expected=False)
 def test_span_status_error(
-    sentry_init,
-    capture_events,
-    capture_items,
-    mock_hf_api_with_errors,
-    stream_gen_ai_spans,
-):
+    sentry_init: "Any",
+    capture_events: "Any",
+    capture_items: "Any",
+    mock_hf_api_with_errors: "Any",
+    stream_gen_ai_spans: "Any",
+) -> None:
     client = get_hf_provider_inference_client()
 
     sentry_init(
@@ -1198,13 +1197,13 @@ def test_span_status_error(
 @pytest.mark.parametrize("send_default_pii", [True, False])
 @pytest.mark.parametrize("include_prompts", [True, False])
 def test_chat_completion_with_tools(
-    sentry_init,
-    capture_events,
-    capture_items,
-    send_default_pii,
-    include_prompts,
-    mock_hf_chat_completion_api_tools,
-    stream_gen_ai_spans,
+    sentry_init: "Any",
+    capture_events: "Any",
+    capture_items: "Any",
+    send_default_pii: "Any",
+    include_prompts: "Any",
+    mock_hf_chat_completion_api_tools: "Any",
+    stream_gen_ai_spans: "Any",
 ):
     sentry_init(
         traces_sample_rate=1.0,
@@ -1354,14 +1353,14 @@ def test_chat_completion_with_tools(
 @pytest.mark.parametrize("send_default_pii", [True, False])
 @pytest.mark.parametrize("include_prompts", [True, False])
 def test_chat_completion_streaming_with_tools(
-    sentry_init,
-    capture_events,
-    capture_items,
-    send_default_pii,
-    include_prompts,
-    mock_hf_chat_completion_api_streaming_tools,
-    stream_gen_ai_spans,
-):
+    sentry_init: "Any",
+    capture_events: "Any",
+    capture_items: "Any",
+    send_default_pii: "Any",
+    include_prompts: "Any",
+    mock_hf_chat_completion_api_streaming_tools: "Any",
+    stream_gen_ai_spans: "Any",
+) -> None:
     sentry_init(
         traces_sample_rate=1.0,
         send_default_pii=send_default_pii,