Merge branch 'main' into fix-link-2

PrefectHQ · Dec 19, 2023 · 297c4b2 · 297c4b2
2 parents f819a4c + b650a5e
commit 297c4b2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/marvin/client/openai.py b/src/marvin/client/openai.py
@@ -84,7 +84,10 @@ class MarvinClient(pydantic.BaseModel):
 
     client: Client = pydantic.Field(
         default_factory=lambda: Client(
-            api_key=getattr(settings.openai.api_key, "get_secret_value", lambda: "")()
+            **settings.openai.model_dump(
+                exclude={"chat", "images", "audio", "assistants", "api_key"}
+            )
+            | dict(api_key=settings.openai.api_key.get_secret_value())
         )
     )
 
@@ -168,7 +171,10 @@ class AsyncMarvinClient(pydantic.BaseModel):
 
     client: AsyncClient = pydantic.Field(
         default_factory=lambda: AsyncClient(
-            api_key=getattr(settings.openai.api_key, "get_secret_value", lambda: "")()
+            **settings.openai.model_dump(
+                exclude={"chat", "images", "audio", "assistants", "api_key"}
+            )
+            | dict(api_key=settings.openai.api_key.get_secret_value())
         )
     )