Python: 4.7 runtime and Union fixes (#489)

smithy-lang · Aug 6, 2024 · 7644031 · 7644031
1 parent 4c32e93
commit 7644031
Show file tree

Hide file tree

Showing 24 changed files with 48 additions and 53 deletions.
diff --git a/TestModels/Aggregate/runtimes/python/pyproject.toml b/TestModels/Aggregate/runtimes/python/pyproject.toml
@@ -12,7 +12,7 @@ include = ["**/smithygenerated/**/*.py", "**/internaldafny/generated/*.py"]
 
 [tool.poetry.dependencies]
 python = "^3.11.0"
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 

diff --git a/TestModels/Constraints/runtimes/python/pyproject.toml b/TestModels/Constraints/runtimes/python/pyproject.toml
@@ -16,7 +16,7 @@ python = "^3.11.0"
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 
 standard-library = {path = "../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/Constructor/runtimes/python/pyproject.toml b/TestModels/Constructor/runtimes/python/pyproject.toml
@@ -12,7 +12,7 @@ include = ["**/smithygenerated/**/*.py", "**/internaldafny/generated/*.py"]
 
 [tool.poetry.dependencies]
 python = "^3.11.0"
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 

diff --git a/TestModels/Dependencies/runtimes/python/pyproject.toml b/TestModels/Dependencies/runtimes/python/pyproject.toml
@@ -20,7 +20,7 @@ simple-resources = { path = "../../../Resource/runtimes/python", develop = false
 simple-errors = { path = "../../../Errors/runtimes/python", develop = false}
 simple-extendable-resources = { path = "../../../Extendable/runtimes/python", develop = false}
 simple-constraints = { path = "../../../Constraints/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/Errors/runtimes/python/pyproject.toml b/TestModels/Errors/runtimes/python/pyproject.toml
@@ -16,7 +16,7 @@ python = "^3.11.0"
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 
 standard-library = {path = "../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/Extendable/runtimes/python/pyproject.toml b/TestModels/Extendable/runtimes/python/pyproject.toml
@@ -16,7 +16,7 @@ python = "^3.11.0"
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 
 standard-library = {path = "../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/Extern/runtimes/python/pyproject.toml b/TestModels/Extern/runtimes/python/pyproject.toml
@@ -16,7 +16,7 @@ python = "^3.11.0"
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 
 standard-library = {path = "../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/LanguageSpecificLogic/runtimes/python/pyproject.toml b/TestModels/LanguageSpecificLogic/runtimes/python/pyproject.toml
@@ -16,7 +16,7 @@ python = "^3.11.0"
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 
 standard-library = {path = "../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/LocalService/runtimes/python/pyproject.toml b/TestModels/LocalService/runtimes/python/pyproject.toml
@@ -16,7 +16,7 @@ python = "^3.11.0"
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 
 standard-library = {path = "../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/MultipleModels/runtimes/python/pyproject.toml b/TestModels/MultipleModels/runtimes/python/pyproject.toml
@@ -16,7 +16,7 @@ python = "^3.11.0"
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 
 standard-library = {path = "../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/Refinement/runtimes/python/pyproject.toml b/TestModels/Refinement/runtimes/python/pyproject.toml
@@ -16,7 +16,7 @@ python = "^3.11.0"
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 
 standard-library = {path = "../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/Resource/runtimes/python/pyproject.toml b/TestModels/Resource/runtimes/python/pyproject.toml
@@ -15,7 +15,7 @@ python = "^3.11.0"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 standard-library = {path = "../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/SimpleTypes/SimpleBlob/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleBlob/runtimes/python/pyproject.toml
@@ -15,7 +15,7 @@ python = "^3.11.0"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 standard-library = {path = "../../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/SimpleTypes/SimpleDouble/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleDouble/runtimes/python/pyproject.toml
@@ -15,7 +15,7 @@ python = "^3.11.0"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 standard-library = {path = "../../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/SimpleTypes/SimpleEnum/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleEnum/runtimes/python/pyproject.toml
@@ -15,7 +15,7 @@ python = "^3.11.0"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 standard-library = {path = "../../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/SimpleTypes/SimpleEnumV2/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleEnumV2/runtimes/python/pyproject.toml
@@ -15,7 +15,7 @@ python = "^3.11.0"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 standard-library = {path = "../../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/SimpleTypes/SimpleInteger/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleInteger/runtimes/python/pyproject.toml
@@ -15,7 +15,7 @@ python = "^3.11.0"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 standard-library = {path = "../../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/SimpleTypes/SimpleLong/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleLong/runtimes/python/pyproject.toml
@@ -15,7 +15,7 @@ python = "^3.11.0"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 standard-library = {path = "../../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/SimpleTypes/SimpleString/runtimes/python/pyproject.toml b/TestModels/SimpleTypes/SimpleString/runtimes/python/pyproject.toml
@@ -15,7 +15,7 @@ python = "^3.11.0"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 standard-library = {path = "../../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/Union/runtimes/python/pyproject.toml b/TestModels/Union/runtimes/python/pyproject.toml
@@ -16,7 +16,7 @@ python = "^3.11.0"
 smithy-python = { path = "../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 
 standard-library = {path = "../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/aws-sdks/ddb/runtimes/python/pyproject.toml b/TestModels/aws-sdks/ddb/runtimes/python/pyproject.toml
@@ -16,7 +16,7 @@ boto3 = "^1.28.38"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 standard-library = {path = "../../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/TestModels/aws-sdks/kms/runtimes/python/pyproject.toml b/TestModels/aws-sdks/kms/runtimes/python/pyproject.toml
@@ -16,7 +16,7 @@ boto3 = "^1.28.38"
 # TODO: Depend on PyPi once Smithy-Python publishes their Python package there
 smithy-python = { path = "../../../../../codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python", develop = false}
 standard-library = {path = "../../../../dafny-dependencies/StandardLibrary/runtimes/python", develop = false}
-DafnyRuntimePython = "^4.4.0"
+DafnyRuntimePython = "^4.7.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

diff --git a/...hy-python-codegen/src/main/java/software/amazon/smithy/python/codegen/UnionGenerator.java b/...hy-python-codegen/src/main/java/software/amazon/smithy/python/codegen/UnionGenerator.java
@@ -26,6 +26,8 @@
 import software.amazon.smithy.model.traits.DocumentationTrait;
 import software.amazon.smithy.utils.StringUtils;
 
+import static java.lang.String.format;
+
 /**
  * Renders unions.
  */
@@ -55,6 +57,17 @@ protected void writeInitMethodConstraintsChecksForMember(MemberShape member, Str
         // Stub method that can be overridden by other codegens.
     }
 
+    protected void writeInitMethodForMember(MemberShape member, Symbol memberSymbol, Shape targetShape, Symbol targetSymbol) {
+        String formatString = format("def __init__(self, value: %s):", getTargetFormat(member));
+        writer.openBlock(formatString,
+            "",
+            targetSymbol,
+            () -> {
+                writeInitMethodConstraintsChecksForMember(member, memberSymbol.getName());
+                writer.write("self.value = value");
+        });
+    }
+
     @Override
     public void run() {
         var parentName = symbolProvider.toSymbol(shape).getName();
@@ -73,10 +86,8 @@ public void run() {
                 member.getMemberTrait(model, DocumentationTrait.class).ifPresent(trait -> {
                     writer.writeDocs(trait.getValue());
                 });
-                writer.openBlock("def __init__(self, value: $T):", "", targetSymbol, () -> {
-                    writeInitMethodConstraintsChecksForMember(member, memberSymbol.getName());
-                    writer.write("self.value = value");
-                });
+
+                writeInitMethodForMember(member, memberSymbol, target, targetSymbol);
 
                 writer.openBlock("def as_dict(self) -> Dict[str, Any]:", "", () -> {
                     if (target.isStructureShape() || target.isUnionShape()) {
@@ -161,6 +172,17 @@ def __repr__(self) -> str:
         writeGlobalFromDict();
     }
 
+    private String getTargetFormat(MemberShape member) {
+        Shape target = model.expectShape(member.getTarget());
+        // Recursive shapes may be referenced before they're defined even with
+        // a topological sort. So forward references need to be used when
+        // referencing them.
+        if (recursiveShapes.contains(target)) {
+            return "'$T'";
+        }
+        return "$T";
+    }
+
     private void writeGlobalFromDict() {
         var parentSymbol = symbolProvider.toSymbol(shape);
         var fromDictSymbol = parentSymbol.expectProperty("fromDict", Symbol.class);

diff --git a/codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python/BUILD b/codegen/smithy-dafny-codegen-modules/smithy-python/python-packages/smithy-python/BUILD