set openai.proxy explicitly to Requests lib to override environmental defaults (openai#339)

bojieli · web-flow · commit 47ce29542e7f · 2023-03-29T22:11:40.000-07:00
By default, the Requests library use the proxy settings from the environment variable HTTPS_PROXY.
It has higher priority than the "proxies" setting in the session, which may lead to confusing behaviors
if both environment variables and the "openai.proxy" config are set.
This patch explicitly informs the Requests library to use the "openai.proxy" config.
diff --git a/openai/api_requestor.py b/openai/api_requestor.py
@@ -521,6 +521,7 @@ def request_raw(
                 files=files,
                 stream=stream,
                 timeout=request_timeout if request_timeout else TIMEOUT_SECS,
+                proxies=_thread_context.session.proxies,
             )
         except requests.exceptions.Timeout as e:
             raise error.Timeout("Request timed out: {}".format(e)) from e

Original file line number	Diff line number	Diff line change
`@@ -521,6 +521,7 @@ def request_raw(`
`521`	`521`	`files=files,`
`522`	`522`	`stream=stream,`
`523`	`523`	`timeout=request_timeout if request_timeout else TIMEOUT_SECS,`
	`524`	`+ proxies=_thread_context.session.proxies,`
`524`	`525`	`)`
`525`	`526`	`except requests.exceptions.Timeout as e:`
`526`	`527`	`raise error.Timeout("Request timed out: {}".format(e)) from e`