Add IO generation toggle to type codegen

Author: JordonPhillips

README.md

@@ -252,9 +252,8 @@ For example, to generate only shapes within the `com.example` namespace:
 
 Input and output shapes (shapes with the `@input` or `@output` traits and
 operation inputs / outputs created as part of an operation definition) are not
-generated by default. To generate these shapes anyway, remove the traits with
-the
-[`excludeTraits` transform](https://smithy.io/2.0/guides/smithy-build-json.html#excludetraits):
+generated by default. To generate these shapes anyway, set the
+`generateInputsAndOutputs` property to `true`.
 
 ```json
 {
@@ -268,18 +267,11 @@ the
     },
     "projections": {
         "shapes": {
-            "transforms": [
-                {
-                    "name": "excludeTraits",
-                    "args": {
-                        "traits": ["input", "output"]
-                    }
-                }
-            ],
             "plugins": {
                 "python-type-codegen": {
                     "module": "echo",
-                    "moduleVersion": "0.0.1"
+                    "moduleVersion": "0.0.1",
+                    "generateInputsAndOutputs": true
                 }
             }
         }

codegen/core/src/main/java/software/amazon/smithy/python/codegen/ClientGenerator.java

@@ -40,7 +40,6 @@
 import software.amazon.smithy.python.codegen.generators.StructureGenerator;
 import software.amazon.smithy.python.codegen.generators.UnionGenerator;
 import software.amazon.smithy.python.codegen.integrations.PythonIntegration;
-import software.amazon.smithy.python.codegen.integrations.RuntimeClientPlugin;
 import software.amazon.smithy.python.codegen.writer.PythonDelegator;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 

codegen/core/src/main/java/software/amazon/smithy/python/codegen/DirectedPythonClientCodegen.java

@@ -7,9 +7,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.stream.Collectors;
-import software.amazon.smithy.codegen.core.directed.CustomizeDirective;
 import software.amazon.smithy.python.codegen.GenerationContext;
-import software.amazon.smithy.python.codegen.PythonSettings;
 import software.amazon.smithy.utils.SmithyInternalApi;
 
 /**
@@ -42,9 +40,9 @@ public void run() {
                                 "# Code generated by smithy-python-codegen DO NOT EDIT.\n");
             }
         }
-        context.writerDelegator().useFileWriter(
-                "%s/__init__.py".formatted(context.settings().moduleName()),
-                w -> w.write("__version__: str = '$L'", context.settings().moduleVersion())
-        );
+        context.writerDelegator()
+                .useFileWriter(
+                        "%s/__init__.py".formatted(context.settings().moduleName()),
+                        w -> w.write("__version__: str = '$L'", context.settings().moduleVersion()));
     }
 }

codegen/core/src/main/java/software/amazon/smithy/python/codegen/generators/InitGenerator.java

@@ -39,7 +39,6 @@ default List<RuntimeClientPlugin> getClientPlugins(GenerationContext context) {
         return Collections.emptyList();
     }
 
-
     /**
      * Writes out all extra files required by runtime plugins.
      */

codegen/core/src/main/java/software/amazon/smithy/python/codegen/integrations/PythonIntegration.java

@@ -54,7 +54,7 @@ public void execute(PluginContext context) {
 
         var model = context.getModel();
         if (typeSettings.service().isEmpty()) {
-            model = addSyntheticService(model, typeSettings.selector().select(model));
+            model = addSyntheticService(model, typeSettings.selector().select(model), typeSettings);
         }
 
         runner.settings(pythonSettings);
@@ -67,7 +67,7 @@ public void execute(PluginContext context) {
         runner.run();
     }
 
-    private Model addSyntheticService(Model model, Collection<Shape> shapes) {
+    private Model addSyntheticService(Model model, Collection<Shape> shapes, PythonTypeCodegenSettings settings) {
         StructureShape.Builder inputBuilder = StructureShape.builder()
                 .id(SYNTHETIC_INPUT_ID)
                 .addTrait(new InputTrait());
@@ -76,16 +76,22 @@ private Model addSyntheticService(Model model, Collection<Shape> shapes) {
                 .id(SYNTHETIC_OPERATION_ID)
                 .input(SYNTHETIC_INPUT_ID);
 
+        ServiceShape.Builder serviceBuilder = ServiceShape.builder()
+                .id(SYNTHETIC_SERVICE_ID);
+
         var index = 0;
         for (Shape shape : shapes) {
             if (!GENERATED_TYPES.contains(shape.getType())
-                    || shape.hasTrait(InputTrait.class)
-                    || shape.hasTrait(OutputTrait.class)
                     || shape.hasTrait(MixinTrait.class)
                     || Prelude.isPreludeShape(shape)) {
                 continue;
             }
 
+            if (!settings.generateInputsAndOutputs()
+                    && (shape.hasTrait(InputTrait.class) || shape.hasTrait(OutputTrait.class))) {
+                continue;
+            }
+
             if (shape.hasTrait(ErrorTrait.class)) {
                 operationBuilder.addError(shape.getId());
             } else {
@@ -94,11 +100,7 @@ private Model addSyntheticService(Model model, Collection<Shape> shapes) {
             }
         }
 
-        ServiceShape service = ServiceShape.builder()
-                .id(SYNTHETIC_SERVICE_ID)
-                .addOperation(SYNTHETIC_OPERATION_ID)
-                .build();
-
+        var service = serviceBuilder.addOperation(SYNTHETIC_OPERATION_ID).build();
         ModelTransformer transformer = ModelTransformer.create();
         return transformer.replaceShapes(model, Set.of(inputBuilder.build(), operationBuilder.build(), service));
     }

codegen/plugins/types/src/main/java/software/amazon/smithy/python/codegen/types/PythonTypeCodegenPlugin.java

@@ -6,6 +6,7 @@
 
 import java.util.Arrays;
 import java.util.Optional;
+import software.amazon.smithy.model.node.BooleanNode;
 import software.amazon.smithy.model.node.ObjectNode;
 import software.amazon.smithy.model.node.StringNode;
 import software.amazon.smithy.model.selector.Selector;
@@ -30,21 +31,24 @@ public record PythonTypeCodegenSettings(
         String moduleName,
         String moduleVersion,
         String moduleDescription,
-        Selector selector) implements ToSmithyBuilder<PythonTypeCodegenSettings> {
+        Selector selector,
+        Boolean generateInputsAndOutputs) implements ToSmithyBuilder<PythonTypeCodegenSettings> {
 
     private static final String SERVICE = "service";
     private static final String MODULE_NAME = "module";
     private static final String MODULE_DESCRIPTION = "moduleDescription";
     private static final String MODULE_VERSION = "moduleVersion";
     private static final String SELECTOR = "selector";
+    private static final String GENERATE_INPUTS_AND_OUTPUTS = "generateInputsAndOutputs";
 
     private PythonTypeCodegenSettings(Builder builder) {
         this(
                 Optional.ofNullable(builder.service),
                 builder.moduleName,
                 builder.moduleVersion,
                 builder.moduleDescription,
-                builder.selector);
+                builder.selector,
+                builder.generateInputsAndOutputs);
     }
 
     @Override
@@ -53,7 +57,8 @@ public Builder toBuilder() {
                 .moduleName(moduleName)
                 .moduleVersion(moduleVersion)
                 .moduleDescription(moduleDescription)
-                .selector(selector);
+                .selector(selector)
+                .generateInputsAndOutputs(generateInputsAndOutputs);
         service.ifPresent(builder::service);
         return builder;
     }
@@ -88,6 +93,9 @@ public static PythonTypeCodegenSettings fromNode(ObjectNode config) {
         config.getStringMember(SERVICE).map(StringNode::expectShapeId).ifPresent(builder::service);
         config.getStringMember(MODULE_DESCRIPTION).map(StringNode::getValue).ifPresent(builder::moduleDescription);
         config.getStringMember(SELECTOR).map(node -> Selector.parse(node.getValue())).ifPresent(builder::selector);
+        config.getBooleanMember(GENERATE_INPUTS_AND_OUTPUTS)
+                .map(BooleanNode::getValue)
+                .ifPresent(builder::generateInputsAndOutputs);
         return builder.build();
     }
 
@@ -102,6 +110,7 @@ public static class Builder implements SmithyBuilder<PythonTypeCodegenSettings>
         private String moduleVersion;
         private String moduleDescription;
         private Selector selector = Selector.IDENTITY;
+        private Boolean generateInputsAndOutputs = false;
 
         @Override
         public PythonTypeCodegenSettings build() {
@@ -134,5 +143,10 @@ public Builder selector(Selector selector) {
             this.selector = selector == null ? Selector.IDENTITY : selector;
             return this;
         }
+
+        public Builder generateInputsAndOutputs(boolean generateInputsAndOutputs) {
+            this.generateInputsAndOutputs = generateInputsAndOutputs;
+            return this;
+        }
     }
 }