Add Config/HttpConfig Protocols + generate __version__

Author: alextwoods

codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsUserAgentIntegration.java

@@ -31,22 +31,22 @@ public List<RuntimeClientPlugin> getClientPlugins() {
                         .addConfigProperty(
                                 ConfigProperty.builder()
                                         .name("sdk_ua_app_id")
-                                        .documentation("A unique and opaque application ID that is appended to the User-Agent header.")
+                                        .documentation(
+                                                "A unique and opaque application ID that is appended to the User-Agent header.")
                                         .type(Symbol.builder().name("str").build())
                                         .nullable(true)
-                                        .build()
-                        )
+                                        .build())
                         .pythonPlugin(
                                 SymbolReference.builder()
                                         .symbol(Symbol.builder()
-                                                .namespace(AwsPythonDependency.SMITHY_AWS_CORE.packageName() + ".plugins", ".")
+                                                .namespace(
+                                                        AwsPythonDependency.SMITHY_AWS_CORE.packageName() + ".plugins",
+                                                        ".")
                                                 .name("user_agent_plugin")
                                                 .addDependency(AwsPythonDependency.SMITHY_AWS_CORE)
                                                 .build())
-                                        .build()
-                        )
-                        .build()
-        );
+                                        .build())
+                        .build());
     }
 
 }

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

@@ -273,9 +273,24 @@ public void generateIntEnumShape(GenerateIntEnumDirective<GenerationContext, Pyt
 
     @Override
     public void customizeBeforeIntegrations(CustomizeDirective<GenerationContext, PythonSettings> directive) {
+        generateServiceModuleInit(directive);
         generateInits(directive);
     }
 
+    /**
+     * Creates top level __init__.py file.
+     */
+    private void generateServiceModuleInit(CustomizeDirective<GenerationContext, PythonSettings> directive) {
+        directive.context()
+                .writerDelegator()
+                .useFileWriter(
+                        "%s/__init__.py".formatted(directive.context().settings().moduleName()),
+                        writer -> {
+                            writer
+                                    .write("__version__ = '$L'", directive.context().settings().moduleVersion());
+                        });
+    }
+
     /**
      * Creates __init__.py files where not already present.
      */

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

@@ -289,7 +289,19 @@ private void writeInterceptorsType(PythonWriter writer) {
     }
 
     private void generateConfig(GenerationContext context, PythonWriter writer) {
-        var symbol = CodegenUtils.getConfigSymbol(context.settings());
+        var configSymbol = CodegenUtils.getConfigSymbol(context.settings());
+        Symbol configProtocolSymbol = null;
+        if (context.applicationProtocol().isHttpProtocol()) {
+            configProtocolSymbol = Symbol.builder()
+                    .name("HttpConfig")
+                    .namespace("smithy_http.interfaces.config", ".")
+                    .build();
+        } else {
+            configProtocolSymbol = Symbol.builder()
+                    .name("Config")
+                    .namespace("smithy_core.interfaces.config", ".")
+                    .build();
+        }
 
         // Initialize the list of config properties with our base properties. Here a new
         // list is constructed because that base list is immutable.
@@ -324,7 +336,7 @@ private void generateConfig(GenerationContext context, PythonWriter writer) {
         writer.addStdlibImport("dataclasses", "dataclass");
         writer.write("""
                 @dataclass(init=False)
-                class $L:
+                class $T($T):
                     \"""Configuration for $L.\"""
 
                     ${C|}
@@ -340,7 +352,8 @@ def __init__(
                         \"""
                         ${C|}
                 """,
-                symbol.getName(),
+                configSymbol,
+                configProtocolSymbol,
                 context.settings().service().getName(),
                 writer.consumer(w -> writePropertyDeclarations(w, finalProperties)),
                 writer.consumer(w -> writeInitParams(w, finalProperties)),

packages/smithy-aws-core/src/smithy_aws_core/user_agent.py

@@ -51,18 +51,18 @@ def __str__(self):
         return f"{clean_prefix}/{clean_name}#{clean_value}"
 
 
+@dataclass(frozen=True, slots=True)
 class RawStringUserAgentComponent:
     """UserAgentComponent interface wrapper around ``str``.
 
     Use for User-Agent header components that are not constructed from prefix+name+value
     but instead are provided as strings. No sanitization is performed.
     """
 
-    def __init__(self, value: str):
-        self._value = value
+    value: str
 
     def __str__(self) -> str:
-        return self._value
+        return self.value
 
 
 _UAComponent = UserAgentComponent | RawStringUserAgentComponent
@@ -71,6 +71,7 @@ def __str__(self) -> str:
 class UserAgent:
     def __init__(
         self,
+        *,
         platform_name: str | None,
         platform_version: str | None,
         platform_machine: str | None,

packages/smithy-core/src/smithy_core/interfaces/config.py

@@ -0,0 +1,11 @@
+#  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  SPDX-License-Identifier: Apache-2.0
+from typing import Protocol, Any
+
+from smithy_core.interceptors import Interceptor
+from smithy_core.interfaces.retries import RetryStrategy
+
+
+class Config(Protocol):
+    interceptors: list[Interceptor[Any, Any, Any, Any]]
+    retry_strategy: RetryStrategy

packages/smithy-http/src/smithy_http/interfaces/config.py

@@ -0,0 +1,15 @@
+#  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#  SPDX-License-Identifier: Apache-2.0
+from typing import Any
+
+from smithy_core.interfaces import URI
+from smithy_core.interfaces.config import Config
+from smithy_http.aio.interfaces import HTTPClient, EndpointResolver
+from smithy_http.interfaces import HTTPRequestConfiguration
+
+
+class HttpConfig(Config):
+    http_client: HTTPClient
+    http_request_config: HTTPRequestConfiguration | None
+    endpoint_resolver: EndpointResolver[Any]
+    endpoint_uri: str | URI | None