fix: minor tweaks to support S3 in Python (#632)

* fix: minor tweaks to support S3 in Python
smithy-lang · Oct 11, 2024 · 7982ad4 · 7982ad4
1 parent 0ac4a65
commit 7982ad4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/...software/amazon/polymorph/smithypython/awssdk/shapevisitor/AwsSdkToDafnyShapeVisitor.java b/...software/amazon/polymorph/smithypython/awssdk/shapevisitor/AwsSdkToDafnyShapeVisitor.java
@@ -29,6 +29,7 @@
 import software.amazon.smithy.model.shapes.TimestampShape;
 import software.amazon.smithy.model.shapes.UnionShape;
 import software.amazon.smithy.model.traits.EnumTrait;
+import software.amazon.smithy.model.traits.StreamingTrait;
 import software.amazon.smithy.python.codegen.GenerationContext;
 import software.amazon.smithy.python.codegen.PythonWriter;
 
@@ -74,6 +75,10 @@ protected String getDefault(Shape shape) {
 
   @Override
   public String blobShape(BlobShape shape) {
+    // if it's a streaming blob, read it first
+    if (shape.hasTrait(StreamingTrait.class)) {
+      return "Seq(" + dataSource + ".read())";
+    }
     writer.addStdlibImport("_dafny", "Seq");
     return "Seq(" + dataSource + ")";
   }

diff --git a/...in/java/software/amazon/polymorph/smithypython/common/nameresolver/DafnyNameResolver.java b/...in/java/software/amazon/polymorph/smithypython/common/nameresolver/DafnyNameResolver.java
@@ -295,10 +295,15 @@ public static String getDafnyTypeForStringShapeWithEnumTrait(
       );
     }
 
+    final String replacedEnumValue = enumValue
+      .replace("_", "__")
+      .replace("-", "__")
+      .replace(":", "__");
+
     return (
       mangleDafnyType(stringShape.getId().getName()) +
       "_" +
-      mangleDafnyType(enumValue.replace("_", "__"))
+      mangleDafnyType(replacedEnumValue)
     );
   }
 

diff --git a/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/utils/ModelUtils.java b/codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/utils/ModelUtils.java
@@ -36,7 +36,7 @@ public class ModelUtils {
   // The spec recommends a similar stricter definition for consistency (uppercase instead of title-case):
   // https://smithy.io/1.0/spec/core/constraint-traits.html?highlight=enum#enum-trait
   private static final Pattern ENUM_NAME_PATTERN = Pattern.compile(
-    "^[A-Z]+[A-Za-z_0-9]*$"
+    "^[A-Za-z_0-9]*$"
   );
 
   /**