From f33b81bf942a251c43b1e39a087c20555054bda7 Mon Sep 17 00:00:00 2001 From: jar Date: Thu, 19 Nov 2026 18:47:57 +0000 Subject: [PATCH 1/2] Fix aiohttp buffered response body error handling Committed-By-Agent: goose Orbit-Session-Id: 5fb90387-7427-4606-8a20-d00aea91367b --- ...-19_fix-aiohttp-body-read-errors.change.md | 4 + stripe/_http_client.py | 7 +- tests/test_http_client.py | 99 +++++++++++++++++++ 3 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 .hark/changes/2026-11-19_fix-aiohttp-body-read-errors.change.md diff --git a/.hark/changes/2026-11-19_fix-aiohttp-body-read-errors.change.md b/.hark/changes/2026-11-19_fix-aiohttp-body-read-errors.change.md new file mode 100644 index 000000000..ca73b76f3 --- /dev/null +++ b/.hark/changes/2026-11-19_fix-aiohttp-body-read-errors.change.md @@ -0,0 +1,4 @@ +--- +title: Fix aiohttp buffered response body read failures to raise retryable APIConnectionError exceptions +semver_level: patch +--- diff --git a/stripe/_http_client.py b/stripe/_http_client.py index 75f8d35bd..31050f875 100644 --- a/stripe/_http_client.py +++ b/stripe/_http_client.py @@ -1514,7 +1514,12 @@ async def request_async( method, url, headers, post_data=post_data ) - return (await content.read()), status_code, response_headers + try: + body = await content.read() + except Exception as e: + self._handle_request_error(e) + + return body, status_code, response_headers def _handle_request_error(self, e: Exception) -> NoReturn: msg = ( diff --git a/tests/test_http_client.py b/tests/test_http_client.py index 959d72104..31b519a8d 100644 --- a/tests/test_http_client.py +++ b/tests/test_http_client.py @@ -1,3 +1,4 @@ +import asyncio import importlib import io import base64 @@ -6,6 +7,7 @@ from typing import Any, Callable, Dict, List, Optional from unittest.mock import MagicMock, Mock, call, patch +import aiohttp import pytest from typing_extensions import Type @@ -2118,6 +2120,103 @@ class TestAIOHTTPClientRetryBehavior(TestAIOHTTPClient): _mocked_request_lib = None max_retries = 3 + @pytest.mark.parametrize("anyio_backend", ["asyncio"]) + @pytest.mark.parametrize( + "error_type", [aiohttp.ClientPayloadError, asyncio.TimeoutError] + ) + @pytest.mark.parametrize("max_retries", [0, 2]) + @pytest.mark.anyio + async def test_body_read_error_until_exceeded( + self, + mocked_request_lib, + mock_response, + make_async_request, + error_type, + max_retries, + ): + response = mock_response(mocked_request_lib) + read_errors = [] + + async def fail_read(): + error = error_type("Response body read failed") + read_errors.append(error) + raise error + + response.content.read = AsyncMock(side_effect=fail_read) + + with pytest.raises(stripe.APIConnectionError) as exc_info: + await make_async_request( + "GET", self.valid_url, {}, None, max_retries=max_retries + ) + + assert exc_info.value.should_retry is True + assert exc_info.value.__cause__ is read_errors[-1] + assert mocked_request_lib.ClientSession().request.await_count == ( + max_retries + 1 + ) + assert response.content.read.await_count == max_retries + 1 + + @pytest.mark.parametrize("anyio_backend", ["asyncio"]) + @pytest.mark.parametrize( + "error_type", [aiohttp.ClientPayloadError, asyncio.TimeoutError] + ) + @pytest.mark.anyio + async def test_body_read_error_until_response( + self, + mocked_request_lib, + mock_response, + make_async_request, + error_type, + ): + failed_response = mock_response(mocked_request_lib, b"partial") + failed_response.content.read = AsyncMock( + side_effect=error_type("Response body read failed") + ) + successful_response = mock_response( + mocked_request_lib, b"complete response", code=202 + ) + successful_response.headers = {"Content-Type": "application/json"} + successful_response.content.read = AsyncMock( + return_value=b"complete response" + ) + request = mocked_request_lib.ClientSession().request + request.side_effect = lambda *args, **kwargs: ( + failed_response + if request.await_count == 1 + else successful_response + ) + + result = await make_async_request( + "GET", self.valid_url, {}, None, max_retries=2 + ) + + assert result == ( + b"complete response", + 202, + {"Content-Type": "application/json"}, + ) + assert request.await_count == 2 + failed_response.content.read.assert_awaited_once_with() + successful_response.content.read.assert_awaited_once_with() + + @pytest.mark.parametrize("anyio_backend", ["asyncio"]) + @pytest.mark.anyio + async def test_body_read_cancellation( + self, mocked_request_lib, mock_response, make_async_request + ): + response = mock_response(mocked_request_lib) + cancellation = asyncio.CancelledError() + response.content.read = AsyncMock(side_effect=cancellation) + + with pytest.raises(asyncio.CancelledError) as exc_info: + await make_async_request( + "GET", self.valid_url, {}, None, max_retries=2 + ) + + assert exc_info.value is cancellation + assert mocked_request_lib.ClientSession().request.await_count == 1 + response.content.read.assert_awaited_once_with() + @pytest.fixture def mock_retry(self, mocked_request_lib): def mock_retry( From 97edbf4ad5cf59165a11acc50dbb9e722995a218 Mon Sep 17 00:00:00 2001 From: jar Date: Thu, 19 Nov 2026 18:49:40 +0000 Subject: [PATCH 2/2] =?UTF-8?q?[=F0=9F=AA=BF]=20try=20to=20deslop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simplify regression-test setup by replacing the async error helper with distinct exception instances, removing an unused partial-body value, and wrapping the existing successful reader rather than duplicating its return value. These changes remove redundant setup without altering production behavior or assertions for retry counts, exception causes, recovery, and cancellation. All 31 aiohttp tests passed. Targeted formatting and git diff --check also passed. Committed-By-Agent: goose Orbit-Session-Id: 5fb90387-7427-4606-8a20-d00aea91367b --- tests/test_http_client.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/test_http_client.py b/tests/test_http_client.py index 31b519a8d..f4a77c3cb 100644 --- a/tests/test_http_client.py +++ b/tests/test_http_client.py @@ -2135,14 +2135,11 @@ async def test_body_read_error_until_exceeded( max_retries, ): response = mock_response(mocked_request_lib) - read_errors = [] - - async def fail_read(): - error = error_type("Response body read failed") - read_errors.append(error) - raise error - - response.content.read = AsyncMock(side_effect=fail_read) + read_errors = [ + error_type("Response body read failed") + for _ in range(max_retries + 1) + ] + response.content.read = AsyncMock(side_effect=read_errors) with pytest.raises(stripe.APIConnectionError) as exc_info: await make_async_request( @@ -2168,7 +2165,7 @@ async def test_body_read_error_until_response( make_async_request, error_type, ): - failed_response = mock_response(mocked_request_lib, b"partial") + failed_response = mock_response(mocked_request_lib) failed_response.content.read = AsyncMock( side_effect=error_type("Response body read failed") ) @@ -2177,7 +2174,7 @@ async def test_body_read_error_until_response( ) successful_response.headers = {"Content-Type": "application/json"} successful_response.content.read = AsyncMock( - return_value=b"complete response" + wraps=successful_response.content.read ) request = mocked_request_lib.ClientSession().request request.side_effect = lambda *args, **kwargs: (