fix(Python): Support orphaned shapes, update Config shape generation

SmithyDafnyMakefile.mk

@@ -259,6 +259,9 @@ transpile_dependencies_test:
 
 ########################## Code-Gen targets
 
+mvn_local_deploy_polymorph_dependencies:
+	$(MAKE) -C $(SMITHY_DAFNY_ROOT) mvn_local_deploy_polymorph_dependencies
+
 # The OUTPUT variables are created this way
 # so that it is possible to run _parts_ of polymorph.
 # Otherwise it is difficult to run/test only a Dafny change.
@@ -269,6 +272,7 @@ transpile_dependencies_test:
 #   make polymorph_code_gen CODEGEN_CLI_ROOT=/path/to/smithy-dafny/codegen/smithy-dafny-codegen-cli
 # StandardLibrary is filtered out from dependent-model patsubst list;
 #   Its model is contained in $(LIBRARY_ROOT)/model, not $(LIBRARY_ROOT)/../StandardLibrary/Model.
+_polymorph: mvn_local_deploy_polymorph_dependencies
 _polymorph:
 	cd $(CODEGEN_CLI_ROOT); \
 	./../gradlew run --args="\
@@ -294,6 +298,7 @@ _polymorph:
 	$(POLYMORPH_OPTIONS) \
 	";
 
+_polymorph_wrapped: mvn_local_deploy_polymorph_dependencies
 _polymorph_wrapped:
 	@: $(if ${CODEGEN_CLI_ROOT},,$(error You must pass the path CODEGEN_CLI_ROOT: CODEGEN_CLI_ROOT=/path/to/smithy-dafny/codegen/smithy-dafny-codegen-cli));
 	cd $(CODEGEN_CLI_ROOT); \

codegen/smithy-dafny-codegen-modules/smithy-python/codegen/smithy-python-codegen/src/main/java/software/amazon/smithy/python/codegen/StructureGenerator.java

@@ -252,7 +252,7 @@ protected boolean isOptionalDefault(MemberShape member) {
             && (target.isDocumentShape() || target.isListShape() || target.isMapShape());
     }
 
