Fix linting errors

Author: colin-sentry

sentry_sdk/integrations/openai.py

@@ -3,24 +3,26 @@
 from sentry_sdk._types import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Iterator, Any, TypeVar, Callable
-
-    F = TypeVar("F", bound=Callable[..., Any])
+    from typing import Iterator, Any, Iterable, List, Optional, Callable
+    from sentry_sdk.tracing import Span
 
 from sentry_sdk._functools import wraps
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.utils import logger, capture_internal_exceptions
 
 try:
-    from openai.types.chat import ChatCompletionChunk
-    from openai.resources.chat.completions import Completions
-    from openai.resources import Embeddings
+    from openai.types.chat import ChatCompletionChunk  # type: ignore
+    from openai.resources.chat.completions import Completions  # type: ignore
+    from openai.resources import Embeddings  # type: ignore
+
+    if TYPE_CHECKING:
+        from openai.types.chat import ChatCompletionMessageParam
 except ImportError:
     raise DidNotEnable("OpenAI not installed")
 
 try:
-    import tiktoken
+    import tiktoken  # type: ignore
 
     enc = tiktoken.get_encoding("cl100k_base")
 
@@ -51,14 +53,15 @@ class OpenAIIntegration(Integration):
 
     @staticmethod
     def setup_once():
-        # TODO minimum version
+        # type: () -> None
         Completions.create = _wrap_chat_completion_create(Completions.create)
         Embeddings.create = _wrap_enbeddings_create(Embeddings.create)
 
 
 def _calculate_chat_completion_usage(
     messages, response, span, streaming_message_responses=None
 ):
+    # type: (Iterable[ChatCompletionMessageParam], Any, Span, Optional[List[str]]) -> None
     completion_tokens = 0
     prompt_tokens = 0
     total_tokens = 0
@@ -104,7 +107,7 @@ def _calculate_chat_completion_usage(
 
 
 def _wrap_chat_completion_create(f):
-    # type: (F) -> F
+    # type: (Callable[..., Any]) -> Callable[..., Any]
     @wraps(f)
     def new_chat_completion(*args, **kwargs):
         # type: (*Any, **Any) -> Any
@@ -180,10 +183,11 @@ def new_iterator() -> Iterator[ChatCompletionChunk]:
 
 
 def _wrap_enbeddings_create(f):
-    # type: (F) -> F
+    # type: (Callable[..., Any]) -> Callable[..., Any]
 
     @wraps(f)
     def new_embeddings_create(*args, **kwargs):
+        # type: (*Any, **Any) -> Any
         hub = Hub.current
         integration = hub.get_integration(OpenAIIntegration)
         if integration is None:

tox.ini

@@ -443,8 +443,8 @@ deps =
     loguru-latest: loguru
 
     # OpenAI
+    openai: tiktoken
     openai-v1: openai~=1.0.0
-    openai-v1: tiktoken
     openai-latest: openai
 
     # OpenTelemetry (OTel)