faststream 0.2.3__tar.gz → 0.2.4__tar.gz

faststream-0.2.4/.github/workflows/deploy-docs.yaml

@@ -0,0 +1,36 @@
+name: Deploy Docs
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - docs/**
+      - .github/workflows/deploy-docs.yaml
+
+permissions:
+  contents: write
+jobs:
+  deploy_docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+      - uses: actions/cache@v3
+        with:
+          key: ${{ github.ref }}
+          path: .cache
+      - run: pip install -e ".[dev]"
+      - run: ./scripts/build-docs.sh
+      - run: echo "VERSION=$(python3 -c 'from importlib.metadata import version; print(".".join(version("faststream").split(".")[:2]))')" >> $GITHUB_ENV
+      - name: Configure Git user
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+      - run: echo $VERSION
+      # - run: cd docs && mike delete --all
+      - run: cd docs && mike deploy --template templates/redirect.html --update-aliases $VERSION latest
+      - run: cd docs && mike set-default --push --template templates/redirect.html latest

{faststream-0.2.3 → faststream-0.2.4}/.github/workflows/test.yaml

@@ -44,35 +44,6 @@ jobs:
         pydantic-version: ["pydantic-v1", "pydantic-v2"]
       fail-fast: false
 
-    services:
-      kafka:
-        image: bitnami/kafka:3.5.0
-        ports:
-          - 9092:9092
-        env:
-          KAFKA_ENABLE_KRAFT: "true"
-          KAFKA_CFG_NODE_ID: "1"
-          KAFKA_CFG_PROCESS_ROLES: "broker,controller"
-          KAFKA_CFG_CONTROLLER_LISTENER_NAMES: "CONTROLLER"
-          KAFKA_CFG_LISTENERS: "PLAINTEXT://:9092,CONTROLLER://:9093"
-          KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT"
-          KAFKA_CFG_ADVERTISED_LISTENERS: "PLAINTEXT://127.0.0.1:9092"
-          KAFKA_BROKER_ID: "1"
-          KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: "1@kafka:9093"
-          ALLOW_PLAINTEXT_LISTENER: "true"
-
-      rabbitmq:
-        image: rabbitmq:alpine
-        ports:
-          - 5672:5672
-
-      # using own container with already included JetStream
-      # https://github.com/nats-io/nats-docker/issues/110
-      nats:
-        image: diementros/nats:js
-        ports:
-          - 4222:4222
-
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -97,7 +68,7 @@ jobs:
         run: pip install --pre "pydantic>=2.0.0b2,<3.0.0"
       - run: mkdir coverage
       - name: Test
-        run: bash scripts/test.sh -m "all"
+        run: bash scripts/test.sh -m "(slow and (not nats and not kafka and not rabbit)) or (not nats and not kafka and not rabbit)"
         env:
           COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}
           CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
@@ -122,7 +93,7 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: pip install .[rabbit,kafka,nats,docs,testing]
       - name: Test
-        run: bash scripts/test.sh -m "not kafka and not rabbit and not nats"
+        run: bash scripts/test.sh -m "(slow and (not nats and not kafka and not rabbit)) or (not nats and not kafka and not rabbit)"
 
   test-windows-latest:
     if: github.event.pull_request.draft == false
@@ -139,9 +110,9 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: pip install .[rabbit,kafka,nats,docs,testing]
       - name: Test
-        run: bash scripts/test.sh -vv -m "not kafka and not rabbit and not nats"
+        run: bash scripts/test.sh -m "(slow and (not nats and not kafka and not rabbit)) or (not nats and not kafka and not rabbit)"
 
-  test-kafka-smoke:
+  test-kafka-real:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     services:
@@ -160,6 +131,32 @@ jobs:
           KAFKA_BROKER_ID: "1"
           KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: "1@kafka:9093"
           ALLOW_PLAINTEXT_LISTENER: "true"
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+          cache: "pip"
+          cache-dependency-path: pyproject.toml
+      - name: Install Dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: pip install .[nats,kafka,rabbit,docs,testing]
+      - run: mkdir coverage
+      - name: Test
+        run: bash scripts/test.sh -m "(slow and kafka) or kafka"
+        env:
+          COVERAGE_FILE: coverage/.coverage.kafka-py
+          CONTEXT: kafka-py
+      - name: Store coverage files
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage
+          path: coverage
+  
+  test-kafka-smoke:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -172,9 +169,9 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: pip install .[kafka,test-core]
       - name: Test
-        run: bash scripts/test.sh tests/brokers/kafka/test_publish.py
+        run: bash scripts/test.sh -m "not kafka" tests/brokers/kafka/test_test_client.py
 
-  test-rabbit-smoke:
+  test-rabbit-real:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     services:
@@ -182,6 +179,32 @@ jobs:
         image: rabbitmq:alpine
         ports:
           - 5672:5672
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+          cache: "pip"
+          cache-dependency-path: pyproject.toml
+      - name: Install Dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: pip install .[nats,kafka,rabbit,docs,testing]
+      - run: mkdir coverage
+      - name: Test
+        run: bash scripts/test.sh -m "(slow and rabbit) or rabbit"
+        env:
+          COVERAGE_FILE: coverage/.coverage.rabbit-py
+          CONTEXT: rabbit-py
+      - name: Store coverage files
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage
+          path: coverage
+  
+  test-rabbit-smoke:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -194,9 +217,9 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: pip install .[rabbit,test-core]
       - name: Test
-        run: bash scripts/test.sh tests/brokers/rabbit/test_publish.py
+        run: bash scripts/test.sh -m "not rabbit" tests/brokers/rabbit/test_test_client.py
 
-  test-nats-smoke:
+  test-nats-real:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     services:
@@ -205,7 +228,33 @@ jobs:
         ports:
           - 4222:4222
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+          cache: "pip"
+          cache-dependency-path: pyproject.toml
+      - name: Install Dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: pip install .[nats,kafka,rabbit,docs,testing]
+      - run: mkdir coverage
+      - name: Test
+        run: bash scripts/test.sh -m "(slow and nats) or nats"
+        env:
+          COVERAGE_FILE: coverage/.coverage.nats-py
+          CONTEXT: nats-py
+      - name: Store coverage files
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage
+          path: coverage
+  
+  test-nats-smoke:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
@@ -216,11 +265,15 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: pip install .[nats,test-core]
       - name: Test
-        run: bash scripts/test.sh tests/brokers/nats/test_publish.py
+        run: bash scripts/test.sh -m "not nats" tests/brokers/nats/test_test_client.py
 
   coverage-combine:
     if: github.event.pull_request.draft == false
-    needs: [test]
+    needs:
+      - test
+      - test-kafka-real
+      - test-rabbit-real
+      - test-nats-real
     runs-on: ubuntu-latest
 
     steps:
@@ -256,10 +309,13 @@ jobs:
     if: github.event.pull_request.draft == false
 
     needs:
-      - coverage-combine
       - static_analysis
+      - coverage-combine
       - test-macos-latest
       - test-windows-latest
+      - test-kafka-real
+      - test-rabbit-real
+      - test-nats-real
       - test-kafka-smoke
       - test-rabbit-smoke
       - test-nats-smoke

{faststream-0.2.3 → faststream-0.2.4}/.gitignore

@@ -4,6 +4,7 @@ dist
 venv*
 .venv*
 .env
+.env*
 *.lock
 .vscode
 .pypirc

{faststream-0.2.3 → faststream-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: faststream
-Version: 0.2.3
+Version: 0.2.4
 Summary: FastStream: the simplest way to work with a messaging queues
 Project-URL: Homepage, https://faststream.airt.ai/
 Project-URL: Documentation, https://faststream.airt.ai/latest/getting-started/
@@ -67,8 +67,8 @@ Requires-Dist: isort>=5; extra == 'lint'
 Requires-Dist: mypy==1.5.1; extra == 'lint'
 Requires-Dist: pre-commit==3.4.0; extra == 'lint'
 Requires-Dist: pyupgrade-directories; extra == 'lint'
-Requires-Dist: ruff==0.0.291; extra == 'lint'
-Requires-Dist: semgrep==1.42.0; extra == 'lint'
+Requires-Dist: ruff==0.0.292; extra == 'lint'
+Requires-Dist: semgrep==1.43.0; extra == 'lint'
 Requires-Dist: types-pyyaml; extra == 'lint'
 Requires-Dist: types-setuptools; extra == 'lint'
 Requires-Dist: types-ujson; extra == 'lint'

{faststream-0.2.3 → faststream-0.2.4}/faststream/__about__.py

@@ -1,5 +1,6 @@
 """Simple and fast framework to create message brokers based microservices"""
-__version__ = "0.2.3"
+__version__ = "0.2.4"
+
 
 INSTALL_YAML = """
 To generate YAML documentation, please install dependencies:\n

{faststream-0.2.3 → faststream-0.2.4}/faststream/__init__.py

@@ -2,7 +2,7 @@ from faststream.annotations import ContextRepo, Logger, NoCast
 from faststream.app import FastStream
 from faststream.broker.middlewares import BaseMiddleware
 from faststream.broker.test import TestApp
-from faststream.utils import Context, Depends, apply_types, context
+from faststream.utils import Context, Depends, Header, Path, apply_types, context
 
 __all__ = (
     # app
@@ -12,6 +12,8 @@ __all__ = (
     "apply_types",
     "context",
     "Context",
+    "Header",
+    "Path",
     "Depends",
     # annotations
     "Logger",

{faststream-0.2.3 → faststream-0.2.4}/faststream/_compat.py

@@ -2,6 +2,7 @@ import importlib.util
 import json
 import os
 import sys
+from contextlib import suppress
 from typing import Any, Callable, Dict, List, Mapping, Optional, Type, TypeVar, Union
 
 from fast_depends._compat import PYDANTIC_V2 as PYDANTIC_V2
@@ -54,28 +55,34 @@ IS_OPTIMIZED = os.getenv("PYTHONOPTIMIZE", False)
 
 
 if is_installed("fastapi"):
-    from fastapi import __version__ as FASTAPI_VERSION
-
-    major, minor, _ = map(int, FASTAPI_VERSION.split("."))
-    FASTAPI_V2 = not (major < 0 and minor < 100)
-
-    if FASTAPI_V2:
-        from fastapi._compat import _normalize_errors
-        from fastapi.exceptions import RequestValidationError
-
-        def raise_fastapi_validation_error(errors: List[Any], body: AnyDict) -> Never:
-            raise RequestValidationError(_normalize_errors(errors), body=body)
-
-    else:
-        from pydantic import (  # type: ignore[assignment]  # isort: skip
-            ValidationError as RequestValidationError,
-        )
-        from pydantic import create_model
-
-        ROUTER_VALIDATION_ERROR_MODEL = create_model("StreamRoute")
-
-        def raise_fastapi_validation_error(errors: List[Any], body: AnyDict) -> Never:
-            raise RequestValidationError(errors, ROUTER_VALIDATION_ERROR_MODEL)  # type: ignore[misc]
+    # NOTE: is_installed somewhen True for some reason
+    with suppress(ImportError):
+        from fastapi import __version__ as FASTAPI_VERSION
+
+        major, minor, _ = map(int, FASTAPI_VERSION.split("."))
+        FASTAPI_V2 = not (major < 0 and minor < 100)
+
+        if FASTAPI_V2:
+            from fastapi._compat import _normalize_errors
+            from fastapi.exceptions import RequestValidationError
+
+            def raise_fastapi_validation_error(
+                errors: List[Any], body: AnyDict
+            ) -> Never:
+                raise RequestValidationError(_normalize_errors(errors), body=body)
+
+        else:
+            from pydantic import (  # type: ignore[assignment]  # isort: skip
+                ValidationError as RequestValidationError,
+            )
+            from pydantic import create_model
+
+            ROUTER_VALIDATION_ERROR_MODEL = create_model("StreamRoute")
+
+            def raise_fastapi_validation_error(
+                errors: List[Any], body: AnyDict
+            ) -> Never:
+                raise RequestValidationError(errors, ROUTER_VALIDATION_ERROR_MODEL)  # type: ignore[misc]
 
 
 JsonSchemaValue = Mapping[str, Any]

{faststream-0.2.3 → faststream-0.2.4}/faststream/broker/fastapi/route.py

@@ -154,6 +154,7 @@ class StreamMessage(Request):
         self,
         body: Optional[AnyDict] = None,
         headers: Optional[AnyDict] = None,
+        path: Optional[AnyDict] = None,
     ):
         """Initialize a class instance.
 
@@ -175,7 +176,7 @@ class StreamMessage(Request):
         self._cookies = {}
         self._headers = headers or {}
         self._body = body or {}
-        self._query_params = self._body
+        self._query_params = {**self._body, **(path or {})}
 
     @classmethod
     def get_session(
@@ -237,7 +238,7 @@ class StreamMessage(Request):
                 else:
                     fastapi_body = body
 
-                session = cls(fastapi_body, message.headers)
+                session = cls(fastapi_body, message.headers, message.path)
             else:
                 session = cls()
             return await func(session)

{faststream-0.2.3 → faststream-0.2.4}/faststream/broker/message.py

@@ -31,10 +31,11 @@ class ABCStreamMessage(Generic[Msg]):
 
     body: Union[bytes, Any]
     decoded_body: Optional[DecodedMessage] = None
+    headers: AnyDict = field(default_factory=dict)
+    path: AnyDict = field(default_factory=dict)
 
     content_type: Optional[str] = None
     reply_to: str = ""
-    headers: AnyDict = field(default_factory=dict)
     message_id: str = field(default_factory=lambda: str(uuid4()))  # pragma: no cover
     correlation_id: str = field(
         default_factory=lambda: str(uuid4())

{faststream-0.2.3 → faststream-0.2.4}/faststream/broker/test.py

@@ -1,12 +1,12 @@
 from abc import abstractmethod
-from contextlib import asynccontextmanager
+from contextlib import ExitStack, asynccontextmanager
 from functools import partial
 from types import MethodType, TracebackType
 from typing import Any, AsyncGenerator, Dict, Generic, Optional, Type, TypeVar
 from unittest.mock import AsyncMock, MagicMock
 
 import anyio
-from anyio.abc._tasks import TaskGroup
+from anyio.from_thread import start_blocking_portal
 
 from faststream.app import FastStream
 from faststream.broker.core.abc import BrokerUsecase
@@ -39,10 +39,9 @@ class TestApp:
         The above docstring is autogenerated by docstring-gen library (https://docstring-gen.airt.ai)
     """
     __test__ = False
+
     app: FastStream
     _extra_options: Optional[Dict[str, SettingField]]
-    _event: anyio.Event
-    _task: TaskGroup
 
     def __init__(
         self,
@@ -64,8 +63,32 @@ class TestApp:
         self.app = app
         self._extra_options = run_extra_options
 
+    def __enter__(self) -> FastStream:
+        with ExitStack() as stack:
+            portal = stack.enter_context(start_blocking_portal())
+            portal.call(self.app._init_async_cycle)
+            portal.call(partial(self.app._start, run_extra_options=self._extra_options))
+
+            @stack.callback
+            def wait_shutdown() -> None:
+                portal.call(self.app._stop)
+
+            self.exit_stack = stack.pop_all()
+
+        return self.app
+
+    def __exit__(
+        self,
+        exc_type: Optional[Type[BaseException]] = None,
+        exc_val: Optional[BaseException] = None,
+        exec_tb: Optional[TracebackType] = None,
+    ) -> None:
+        assert self.app._stop_event  # nosec B101
+        self.app._stop_event.set()
+        self.exit_stack.close()
+
     async def __aenter__(self) -> FastStream:
-        self.app._stop_event = self._event = anyio.Event()
+        self.app._init_async_cycle()
         await self.app._start(run_extra_options=self._extra_options)
         self._task = tg = anyio.create_task_group()
         await tg.__aenter__()
@@ -91,7 +114,8 @@ class TestApp:
 
             The above docstring is autogenerated by docstring-gen library (https://docstring-gen.airt.ai)
         """
-        self._event.set()
+        assert self.app._stop_event  # nosec B101
+        self.app._stop_event.set()
         await self._task.__aexit__(None, None, None)
 
 

{faststream-0.2.3 → faststream-0.2.4}/faststream/cli/main.py

@@ -165,7 +165,7 @@ def _run(
         except ImportError:
             logger.warning("You have no installed `uvloop`")
         else:
-            uvloop.install()
+            uvloop.install()  # type: ignore[attr-defined]
 
     anyio.run(
         app_obj.run,

{faststream-0.2.3 → faststream-0.2.4}/faststream/kafka/__init__.py

@@ -1,6 +1,6 @@
 from faststream.broker.test import TestApp
+from faststream.kafka.annotations import KafkaMessage
 from faststream.kafka.broker import KafkaBroker
-from faststream.kafka.message import KafkaMessage
 from faststream.kafka.router import KafkaRouter
 from faststream.kafka.shared.router import KafkaRoute
 from faststream.kafka.test import TestKafkaBroker

{faststream-0.2.3 → faststream-0.2.4}/faststream/kafka/fastapi.pyi

@@ -128,6 +128,7 @@ class KafkaRouter(StreamRouter[ConsumerRecord]):
         description: Optional[str] = None,
         asyncapi_tags: Optional[Sequence[asyncapi.Tag]] = None,
         schema_url: Optional[str] = "/asyncapi",
+        setup_state: bool = True,
         # logging args
         logger: Optional[logging.Logger] = access_logger,
         log_level: int = logging.INFO,

{faststream-0.2.3 → faststream-0.2.4}/faststream/kafka/publisher.py

@@ -87,7 +87,7 @@ class LogicPublisher(ABCPublisher[ConsumerRecord]):
             if not messages:
                 if not isinstance(message, Sequence):
                     raise ValueError(
-                        f"Message: {messages} should be Sequence type to send in batch"
+                        f"Message: {message} should be Sequence type to send in batch"
                     )
                 else:
                     to_send = message

{faststream-0.2.3 → faststream-0.2.4}/faststream/nats/__init__.py

@@ -14,9 +14,9 @@ from nats.js.api import (
 )
 
 from faststream.broker.test import TestApp
+from faststream.nats.annotations import NatsMessage
 from faststream.nats.broker import NatsBroker
 from faststream.nats.js_stream import JStream
-from faststream.nats.message import NatsMessage
 from faststream.nats.router import NatsRouter
 from faststream.nats.shared.router import NatsRoute
 from faststream.nats.test import TestNatsBroker

{faststream-0.2.3 → faststream-0.2.4}/faststream/nats/fastapi.pyi

@@ -122,6 +122,7 @@ class NatsRouter(StreamRouter[Msg]):
         description: Optional[str] = None,
         asyncapi_tags: Optional[Sequence[asyncapi.Tag]] = None,
         schema_url: Optional[str] = "/asyncapi",
+        setup_state: bool = True,
         # FastAPI kwargs
         prefix: str = "",
         tags: Optional[List[Union[str, Enum]]] = None,

{faststream-0.2.3 → faststream-0.2.4}/faststream/nats/handler.py

@@ -23,6 +23,7 @@ from faststream.nats.js_stream import JStream
 from faststream.nats.message import NatsMessage
 from faststream.nats.parser import JsParser, Parser
 from faststream.types import AnyDict
+from faststream.utils.context.path import compile_path
 
 
 class LogicNatsHandler(AsyncHandler[Msg]):
@@ -39,7 +40,10 @@ class LogicNatsHandler(AsyncHandler[Msg]):
         description: Optional[str] = None,
         title: Optional[str] = None,
     ):
-        self.subject = subject
+        reg, path = compile_path(subject, replace_symbol="*")
+        self.subject = path
+        self.path_regex = reg
+
         self.queue = queue
 
         self.stream = stream

{faststream-0.2.3 → faststream-0.2.4}/faststream/nats/parser.py

@@ -1,3 +1,4 @@
+from typing import Optional, Pattern
 from uuid import uuid4
 
 from nats.aio.msg import Msg
@@ -5,7 +6,8 @@ from nats.aio.msg import Msg
 from faststream.broker.message import StreamMessage
 from faststream.broker.parsers import decode_message
 from faststream.nats.message import NatsMessage
-from faststream.types import DecodedMessage
+from faststream.types import AnyDict, DecodedMessage
+from faststream.utils.context.main import context
 
 
 class NatsParser:
@@ -17,10 +19,21 @@ class NatsParser:
         message: Msg,
     ) -> StreamMessage[Msg]:
         headers = message.header or {}
+
+        handler = context.get("handler_")
+        path: AnyDict = {}
+        path_re: Optional[Pattern[str]]
+        if handler and (path_re := handler.path_regex):
+            if path_re is not None:
+                match = path_re.match(message.subject)
+                if match:
+                    path = match.groupdict()
+
         return NatsMessage(
             is_js=self.is_js,
             raw_message=message,
             body=message.data,
+            path=path,
             reply_to=headers.get("reply_to", "") if self.is_js else message.reply,
             headers=headers,
             content_type=headers.get("content-type", ""),

{faststream-0.2.3 → faststream-0.2.4}/faststream/rabbit/__init__.py

@@ -1,6 +1,6 @@
 from faststream.broker.test import TestApp
+from faststream.rabbit.annotations import RabbitMessage
 from faststream.rabbit.broker import RabbitBroker
-from faststream.rabbit.message import RabbitMessage
 from faststream.rabbit.router import RabbitRouter
 from faststream.rabbit.shared.constants import ExchangeType
 from faststream.rabbit.shared.router import RabbitRoute

{faststream-0.2.3 → faststream-0.2.4}/faststream/rabbit/fastapi.pyi

@@ -80,6 +80,7 @@ class RabbitRouter(StreamRouter[IncomingMessage]):
         description: Optional[str] = None,
         asyncapi_tags: Optional[Sequence[asyncapi.Tag]] = None,
         schema_url: Optional[str] = "/asyncapi",
+        setup_state: bool = True,
         # FastAPI kwargs
         prefix: str = "",
         tags: Optional[List[Union[str, Enum]]] = None,

{faststream-0.2.3 → faststream-0.2.4}/faststream/rabbit/helpers.py

@@ -78,6 +78,7 @@ class RabbitDeclarer(Singleton):
                         queue,
                         exclude={
                             "routing_key",
+                            "path_regex",
                             "bind_arguments",
                         },
                     )

{faststream-0.2.3 → faststream-0.2.4}/faststream/rabbit/parser.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any, Optional, Pattern
 from uuid import uuid4
 
 import aio_pika
@@ -8,7 +8,8 @@ from faststream.broker.message import StreamMessage
 from faststream.broker.parsers import decode_message, encode_message
 from faststream.rabbit.message import RabbitMessage
 from faststream.rabbit.types import AioPikaSendableMessage
-from faststream.types import DecodedMessage
+from faststream.types import AnyDict, DecodedMessage
+from faststream.utils.context.main import context
 
 
 class AioPikaParser:
@@ -43,6 +44,15 @@ class AioPikaParser:
 
             The above docstring is autogenerated by docstring-gen library (https://docstring-gen.airt.ai)
         """
+        handler = context.get("handler_")
+        path: AnyDict = {}
+        path_re: Optional[Pattern[str]]
+        if handler and (path_re := handler.queue.path_regex):
+            if path_re is not None:
+                match = path_re.match(message.routing_key or "")
+                if match:
+                    path = match.groupdict()
+
         return RabbitMessage(
             body=message.body,
             headers=message.headers,
@@ -50,6 +60,7 @@ class AioPikaParser:
             content_type=message.content_type,
             message_id=message.message_id or str(uuid4()),
             correlation_id=message.correlation_id or str(uuid4()),
+            path=path,
             raw_message=message,
         )