Skip to content

Close request when initial response fails and propagate error #454

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
merged 3 commits into from
Mar 19, 2025
Merged

Close request when initial response fails and propagate error #454

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e27430
Close request when initial response fails and propogate error
alextwoods Mar 19, 2025
2be5ba4
Cleanups from PR
alextwoods Mar 19, 2025
dea4cec
Fix indent
alextwoods Mar 19, 2025
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
4 changes: 2 additions & 2 deletions codegen/core/src/main/java/software/amazon/smithy/python/codegen/ClientGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,9 @@ def _classify_error(
request_future, response_future,
)
except Exception as e:
if request_future is not None and not request_future.done:
if request_future is not None and not request_future.done():
request_future.set_exception($4T(e))
if response_future is not None and not response_future.done:
if response_future is not None and not response_future.done():
response_future.set_exception($4T(e))

# Make sure every exception that we throw is an instance of $4T so
Expand Down
19 changes: 12 additions & 7 deletions packages/smithy-http/src/smithy_http/aio/crt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,13 @@ def on_response(
kind=FieldPosition.HEADER,
)

self._response_future.set_result(
AWSCRTHTTPResponse(
status=status_code,
fields=fields,
body=self._body,
self._response_future.set_result(
AWSCRTHTTPResponse(
status=status_code,
fields=fields,
body=self._body,
)
)
)

async def await_response(self) -> AWSCRTHTTPResponse:
return await asyncio.wrap_future(self._response_future)
Expand Down Expand Up @@ -251,7 +251,12 @@ async def send(
crt_stream.completion_future.add_done_callback(
partial(self._close_input_body, body=crt_body)
)
return await response_factory.await_response()

response = await response_factory.await_response()
if response.status != 200 and response.status >= 300:
await close(crt_body)

return response

def _close_input_body(
self, future: ConcurrentFuture[int], *, body: "BufferableByteStream | BytesIO"
Expand Down