Merge pull request #770 from PrefectHQ/openai-client

Fix issue with openai class moving

src/marvin/ai/audio.py

@@ -1,11 +1,9 @@
 from functools import partial, wraps
 from typing import Any, Callable, Literal, Optional, TypeVar
 
-from openai._base_client import HttpxBinaryResponseContent
-
 import marvin
 from marvin.client.openai import MarvinClient
-from marvin.types import SpeechRequest
+from marvin.types import HttpxBinaryResponseContent, SpeechRequest
 from marvin.utilities.jinja import Environment
 from marvin.utilities.logging import get_logger
 from marvin.utilities.python import PythonFunction

src/marvin/client/openai.py

@@ -26,14 +26,14 @@
 )
 from marvin.types import (
     ChatRequest,
+    HttpxBinaryResponseContent,
     ImageRequest,
     StreamingChatResponse,
     VisionRequest,
 )
 from marvin.utilities.logging import get_logger
 
 if TYPE_CHECKING:
-    from openai._base_client import HttpxBinaryResponseContent
     from openai.types import ImagesResponse
 
 

src/marvin/types.py

@@ -9,6 +9,15 @@
 
 T = TypeVar("T", bound=BaseModel)
 
+# OpenAI client 1.8 moved the HttpxBinaryResponseContent class to a different
+# module, presumably this will continue to change in the future
+try:
+    # >= 1.8
+    from openai._legacy_response import HttpxBinaryResponseContent  # noqa F401
+except ImportError:
+    # < 1.8
+    from openai._base_client import HttpxBinaryResponseContent  # noqa F401
+
 
 class ResponseFormat(BaseModel):
     type: str