Skip to content

Fix path serialization #113

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
JordonPhillips merged 11 commits into from
Jan 24, 2023
Merged

Fix path serialization #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1603747
Fix pytest-asyncio dependency version
JordonPhillips Jan 12, 2023
ce20d33
Merge urls rather than overwriting
JordonPhillips Jan 4, 2023
63bd934
Use ShapeVisistor for http member serialization
JordonPhillips Jan 12, 2023
d24c2c9
Fix non-numeric float serialization
JordonPhillips Jan 13, 2023
9f265ff
Fix RFC3339 serialization
JordonPhillips Jan 13, 2023
8e95d14
Parse protocol test timestamps in the generator
JordonPhillips Jan 13, 2023
66a4759
Omit 0 as fractional epoch seconds
JordonPhillips Jan 13, 2023
f5f9d2d
Add tests to cover serializing scientific notation
JordonPhillips Jan 19, 2023
b62a878
Update serialize_rfc3339 docs
JordonPhillips Jan 24, 2023
6d7635b
Fix pytest-asyncio version range
JordonPhillips Jan 24, 2023
377d259
Use a slice to strip trailing endpoint slash
JordonPhillips Jan 24, 2023
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
8 changes: 8 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 @@ -313,6 +313,14 @@ async def _handle_attempt(
endpoint = await config.endpoint_resolver.resolve_endpoint(
StaticEndpointParams(url=config.endpoint_url)
)
if not endpoint.url.path:
endpoint.url.path = ""
elif endpoint.url.path.endswith("/"):
endpoint.url.path = endpoint.url.path[:-1]
if context.transport_request.url.path:
endpoint.url.path += context.transport_request.url.path
endpoint.url.query = context.transport_request.url.query
endpoint.url.host = context.transport_request.url.host + endpoint.url.host
Copy link
Contributor

@nateprewitt nateprewitt Jan 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand what's happening here. Why are we concatenating two hosts and what's the expected outcome? Is context.transport_request.url.host a prefix in this case?

Copy link
Contributor Author

@JordonPhillips JordonPhillips Jan 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the hostLabel trait allows for setting an endpoint prefix, so this is just accounting for that.

context._transport_request.url = endpoint.url
context._transport_request.headers.extend(endpoint.headers)

Expand Down
79 changes: 79 additions & 0 deletions ...ithy-python-codegen/src/main/java/software/amazon/smithy/python/codegen/CodegenUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,28 @@
import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.nio.file.Path;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoField;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.logging.Logger;
import software.amazon.smithy.codegen.core.CodegenException;
import software.amazon.smithy.codegen.core.Symbol;
import software.amazon.smithy.model.Model;
import software.amazon.smithy.model.node.Node;
import software.amazon.smithy.model.shapes.MemberShape;
import software.amazon.smithy.model.shapes.Shape;
import software.amazon.smithy.model.traits.ErrorTrait;
import software.amazon.smithy.model.traits.TimestampFormatTrait;
import software.amazon.smithy.model.traits.TimestampFormatTrait.Format;
import software.amazon.smithy.utils.SetUtils;
import software.amazon.smithy.utils.StringUtils;

Expand Down Expand Up @@ -209,4 +220,72 @@ public static List<Object[]> toTuples(Map<?, ?> map) {
return map.entrySet().stream().map((entry) ->
List.of(entry.getKey(), entry.getValue()).toArray()).toList();
}

/**
* Generates a Python datetime constructor for the given ZonedDateTime.
*
* @param writer A writer to add dependencies to.
* @param value The ZonedDateTime to convert.
* @return A string containing a Python datetime constructor representing the given ZonedDateTime.
*/
public static String getDatetimeConstructor(PythonWriter writer, ZonedDateTime value) {
writer.addStdlibImport("datetime", "datetime");
writer.addStdlibImport("datetime", "timezone");
var timezone = "timezone.utc";
if (value.getOffset() != ZoneOffset.UTC) {
writer.addStdlibImport("datetime", "timedelta");
timezone = String.format("timezone(timedelta(seconds=%d))", value.getOffset().getTotalSeconds());
}
return String.format("datetime(%d, %d, %d, %d, %d, %d, %d, %s)", value.get(ChronoField.YEAR),
value.get(ChronoField.MONTH_OF_YEAR), value.get(ChronoField.DAY_OF_MONTH),
value.get(ChronoField.HOUR_OF_DAY), value.get(ChronoField.MINUTE_OF_HOUR),
value.get(ChronoField.SECOND_OF_MINUTE), value.get(ChronoField.MICRO_OF_SECOND), timezone);
}

/**
* Parses a timestamp Node.
*
* <p>This is used to offload modeled timestamp parsing from Python runtime to Java build time.
*
* @param model The model being generated.
* @param shape The shape of the node.
* @param value The node to parse.
* @return A parsed ZonedDateTime representation of the given node.
*/
public static ZonedDateTime parseTimestampNode(Model model, Shape shape, Node value) {
if (value.isNumberNode()) {
return parseEpochTime(value);
}

Optional<TimestampFormatTrait> trait = shape.getTrait(TimestampFormatTrait.class);
if (shape.isMemberShape()) {
trait = shape.asMemberShape().get().getMemberTrait(model, TimestampFormatTrait.class);
}
var format = Format.DATE_TIME;
if (trait.isPresent()) {
format = trait.get().getFormat();
}

return switch (format) {
case DATE_TIME -> parseDateTime(value);
case HTTP_DATE -> parseHttpDate(value);
default -> throw new CodegenException("Unexpected timestamp format: " + format);
};
}

private static ZonedDateTime parseEpochTime(Node value) {
Number number = value.expectNumberNode().getValue();
Instant instant = Instant.ofEpochMilli(Double.valueOf(number.doubleValue() * 1000).longValue());
return instant.atZone(ZoneId.of("UTC"));
}

private static ZonedDateTime parseDateTime(Node value) {
Instant instant = Instant.from(DateTimeFormatter.ISO_INSTANT.parse(value.expectStringNode().getValue()));
return instant.atZone(ZoneId.of("UTC"));
}

private static ZonedDateTime parseHttpDate(Node value) {
Instant instant = Instant.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(value.expectStringNode().getValue()));
return instant.atZone(ZoneId.of("UTC"));
}
}
4 changes: 2 additions & 2 deletions ...odegen/src/main/java/software/amazon/smithy/python/codegen/HttpProtocolTestGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,8 +479,8 @@ public Void nullNode(NullNode node) {
public Void numberNode(NumberNode node) {
// TODO: Add support for timestamp, int-enum, and others
if (inputShape.isTimestampShape()) {
writer.addStdlibImport("datetime", "datetime");
writer.writeInline("datetime.fromtimestamp($L)", node.getValue());
var parsed = CodegenUtils.parseTimestampNode(model, inputShape, node);
writer.writeInline(CodegenUtils.getDatetimeConstructor(writer, parsed));
} else if (inputShape.isFloatShape() || inputShape.isDoubleShape()) {
writer.writeInline("float($L)", node.getValue());
} else {
Expand Down
2 changes: 1 addition & 1 deletion ...n-codegen/src/main/java/software/amazon/smithy/python/codegen/SmithyPythonDependency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class SmithyPythonDependency {
*/
public static final PythonDependency PYTEST_ASYNCIO = new PythonDependency(
"pytest-asyncio",
">=0.2.3,<0.3.0",
">=0.20.3,<0.21.0",
Type.TEST_DEPENDENCY,
false
);
Expand Down
57 changes: 2 additions & 55 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 @@ -18,14 +18,9 @@
import static java.lang.String.format;
import static software.amazon.smithy.python.codegen.CodegenUtils.isErrorMessage;

import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoField;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.logging.Logger;
import java.util.stream.Collectors;
Expand All @@ -43,7 +38,6 @@
import software.amazon.smithy.model.traits.ErrorTrait;
import software.amazon.smithy.model.traits.RequiredTrait;
import software.amazon.smithy.model.traits.SensitiveTrait;
import software.amazon.smithy.model.traits.TimestampFormatTrait;


/**
Expand Down Expand Up @@ -299,15 +293,8 @@ private String getDefaultValue(PythonWriter writer, MemberShape member) {
var defaultNode = member.expectTrait(DefaultTrait.class).toNode();
var target = model.expectShape(member.getTarget());
if (target.isTimestampShape()) {
writer.addStdlibImport("datetime", "datetime");
writer.addStdlibImport("datetime", "timezone");
// We *could* let python do this parsing, but then that work has to be done every time a customer
// runs their code.
ZonedDateTime value = parseDefaultTimestamp(member, defaultNode);
return String.format("datetime(%d, %d, %d, %d, %d, %d, %d, timezone.utc)", value.get(ChronoField.YEAR),
value.get(ChronoField.MONTH_OF_YEAR), value.get(ChronoField.DAY_OF_MONTH),
value.get(ChronoField.HOUR_OF_DAY), value.get(ChronoField.MINUTE_OF_HOUR),
value.get(ChronoField.SECOND_OF_MINUTE), value.get(ChronoField.MICRO_OF_SECOND));
ZonedDateTime value = CodegenUtils.parseTimestampNode(model, member, defaultNode);
return CodegenUtils.getDatetimeConstructor(writer, value);
} else if (target.isBlobShape()) {
return String.format("b'%s'", defaultNode.expectStringNode().getValue());
}
Expand All @@ -318,46 +305,6 @@ private String getDefaultValue(PythonWriter writer, MemberShape member) {
};
}

private ZonedDateTime parseDefaultTimestamp(MemberShape member, Node value) {
Optional<TimestampFormatTrait> trait = member.getMemberTrait(model, TimestampFormatTrait.class);
if (trait.isPresent()) {
switch (trait.get().getFormat()) {
case EPOCH_SECONDS:
return parseEpochTime(value);
case DATE_TIME:
return parseDateTime(value);
case HTTP_DATE:
return parseHttpDate(value);
default:
break;
}
}

if (value.isNumberNode()) {
return parseEpochTime(value);
} else {
// Smithy's node validator asserts that string nodes are in the http date format if there
// is no format explicitly given.
return parseDateTime(value);
}
}

private ZonedDateTime parseEpochTime(Node value) {
Number number = value.expectNumberNode().getValue();
Instant instant = Instant.ofEpochMilli(Double.valueOf(number.doubleValue() * 1000).longValue());
return instant.atZone(ZoneId.of("UTC"));
}

private ZonedDateTime parseDateTime(Node value) {
Instant instant = Instant.from(DateTimeFormatter.ISO_INSTANT.parse(value.expectStringNode().getValue()));
return instant.atZone(ZoneId.of("UTC"));
}

private ZonedDateTime parseHttpDate(Node value) {
Instant instant = Instant.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(value.expectStringNode().getValue()));
return instant.atZone(ZoneId.of("UTC"));
}

private boolean hasDocs() {
if (shape.hasTrait(DocumentationTrait.class)) {
return true;
Expand Down
Loading