buz 2.17.0rc1__tar.gz → 2.17.0rc3__tar.gz

{buz-2.17.0rc1 → buz-2.17.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: buz
-Version: 2.17.0rc1
+Version: 2.17.0rc3
 Summary: Buz is a set of light, simple and extensible implementations of event, command and query buses.
 License: MIT
 Author: Luis Pintado Lozano

{buz-2.17.0rc1 → buz-2.17.0rc3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "buz"
-version = "2.17.0-rc1"
+version = "2.17.0-rc3"
 description = "Buz is a set of light, simple and extensible implementations of event, command and query buses."
 readme = "README.md"
 authors = [

buz-2.17.0rc3/src/buz/event/async_subscriber.py

@@ -0,0 +1,13 @@
+from abc import ABC, abstractmethod
+from typing import Generic, TypeVar
+
+from buz.event.event import Event
+from buz.event.meta_subscriber import MetaSubscriber
+
+TEvent = TypeVar("TEvent", bound=Event)
+
+
+class AsyncSubscriber(Generic[TEvent], MetaSubscriber[TEvent], ABC):
+    @abstractmethod
+    async def consume(self, event: TEvent) -> None:
+        pass

buz-2.17.0rc3/src/buz/event/base_async_subscriber.py

@@ -0,0 +1,12 @@
+from abc import ABC
+from typing import Generic, TypeVar
+
+from buz.event.event import Event
+from buz.event.async_subscriber import AsyncSubscriber
+from buz.event.meta_base_subscriber import MetaBaseSubscriber
+
+TEvent = TypeVar("TEvent", bound=Event)
+
+
+class BaseAsyncSubscriber(Generic[TEvent], AsyncSubscriber[TEvent], MetaBaseSubscriber[TEvent], ABC):
+    pass

buz-2.17.0rc3/src/buz/event/base_subscriber.py

@@ -0,0 +1,12 @@
+from abc import ABC
+from typing import Generic, TypeVar
+
+from buz.event.event import Event
+from buz.event.subscriber import Subscriber
+from buz.event.meta_base_subscriber import MetaBaseSubscriber
+
+TEvent = TypeVar("TEvent", bound=Event)
+
+
+class BaseSubscriber(Generic[TEvent], Subscriber[TEvent], MetaBaseSubscriber[TEvent], ABC):
+    pass

{buz-2.17.0rc1 → buz-2.17.0rc3}/src/buz/event/meta_base_subscriber.py

@@ -1,23 +1,26 @@
 from abc import ABC
-from typing import Type, get_type_hints
+from typing import Generic, Type, TypeVar, cast, get_type_hints
 
-from buz.event import Event
+from buz.event.event import Event
 from buz.event.meta_subscriber import MetaSubscriber
 
+TEvent = TypeVar("TEvent", bound=Event)
 
-class MetaBaseSubscriber(MetaSubscriber, ABC):
+
+class MetaBaseSubscriber(Generic[TEvent], MetaSubscriber[TEvent], ABC):
     @classmethod
     def fqn(cls) -> str:
         return f"subscriber.{cls.__module__}.{cls.__name__}"
 
     @classmethod
-    def handles(cls) -> Type[Event]:
+    def handles(cls) -> Type[TEvent]:
         consume_types = get_type_hints(cls.consume)
 
-        if "event" not in consume_types:
+        t_event = consume_types.get("event")
+        if t_event is None:
             raise TypeError("event parameter not found in consume method")
 
-        if not issubclass(consume_types["event"], Event):
+        if not issubclass(t_event, Event):
             raise TypeError("event parameter is not an buz.event.Event subclass")
 
-        return consume_types["event"]
+        return cast(Type[TEvent], t_event)

buz-2.17.0rc3/src/buz/event/meta_subscriber.py

@@ -0,0 +1,18 @@
+from abc import ABC, abstractmethod
+from typing import Awaitable, Generic, Type, TypeVar, Union
+
+from buz import Handler
+from buz.event.event import Event
+
+TEvent = TypeVar("TEvent", bound=Event)
+
+
+class MetaSubscriber(Generic[TEvent], Handler[TEvent], ABC):
+    @abstractmethod
+    def consume(self, event: TEvent) -> Union[None, Awaitable[None]]:
+        pass
+
+    @classmethod
+    @abstractmethod
+    def handles(cls) -> Type[TEvent]:
+        pass

buz-2.17.0rc3/src/buz/event/subscriber.py

@@ -0,0 +1,13 @@
+from abc import ABC, abstractmethod
+from typing import Generic, TypeVar
+
+from buz.event.event import Event
+from buz.event.meta_subscriber import MetaSubscriber
+
+TEvent = TypeVar("TEvent", bound=Event)
+
+
+class Subscriber(Generic[TEvent], MetaSubscriber[TEvent], ABC):
+    @abstractmethod
+    def consume(self, event: TEvent) -> None:
+        pass

{buz-2.17.0rc1 → buz-2.17.0rc3}/src/buz/event/transactional_outbox/event_to_outbox_record_translator.py

@@ -16,5 +16,5 @@ class EventToOutboxRecordTranslator:
             event_fqn=event.fqn(),
             created_at=event.parsed_created_at(),
             event_payload=payload,
-            event_metadata=event.metadata,
+            event_metadata=dict(event.metadata),
         )

{buz-2.17.0rc1 → buz-2.17.0rc3}/src/buz/event/transactional_outbox/outbox_record.py

@@ -2,7 +2,6 @@ from datetime import datetime
 from typing import Optional, Any, ClassVar
 from uuid import UUID
 from dataclasses import dataclass, fields
-from dataclasses import field as dataclass_field
 
 
 @dataclass
@@ -13,7 +12,7 @@ class OutboxRecord:  # type: ignore[misc]
     event_fqn: str
     event_payload: dict[str, Any]  # type: ignore[misc]
     created_at: datetime
-    event_metadata: Optional[dict[str, Any]] = dataclass_field(default_factory=dict)  # type: ignore[misc]
+    event_metadata: Optional[dict[str, Any]] = None
     delivered_at: Optional[datetime] = None
     delivery_errors: int = 0
     delivery_paused_at: Optional[datetime] = None

{buz-2.17.0rc1 → buz-2.17.0rc3}/src/buz/event/transactional_outbox/transactional_outbox_event_bus.py

@@ -31,10 +31,10 @@ class TransactionalOutboxEventBus(EventBus):
 
     def bulk_publish(self, events: Iterable[Event]) -> None:
         outbox_records: list[OutboxRecord] = []
+
         for event in events:
-            self.__publish_middleware_chain_resolver.resolve(
-                event, lambda resolved_event: outbox_records.append(self.__process_event(resolved_event))
-            )
+            self.__publish_middleware_chain_resolver.resolve(event, lambda resolved_event: None)
+            outbox_records.append(self.__process_event(event))
 
         if len(outbox_records) == 0:
             return None

{buz-2.17.0rc1 → buz-2.17.0rc3}/src/buz/kafka/infrastructure/deserializers/implementations/cdc/cdc_record_bytes_to_event_deserializer.py

@@ -52,5 +52,4 @@ class CDCRecordBytesToEventDeserializer(BytesToMessageDeserializer[Event], Gener
     def __deserialize_event_metadata(self, event_metadata: Optional[str]) -> dict:
         if event_metadata is None:
             return {}
-
         return orjson.loads(event_metadata)

{buz-2.17.0rc1 → buz-2.17.0rc3}/src/buz/kafka/infrastructure/serializers/implementations/cdc_record_bytes_to_event_serializer.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from dataclasses import asdict
 from datetime import datetime
+from typing import Optional
 
 from buz.event import Event
 from buz.kafka.infrastructure.cdc.cdc_message import CDCMessage, CDCPayload
@@ -38,8 +39,5 @@ class CDCRecordBytesToEventSerializer(ByteSerializer):
         del payload["metadata"]
         return self.__json_serializer.serialize_as_json(payload)
 
-    def __serialize_event_metadata(self, event: Event) -> str:
-        if event.metadata is None:
-            return str({})
-
-        return self.__json_serializer.serialize_as_json(event.metadata)
+    def __serialize_event_metadata(self, event: Event) -> Optional[str]:
+        return self.__json_serializer.serialize_as_json(event.metadata)  # type: ignore[arg-type]

{buz-2.17.0rc1 → buz-2.17.0rc3}/src/buz/kafka/infrastructure/serializers/implementations/json_byte_serializer.py

@@ -15,7 +15,9 @@ ALLOWED_SERIALIZABLE_DICTIONARY_KEYS = str
 
 JSON_SERIALIZABLE_VALUE = Union[PRIMITIVES, list[PRIMITIVES], dict[ALLOWED_SERIALIZABLE_DICTIONARY_KEYS, PRIMITIVES]]
 
-JSON_SERIALIZABLE = dict[ALLOWED_SERIALIZABLE_DICTIONARY_KEYS, Union[JSON_SERIALIZABLE_VALUE, "JSON_SERIALIZABLE"]]
+JSON_SERIALIZABLE = Union[
+    dict[ALLOWED_SERIALIZABLE_DICTIONARY_KEYS, Union[JSON_SERIALIZABLE_VALUE, "JSON_SERIALIZABLE"]]
+]
 
 
 class JSONByteSerializer(ByteSerializer[JSON_SERIALIZABLE]):

{buz-2.17.0rc1 → buz-2.17.0rc3}/src/buz/message.py

@@ -3,11 +3,13 @@ from dataclasses import field, dataclass
 from datetime import datetime
 from inspect import signature, Parameter
 from types import MappingProxyType
-from typing import Any, ClassVar, Optional, get_origin, get_args, Union
+from typing import Any, ClassVar, get_origin, get_args, Union
 from typing_extensions import Self
 
 from uuid_utils.compat import uuid7
 
+from buz.metadata import Metadata
+
 
 @dataclass(frozen=True)
 class Message(ABC):
@@ -17,7 +19,7 @@ class Message(ABC):
     created_at: str = field(
         init=False, default_factory=lambda: datetime.strftime(datetime.now(), Message.DATE_TIME_FORMAT)
     )
-    metadata: Optional[dict[str, Any]] = field(init=False, default_factory=dict)
+    metadata: Metadata = field(init=False, default_factory=lambda: Metadata())
 
     @classmethod
     def fqn(cls) -> str:
@@ -27,7 +29,8 @@ class Message(ABC):
     def restore(cls, **kwargs: Any) -> Self:
         message_id = kwargs.pop("id")
         created_at = kwargs.pop("created_at")
-        metadata = kwargs.pop("metadata", dict())
+        metadata_kwargs = kwargs.pop("metadata", None) or {}
+        metadata = Metadata(**metadata_kwargs)
 
         instance = cls.__from_dict(kwargs)  # type: ignore
 
@@ -65,11 +68,5 @@ class Message(ABC):
     def parsed_created_at(self) -> datetime:
         return datetime.strptime(self.created_at, self.DATE_TIME_FORMAT)
 
-    def add_metadata(self, metadata: Optional[dict[str, Any]]) -> None:
-        if metadata is None:
-            return None
-
-        if self.metadata is None:
-            object.__setattr__(self, "metadata", metadata)
-        else:
-            self.metadata.update(metadata)
+    def add_metadata(self, metadata: Metadata) -> None:
+        self.metadata.update(metadata)

buz-2.17.0rc3/src/buz/metadata.py

@@ -0,0 +1,8 @@
+from typing import Any, TypedDict
+
+
+class Metadata(TypedDict):
+    def __init__(self, **kwargs: dict[str, Any]) -> None:  # type: ignore[misc]
+        super().__init__()
+        for key, value in kwargs.items():
+            setattr(self, key, value)

buz-2.17.0rc1/src/buz/event/async_subscriber.py

@@ -1,10 +0,0 @@
-from abc import ABC, abstractmethod
-
-from buz.event import Event
-from buz.event.meta_subscriber import MetaSubscriber
-
-
-class AsyncSubscriber(MetaSubscriber, ABC):
-    @abstractmethod
-    async def consume(self, event: Event) -> None:
-        pass

buz-2.17.0rc1/src/buz/event/base_async_subscriber.py

@@ -1,8 +0,0 @@
-from abc import ABC
-
-from buz.event.async_subscriber import AsyncSubscriber
-from buz.event.meta_base_subscriber import MetaBaseSubscriber
-
-
-class BaseAsyncSubscriber(AsyncSubscriber, MetaBaseSubscriber, ABC):
-    pass

buz-2.17.0rc1/src/buz/event/base_subscriber.py

@@ -1,7 +0,0 @@
-from abc import ABC
-from buz.event import Subscriber
-from buz.event.meta_base_subscriber import MetaBaseSubscriber
-
-
-class BaseSubscriber(Subscriber, MetaBaseSubscriber, ABC):
-    pass

buz-2.17.0rc1/src/buz/event/meta_subscriber.py

@@ -1,16 +0,0 @@
-from abc import ABC, abstractmethod
-from typing import Awaitable, Type, Union
-
-from buz import Handler
-from buz.event import Event
-
-
-class MetaSubscriber(Handler, ABC):
-    @abstractmethod
-    def consume(self, event: Event) -> Union[None, Awaitable[None]]:
-        pass
-
-    @classmethod
-    @abstractmethod
-    def handles(cls) -> Type[Event]:
-        pass

buz-2.17.0rc1/src/buz/event/subscriber.py

@@ -1,10 +0,0 @@
-from abc import ABC, abstractmethod
-
-from buz.event import Event
-from buz.event.meta_subscriber import MetaSubscriber
-
-
-class Subscriber(MetaSubscriber, ABC):
-    @abstractmethod
-    def consume(self, event: Event) -> None:
-        pass