Fix more CI issues

Author: colin-sentry

sentry_sdk/integrations/openai.py

@@ -3,7 +3,7 @@
 from sentry_sdk._types import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Iterator, Any, Iterable, List, Optional, Callable
+    from typing import Any, Iterable, List, Optional, Callable, Iterator
     from sentry_sdk.tracing import Span
 
 from sentry_sdk._functools import wraps
@@ -146,9 +146,11 @@ def new_chat_completion(*args, **kwargs):
             elif hasattr(res, "_iterator"):
                 data_buf: list[list[str]] = []  # one for each choice
 
-                old_iterator: Iterator[ChatCompletionChunk] = res._iterator
+                # type: Iterator[ChatCompletionChunk]
+                old_iterator = res._iterator
 
-                def new_iterator() -> Iterator[ChatCompletionChunk]:
+                def new_iterator():
+                    # type: () -> Iterator[ChatCompletionChunk]
                     with capture_internal_exceptions():
                         for x in old_iterator:
                             if hasattr(x, "choices"):

tests/integrations/openai/test_openai.py

@@ -1,7 +1,8 @@
 from openai import OpenAI, Stream
 from openai.types import CompletionUsage, CreateEmbeddingResponse, Embedding
 from openai.types.chat import ChatCompletion, ChatCompletionMessage, ChatCompletionChunk
-from openai.types.chat.chat_completion_chunk import ChoiceDelta, Choice
+from openai.types.chat.chat_completion import Choice
+from openai.types.chat.chat_completion_chunk import ChoiceDelta, Choice as DeltaChoice
 from openai.types.create_embedding_response import Usage as EmbeddingTokenUsage
 
 from sentry_sdk import start_transaction
@@ -72,22 +73,22 @@ def test_streaming_chat_completion(sentry_init, capture_events):
     returned_stream._iterator = [
         ChatCompletionChunk(
             id="1",
-            choices=[Choice(index=0, delta=ChoiceDelta(content="hel"))],
+            choices=[DeltaChoice(index=0, delta=ChoiceDelta(content="hel"))],
             created=100000,
             model="model-id",
             object="chat.completion.chunk",
         ),
         ChatCompletionChunk(
             id="1",
-            choices=[Choice(index=1, delta=ChoiceDelta(content="lo "))],
+            choices=[DeltaChoice(index=1, delta=ChoiceDelta(content="lo "))],
             created=100000,
             model="model-id",
             object="chat.completion.chunk",
         ),
         ChatCompletionChunk(
             id="1",
             choices=[
-                Choice(
+                DeltaChoice(
                     index=2, delta=ChoiceDelta(content="world"), finish_reason="stop"
                 )
             ],

tox.ini

@@ -147,7 +147,7 @@ envlist =
     {py3.5,py3.11,py3.12}-loguru-latest
 
     # OpenAI
-    {py3.5,py3.7,py3.9,py3.11,py3.12}-openai-latest
+    {py3.9,py3.11,py3.12}-openai-latest
 
     # OpenTelemetry (OTel)
     {py3.7,py3.9,py3.11,py3.12}-opentelemetry