Skip to content

fix(client): don't KeyError when a proxy is configured #555

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
RapidPoseidon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(client): don't KeyError when a proxy is configured #555

Show file tree
Hide file tree
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
10 changes: 6 additions & 4 deletions openapi/templates/rest.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,13 @@ class RESTClientObject:
if self.configuration.proxy:
client_kwargs["proxy"] = self.configuration.proxy

existing_headers = client_kwargs.pop("headers")
if self.configuration.proxy_headers:
for key, value in self.configuration.proxy_headers.items():
existing_headers[key] = value
client_kwargs["headers"] = existing_headers
# httpx doesn't have a dedicated `proxy_headers` kwarg the way
# urllib3 does — merging them into the default request headers
# is the closest equivalent.
existing_headers = dict(client_kwargs.get("headers") or {})
existing_headers.update(self.configuration.proxy_headers)
client_kwargs["headers"] = existing_headers

if self.configuration.retries is not None:
transport = httpx.HTTPTransport(retries=self.configuration.retries, limits=limits)
Expand Down
10 changes: 6 additions & 4 deletions src/rapidata/api_client/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,13 @@ def _get_session_defaults(self):
if self.configuration.proxy:
client_kwargs["proxy"] = self.configuration.proxy

existing_headers = client_kwargs.pop("headers")
if self.configuration.proxy_headers:
for key, value in self.configuration.proxy_headers.items():
existing_headers[key] = value
client_kwargs["headers"] = existing_headers
# httpx doesn't have a dedicated `proxy_headers` kwarg the way
# urllib3 does — merging them into the default request headers
# is the closest equivalent.
existing_headers = dict(client_kwargs.get("headers") or {})
existing_headers.update(self.configuration.proxy_headers)
client_kwargs["headers"] = existing_headers

if self.configuration.retries is not None:
transport = httpx.HTTPTransport(retries=self.configuration.retries, limits=limits)
Expand Down
Loading