Merge pull request #692 from PrefectHQ/revert-691-zzstoatzz-patch-1

zzstoatzz · web-flow · commit 24b6132b208f · 2023-12-16T19:47:06.000-06:00
Revert "allow config of openai client"
diff --git a/src/marvin/client/openai.py b/src/marvin/client/openai.py
@@ -84,9 +84,7 @@ class MarvinClient(pydantic.BaseModel):
 
     client: Client = pydantic.Field(
         default_factory=lambda: Client(
-            **settings.openai.model_dump(
-                exclude={"chat", "images", "audio", "assistants"}
-            )
+            api_key=getattr(settings.openai.api_key, "get_secret_value", lambda: "")()
         )
     )
 
@@ -170,9 +168,7 @@ class AsyncMarvinClient(pydantic.BaseModel):
 
     client: AsyncClient = pydantic.Field(
         default_factory=lambda: AsyncClient(
-            **settings.openai.model_dump(
-                exclude={"chat", "images", "audio", "assistants"}
-            )
+            api_key=getattr(settings.openai.api_key, "get_secret_value", lambda: "")()
         )
     )
 

Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,7 @@ class MarvinClient(pydantic.BaseModel):`
`84`	`84`
`85`	`85`	`client: Client = pydantic.Field(`
`86`	`86`	`default_factory=lambda: Client(`
`87`		`- **settings.openai.model_dump(`
`88`		`- exclude={"chat", "images", "audio", "assistants"}`
`89`		`- )`
	`87`	`+ api_key=getattr(settings.openai.api_key, "get_secret_value", lambda: "")()`
`90`	`88`	`)`
`91`	`89`	`)`
`92`	`90`
`@@ -170,9 +168,7 @@ class AsyncMarvinClient(pydantic.BaseModel):`
`170`	`168`
`171`	`169`	`client: AsyncClient = pydantic.Field(`
`172`	`170`	`default_factory=lambda: AsyncClient(`
`173`		`- **settings.openai.model_dump(`
`174`		`- exclude={"chat", "images", "audio", "assistants"}`
`175`		`- )`
	`171`	`+ api_key=getattr(settings.openai.api_key, "get_secret_value", lambda: "")()`
`176`	`172`	`)`
`177`	`173`	`)`
`178`	`174`