Renaming namespace

leandrodamascena · leandrodamascena · commit 7ec47f1d0575 · 2025-06-18T11:08:08.000+01:00
diff --git a/aws_lambda_powertools/utilities/kafka/__init__.py b/aws_lambda_powertools/utilities/kafka/__init__.py
@@ -0,0 +1,9 @@
+from aws_lambda_powertools.utilities.kafka.consumer_records import ConsumerRecords
+from aws_lambda_powertools.utilities.kafka.kafka_consumer import kafka_consumer
+from aws_lambda_powertools.utilities.kafka.schema_config import SchemaConfig
+
+__all__ = [
+    "kafka_consumer",
+    "ConsumerRecords",
+    "SchemaConfig",
+]
diff --git a/aws_lambda_powertools/utilities/kafka/consumer_records.py b/aws_lambda_powertools/utilities/kafka/consumer_records.py
@@ -5,13 +5,13 @@
 
 from aws_lambda_powertools.utilities.data_classes.common import CaseInsensitiveDict, DictWrapper
 from aws_lambda_powertools.utilities.data_classes.kafka_event import KafkaEventBase, KafkaEventRecordBase
-from aws_lambda_powertools.utilities.kafka_consumer.deserializer.deserializer import get_deserializer
-from aws_lambda_powertools.utilities.kafka_consumer.serialization.serialization import serialize_to_output_type
+from aws_lambda_powertools.utilities.kafka.deserializer.deserializer import get_deserializer
+from aws_lambda_powertools.utilities.kafka.serialization.serialization import serialize_to_output_type
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
-    from aws_lambda_powertools.utilities.kafka_consumer.schema_config import SchemaConfig
+    from aws_lambda_powertools.utilities.kafka.schema_config import SchemaConfig
 
 
 class ConsumerRecordSchemaMetadata(DictWrapper):
diff --git a/aws_lambda_powertools/utilities/kafka/deserializer/__init__.py b/aws_lambda_powertools/utilities/kafka/deserializer/__init__.py
diff --git a/aws_lambda_powertools/utilities/kafka/deserializer/avro.py b/aws_lambda_powertools/utilities/kafka/deserializer/avro.py
@@ -5,8 +5,8 @@
 from avro.io import BinaryDecoder, DatumReader
 from avro.schema import parse as parse_schema
 
