Skip to content

Rewind bodies before retrying #361

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
Jan 9, 2025
Merged

Rewind bodies before retrying #361

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
a03e476
Use seekable bodies for requests
JordonPhillips Jan 7, 2025
3cb180c
Rewind requests before retrying them
JordonPhillips Jan 7, 2025
9d6e16e
Set default in seek getattr
JordonPhillips Jan 8, 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
2 changes: 2 additions & 0 deletions ...y-python-codegen/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 @@ -334,6 +334,8 @@ async def _handle_execution(
except SmithyRetryException:
raise context_with_response.response
await sleep(retry_token.retry_delay)
if (seek := getattr(context_with_transport_request.transport_request.body, "seek")) is not None:
await seek(0)
else:
# Step 8: Invoke record_success
retry_strategy.record_success(token=retry_token)
Expand Down
14 changes: 7 additions & 7 deletions ...ain/java/software/amazon/smithy/python/codegen/integration/RestJsonProtocolGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ protected void serializeDocumentBody(
) {
writer.addDependency(SmithyPythonDependency.SMITHY_JSON);
writer.addImport("smithy_json", "JSONCodec");
writer.addImport("smithy_core.aio.types", "AsyncBytesReader");
writer.addImport("smithy_core.aio.types", "SeekableAsyncBytesReader");

writer.pushState();

if (documentBindings.isEmpty()) {
var body = shouldWriteDefaultBody(context, operation) ? "b'{}'" : "b''";
writer.write("""
content_length = 0
body = AsyncBytesReader($L)
body = SeekableAsyncBytesReader($L)
""", body);
} else {
writer.addImport("smithy_core.types", "TimestampFormat");
Expand All @@ -159,7 +159,7 @@ protected void serializeDocumentBody(
content = b'{}'
${/writeDefaultBody}
content_length = len(content)
body = AsyncBytesReader(content)
body = SeekableAsyncBytesReader(content)
""");
}

Expand Down Expand Up @@ -223,13 +223,13 @@ protected void serializePayloadBody(
return;
}

writer.addImport("smithy_core.aio.types", "AsyncBytesReader");
writer.addImport("smithy_core.aio.types", "SeekableAsyncBytesReader");
writer.write("content_length: int = 0");

CodegenUtils.accessStructureMember(context, writer, "input", payloadBinding.getMember(), () -> {
if (target.isBlobShape()) {
writer.write("content_length = len($L)", dataSource);
writer.write("body = AsyncBytesReader($L)", dataSource);
writer.write("body = SeekableAsyncBytesReader($L)", dataSource);
return;
}

Expand All @@ -244,13 +244,13 @@ protected void serializePayloadBody(
""", dataSource);
}
writer.write("content_length = len(content)");
writer.write("body = AsyncBytesReader(content)");
writer.write("body = SeekableAsyncBytesReader(content)");
});
if (target.isStructureShape()) {
writer.write("""
else:
content_length = 2
body = AsyncBytesReader(b'{}')
body = SeekableAsyncBytesReader(b'{}')
""");
}
}
Expand Down
Loading