faststream 0.7.2__tar.gz → 0.7.4__tar.gz

{faststream-0.7.2 → faststream-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: faststream
-Version: 0.7.2
+Version: 0.7.4
 Summary: FastStream: the simplest way to work with a messaging queues
 Keywords: rabbitmq,kafka,nats,redis,mqtt,asyncapi,framework,message brokers
 Author: AG2AI, Nikita Pastukhov
@@ -37,17 +37,17 @@ Classifier: Framework :: Pydantic :: 2
 Requires-Dist: fast-depends[pydantic]>=3.0.0
 Requires-Dist: typing-extensions>=4.12.0
 Requires-Dist: anyio>=4.0,<5
-Requires-Dist: typer>=0.9,!=0.12,<=0.21.1 ; extra == 'cli'
+Requires-Dist: typer>=0.9,!=0.12,<=0.27.1 ; extra == 'cli'
 Requires-Dist: watchfiles>=0.15.0,<1.2.0 ; extra == 'cli'
 Requires-Dist: confluent-kafka>=2,!=2.8.1,<3 ; python_full_version < '3.13' and extra == 'confluent'
 Requires-Dist: confluent-kafka>=2.6,!=2.8.1,<3 ; python_full_version >= '3.13' and extra == 'confluent'
 Requires-Dist: aiokafka>=0.9,<0.15 ; extra == 'kafka'
-Requires-Dist: zmqtt>=0.0.5 ; extra == 'mqtt'
+Requires-Dist: zmqtt>=0.1.0,<0.2.0 ; extra == 'mqtt'
 Requires-Dist: nats-py>=2.12.0,<=3.0.0 ; extra == 'nats'
 Requires-Dist: opentelemetry-sdk>=1.24.0,<2.0.0 ; extra == 'otel'
 Requires-Dist: prometheus-client>=0.20.0,<0.30.0 ; extra == 'prometheus'
-Requires-Dist: aio-pika>=9,<10 ; extra == 'rabbit'
-Requires-Dist: redis>=5.0.0,<8.0.0 ; extra == 'redis'
+Requires-Dist: aio-pika>=9,<11 ; extra == 'rabbit'
+Requires-Dist: redis>=5.0.0,<9.0.0 ; extra == 'redis'
 Requires-Python: >=3.10
 Project-URL: Homepage, https://faststream.ag2.ai/latest/
 Project-URL: Documentation, https://faststream.ag2.ai/latest/getting-started/
@@ -438,7 +438,11 @@ if __name__ == "__main__":
     web.run_app(app)
 ```
 
-### **FastAPI** Plugin
+### **FastAPI** Plugin (deprecated)
+
+The integration has been moved to the
+**[faststream_fastapi](https://github.com/faststream-community/faststream_fastapi)**
+package and will be removed in 1.0.0 version.
 
 Also, **FastStream** can be used as part of **FastAPI**.
 

{faststream-0.7.2 → faststream-0.7.4}/README.md

@@ -371,7 +371,11 @@ if __name__ == "__main__":
     web.run_app(app)
 ```
 
-### **FastAPI** Plugin
+### **FastAPI** Plugin (deprecated)
+
+The integration has been moved to the
+**[faststream_fastapi](https://github.com/faststream-community/faststream_fastapi)**
+package and will be removed in 1.0.0 version.
 
 Also, **FastStream** can be used as part of **FastAPI**.
 

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/application.py

@@ -1,6 +1,6 @@
 import logging
 from abc import abstractmethod
-from collections.abc import AsyncIterator, Callable, Sequence
+from collections.abc import AsyncGenerator, Callable, Sequence
 from contextlib import asynccontextmanager
 from typing import TYPE_CHECKING, Any, Optional, TypeVar
 
@@ -32,7 +32,7 @@ try:
     from faststream.exceptions import StartupValidationError
 
     @asynccontextmanager
-    async def catch_startup_validation_error() -> AsyncIterator[None]:
+    async def catch_startup_validation_error() -> AsyncGenerator[None, None]:
         try:
             yield
         except PValidation as e:
@@ -216,7 +216,7 @@ class Application(StartAbleApplication):
     async def _start_hooks_context(
         self,
         **run_extra_options: "SettingField",
-    ) -> AsyncIterator[None]:
+    ) -> AsyncGenerator[None, None]:
         async with catch_startup_validation_error():
             for func in self._on_startup_calling:
                 await func(**run_extra_options)
@@ -230,7 +230,7 @@ class Application(StartAbleApplication):
     async def _startup_logging(
         self,
         log_level: int = logging.INFO,
-    ) -> AsyncIterator[None]:
+    ) -> AsyncGenerator[None, None]:
         """Separated startup logging."""
         self._log(
             log_level,
@@ -260,7 +260,7 @@ class Application(StartAbleApplication):
                 await broker.stop()
 
     @asynccontextmanager
-    async def _shutdown_hooks_context(self) -> AsyncIterator[None]:
+    async def _shutdown_hooks_context(self) -> AsyncGenerator[None, None]:
         for func in self._on_shutdown_calling:
             await func()
 
@@ -273,7 +273,7 @@ class Application(StartAbleApplication):
     async def _shutdown_logging(
         self,
         log_level: int = logging.INFO,
-    ) -> AsyncIterator[None]:
+    ) -> AsyncGenerator[None, None]:
         """Separated startup logging."""
         self._log(log_level, "FastStream app shutting down...")
 

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/cli/docs.py