-from aws_lambda_powertools.utilities.kafka_consumer.deserializer.base import DeserializerBase
-from aws_lambda_powertools.utilities.kafka_consumer.exceptions import (
+from aws_lambda_powertools.utilities.kafka.deserializer.base import DeserializerBase
+from aws_lambda_powertools.utilities.kafka.exceptions import (
     KafkaConsumerAvroSchemaParserError,
     KafkaConsumerDeserializationError,
 )
diff --git a/aws_lambda_powertools/utilities/kafka/deserializer/base.py b/aws_lambda_powertools/utilities/kafka/deserializer/base.py
diff --git a/aws_lambda_powertools/utilities/kafka/deserializer/default.py b/aws_lambda_powertools/utilities/kafka/deserializer/default.py
@@ -2,7 +2,7 @@
 
 import base64
 
-from aws_lambda_powertools.utilities.kafka_consumer.deserializer.base import DeserializerBase
+from aws_lambda_powertools.utilities.kafka.deserializer.base import DeserializerBase
 
 
 class DefaultDeserializer(DeserializerBase):
diff --git a/aws_lambda_powertools/utilities/kafka/deserializer/deserializer.py b/aws_lambda_powertools/utilities/kafka/deserializer/deserializer.py
@@ -3,11 +3,11 @@
 import hashlib
 from typing import TYPE_CHECKING, Any
 
-from aws_lambda_powertools.utilities.kafka_consumer.deserializer.default import DefaultDeserializer
-from aws_lambda_powertools.utilities.kafka_consumer.deserializer.json import JsonDeserializer
+from aws_lambda_powertools.utilities.kafka.deserializer.default import DefaultDeserializer
+from aws_lambda_powertools.utilities.kafka.deserializer.json import JsonDeserializer
 
 if TYPE_CHECKING:
-    from aws_lambda_powertools.utilities.kafka_consumer.deserializer.base import DeserializerBase
+    from aws_lambda_powertools.utilities.kafka.deserializer.base import DeserializerBase
 
 # Cache for deserializers
 _deserializer_cache: dict[str, DeserializerBase] = {}
@@ -85,12 +85,12 @@ def get_deserializer(schema_type: str | object, schema_value: Any) -> Deserializ
 
     if schema_type == "AVRO":
         # Import here to avoid dependency if not used
-        from aws_lambda_powertools.utilities.kafka_consumer.deserializer.avro import AvroDeserializer
+        from aws_lambda_powertools.utilities.kafka.deserializer.avro import AvroDeserializer
 
         deserializer = AvroDeserializer(schema_value)
     elif schema_type == "PROTOBUF":
         # Import here to avoid dependency if not used
-        from aws_lambda_powertools.utilities.kafka_consumer.deserializer.protobuf import ProtobufDeserializer
+        from aws_lambda_powertools.utilities.kafka.deserializer.protobuf import ProtobufDeserializer
 
         deserializer = ProtobufDeserializer(schema_value)
     elif schema_type == "JSON":
diff --git a/aws_lambda_powertools/utilities/kafka/deserializer/json.py b/aws_lambda_powertools/utilities/kafka/deserializer/json.py
@@ -3,8 +3,8 @@
 import base64
 import json
 
-from aws_lambda_powertools.utilities.kafka_consumer.deserializer.base import DeserializerBase
-from aws_lambda_powertools.utilities.kafka_consumer.exceptions import KafkaConsumerDeserializationError
+from aws_lambda_powertools.utilities.kafka.deserializer.base import DeserializerBase
+from aws_lambda_powertools.utilities.kafka.exceptions import KafkaConsumerDeserializationError
 
 
 class JsonDeserializer(DeserializerBase):
diff --git a/aws_lambda_powertools/utilities/kafka/deserializer/protobuf.py b/aws_lambda_powertools/utilities/kafka/deserializer/protobuf.py
@@ -4,8 +4,8 @@
 
 from google.protobuf.json_format import MessageToDict
 
-from aws_lambda_powertools.utilities.kafka_consumer.deserializer.base import DeserializerBase
-from aws_lambda_powertools.utilities.kafka_consumer.exceptions import (
+from aws_lambda_powertools.utilities.kafka.deserializer.base import DeserializerBase
+from aws_lambda_powertools.utilities.kafka.exceptions import (
     KafkaConsumerDeserializationError,
 )
 
diff --git a/aws_lambda_powertools/utilities/kafka/exceptions.py b/aws_lambda_powertools/utilities/kafka/exceptions.py
diff --git a/aws_lambda_powertools/utilities/kafka/kafka_consumer.py b/aws_lambda_powertools/utilities/kafka/kafka_consumer.py
@@ -3,12 +3,12 @@
 from typing import TYPE_CHECKING, Any
 
 from aws_lambda_powertools.middleware_factory import lambda_handler_decorator
-from aws_lambda_powertools.utilities.kafka_consumer.consumer_records import ConsumerRecords
+from aws_lambda_powertools.utilities.kafka.consumer_records import ConsumerRecords
 
 if TYPE_CHECKING:
     from collections.abc import Callable
 
-    from aws_lambda_powertools.utilities.kafka_consumer.schema_config import SchemaConfig
+    from aws_lambda_powertools.utilities.kafka.schema_config import SchemaConfig
     from aws_lambda_powertools.utilities.typing import LambdaContext
 
 
diff --git a/aws_lambda_powertools/utilities/kafka/schema_config.py b/aws_lambda_powertools/utilities/kafka/schema_config.py
@@ -2,7 +2,7 @@
 
 from typing import Any, Literal
 
-from aws_lambda_powertools.utilities.kafka_consumer.exceptions import KafkaConsumerMissingSchemaError
+from aws_lambda_powertools.utilities.kafka.exceptions import KafkaConsumerMissingSchemaError
 
 
 class SchemaConfig:
diff --git a/aws_lambda_powertools/utilities/kafka/serialization/__init__.py b/aws_lambda_powertools/utilities/kafka/serialization/__init__.py
diff --git a/aws_lambda_powertools/utilities/kafka/serialization/base.py b/aws_lambda_powertools/utilities/kafka/serialization/base.py
@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
-    from aws_lambda_powertools.utilities.kafka_consumer.serialization.types import T
+    from aws_lambda_powertools.utilities.kafka.serialization.types import T
 
 
 class OutputSerializerBase(ABC):
diff --git a/aws_lambda_powertools/utilities/kafka/serialization/custom_dict.py b/aws_lambda_powertools/utilities/kafka/serialization/custom_dict.py
@@ -2,11 +2,11 @@
 
 from typing import TYPE_CHECKING, Any
 
-from aws_lambda_powertools.utilities.kafka_consumer.exceptions import KafkaConsumerOutputSerializerError
-from aws_lambda_powertools.utilities.kafka_consumer.serialization.base import OutputSerializerBase
+from aws_lambda_powertools.utilities.kafka.exceptions import KafkaConsumerOutputSerializerError
+from aws_lambda_powertools.utilities.kafka.serialization.base import OutputSerializerBase
 
 if TYPE_CHECKING:
-    from aws_lambda_powertools.utilities.kafka_consumer.serialization.types import T
+    from aws_lambda_powertools.utilities.kafka.serialization.types import T
 
 
 class CustomDictOutputSerializer(OutputSerializerBase):
diff --git a/aws_lambda_powertools/utilities/kafka/serialization/dataclass.py b/aws_lambda_powertools/utilities/kafka/serialization/dataclass.py
@@ -3,8 +3,8 @@
 from dataclasses import is_dataclass
 from typing import Any, cast
 
-from aws_lambda_powertools.utilities.kafka_consumer.serialization.base import OutputSerializerBase
-from aws_lambda_powertools.utilities.kafka_consumer.serialization.types import T
+from aws_lambda_powertools.utilities.kafka.serialization.base import OutputSerializerBase
+from aws_lambda_powertools.utilities.kafka.serialization.types import T
 
 
 class DataclassOutputSerializer(OutputSerializerBase):
diff --git a/aws_lambda_powertools/utilities/kafka/serialization/pydantic.py b/aws_lambda_powertools/utilities/kafka/serialization/pydantic.py
@@ -4,10 +4,10 @@
 
 from pydantic import TypeAdapter
 
-from aws_lambda_powertools.utilities.kafka_consumer.serialization.base import OutputSerializerBase
+from aws_lambda_powertools.utilities.kafka.serialization.base import OutputSerializerBase
 
 if TYPE_CHECKING:
-    from aws_lambda_powertools.utilities.kafka_consumer.serialization.types import T
+    from aws_lambda_powertools.utilities.kafka.serialization.types import T
 
 
 class PydanticOutputSerializer(OutputSerializerBase):
diff --git a/aws_lambda_powertools/utilities/kafka/serialization/serialization.py b/aws_lambda_powertools/utilities/kafka/serialization/serialization.py
@@ -3,11 +3,11 @@
 from dataclasses import is_dataclass
 from typing import TYPE_CHECKING, Any
 
-from aws_lambda_powertools.utilities.kafka_consumer.serialization.custom_dict import CustomDictOutputSerializer
-from aws_lambda_powertools.utilities.kafka_consumer.serialization.dataclass import DataclassOutputSerializer
+from aws_lambda_powertools.utilities.kafka.serialization.custom_dict import CustomDictOutputSerializer
+from aws_lambda_powertools.utilities.kafka.serialization.dataclass import DataclassOutputSerializer
 
 if TYPE_CHECKING:
-    from aws_lambda_powertools.utilities.kafka_consumer.serialization.types import T
+    from aws_lambda_powertools.utilities.kafka.serialization.types import T
 
 
 def _get_output_serializer(output_class: type[T] | None = None) -> Any:
@@ -24,7 +24,7 @@ def _get_output_serializer(output_class: type[T] | None = None) -> Any:
         return DataclassOutputSerializer()
 
     if _is_pydantic_model(output_class):
-        from aws_lambda_powertools.utilities.kafka_consumer.serialization.pydantic import PydanticOutputSerializer
+        from aws_lambda_powertools.utilities.kafka.serialization.pydantic import PydanticOutputSerializer
 
         return PydanticOutputSerializer()
 
diff --git a/aws_lambda_powertools/utilities/kafka/serialization/types.py b/aws_lambda_powertools/utilities/kafka/serialization/types.py
diff --git a/aws_lambda_powertools/utilities/kafka_consumer/__init__.py b/aws_lambda_powertools/utilities/kafka_consumer/__init__.py
diff --git a/tests/functional/kafka_consumer/_avro/test_kafka_consumer_with_avro.py b/tests/functional/kafka_consumer/_avro/test_kafka_consumer_with_avro.py
@@ -7,14 +7,14 @@
 from avro.io import BinaryEncoder, DatumWriter
 from avro.schema import parse as parse_schema
 
-from aws_lambda_powertools.utilities.kafka_consumer.consumer_records import ConsumerRecords
-from aws_lambda_powertools.utilities.kafka_consumer.exceptions import (
+from aws_lambda_powertools.utilities.kafka.consumer_records import ConsumerRecords
+from aws_lambda_powertools.utilities.kafka.exceptions import (
     KafkaConsumerAvroSchemaParserError,
     KafkaConsumerDeserializationError,
     KafkaConsumerMissingSchemaError,
 )
-from aws_lambda_powertools.utilities.kafka_consumer.kafka_consumer import kafka_consumer
-from aws_lambda_powertools.utilities.kafka_consumer.schema_config import SchemaConfig
+from aws_lambda_powertools.utilities.kafka.kafka_consumer import kafka_consumer
+from aws_lambda_powertools.utilities.kafka.schema_config import SchemaConfig
 
 
 @pytest.fixture
diff --git a/tests/functional/kafka_consumer/_protobuf/test_kafka_consumer_with_protobuf.py b/tests/functional/kafka_consumer/_protobuf/test_kafka_consumer_with_protobuf.py
@@ -4,13 +4,13 @@
 
 import pytest
 
-from aws_lambda_powertools.utilities.kafka_consumer.consumer_records import ConsumerRecords
-from aws_lambda_powertools.utilities.kafka_consumer.exceptions import (
+from aws_lambda_powertools.utilities.kafka.consumer_records import ConsumerRecords
+from aws_lambda_powertools.utilities.kafka.exceptions import (
     KafkaConsumerDeserializationError,
     KafkaConsumerMissingSchemaError,
 )
-from aws_lambda_powertools.utilities.kafka_consumer.kafka_consumer import kafka_consumer
-from aws_lambda_powertools.utilities.kafka_consumer.schema_config import SchemaConfig
+from aws_lambda_powertools.utilities.kafka.kafka_consumer import kafka_consumer
+from aws_lambda_powertools.utilities.kafka.schema_config import SchemaConfig
 
 # Import the generated protobuf classes
 from .user_pb2 import Key, User
diff --git a/tests/functional/kafka_consumer/_pydantic/test_kafka_consumer.py b/tests/functional/kafka_consumer/_pydantic/test_kafka_consumer.py
@@ -9,12 +9,12 @@
 from avro.schema import parse as parse_schema
 from pydantic import BaseModel
 
-from aws_lambda_powertools.utilities.kafka_consumer.consumer_records import ConsumerRecords
-from aws_lambda_powertools.utilities.kafka_consumer.exceptions import (
+from aws_lambda_powertools.utilities.kafka.consumer_records import ConsumerRecords
+from aws_lambda_powertools.utilities.kafka.exceptions import (
     KafkaConsumerDeserializationError,
 )
-from aws_lambda_powertools.utilities.kafka_consumer.kafka_consumer import kafka_consumer
-from aws_lambda_powertools.utilities.kafka_consumer.schema_config import SchemaConfig
+from aws_lambda_powertools.utilities.kafka.kafka_consumer import kafka_consumer
+from aws_lambda_powertools.utilities.kafka.schema_config import SchemaConfig
 
 
 @pytest.fixture
diff --git a/tests/functional/kafka_consumer/required_dependencies/test_kafka_consumer.py b/tests/functional/kafka_consumer/required_dependencies/test_kafka_consumer.py
@@ -5,12 +5,12 @@
 
 import pytest
 
-from aws_lambda_powertools.utilities.kafka_consumer.consumer_records import ConsumerRecords
-from aws_lambda_powertools.utilities.kafka_consumer.exceptions import (
+from aws_lambda_powertools.utilities.kafka.consumer_records import ConsumerRecords
+from aws_lambda_powertools.utilities.kafka.exceptions import (
     KafkaConsumerDeserializationError,
 )
-from aws_lambda_powertools.utilities.kafka_consumer.kafka_consumer import kafka_consumer
-from aws_lambda_powertools.utilities.kafka_consumer.schema_config import SchemaConfig
+from aws_lambda_powertools.utilities.kafka.kafka_consumer import kafka_consumer
+from aws_lambda_powertools.utilities.kafka.schema_config import SchemaConfig
 
 
 @pytest.fixture

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`
`5`	`5`	`from google.protobuf.json_format import MessageToDict`
`6`	`6`
`7`		`-from aws_lambda_powertools.utilities.kafka_consumer.deserializer.base import DeserializerBase`
`8`		`-from aws_lambda_powertools.utilities.kafka_consumer.exceptions import (`
	`7`	`+from aws_lambda_powertools.utilities.kafka.deserializer.base import DeserializerBase`
	`8`	`+from aws_lambda_powertools.utilities.kafka.exceptions import (`
`9`	`9`	`KafkaConsumerDeserializationError,`
`10`	`10`	`)`
`11`	`11`