Skip to content

Don't prematurely handle event streams #340

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 1 commit into from
Nov 27, 2024
Merged

Don't prematurely handle event streams #340

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
4 changes: 4 additions & 0 deletions ...ython-codegen/src/main/java/software/amazon/smithy/python/codegen/StructureGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import software.amazon.smithy.model.traits.InputTrait;
import software.amazon.smithy.model.traits.OutputTrait;
import software.amazon.smithy.model.traits.SensitiveTrait;
import software.amazon.smithy.model.traits.StreamingTrait;
import software.amazon.smithy.python.codegen.generators.MemberDeserializerGenerator;
import software.amazon.smithy.python.codegen.generators.MemberSerializerGenerator;

Expand Down Expand Up @@ -417,6 +418,9 @@ private void deserializeMembers(Collection<MemberShape> members) {
int index = 0;
for (MemberShape member : members) {
var target = model.expectShape(member.getTarget());
if (target.hasTrait(StreamingTrait.class) && target.isUnionShape()) {
continue;
}
writer.write("""
case $L:
kwargs[$S] = ${C|}
Expand Down
12 changes: 8 additions & 4 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 @@ -314,10 +314,15 @@ protected void deserializePayloadBody(

var symbolProvider = context.symbolProvider();
var memberName = symbolProvider.toMemberName(payloadBinding.getMember());
var target = context.model().expectShape(payloadBinding.getMember().getTarget());

if (payloadBinding.getMember().getMemberTrait(context.model(), StreamingTrait.class).isPresent()) {
writer.addImport("smithy_core.aio.types", "AsyncBytesReader");
writer.write("kwargs[$S] = AsyncBytesReader(http_response.body)", memberName);
if (target.hasTrait(StreamingTrait.class)) {
// If the target is a union, nothing needs to be done here. The stream deserializer will
// take the response body directly and handle it.
if (target.isBlobShape()) {
writer.addImport("smithy_core.aio.types", "AsyncBytesReader");
writer.write("kwargs[$S] = AsyncBytesReader(http_response.body)", memberName);
}
return;
}

Expand All @@ -334,7 +339,6 @@ protected void deserializePayloadBody(
""");
}

var target = context.model().expectShape(payloadBinding.getMember().getTarget());
var deserializerSymbol = symbolProvider.toSymbol(target);

writer.write("if body:").indent();
Expand Down
Loading