@@ -200,7 +200,7 @@ def _parse_and_serve(args: RunArgs) -> None:
             data = json_dumps(schema)
 
         else:
-            msg = f"Unknown extension given - {args.app}; Please provide app in format [python_module:Specification] or [asyncapi.yaml/.json] - path to your application or documentation"
+            msg = f"Unknown extension given - {args.app}; Please provide app in format [python_module:FastStream] or [asyncapi.yaml/.json] - path to your application or documentation"
             raise ValueError(msg)
 
         for schema in (SchemaV3, SchemaV2_6):

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/cli/supervisors/multiprocess.py

@@ -4,6 +4,8 @@ from typing import TYPE_CHECKING
 from faststream._internal.cli.supervisors.basereload import BaseReload
 from faststream._internal.logger import logger
 
+SIGKILL: int | None = getattr(signal, "SIGKILL", None)
+
 if TYPE_CHECKING:
     from multiprocessing.context import SpawnProcess
 
@@ -50,7 +52,11 @@ class Multiprocess(BaseReload):
                 continue
 
             log_msg = "Worker %s (pid:%s) exited with code %s."
-            if process.exitcode and abs(process.exitcode) == signal.SIGKILL:
+            if (
+                SIGKILL is not None
+                and process.exitcode
+                and abs(process.exitcode) == SIGKILL
+            ):
                 log_msg += " Perhaps out of memory?"
             logger.error(log_msg, worker_id, process.pid, process.exitcode)
 

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/cli/supervisors/utils.py

@@ -25,7 +25,9 @@ HANDLED_SIGNALS: tuple[int, ...] = (
 )
 if IS_WINDOWS:  # pragma: py-not-win32
     # Windows signal 21. Sent by Ctrl+Break.
