Merge branch 'master' into potel-base

Author: antonpirker

CHANGELOG.md

@@ -32,7 +32,7 @@ for your feedback. How was the migration? Is everything working as expected? Is
   default 1024 characters/bytes).
 
   If you want to adjust the limit, you can set a
-  [`max_value_limit`](https://docs.sentry.io/platforms/python/configuration/options/#max_value_length)
+  [`max_value_length`](https://docs.sentry.io/platforms/python/configuration/options/#max_value_length)
   in your `sentry_sdk.init()`.
 
 - `OpenAI` integration update (#4612) by @antonpirker

sentry_sdk/ai/utils.py

@@ -23,9 +23,13 @@ def _normalize_data(data: Any) -> Any:
         return list(_normalize_data(x) for x in data)
     if isinstance(data, dict):
         return {k: _normalize_data(v) for (k, v) in data.items()}
+
     return data
 
 
 def set_data_normalized(span: Span, key: str, value: Any) -> None:
     normalized = _normalize_data(value)
-    span.set_attribute(key, normalized)
+    if isinstance(normalized, (int, float, bool, str)):
+        span.set_attribute(key, normalized)
+    else:
+        span.set_attribute(key, str(normalized))

tests/integrations/cohere/test_cohere.py

@@ -57,9 +57,14 @@ def test_nonstreaming_chat(
     assert span["data"][SPANDATA.AI_MODEL_ID] == "some-model"
 
     if send_default_pii and include_prompts:
-        input_messages = json.loads(span["data"][SPANDATA.AI_INPUT_MESSAGES])
-        assert "some context" in input_messages[0]["content"]
-        assert "hello" in input_messages[1]["content"]
+        assert (
+            "{'role': 'system', 'content': 'some context'}"
+            in span["data"][SPANDATA.AI_INPUT_MESSAGES]
+        )
+        assert (
+            "{'role': 'user', 'content': 'hello'}"
+            in span["data"][SPANDATA.AI_INPUT_MESSAGES]
+        )
         assert "the model response" in span["data"][SPANDATA.AI_RESPONSES]
     else:
         assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]
@@ -129,9 +134,14 @@ def test_streaming_chat(sentry_init, capture_events, send_default_pii, include_p
     assert span["data"][SPANDATA.AI_MODEL_ID] == "some-model"
 
     if send_default_pii and include_prompts:
-        input_messages = json.loads(span["data"][SPANDATA.AI_INPUT_MESSAGES])
-        assert "some context" in input_messages[0]["content"]
-        assert "hello" in input_messages[1]["content"]
+        assert (
+            "{'role': 'system', 'content': 'some context'}"
+            in span["data"][SPANDATA.AI_INPUT_MESSAGES]
+        )
+        assert (
+            "{'role': 'user', 'content': 'hello'}"
+            in span["data"][SPANDATA.AI_INPUT_MESSAGES]
+        )
         assert "the model response" in span["data"][SPANDATA.AI_RESPONSES]
     else:
         assert SPANDATA.AI_INPUT_MESSAGES not in span["data"]

tests/integrations/openai/test_openai.py

@@ -1,4 +1,3 @@
-import json
 import pytest
 from openai import AsyncOpenAI, OpenAI, AsyncStream, Stream, OpenAIError
 from openai.types import CompletionUsage, CreateEmbeddingResponse, Embedding
@@ -144,11 +143,8 @@ def test_nonstreaming_chat_completion(
     assert span["op"] == "gen_ai.chat"
 
     if send_default_pii and include_prompts:
-        assert "hello" in span["data"][SPANDATA.GEN_AI_REQUEST_MESSAGES]["content"]
-        assert (
-            "the model response"
-            in json.loads(span["data"][SPANDATA.GEN_AI_RESPONSE_TEXT])[0]["content"]
-        )
+        assert "hello" in span["data"][SPANDATA.GEN_AI_REQUEST_MESSAGES]
+        assert "the model response" in span["data"][SPANDATA.GEN_AI_RESPONSE_TEXT]
     else:
         assert SPANDATA.GEN_AI_REQUEST_MESSAGES not in span["data"]
         assert SPANDATA.GEN_AI_RESPONSE_TEXT not in span["data"]
@@ -189,11 +185,8 @@ async def test_nonstreaming_chat_completion_async(
     assert span["op"] == "gen_ai.chat"
 
     if send_default_pii and include_prompts:
-        assert "hello" in span["data"][SPANDATA.GEN_AI_REQUEST_MESSAGES]["content"]
-        assert (
-            "the model response"
-            in json.loads(span["data"][SPANDATA.GEN_AI_RESPONSE_TEXT])[0]["content"]
-        )
+        assert "hello" in span["data"][SPANDATA.GEN_AI_REQUEST_MESSAGES]
+        assert "the model response" in span["data"][SPANDATA.GEN_AI_RESPONSE_TEXT]
     else:
         assert SPANDATA.GEN_AI_REQUEST_MESSAGES not in span["data"]
         assert SPANDATA.GEN_AI_RESPONSE_TEXT not in span["data"]
@@ -285,7 +278,7 @@ def test_streaming_chat_completion(
     assert span["op"] == "gen_ai.chat"
 
     if send_default_pii and include_prompts:
-        assert "hello" in span["data"][SPANDATA.GEN_AI_REQUEST_MESSAGES]["content"]
+        assert "hello" in span["data"][SPANDATA.GEN_AI_REQUEST_MESSAGES]
         assert "hello world" in span["data"][SPANDATA.GEN_AI_RESPONSE_TEXT]
     else:
         assert SPANDATA.GEN_AI_REQUEST_MESSAGES not in span["data"]
@@ -381,7 +374,7 @@ async def test_streaming_chat_completion_async(
     assert span["op"] == "gen_ai.chat"
 
     if send_default_pii and include_prompts:
-        assert "hello" in span["data"][SPANDATA.GEN_AI_REQUEST_MESSAGES]["content"]
+        assert "hello" in span["data"][SPANDATA.GEN_AI_REQUEST_MESSAGES]
         assert "hello world" in span["data"][SPANDATA.GEN_AI_RESPONSE_TEXT]
     else:
         assert SPANDATA.GEN_AI_REQUEST_MESSAGES not in span["data"]