From 8a1af26f1647d6291e36ab756073377313fd61da Mon Sep 17 00:00:00 2001 From: Nate Prewitt Date: Thu, 27 Mar 2025 14:28:12 -0600 Subject: [PATCH] Move aws_event_stream to smithy_aws_event_stream --- .../smithy/python/codegen/SmithyPythonDependency.java | 4 ++-- .../codegen/integrations/RestJsonProtocolGenerator.java | 8 ++++---- packages/smithy-aws-event-stream/CHANGES.md | 4 ++++ .../{aws-event-stream => smithy-aws-event-stream}/NOTICE | 0 .../README.md | 0 .../pyproject.toml | 4 ++-- .../src/smithy_aws_event_stream}/__init__.py | 2 +- .../src/smithy_aws_event_stream}/_private/__init__.py | 0 .../smithy_aws_event_stream}/_private/deserializers.py | 0 .../src/smithy_aws_event_stream}/_private/serializers.py | 0 .../src/smithy_aws_event_stream}/aio/__init__.py | 0 .../src/smithy_aws_event_stream}/events.py | 0 .../src/smithy_aws_event_stream}/exceptions.py | 0 .../src/smithy_aws_event_stream}/py.typed | 0 .../tests/py.typed | 0 .../tests/unit/_private/__init__.py | 2 +- .../tests/unit/_private/test_deserializers.py | 8 ++++---- .../tests/unit/_private/test_serializers.py | 6 +++--- .../tests/unit/test_events.py | 6 +++--- pyproject.toml | 2 +- 20 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 packages/smithy-aws-event-stream/CHANGES.md rename packages/{aws-event-stream => smithy-aws-event-stream}/NOTICE (100%) rename packages/{aws-event-stream => smithy-aws-event-stream}/README.md (100%) rename packages/{aws-event-stream => smithy-aws-event-stream}/pyproject.toml (72%) rename packages/{aws-event-stream/src/aws_event_stream => smithy-aws-event-stream/src/smithy_aws_event_stream}/__init__.py (64%) rename packages/{aws-event-stream/src/aws_event_stream => smithy-aws-event-stream/src/smithy_aws_event_stream}/_private/__init__.py (100%) rename packages/{aws-event-stream/src/aws_event_stream => smithy-aws-event-stream/src/smithy_aws_event_stream}/_private/deserializers.py (100%) rename packages/{aws-event-stream/src/aws_event_stream => smithy-aws-event-stream/src/smithy_aws_event_stream}/_private/serializers.py (100%) rename packages/{aws-event-stream/src/aws_event_stream => smithy-aws-event-stream/src/smithy_aws_event_stream}/aio/__init__.py (100%) rename packages/{aws-event-stream/src/aws_event_stream => smithy-aws-event-stream/src/smithy_aws_event_stream}/events.py (100%) rename packages/{aws-event-stream/src/aws_event_stream => smithy-aws-event-stream/src/smithy_aws_event_stream}/exceptions.py (100%) rename packages/{aws-event-stream/src/aws_event_stream => smithy-aws-event-stream/src/smithy_aws_event_stream}/py.typed (100%) rename packages/{aws-event-stream => smithy-aws-event-stream}/tests/py.typed (100%) rename packages/{aws-event-stream => smithy-aws-event-stream}/tests/unit/_private/__init__.py (99%) rename packages/{aws-event-stream => smithy-aws-event-stream}/tests/unit/_private/test_deserializers.py (93%) rename packages/{aws-event-stream => smithy-aws-event-stream}/tests/unit/_private/test_serializers.py (92%) rename packages/{aws-event-stream => smithy-aws-event-stream}/tests/unit/test_events.py (99%) 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 145f614dc..981a87e2f 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 @@ -69,8 +69,8 @@ public final class SmithyPythonDependency { /** * EventStream implementations for application/vnd.amazon.eventstream. */ - public static final PythonDependency AWS_EVENT_STREAM = new PythonDependency( - "aws_event_stream", + public static final PythonDependency SMITHY_AWS_EVENT_STREAM = new PythonDependency( + "smithy_aws_event_stream", "==0.0.1", Type.DEPENDENCY, false); 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 f967308db..9f5aae4de 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 @@ -407,11 +407,11 @@ protected void resolveErrorCodeAndMessage( @Override public void wrapInputStream(GenerationContext context, PythonWriter writer) { writer.addDependency(SmithyPythonDependency.SMITHY_JSON); - writer.addDependency(SmithyPythonDependency.AWS_EVENT_STREAM); + writer.addDependency(SmithyPythonDependency.SMITHY_AWS_EVENT_STREAM); writer.addImport("smithy_json", "JSONCodec"); writer.addImport("smithy_core.aio.types", "AsyncBytesReader"); writer.addImport("smithy_core.types", "TimestampFormat"); - writer.addImport("aws_event_stream.aio", "AWSEventPublisher"); + writer.addImport("smithy_aws_event_stream.aio", "AWSEventPublisher"); writer.addImport("aws_sdk_signers", "AsyncEventSigner"); writer.write( """ @@ -437,11 +437,11 @@ public void wrapInputStream(GenerationContext context, PythonWriter writer) { @Override public void wrapOutputStream(GenerationContext context, PythonWriter writer) { writer.addDependency(SmithyPythonDependency.SMITHY_JSON); - writer.addDependency(SmithyPythonDependency.AWS_EVENT_STREAM); + writer.addDependency(SmithyPythonDependency.SMITHY_AWS_EVENT_STREAM); writer.addImport("smithy_json", "JSONCodec"); writer.addImport("smithy_core.aio.types", "AsyncBytesReader"); writer.addImport("smithy_core.types", "TimestampFormat"); - writer.addImport("aws_event_stream.aio", "AWSEventReceiver"); + writer.addImport("smithy_aws_event_stream.aio", "AWSEventReceiver"); writer.write( """ codec = JSONCodec(default_timestamp_format=TimestampFormat.EPOCH_SECONDS) diff --git a/packages/smithy-aws-event-stream/CHANGES.md b/packages/smithy-aws-event-stream/CHANGES.md new file mode 100644 index 000000000..f6530f64f --- /dev/null +++ b/packages/smithy-aws-event-stream/CHANGES.md @@ -0,0 +1,4 @@ +## Unreleased +### Features +* Added basic support for the [Amazon Event Stream](https://smithy.io/2.0/aws/amazon-eventstream.html) specification. +* Added support for unidirectdional and bidirectional event streams. diff --git a/packages/aws-event-stream/NOTICE b/packages/smithy-aws-event-stream/NOTICE similarity index 100% rename from packages/aws-event-stream/NOTICE rename to packages/smithy-aws-event-stream/NOTICE diff --git a/packages/aws-event-stream/README.md b/packages/smithy-aws-event-stream/README.md similarity index 100% rename from packages/aws-event-stream/README.md rename to packages/smithy-aws-event-stream/README.md diff --git a/packages/aws-event-stream/pyproject.toml b/packages/smithy-aws-event-stream/pyproject.toml similarity index 72% rename from packages/aws-event-stream/pyproject.toml rename to packages/smithy-aws-event-stream/pyproject.toml index a064f9fa9..aa9ffb1c3 100644 --- a/packages/aws-event-stream/pyproject.toml +++ b/packages/smithy-aws-event-stream/pyproject.toml @@ -1,7 +1,7 @@ [project] -name = "aws-event-stream" +name = "smithy-aws-event-stream" version = "0.0.1" -description = "Core Smithy components for AWS services and protocols." +description = "Smithy components for Amazon Event Streams." readme = "README.md" requires-python = ">=3.12" dependencies = [ diff --git a/packages/aws-event-stream/src/aws_event_stream/__init__.py b/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/__init__.py similarity index 64% rename from packages/aws-event-stream/src/aws_event_stream/__init__.py rename to packages/smithy-aws-event-stream/src/smithy_aws_event_stream/__init__.py index ec11bb061..154476a81 100644 --- a/packages/aws-event-stream/src/aws_event_stream/__init__.py +++ b/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/__init__.py @@ -3,4 +3,4 @@ import importlib.metadata -__version__: str = importlib.metadata.version("aws-event-stream") +__version__: str = importlib.metadata.version("smithy-aws-event-stream") diff --git a/packages/aws-event-stream/src/aws_event_stream/_private/__init__.py b/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/_private/__init__.py similarity index 100% rename from packages/aws-event-stream/src/aws_event_stream/_private/__init__.py rename to packages/smithy-aws-event-stream/src/smithy_aws_event_stream/_private/__init__.py diff --git a/packages/aws-event-stream/src/aws_event_stream/_private/deserializers.py b/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/_private/deserializers.py similarity index 100% rename from packages/aws-event-stream/src/aws_event_stream/_private/deserializers.py rename to packages/smithy-aws-event-stream/src/smithy_aws_event_stream/_private/deserializers.py diff --git a/packages/aws-event-stream/src/aws_event_stream/_private/serializers.py b/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/_private/serializers.py similarity index 100% rename from packages/aws-event-stream/src/aws_event_stream/_private/serializers.py rename to packages/smithy-aws-event-stream/src/smithy_aws_event_stream/_private/serializers.py diff --git a/packages/aws-event-stream/src/aws_event_stream/aio/__init__.py b/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/aio/__init__.py similarity index 100% rename from packages/aws-event-stream/src/aws_event_stream/aio/__init__.py rename to packages/smithy-aws-event-stream/src/smithy_aws_event_stream/aio/__init__.py diff --git a/packages/aws-event-stream/src/aws_event_stream/events.py b/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/events.py similarity index 100% rename from packages/aws-event-stream/src/aws_event_stream/events.py rename to packages/smithy-aws-event-stream/src/smithy_aws_event_stream/events.py diff --git a/packages/aws-event-stream/src/aws_event_stream/exceptions.py b/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/exceptions.py similarity index 100% rename from packages/aws-event-stream/src/aws_event_stream/exceptions.py rename to packages/smithy-aws-event-stream/src/smithy_aws_event_stream/exceptions.py diff --git a/packages/aws-event-stream/src/aws_event_stream/py.typed b/packages/smithy-aws-event-stream/src/smithy_aws_event_stream/py.typed similarity index 100% rename from packages/aws-event-stream/src/aws_event_stream/py.typed rename to packages/smithy-aws-event-stream/src/smithy_aws_event_stream/py.typed diff --git a/packages/aws-event-stream/tests/py.typed b/packages/smithy-aws-event-stream/tests/py.typed similarity index 100% rename from packages/aws-event-stream/tests/py.typed rename to packages/smithy-aws-event-stream/tests/py.typed diff --git a/packages/aws-event-stream/tests/unit/_private/__init__.py b/packages/smithy-aws-event-stream/tests/unit/_private/__init__.py similarity index 99% rename from packages/aws-event-stream/tests/unit/_private/__init__.py rename to packages/smithy-aws-event-stream/tests/unit/_private/__init__.py index b3090b72f..364adef78 100644 --- a/packages/aws-event-stream/tests/unit/_private/__init__.py +++ b/packages/smithy-aws-event-stream/tests/unit/_private/__init__.py @@ -4,7 +4,7 @@ from dataclasses import dataclass from typing import Any, ClassVar, Literal, Self -from aws_event_stream.events import Byte, EventMessage, Long, Short +from smithy_aws_event_stream.events import Byte, EventMessage, Long, Short from smithy_core.deserializers import ShapeDeserializer from smithy_core.exceptions import SmithyException from smithy_core.prelude import ( diff --git a/packages/aws-event-stream/tests/unit/_private/test_deserializers.py b/packages/smithy-aws-event-stream/tests/unit/_private/test_deserializers.py similarity index 93% rename from packages/aws-event-stream/tests/unit/_private/test_deserializers.py rename to packages/smithy-aws-event-stream/tests/unit/_private/test_deserializers.py index 744b24744..34081bbf8 100644 --- a/packages/aws-event-stream/tests/unit/_private/test_deserializers.py +++ b/packages/smithy-aws-event-stream/tests/unit/_private/test_deserializers.py @@ -4,10 +4,10 @@ from typing import Any import pytest -from aws_event_stream._private.deserializers import EventDeserializer -from aws_event_stream.aio import AWSEventReceiver -from aws_event_stream.events import Event, EventMessage -from aws_event_stream.exceptions import UnmodeledEventError +from smithy_aws_event_stream._private.deserializers import EventDeserializer +from smithy_aws_event_stream.aio import AWSEventReceiver +from smithy_aws_event_stream.events import Event, EventMessage +from smithy_aws_event_stream.exceptions import UnmodeledEventError from smithy_core.aio.types import AsyncBytesReader from smithy_core.deserializers import DeserializeableShape from smithy_json import JSONCodec diff --git a/packages/aws-event-stream/tests/unit/_private/test_serializers.py b/packages/smithy-aws-event-stream/tests/unit/_private/test_serializers.py similarity index 92% rename from packages/aws-event-stream/tests/unit/_private/test_serializers.py rename to packages/smithy-aws-event-stream/tests/unit/_private/test_serializers.py index c9e254594..802a5eda1 100644 --- a/packages/aws-event-stream/tests/unit/_private/test_serializers.py +++ b/packages/smithy-aws-event-stream/tests/unit/_private/test_serializers.py @@ -3,9 +3,9 @@ from typing import Any import pytest -from aws_event_stream._private.serializers import EventSerializer -from aws_event_stream.aio import AWSEventPublisher -from aws_event_stream.events import EventMessage +from smithy_aws_event_stream._private.serializers import EventSerializer +from smithy_aws_event_stream.aio import AWSEventPublisher +from smithy_aws_event_stream.events import EventMessage from smithy_core.aio.types import AsyncBytesProvider from smithy_core.serializers import SerializeableShape from smithy_json import JSONCodec diff --git a/packages/aws-event-stream/tests/unit/test_events.py b/packages/smithy-aws-event-stream/tests/unit/test_events.py similarity index 99% rename from packages/aws-event-stream/tests/unit/test_events.py rename to packages/smithy-aws-event-stream/tests/unit/test_events.py index 3e32faad8..85d65a657 100644 --- a/packages/aws-event-stream/tests/unit/test_events.py +++ b/packages/smithy-aws-event-stream/tests/unit/test_events.py @@ -6,7 +6,7 @@ from io import BytesIO import pytest -from aws_event_stream.events import ( +from smithy_aws_event_stream.events import ( MAX_HEADER_VALUE_BYTE_LENGTH, MAX_HEADERS_LENGTH, MAX_PAYLOAD_LENGTH, @@ -19,8 +19,8 @@ Long, Short, ) -from aws_event_stream.events import _EventEncoder as EventEncoder -from aws_event_stream.exceptions import ( +from smithy_aws_event_stream.events import _EventEncoder as EventEncoder +from smithy_aws_event_stream.exceptions import ( ChecksumMismatch, DuplicateHeader, InvalidEventBytes, diff --git a/pyproject.toml b/pyproject.toml index 088cde49e..d4fef3cd7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ smithy_core = { workspace = true } smithy_http = { workspace = true } smithy_json = { workspace = true } smithy_aws_core = { workspace = true } -aws_event_stream = { workspace = true } +smithy_aws_event_stream = { workspace = true } aws_sdk_signers = {workspace = true } [tool.pyright]