-    HANDLED_SIGNALS += (signal.SIGBREAK,)  # type: ignore[attr-defined]
+    sigbreak: int | None = getattr(signal, "SIGBREAK", None)
+    if sigbreak is not None:
+        HANDLED_SIGNALS += (sigbreak,)
 
 
 def set_exit(

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/cli/utils/errors.py

@@ -2,10 +2,14 @@ from faststream.exceptions import StartupValidationError
 
 
 def draw_startup_errors(startup_exc: StartupValidationError) -> None:
-    from click.exceptions import BadParameter, MissingParameter
     from typer.core import TyperOption
 
-    def draw_error(click_exc: BadParameter) -> None:
+    try:
+        from typer._click import exceptions as click_exceptions
+    except ImportError:  # pragma: no cover - Typer < 0.26
+        from click import exceptions as click_exceptions  # type: ignore[no-redef]
+
+    def draw_error(click_exc: click_exceptions.ClickException) -> None:
         try:
             from typer import rich_utils
 
@@ -15,7 +19,7 @@ def draw_startup_errors(startup_exc: StartupValidationError) -> None:
 
     for field in startup_exc.invalid_fields:
         draw_error(
-            BadParameter(
+            click_exceptions.BadParameter(
                 message=(
                     "extra option in your application "
                     "`lifespan/on_startup` hook has a wrong type."
@@ -26,7 +30,7 @@ def draw_startup_errors(startup_exc: StartupValidationError) -> None:
 
     if startup_exc.missed_fields:
         draw_error(
-            MissingParameter(
+            click_exceptions.MissingParameter(
                 message=(
                     "You registered extra options in your application "
                     "`lifespan/on_startup` hook, but does not set in CLI."

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/context/repository.py

@@ -1,4 +1,4 @@
-from collections.abc import Iterator, Mapping
+from collections.abc import Generator, Mapping
 from contextlib import contextmanager
 from contextvars import ContextVar, Token
 from typing import Any
@@ -97,7 +97,7 @@ class ContextRepo:
         return context_value
 
     @contextmanager
-    def scope(self, key: str, value: Any) -> Iterator[None]:
+    def scope(self, key: str, value: Any) -> Generator[None, None, None]:
         """Sets a local variable and yields control to the caller. After the caller is done, the local variable is reset.
 
         Args:

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/endpoint/call_wrapper.py

@@ -138,6 +138,8 @@ class HandlerCallWrapper(Generic[P_HandlerParams, T_HandlerReturn]):
 
         if error:
             self.future.set_exception(error)
+            # Mark the mirrored error as retrieved to avoid unhandled-future reports.
+            self.future.exception()
 
         else:
             self.future.set_result(result)

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/fastapi/_compat.py

@@ -91,7 +91,7 @@ if FASTAPI_v102_3:
     ) -> SolvedDependency:
         solved_result = await solve_dependencies(
             request=request,
-            body=request._body,  # type: ignore[arg-type]
+            body=request._body,  # pyright: ignore[reportArgumentType]
             dependant=dependant,
             dependency_overrides_provider=dependency_overrides_provider,
             **extra,  # type: ignore[arg-type]
@@ -122,7 +122,7 @@ else:
     ) -> SolvedDependency:
         solved_result = await solve_dependencies(
             request=request,
-            body=request._body,  # type: ignore[arg-type]
+            body=request._body,  # pyright: ignore[reportArgumentType]
             dependant=dependant,
             dependency_overrides_provider=dependency_overrides_provider,
             **kwargs,

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/fastapi/get_dependant.py

@@ -1,10 +1,12 @@
 import inspect
 from collections.abc import Callable, Iterable
+from dataclasses import fields
 from typing import TYPE_CHECKING, Annotated, Any, cast, get_args, get_origin
 
 from fast_depends.library.serializer import OptionItem
 from fast_depends.utils import get_typed_annotation
 from fastapi import params
+from fastapi.dependencies.models import Dependant
 from fastapi.dependencies.utils import (
     get_dependant,
     get_parameterless_sub_dependant,
@@ -17,6 +19,23 @@ if TYPE_CHECKING:
     from fastapi.dependencies import models
 
 
+class _FastStreamDependant(Dependant):
+    """FastAPI dependant extended with fields required by FastStream."""
+
+    model: type[Any]
+    custom_fields: dict[str, Any]
+    flat_params: list[OptionItem]
+
+
+def _extend_fastapi_dependant(dependant: Dependant) -> _FastStreamDependant:
+    """Copy a native FastAPI dependant into an extensible subclass."""
+    return _FastStreamDependant(**{
+        field.name: getattr(dependant, field.name)
+        for field in fields(dependant)
+        if field.init
+    })
+
+
 def get_fastapi_dependant(
     orig_call: Callable[..., Any],
     dependencies: Iterable["params.Depends"],
@@ -55,6 +74,7 @@ def _patch_fastapi_dependent(dependant: "models.Dependant") -> "models.Dependant
 
     from faststream._internal._compat import PydanticUndefined
 
+    dependant = _extend_fastapi_dependant(dependant)
     params = dependant.query_params + dependant.body_params
 
     for d in dependant.dependencies:
@@ -128,12 +148,12 @@ def _patch_fastapi_dependent(dependant: "models.Dependant") -> "models.Dependant
                 f,
             )
 
-    dependant.model = create_model(  # type: ignore[attr-defined]
+    dependant.model = create_model(
         getattr(call, "__name__", type(call).__name__),
     )
 
-    dependant.custom_fields = {}  # type: ignore[attr-defined]
-    dependant.flat_params = [  # type: ignore[attr-defined]
+    dependant.custom_fields = {}
+    dependant.flat_params = [
         OptionItem(field_name=name, field_type=type_, default_value=default)
         for name, (type_, default) in params_unique.items()
     ]

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/fastapi/router.py

@@ -2,7 +2,7 @@ import json
 import warnings
 from abc import abstractmethod
 from collections.abc import (
-    AsyncIterator,
+    AsyncGenerator,
     Awaitable,
     Callable,
     Iterable,
@@ -273,7 +273,7 @@ class StreamRouter(APIRouter, StartAbleApplication, Generic[MsgType]):
         @asynccontextmanager
         async def start_broker_lifespan(
             app: "FastAPI",
-        ) -> AsyncIterator[Mapping[str, Any] | None]:
+        ) -> AsyncGenerator[Mapping[str, Any] | None, None]:
             """Starts the lifespan of a broker."""
             self.fastapi_config.set_application(app)
 

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/testing/broker.py

@@ -1,13 +1,21 @@
 import warnings
 from abc import abstractmethod
-from collections.abc import AsyncIterator, Generator, Iterator
+from collections.abc import AsyncGenerator, Generator
 from contextlib import (
     AsyncExitStack,
     asynccontextmanager,
     contextmanager,
 )
 from functools import partial
-from typing import TYPE_CHECKING, Any, Generic, Optional, Protocol, TypeVar, cast
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Generic,
+    Optional,
+    Protocol,
+    TypeVar,
+    cast,
+)
 from unittest import mock
 from unittest.mock import MagicMock
 
@@ -97,7 +105,7 @@ class TestBroker(Generic[Broker, EnterType]):
         await self._ctx.__aexit__(exc_type, exc_val, exc_tb)
 
     @asynccontextmanager
-    async def _create_ctx(self) -> AsyncIterator[list[Broker]]:
+    async def _create_ctx(self) -> AsyncGenerator[list[Broker], None]:
         async with AsyncExitStack() as stack:
             saved_running = {}
             started_brokers = []
@@ -123,7 +131,7 @@ class TestBroker(Generic[Broker, EnterType]):
                 sub.running = was_running
 
     @asynccontextmanager
-    async def _do_start(self, broker: Broker) -> AsyncIterator[Broker]:
+    async def _do_start(self, broker: Broker) -> AsyncGenerator[Broker, None]:
         try:
             if not self.connect_only:
                 await broker.start()
@@ -134,11 +142,11 @@ class TestBroker(Generic[Broker, EnterType]):
             self._fake_close(broker)
 
     @contextmanager
-    def _patch_producer(self, broker: Broker) -> Iterator[None]:
+    def _patch_producer(self, broker: Broker) -> Generator[None, None, None]:
         raise NotImplementedError
 
     @contextmanager
-    def _patch_logger(self, broker: Broker) -> Iterator[None]:
+    def _patch_logger(self, broker: Broker) -> Generator[None, None, None]:
         broker._setup_logger()
 
         logger_state = broker.config.logger

{faststream-0.7.2 → faststream-0.7.4}/faststream/_internal/utils/functions.py

@@ -1,5 +1,5 @@
 import asyncio
-from collections.abc import AsyncIterator, Awaitable, Callable
+from collections.abc import AsyncGenerator, Awaitable, Callable
 from concurrent.futures import Executor
 from contextlib import asynccontextmanager
 from functools import partial, wraps
@@ -64,7 +64,7 @@ def to_async(
 
 
 @asynccontextmanager
-async def fake_context(*args: Any, **kwargs: Any) -> AsyncIterator[None]:
+async def fake_context(*args: Any, **kwargs: Any) -> AsyncGenerator[None, None]:
     yield None
 
 

{faststream-0.7.2 → faststream-0.7.4}/faststream/asgi/app.py

@@ -2,7 +2,7 @@ import inspect
 import logging
 import traceback
 from abc import abstractmethod
-from collections.abc import AsyncIterator, Sequence
+from collections.abc import AsyncGenerator, Sequence
 from contextlib import asynccontextmanager
 from typing import TYPE_CHECKING, Any, Optional, Protocol
 
@@ -250,7 +250,7 @@ class AsgiFastStream(Application):
     async def start_lifespan_context(
         self,
         run_extra_options: dict[str, "SettingField"] | None = None,
-    ) -> AsyncIterator[None]:
+    ) -> AsyncGenerator[None, None]:
         run_extra_options = run_extra_options or self._run_extra_options
 
         async with self.lifespan_context(**run_extra_options):

{faststream-0.7.2 → faststream-0.7.4}/faststream/confluent/fastapi/__init__.py

@@ -1,3 +1,4 @@
+import warnings
 from typing import Annotated
 
 from faststream._internal.fastapi.context import Context, ContextRepo, Logger
@@ -7,6 +8,15 @@ from faststream.confluent.publisher.producer import AsyncConfluentFastProducer
 
 from .fastapi import KafkaRouter
 
+warnings.warn(
+    "The integration has been moved to the faststream_fastapi package"
+    " and will be removed in 1.0.0 version."
+    "\n`pip install faststream_fastapi`"
+    "\nhttps://github.com/faststream-community/faststream_fastapi",
+    DeprecationWarning,
+    stacklevel=2,
+)
+
 __all__ = (
     "Context",
     "ContextRepo",

{faststream-0.7.2 → faststream-0.7.4}/faststream/confluent/response.py

@@ -1,3 +1,4 @@
+from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any, Union
 
 from typing_extensions import override
@@ -9,6 +10,7 @@ from faststream.response.response import (
     Response,
     extract_per_message_keys_and_bodies,
     key_for_index,
+    realign_keys,
 )
 
 if TYPE_CHECKING:
@@ -99,9 +101,9 @@ class KafkaPublishCommand(BatchPublishCommand):
 
         # per-message keys support
         keys, normalized = extract_per_message_keys_and_bodies(self.batch_bodies)
+        self._per_message_keys = keys
         if normalized is not None:
             self.batch_bodies = normalized
-        self._per_message_keys = keys
 
     @classmethod
     def from_cmd(
@@ -140,6 +142,24 @@ class KafkaPublishCommand(BatchPublishCommand):
 
         return headers | self.headers
 
+    @BatchPublishCommand.batch_bodies.setter  # type: ignore[attr-defined, untyped-decorator]
+    def batch_bodies(self, value: Sequence["Any"]) -> None:
+        if len(value) == 0:
+            self.body = None
+            self.extra_bodies = ()
+        else:
+            self._align_keys(value)
+            self.body = value[0]
+            self.extra_bodies = tuple(value[1:])
+
+    def _align_keys(self, value: Sequence["Any"]) -> None:
+        """Align the per-message keys with the batch_bodies."""
+        if not self._per_message_keys:
+            return
+        self._per_message_keys = realign_keys(
+            self._per_message_keys, self.batch_bodies, value
+        )
+
 
 # Semantic alias for publish operations
 # More intuitive name when using in publish_batch() rather than as handler return value

{faststream-0.7.2 → faststream-0.7.4}/faststream/confluent/testing.py

@@ -1,4 +1,4 @@
-from collections.abc import Callable, Generator, Iterable, Iterator, Sequence
+from collections.abc import Callable, Generator, Iterable, Sequence
 from contextlib import ExitStack, contextmanager
 from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Any, Optional, cast, overload
@@ -70,7 +70,7 @@ class TestKafkaBroker(TestBroker[KafkaBroker, EnterType]):
         )
 
     @contextmanager
-    def _patch_producer(self, broker: KafkaBroker) -> Iterator[None]:
+    def _patch_producer(self, broker: KafkaBroker) -> Generator[None, None, None]:
         fake_producer = FakeProducer(broker, self.brokers)
 
         with ExitStack() as es:
@@ -279,7 +279,7 @@ class FakeProducer(AsyncConfluentFastProducer):
 class MockConfluentMessage:
     def __init__(
         self,
-        raw_msg: bytes,
+        raw_msg: bytes | None,
         topic: str,
         key: bytes | str,
         headers: list[tuple[str, bytes]],
@@ -304,7 +304,7 @@ class MockConfluentMessage:
         self._timestamp = (timestamp_type, timestamp_ms)
 
     def len(self) -> int:
-        return len(self._raw_msg)
+        return 0 if self._raw_msg is None else len(self._raw_msg)
 
     def error(self) -> str | None:
         return self._error
@@ -327,7 +327,7 @@ class MockConfluentMessage:
     def topic(self) -> str:
         return self._topic
 
-    def value(self) -> bytes:
+    def value(self) -> bytes | None:
         return self._raw_msg
 
 
@@ -345,8 +345,12 @@ async def build_message(
     codec: Optional["CodecProto"] = None,
 ) -> MockConfluentMessage:
     """Build a mock confluent_kafka.Message for a sendable message."""
-    codec_instance = codec or DefaultCodec()
-    msg, content_type = await codec_instance.encode(message, serializer)
+    if message is None:
+        # keep a real tombstone (message.value() is None) distinct from b""
+        msg, content_type = None, None
+    else:
+        codec_instance = codec or DefaultCodec()
+        msg, content_type = await codec_instance.encode(message, serializer)
     k = key or b""
     headers = {
         "content-type": content_type or "",

{faststream-0.7.2 → faststream-0.7.4}/faststream/kafka/fastapi/__init__.py

@@ -1,3 +1,4 @@
+import warnings
 from typing import Annotated
 
 from faststream._internal.fastapi.context import Context, ContextRepo, Logger
@@ -7,6 +8,15 @@ from faststream.kafka.publisher.producer import AioKafkaFastProducer
 
 from .fastapi import KafkaRouter
 
+warnings.warn(
+    "The integration has been moved to the faststream_fastapi package"
+    " and will be removed in 1.0.0 version."
+    "\n`pip install faststream_fastapi`"
+    "\nhttps://github.com/faststream-community/faststream_fastapi",
+    DeprecationWarning,
+    stacklevel=2,
+)
+
 __all__ = (
     "Context",
     "ContextRepo",

{faststream-0.7.2 → faststream-0.7.4}/faststream/kafka/response.py

@@ -1,3 +1,4 @@
+from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any, Union
 
 from typing_extensions import override
@@ -9,6 +10,7 @@ from faststream.response.response import (
     Response,
     extract_per_message_keys_and_bodies,
     key_for_index,
+    realign_keys,
 )
 
 if TYPE_CHECKING:
@@ -99,9 +101,9 @@ class KafkaPublishCommand(BatchPublishCommand):
 
         # per-message keys support
         keys, normalized = extract_per_message_keys_and_bodies(self.batch_bodies)
+        self._per_message_keys = keys
         if normalized is not None:
             self.batch_bodies = normalized
-        self._per_message_keys = keys
 
     @classmethod
     def from_cmd(
@@ -140,6 +142,24 @@ class KafkaPublishCommand(BatchPublishCommand):
 
         return headers | self.headers
 
+    @BatchPublishCommand.batch_bodies.setter  # type: ignore[attr-defined, untyped-decorator]
+    def batch_bodies(self, value: Sequence["Any"]) -> None:
+        if len(value) == 0:
+            self.body = None
+            self.extra_bodies = ()
+        else:
+            self._align_keys(value)
+            self.body = value[0]
+            self.extra_bodies = tuple(value[1:])
+
+    def _align_keys(self, value: Sequence["Any"]) -> None:
+        """Align the per-message keys with the batch_bodies."""
+        if not self._per_message_keys:
+            return
+        self._per_message_keys = realign_keys(
+            self._per_message_keys, self.batch_bodies, value
+        )
+
 
 # Semantic alias for publish operations
 # More intuitive name when using in publish_batch() rather than as handler return value

{faststream-0.7.2 → faststream-0.7.4}/faststream/kafka/testing.py

@@ -1,5 +1,5 @@
 import re
-from collections.abc import Callable, Generator, Iterable, Iterator, Sequence
+from collections.abc import Callable, Generator, Iterable, Sequence
 from contextlib import ExitStack, contextmanager
 from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Any, Optional, cast, overload
@@ -72,7 +72,7 @@ class TestKafkaBroker(TestBroker[KafkaBroker, EnterType]):
         )
 
     @contextmanager
-    def _patch_producer(self, broker: KafkaBroker) -> Iterator[None]:
+    def _patch_producer(self, broker: KafkaBroker) -> Generator[None, None, None]:
         fake_producer = FakeProducer(broker, self.brokers)
 
         with ExitStack() as es:
@@ -309,7 +309,12 @@ async def build_message(
     codec: Optional["CodecProto"] = None,
 ) -> "ConsumerRecord":
     """Build a Kafka ConsumerRecord for a sendable message."""
-    msg, content_type = await (codec or DefaultCodec()).encode(message, serializer)
+    if message is None and key is not None:
+        # keyed None is a real tombstone, matching publish()'s own rule
+        # (aiokafka needs a key or value, a keyless None still goes b"")
+        msg, content_type = None, None
+    else:
+        msg, content_type = await (codec or DefaultCodec()).encode(message, serializer)
 
     k = key or b""
 
@@ -328,8 +333,8 @@ async def build_message(
         partition=partition or 0,
         key=k,
         serialized_key_size=len(k),
-        serialized_value_size=len(msg),
-        checksum=sum(msg),
+        serialized_value_size=0 if msg is None else len(msg),
+        checksum=0 if msg is None else sum(msg),
         offset=0,
         headers=[(i, j.encode()) for i, j in headers.items()],
         timestamp_type=1,

{faststream-0.7.2 → faststream-0.7.4}/faststream/mqtt/broker/broker.py

@@ -64,6 +64,7 @@ class MQTTBroker(
         reconnect: zmqtt.ReconnectConfig | None = None,
         mqtt_connect_timeout: float = 30.0,
         session_expiry_interval: int = 0,
+        stripped_prefixes: tuple[str, ...] | None = None,
         graceful_timeout: float | None = 15.0,
         decoder: Optional["CustomCallable"] = None,
         parser: Optional["CustomCallable"] = None,
@@ -90,6 +91,10 @@ class MQTTBroker(
     ) -> None:
         secure_kwargs = parse_security(security)
 
+        connection_kwargs = {}
+        if stripped_prefixes is not None:
+            connection_kwargs["stripped_prefixes"] = stripped_prefixes
+
         producer: ZmqttBaseProducer
         if version == "5.0":
             producer = ZmqttProducerV5(parser=parser, decoder=decoder)
@@ -116,6 +121,7 @@ class MQTTBroker(
             reconnect=reconnect,
             mqtt_connect_timeout=mqtt_connect_timeout,
             session_expiry_interval=session_expiry_interval,
+            **connection_kwargs,
             **secure_kwargs,
             # broker config
             routers=routers,