fix(openai): Avoid consuming iterables passed to Completions API

Author: alexander-alderman-webb

sentry_sdk/integrations/openai.py

@@ -371,13 +371,6 @@ def _set_completions_api_input_data(
         _commmon_set_input_data(span, kwargs)
         return
 
-    system_instructions = _get_system_instructions_completions(messages)
-    if len(system_instructions) > 0:
-        span.set_data(
-            SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS,
-            json.dumps(_transform_system_instructions(system_instructions)),
-        )
-
     if isinstance(messages, str):
         normalized_messages = normalize_message_roles([messages])  # type: ignore
         scope = sentry_sdk.get_current_scope()
@@ -390,6 +383,21 @@ def _set_completions_api_input_data(
         _commmon_set_input_data(span, kwargs)
         return
 
+    if not isinstance(messages, Iterable):
+        set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "chat")
+        _commmon_set_input_data(span, kwargs)
+        return
+
+    messages = list(messages)
+    kwargs["messages"] = messages
+
+    system_instructions = _get_system_instructions_completions(messages)
+    if len(system_instructions) > 0:
+        span.set_data(
+            SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS,
+            json.dumps(_transform_system_instructions(system_instructions)),
+        )
+
     non_system_messages = [
         message
         for message in messages

tests/integrations/openai/test_openai.py

@@ -204,6 +204,21 @@ def test_nonstreaming_chat_completion_no_prompts(
             ],
             id="parts",
         ),
+        pytest.param(
+            iter(
+                [
+                    {
+                        "role": "system",
+                        "content": [
+                            {"type": "text", "text": "You are a helpful assistant."},
+                            {"type": "text", "text": "Be concise and clear."},
+                        ],
+                    },
+                    {"role": "user", "content": "hello"},
+                ]
+            ),
+            id="iterator",
+        ),
     ],
 )
 def test_nonstreaming_chat_completion(sentry_init, capture_events, messages, request):
@@ -335,6 +350,21 @@ async def test_nonstreaming_chat_completion_async_no_prompts(
             ],
             id="parts",
         ),
+        pytest.param(
+            iter(
+                [
+                    {
+                        "role": "system",
+                        "content": [
+                            {"type": "text", "text": "You are a helpful assistant."},
+                            {"type": "text", "text": "Be concise and clear."},
+                        ],
+                    },
+                    {"role": "user", "content": "hello"},
+                ]
+            ),
+            id="iterator",
+        ),
     ],
 )
 async def test_nonstreaming_chat_completion_async(
@@ -521,6 +551,21 @@ def test_streaming_chat_completion_no_prompts(
             ],
             id="parts",
         ),
+        pytest.param(
+            iter(
+                [
+                    {
+                        "role": "system",
+                        "content": [
+                            {"type": "text", "text": "You are a helpful assistant."},
+                            {"type": "text", "text": "Be concise and clear."},
+                        ],
+                    },
+                    {"role": "user", "content": "hello"},
+                ]
+            ),
+            id="iterator",
+        ),
     ],
 )
 def test_streaming_chat_completion(sentry_init, capture_events, messages, request):
@@ -757,6 +802,21 @@ async def test_streaming_chat_completion_async_no_prompts(
             ],
             id="parts",
         ),
+        pytest.param(
+            iter(
+                [
+                    {
+                        "role": "system",
+                        "content": [
+                            {"type": "text", "text": "You are a helpful assistant."},
+                            {"type": "text", "text": "Be concise and clear."},
+                        ],
+                    },
+                    {"role": "user", "content": "hello"},
+                ]
+            ),
+            id="iterator",
+        ),
     ],
 )
 async def test_streaming_chat_completion_async(