-    private void writeClassDocs(boolean isError) {
+    protected void writeClassDocs(boolean isError) {
         if (hasDocs()) {
             writer.writeDocs(() -> {
                 shape.getTrait(DocumentationTrait.class).ifPresent(trait -> {
@@ -326,7 +326,7 @@ private boolean hasDocs() {
         return false;
     }
 
-    private void writeMemberDocs(MemberShape member) {
+    protected void writeMemberDocs(MemberShape member) {
         member.getMemberTrait(model, DocumentationTrait.class).ifPresent(trait -> {
             String memberName = symbolProvider.toMemberName(member);
             String docs = writer.formatDocs(String.format(":param %s: %s", memberName, trait.getValue()));

codegen/smithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithypython/localservice/customize/ConfigFileWriter.java

@@ -58,20 +58,6 @@ public void customizeFileForServiceShape(
 
           writer.write(
             """
-            class $L(Config):
-                ""\"
-                Smithy-modelled localService Config shape for this localService.
-                ""\"
-                ${C|}
-
-                def __init__(
-                    self,
-                    ${C|}
-                ):
-                    ${C|}
-                    super().__init__()
-                    ${C|}
-
             def dafny_config_to_smithy_config(dafny_config) -> $L:
                 ""\"
                 Converts the provided Dafny shape for this localService's config
@@ -87,31 +73,6 @@ def smithy_config_to_dafny_config(smithy_config) -> $L:
                 ${C|}
             """,
             configShape.getId().getName(),
-            writer.consumer(w ->
-              generateConfigClassFields(configShape, codegenContext, w)
-            ),
-            writer.consumer(w ->
-              generateConfigConstructorParameters(
-                configShape,
-                codegenContext,
-                w
-              )
-            ),
-            writer.consumer(w ->
-              generateConfigConstructorDocumentation(
-                configShape,
-                codegenContext,
-                w
-              )
-            ),
-            writer.consumer(w ->
-              generateConfigConstructorFieldAssignments(
-                configShape,
-                codegenContext,
-                w
-              )
-            ),
-            configShape.getId().getName(),
             writer.consumer(w ->
               generateDafnyConfigToSmithyConfigFunctionBody(
                 configShape,
@@ -132,149 +93,6 @@ def smithy_config_to_dafny_config(smithy_config) -> $L:
       );
   }
 
-  /**
-   * Generates the members of the Smithy-modelled localService Config shape's class. Called when
-   * writing the class.
-   *
-   * @param configShape
-   * @param codegenContext
-   * @param writer
-   */
-  private void generateConfigClassFields(
-    StructureShape configShape,
-    GenerationContext codegenContext,
-    PythonWriter writer
-  ) {
-    Map<String, MemberShape> memberShapeSet = configShape.getAllMembers();
-    NullableIndex index = NullableIndex.of(codegenContext.model());
-    for (Entry<
-      String,
-      MemberShape
-    > memberShapeEntry : memberShapeSet.entrySet()) {
-      MemberShape memberShape = memberShapeEntry.getValue();
-      final Shape targetShape = codegenContext
-        .model()
-        .expectShape(memberShape.getTarget());
-      Symbol targetShapeSymbol = codegenContext
-        .symbolProvider()
-        .toSymbol(targetShape);
-      if (index.isMemberNullable(memberShape)) {
-        writer.addStdlibImport("typing", "Optional");
-        writer.write(
-          "$L: Optional[$T]",
-          CaseUtils.toSnakeCase(memberShape.getMemberName()),
-          targetShapeSymbol
-        );
-      } else {
-        writer.write(
-          "$L: $T",
-          CaseUtils.toSnakeCase(memberShape.getMemberName()),
-          targetShapeSymbol
-        );
-      }
-    }
-  }
-
-  /**
-   * Generates constructor parameters for the localService's Config class. Called when writing
-   * parameters for the Config class' constructor (__init__ method).
-   *
-   * @param configShape
-   * @param codegenContext
-   * @param writer
-   */
-  private void generateConfigConstructorParameters(
-    StructureShape configShape,
-    GenerationContext codegenContext,
-    PythonWriter writer
-  ) {
-    Map<String, MemberShape> memberShapeSet = configShape.getAllMembers();
-    NullableIndex index = NullableIndex.of(codegenContext.model());
-    for (MemberShape memberShape : memberShapeSet.values()) {
-      final Shape targetShape = codegenContext
-        .model()
-        .expectShape(memberShape.getTarget());
-      Symbol targetShapeSymbol = codegenContext
-        .symbolProvider()
-        .toSymbol(targetShape);
-      if (index.isMemberNullable(memberShape)) {
-        writer.addStdlibImport("typing", "Optional");
-        writer.write(
-          "$L: Optional[$T] = None,",
-          CaseUtils.toSnakeCase(memberShape.getMemberName()),
-          targetShapeSymbol
-        );
-      } else {
-        writer.write(
-          "$L: $T,",
-          CaseUtils.toSnakeCase(memberShape.getMemberName()),
-          targetShapeSymbol
-        );
-      }
-    }
-  }
-
-  /**
-   * Generates constructor documentation for the localService's Config class. Called when writing
-   * parameters for the Config class' constructor (__init__ method).
-   *
-   * @param configShape
-   * @param codegenContext
-   * @param writer
-   */
-  private void generateConfigConstructorDocumentation(
-    StructureShape configShape,
-    GenerationContext codegenContext,
-    PythonWriter writer
-  ) {
-    Map<String, MemberShape> memberShapeSet = configShape.getAllMembers();
-    writer.writeDocs(() -> {
-      var constructorDocs = configShape
-        .getTrait(DocumentationTrait.class)
-        .map(StringTrait::getValue)
-        .orElse(
-          String.format("Constructor for %s.", configShape.getId().getName())
-        );
-      writer.write(constructorDocs + "\n");
-      for (MemberShape memberShape : memberShapeSet.values()) {
-        memberShape
-          .getMemberTrait(codegenContext.model(), DocumentationTrait.class)
-          .ifPresent(trait -> {
-            String memberName = codegenContext
-              .symbolProvider()
-              .toMemberName(memberShape);
-            String memberDocs = writer.formatDocs(
-              String.format(":param %s: %s", memberName, trait.getValue())
-            );
-            writer.write(memberDocs);
-          });
-      }
-    });
-  }
-
-  /**
-   * Generates assignments to fields for the localService's Config class. Called when writing the
-   * Config class' constructor.
-   *
-   * @param configShape
-   * @param codegenContext
-   * @param writer
-   */
-  private void generateConfigConstructorFieldAssignments(
-    StructureShape configShape,
-    GenerationContext codegenContext,
-    PythonWriter writer
-  ) {
-    Map<String, MemberShape> memberShapeSet = configShape.getAllMembers();
-    for (String memberName : memberShapeSet.keySet()) {
-      writer.write(
-        "self.$L = $L",
-        CaseUtils.toSnakeCase(memberName),
-        CaseUtils.toSnakeCase(memberName)
-      );
-    }
-  }
-
   /**
    * Generates the body converting the Dafny Config class (from internaldafny code) to the
    * Smithy-modelled Config class defined in this file.