Skip to content

[Fix] Follow redirects when a custom httpx client is supplied to the OpenAI SDK #2633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CastilloLuis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Fix] Follow redirects when a custom httpx client is supplied to the OpenAI SDK #2633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions opencompass/models/openai_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,12 @@ def _create_fresh_client(self):
# Create fresh client with current key
http_client_cfg = self.http_client_cfg.copy()
set_proxy_cfg(http_client_cfg, self.proxy_url)
# httpx defaults follow_redirects to False, and openai-python only
# applies its own follow_redirects=True when it builds the client
# itself -- supplying http_client bypasses that. Without this, any
# endpoint that answers with a redirect (common for hosted gateways)
# surfaces the raw redirect response as an API error.
http_client_cfg.setdefault('follow_redirects', True)
limits = httpx.Limits(max_keepalive_connections=2048,
max_connections=4096)
http_client = httpx.Client(**http_client_cfg,
Expand Down Expand Up @@ -1024,6 +1030,9 @@ def __init__(
'http://': self.proxy_url,
'https://': self.proxy_url,
}
# See the note in OpenAISDK._create_fresh_client: a supplied
# http_client loses openai-python's follow_redirects=True default.
http_client_cfg.setdefault('follow_redirects', True)

self.openai_client = OpenAI(
base_url=self.openai_api_base,
Expand Down