Skip to content

[codex] Switch httpx timeout handling to match #3011

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

Merged
adamtheturtle merged 6 commits into from
May 19, 2026
Merged

[codex] Switch httpx timeout handling to match #3011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
413ba18
Deduplicate httpx timeout construction
adamtheturtle May 19, 2026
1fb9ed1
Fix timeout helper coverage
adamtheturtle May 19, 2026
b4355ac
Inline httpx timeout match handling
adamtheturtle May 19, 2026
2d3c110
Use assert_never for timeout match fallback
adamtheturtle May 19, 2026
8cf510f
Add type checker names to spelling dictionary
adamtheturtle May 19, 2026
7e3c00f
Avoid timeout match suppressions
adamtheturtle May 19, 2026
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
62 changes: 32 additions & 30 deletions src/vws/transports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,21 +149,22 @@ def __call__(
Returns:
A Response populated from the httpx response.
"""
if isinstance(request_timeout, tuple):
connect_timeout, read_timeout = request_timeout
httpx_timeout = httpx.Timeout(
connect=connect_timeout,
read=read_timeout,
write=None,
pool=None,
)
else:
httpx_timeout = httpx.Timeout(
connect=request_timeout,
read=request_timeout,
write=None,
pool=None,
)
match request_timeout:
case tuple() as timeout:
connect_timeout, read_timeout = timeout
httpx_timeout = httpx.Timeout(
connect=connect_timeout,
read=read_timeout,
write=None,
pool=None,
)
case timeout:
httpx_timeout = httpx.Timeout(
connect=timeout,
read=timeout,
write=None,
pool=None,
)

httpx_response = self._client.request(
method=method,
Expand Down Expand Up @@ -272,21 +273,22 @@ async def __call__(
Returns:
A Response populated from the httpx response.
"""
if isinstance(request_timeout, tuple):
connect_timeout, read_timeout = request_timeout
httpx_timeout = httpx.Timeout(
connect=connect_timeout,
read=read_timeout,
write=None,
pool=None,
)
else:
httpx_timeout = httpx.Timeout(
connect=request_timeout,
read=request_timeout,
write=None,
pool=None,
)
match request_timeout:
case tuple() as timeout:
connect_timeout, read_timeout = timeout
httpx_timeout = httpx.Timeout(
connect=connect_timeout,
read=read_timeout,
write=None,
pool=None,
)
case timeout:
httpx_timeout = httpx.Timeout(
connect=timeout,
read=timeout,
write=None,
pool=None,
)

httpx_response = await self._client.request(
method=method,
Expand Down
45 changes: 45 additions & 0 deletions tests/test_transports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,28 @@ def test_tuple_timeout() -> None:
assert isinstance(response, Response)
assert response.status_code == HTTPStatus.OK

@staticmethod
@respx.mock
def test_int_timeout() -> None:
"""``HTTPXTransport`` works with an int timeout."""
route = respx.post(url="https://example.com/test").mock(
return_value=httpx.Response(
status_code=HTTPStatus.OK,
text="OK",
),
)
transport = HTTPXTransport()
response = transport(
method="POST",
url="https://example.com/test",
headers={"Content-Type": "text/plain"},
data=b"hello",
request_timeout=30,
)
assert route.called
assert isinstance(response, Response)
assert response.status_code == HTTPStatus.OK

@staticmethod
@respx.mock
def test_context_manager() -> None:
Expand Down Expand Up @@ -137,6 +159,29 @@ async def test_tuple_timeout() -> None:
assert isinstance(response, Response)
assert response.status_code == HTTPStatus.OK

@staticmethod
@pytest.mark.asyncio
@respx.mock
async def test_int_timeout() -> None:
"""``AsyncHTTPXTransport`` works with an int timeout."""
route = respx.post(url="https://example.com/test").mock(
return_value=httpx.Response(
status_code=HTTPStatus.OK,
text="OK",
),
)
transport = AsyncHTTPXTransport()
response = await transport(
method="POST",
url="https://example.com/test",
headers={"Content-Type": "text/plain"},
data=b"hello",
request_timeout=30,
)
assert route.called
assert isinstance(response, Response)
assert response.status_code == HTTPStatus.OK

@staticmethod
@pytest.mark.asyncio
@respx.mock
Expand Down
Loading