PR cleanups

Author: alextwoods

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

@@ -446,7 +446,7 @@ async def _handle_attempt(
             writer.addImport("smithy_core", "URI");
             writer.write("""
                             # Step 7f: Invoke endpoint_resolver.resolve_endpoint
-                            endpoint_resolver_parameters = $T.build(config=config)
+                            endpoint_resolver_parameters = $1T.build(config=config)
                             logger.debug("Calling endpoint resolver with parameters: %s", endpoint_resolver_parameters)
                             endpoint = await config.endpoint_resolver.resolve_endpoint(
                                 endpoint_resolver_parameters
@@ -469,7 +469,8 @@ async def _handle_attempt(
                             )
                             context._transport_request.fields.extend(endpoint.headers)
 
-                    """, CodegenUtils.getEndpointParametersSymbol(context.settings()));
+                    """,
+                    CodegenUtils.getEndpointParametersSymbol(context.settings()));
         }
         writer.popState();
 

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

@@ -136,19 +136,15 @@ private static List<ConfigProperty> getHttpProperties(GenerationContext context)
         properties.add(ConfigProperty.builder()
                 .name("endpoint_resolver")
                 .type(Symbol.builder()
-                        .name("EndpointResolverProtocol[EndpointParameters]")
+                        .name("_EndpointResolver[EndpointParameters]")
                         .addReference(CodegenUtils.getEndpointParametersSymbol(context.settings()))
-                        .addReference(Symbol.builder()
-                                .name("EndpointResolverProtocol")
-                                .namespace("smithy_http.aio.interfaces", ".")
-                                .addDependency(SmithyPythonDependency.SMITHY_HTTP)
-                                .build())
                         .build())
                 .documentation("""
                         The endpoint resolver used to resolve the final endpoint per-operation based on the \
                         configuration.""")
                 .nullable(false)
                 .initialize(writer -> {
+                    writer.addImport("smithy_http.aio.interfaces", "EndpointResolver", "_EndpointResolver");
                     writer.pushState(new InitDefaultEndpointResolverSection());
                     writer.write("self.endpoint_resolver = endpoint_resolver or $T()", endpointResolver);
                     writer.popState();

packages/smithy-aws-core/src/smithy_aws_core/endpoints/standard_regional.py

@@ -7,10 +7,11 @@
 import smithy_core
 from smithy_core import URI
 from smithy_http.aio.interfaces import (
-    EndpointResolverProtocol,
-    EndpointParametersProtocol,
+    EndpointResolver,
+    EndpointParameters,
 )
-from smithy_http.endpoints import Endpoint, EndpointResolutionError
+from smithy_http.endpoints import Endpoint
+from smithy_http.exceptions import EndpointResolutionError
 
 
 class _RegionUriConfig(Protocol):
@@ -19,7 +20,7 @@ class _RegionUriConfig(Protocol):
 
 
 @dataclass(kw_only=True)
-class RegionalEndpointParameters(EndpointParametersProtocol[_RegionUriConfig]):
+class RegionalEndpointParameters(EndpointParameters[_RegionUriConfig]):
     """Endpoint parameters for services with standard regional endpoints."""
 
     sdk_endpoint: str | smithy_core.interfaces.URI | None
@@ -30,9 +31,7 @@ def build(cls, config: _RegionUriConfig) -> Self:
         return cls(sdk_endpoint=config.endpoint_uri, region=config.region)
 
 
-class StandardRegionalEndpointsResolver(
-    EndpointResolverProtocol[RegionalEndpointParameters]
-):
+class StandardRegionalEndpointsResolver(EndpointResolver[RegionalEndpointParameters]):
     """Resolves endpoints for services with standard regional endpoints."""
 
     def __init__(self, endpoint_prefix: str = "bedrock-runtime"):

packages/smithy-aws-core/tests/unit/endpoints/test_standard_regional.py

@@ -6,10 +6,11 @@
 )
 
 from smithy_core import URI
-from smithy_http.endpoints import EndpointResolutionError
 
 import pytest
 
+from smithy_http.exceptions import EndpointResolutionError
+
 
 async def test_resolve_endpoint_with_valid_sdk_endpoint_string():
     resolver = StandardRegionalEndpointsResolver(endpoint_prefix="service")

packages/smithy-http/src/smithy_http/aio/endpoints.py

@@ -3,13 +3,14 @@
 from urllib.parse import urlparse
 
 from smithy_core import URI
-from .interfaces import EndpointResolverProtocol
+from .interfaces import EndpointResolver
 
 from .. import interfaces as http_interfaces
-from ..endpoints import Endpoint, StaticEndpointParams, EndpointResolutionError
+from ..endpoints import Endpoint, StaticEndpointParams
+from ..exceptions import EndpointResolutionError
 
 
-class StaticEndpointResolver(EndpointResolverProtocol[StaticEndpointParams]):
+class StaticEndpointResolver(EndpointResolver[StaticEndpointParams]):
     """A basic endpoint resolver that forwards a static URI."""
 
     async def resolve_endpoint(

packages/smithy-http/src/smithy_http/aio/interfaces/__init__.py

@@ -1,6 +1,6 @@
 #  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #  SPDX-License-Identifier: Apache-2.0
-from typing import Protocol, TypeVar, Self
+from typing import Protocol, Self
 
 from smithy_core.aio.interfaces import Request, Response
 from smithy_core.aio.utils import read_streaming_blob, read_streaming_blob_async
@@ -12,26 +12,17 @@
     HTTPRequestConfiguration,
 )
 
-Config = TypeVar("Config", contravariant=True)
 
-
-class EndpointParametersProtocol(Protocol[Config]):
+class EndpointParameters[C](Protocol):
     @classmethod
-    def build(cls, config: Config) -> Self:
+    def build(cls, config: C) -> Self:
         raise NotImplementedError()
 
 
-# EndpointParams are defined in the generated client, so we use a TypeVar here.
-# More specific EndpointParams implementations are subtypes of less specific ones. But
-# consumers of less specific EndpointParams implementations are subtypes of consumers
-# of more specific ones.
-EndpointParams = TypeVar("EndpointParams", contravariant=True)
-
-
-class EndpointResolverProtocol(Protocol[EndpointParams]):
+class EndpointResolver[T](Protocol):
     """Resolves an operation's endpoint based given parameters."""
 
-    async def resolve_endpoint(self, params: EndpointParams) -> Endpoint:
+    async def resolve_endpoint(self, params: T) -> Endpoint:
         raise NotImplementedError()
 
 

packages/smithy-http/src/smithy_http/endpoints.py

@@ -3,11 +3,10 @@
 from dataclasses import dataclass, field
 from typing import Protocol, Self
 
-from smithy_core import SmithyException
 from smithy_core.interfaces import URI
 
 from . import Fields, interfaces
-from .aio.interfaces import EndpointParametersProtocol
+from .aio.interfaces import EndpointParameters
 
 
 @dataclass
@@ -16,16 +15,12 @@ class Endpoint(interfaces.Endpoint):
     headers: interfaces.Fields = field(default_factory=Fields)
 
 
-class EndpointResolutionError(SmithyException):
-    """Exception type for all exceptions raised by endpoint resolution."""
-
-
 class _UriConfig(Protocol):
     endpoint_uri: str | URI | None
 
 
 @dataclass
-class StaticEndpointParams(EndpointParametersProtocol[_UriConfig]):
+class StaticEndpointParams(EndpointParameters[_UriConfig]):
     """Static endpoint params.
 
     :param uri: A static URI to route requests to.

packages/smithy-http/src/smithy_http/exceptions.py

@@ -5,3 +5,7 @@
 
 class SmithyHTTPException(SmithyException):
     """Base exception type for all exceptions raised in HTTP clients."""
+
+
+class EndpointResolutionError(SmithyException):
+    """Exception type for all exceptions raised by endpoint resolution."""