From 7e76f6ff4a02a407caafa6e945fa1bb6c2733922 Mon Sep 17 00:00:00 2001 From: jonathan343 Date: Thu, 20 Mar 2025 13:47:05 -0400 Subject: [PATCH] Remove remaining references to smithy_event_stream --- .../python/aws/codegen/AwsRstDocFileGenerator.java | 2 +- .../amazon/smithy/python/codegen/ClientGenerator.java | 4 ++-- .../smithy/python/codegen/SmithyPythonDependency.java | 9 --------- .../codegen/integrations/RestJsonProtocolGenerator.java | 1 - pyproject.toml | 1 - 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsRstDocFileGenerator.java b/codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsRstDocFileGenerator.java index ec81cbdc7..0141801b3 100644 --- a/codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsRstDocFileGenerator.java +++ b/codegen/aws/core/src/main/java/software/amazon/smithy/python/aws/codegen/AwsRstDocFileGenerator.java @@ -197,4 +197,4 @@ public void append(PythonWriter pythonWriter, UnionMemberSection section) { }); } } -} \ No newline at end of file +} diff --git a/codegen/core/src/main/java/software/amazon/smithy/python/codegen/ClientGenerator.java b/codegen/core/src/main/java/software/amazon/smithy/python/codegen/ClientGenerator.java index 93f561ba8..aee41565d 100644 --- a/codegen/core/src/main/java/software/amazon/smithy/python/codegen/ClientGenerator.java +++ b/codegen/core/src/main/java/software/amazon/smithy/python/codegen/ClientGenerator.java @@ -896,7 +896,7 @@ private void writeSharedOperationInit(PythonWriter writer, OperationShape operat private void generateEventStreamOperation(PythonWriter writer, OperationShape operation) { writer.pushState(); - writer.addDependency(SmithyPythonDependency.SMITHY_EVENT_STREAM); + writer.addDependency(SmithyPythonDependency.SMITHY_CORE); var operationSymbol = symbolProvider.toSymbol(operation); writer.putContext("operation", operationSymbol); var operationMethodSymbol = operationSymbol.expectProperty(OPERATION_METHOD); @@ -963,7 +963,7 @@ raise NotImplementedError() writer.consumer(w -> writeSharedOperationInit(w, operation, input)), outputStreamSymbol.expectProperty(SymbolProperties.DESERIALIZER)); } else { - writer.addImport("smithy_event_stream.aio.interfaces", "InputEventStream"); + writer.addImport("smithy_core.aio.eventstream", "InputEventStream"); writer.write(""" async def ${operationName:L}( self, diff --git a/codegen/core/src/main/java/software/amazon/smithy/python/codegen/SmithyPythonDependency.java b/codegen/core/src/main/java/software/amazon/smithy/python/codegen/SmithyPythonDependency.java index c43e47d61..145f614dc 100644 --- a/codegen/core/src/main/java/software/amazon/smithy/python/codegen/SmithyPythonDependency.java +++ b/codegen/core/src/main/java/software/amazon/smithy/python/codegen/SmithyPythonDependency.java @@ -66,15 +66,6 @@ public final class SmithyPythonDependency { Type.DEPENDENCY, false); - /** - * Core interfaces for event streams. - */ - public static final PythonDependency SMITHY_EVENT_STREAM = new PythonDependency( - "smithy_event_stream", - "==0.0.1", - Type.DEPENDENCY, - false); - /** * EventStream implementations for application/vnd.amazon.eventstream. */ diff --git a/codegen/core/src/main/java/software/amazon/smithy/python/codegen/integrations/RestJsonProtocolGenerator.java b/codegen/core/src/main/java/software/amazon/smithy/python/codegen/integrations/RestJsonProtocolGenerator.java index 6614cc390..f967308db 100644 --- a/codegen/core/src/main/java/software/amazon/smithy/python/codegen/integrations/RestJsonProtocolGenerator.java +++ b/codegen/core/src/main/java/software/amazon/smithy/python/codegen/integrations/RestJsonProtocolGenerator.java @@ -171,7 +171,6 @@ protected void writeDefaultHeaders(GenerationContext context, PythonWriter write } } - @Override protected void serializePayloadBody( GenerationContext context, diff --git a/pyproject.toml b/pyproject.toml index b10ae5f41..9cb584aa9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,6 @@ members = ["packages/*"] [tool.uv.sources] smithy_core = { workspace = true } -smithy_event_stream = { workspace = true } smithy_http = { workspace = true } smithy_json = { workspace = true } smithy_aws_core = { workspace = true }