faststream 0.2.2__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.2 → 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.2 → faststream-0.2.4}/.gitignore

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

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

@@ -1,14 +1,13 @@
 Metadata-Version: 2.1
 Name: faststream
-Version: 0.2.2
+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/
 Project-URL: Tracker, https://github.com/airtai/FastStream/issues
 Project-URL: Source, https://github.com/airtai/FastStream
 Project-URL: Discord, https://discord.gg/CJWmYpyFbc
-Author-email: airt <info@airt.ai>, Pastukhov Nikita <diementros@yandex.ru>
-Maintainer-email: airt <info@airt.ai>, Pastukhov Nikita <diementros@yandex.ru>
+Author-email: airt <info@airt.ai>, lancetnik <diementros@gmail.com>
 License-File: LICENSE
 Keywords: framework,kafka,message brokers,nats,rabbitmq
 Classifier: Development Status :: 5 - Production/Stable
@@ -68,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.2/examples/kafka/batch_consume.py → faststream-0.2.4/examples/kafka/batch_publish_1.py

@@ -14,5 +14,4 @@ async def handle(msg: List[str], logger: Logger):
 
 @app.after_startup
 async def test() -> None:
-    await broker.publish("hi", "test")
-    await broker.publish("FastStream", "test")
+    await broker.publish_batch("hi", "FastStream", topic="test")

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

@@ -1,5 +1,5 @@
 """Simple and fast framework to create message brokers based microservices"""
-__version__ = "0.2.2"
+__version__ = "0.2.4"
 
 
 INSTALL_YAML = """

{faststream-0.2.2 → 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.2 → 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.2 → faststream-0.2.4}/faststream/asyncapi/message.py

@@ -5,7 +5,6 @@ from fast_depends.core import CallModel
 from pydantic import BaseModel
 
 from faststream._compat import PYDANTIC_V2, get_model_fields, model_schema
-from faststream.asyncapi.utils import to_camelcase
 
 
 def parse_handler_params(call: CallModel[Any, Any], prefix: str = "") -> Dict[str, Any]:
@@ -200,11 +199,7 @@ def get_model_schema(
 
         body = param_body
 
-    camel_body = to_camelcase(body["title"])
     if not use_original_model:
-        if prefix.lower() != camel_body.lower():
-            body["title"] = f"{prefix}{camel_body}Payload"
-        else:
-            body["title"] = f"{camel_body}Payload"
+        body["title"] = f"{prefix}:Payload"
 
     return body

{faststream-0.2.2 → faststream-0.2.4}/faststream/asyncapi/utils.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Tuple
 
 from faststream.types import AnyDict
 
@@ -22,7 +22,11 @@ def to_camelcase(*names: str) -> str:
     return " ".join(names).replace("_", " ").title().replace(" ", "")
 
 
-def resolve_payloads(payloads: List[AnyDict]) -> AnyDict:
+def resolve_payloads(
+    payloads: List[Tuple[AnyDict, str]],
+    extra: str = "",
+    served_words: int = 1,
+) -> AnyDict:
     """Resolve payloads.
 
     Args:
@@ -37,9 +41,32 @@ def resolve_payloads(payloads: List[AnyDict]) -> AnyDict:
     ln = len(payloads)
     payload: AnyDict
     if ln > 1:
-        payload = {"oneOf": {body["title"]: body for body in payloads}}
+        one_of_payloads = {}
+
+        for body, handler_name in payloads:
+            title = body["title"]
+            words = title.split(":")
+
+            if len(words) > 1:  # not pydantic model case
+                body["title"] = title = ":".join(
+                    filter(
+                        lambda x: bool(x),
+                        (
+                            handler_name,
+                            extra if extra not in words else "",
+                            *words[served_words:],
+                        ),
+                    )
+                )
+
+            one_of_payloads[title] = body
+
+        payload = {"oneOf": one_of_payloads}
+
     elif ln == 1:
-        payload = payloads[0]
+        payload = payloads[0][0]
+
     else:
         payload = {}
+
     return payload

{faststream-0.2.2 → 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.2 → faststream-0.2.4}/faststream/broker/handler.py

@@ -1,5 +1,6 @@
 from abc import abstractmethod
 from contextlib import AsyncExitStack
+from inspect import unwrap
 from typing import (
     Any,
     Awaitable,
@@ -18,6 +19,7 @@ from fast_depends.core import CallModel
 
 from faststream._compat import IS_OPTIMIZED, override
 from faststream.asyncapi.base import AsyncAPIOperation
+from faststream.asyncapi.message import parse_handler_params
 from faststream.asyncapi.utils import to_camelcase
 from faststream.broker.message import StreamMessage
 from faststream.broker.middlewares import BaseMiddleware
@@ -36,7 +38,7 @@ from faststream.broker.types import (
 )
 from faststream.broker.wrapper import HandlerCallWrapper
 from faststream.exceptions import HandlerException, StopConsume
-from faststream.types import SendableMessage
+from faststream.types import AnyDict, SendableMessage
 from faststream.utils.context.main import context
 from faststream.utils.functions import to_async
 
@@ -109,21 +111,13 @@ class BaseHandler(AsyncAPIOperation, Generic[MsgType]):
         self._title = title
         self.log_context_builder = log_context_builder
 
-    @override
     @property
-    def name(self) -> Union[str, bool]:  # type: ignore[override]
-        if self._title:
-            return self._title
-
-        if not self.calls:  # pragma: no cover
-            return False
-
-        else:
-            return True
+    def name(self) -> str:
+        return self._title or self.call_name
 
     @property
     def call_name(self) -> str:
-        caller = self.calls[0][0]._original_call
+        caller = unwrap(self.calls[0][0]._original_call)
         name = getattr(caller, "__name__", str(caller))
         return to_camelcase(name)
 
@@ -133,7 +127,7 @@ class BaseHandler(AsyncAPIOperation, Generic[MsgType]):
             description = None
 
         else:
-            caller = self.calls[0][0]._original_call
+            caller = unwrap(self.calls[0][0]._original_call)
             description = getattr(caller, "__doc__", None)
 
         return self._description or description
@@ -156,6 +150,17 @@ class BaseHandler(AsyncAPIOperation, Generic[MsgType]):
         """
         raise NotImplementedError()
 
+    def get_payloads(self) -> List[Tuple[AnyDict, str]]:
+        payloads: List[Tuple[AnyDict, str]] = []
+
+        for h, _, _, _, _, dep in self.calls:
+            body = parse_handler_params(
+                dep, prefix=f"{self._title or self.call_name}:Message"
+            )
+            payloads.append((body, to_camelcase(unwrap(h._original_call).__name__)))
+
+        return payloads
+
 
 class AsyncHandler(BaseHandler[MsgType]):
     """A class representing an asynchronous handler.

{faststream-0.2.2 → 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.2 → faststream-0.2.4}/faststream/broker/publisher.py

@@ -1,6 +1,7 @@
 from abc import abstractmethod
 from dataclasses import dataclass, field
-from typing import Any, Callable, Generic, List, Optional
+from inspect import unwrap
+from typing import Any, Callable, Generic, List, Optional, Tuple
 from unittest.mock import MagicMock
 
 from fast_depends._compat import CreateBaseModel, create_model
@@ -39,18 +40,30 @@ class BasePublisher(AsyncAPIOperation, Generic[MsgType]):
 
     title: Optional[str] = field(default=None)
     _description: Optional[str] = field(default=None)
-    _fake_handler: bool = field(default=False)
     _schema: Optional[Any] = field(default=None)
 
     calls: List[Callable[..., Any]] = field(
         init=False, default_factory=list, repr=False
     )
-    mock: MagicMock = field(init=False, default_factory=MagicMock, repr=False)
+    _fake_handler: bool = field(default=False, repr=False)
+    mock: Optional[MagicMock] = field(init=False, default=None, repr=False)
 
     @property
     def description(self) -> Optional[str]:
         return self._description
 
+    def set_test(
+        self,
+        mock: MagicMock,
+        with_fake: bool,
+    ) -> None:
+        self.mock = mock
+        self._fake_handler = with_fake
+
+    def reset_test(self) -> None:
+        self._fake_handler = False
+        self.mock = None
+
     def __call__(
         self,
         func: Callable[P_HandlerParams, T_HandlerReturn],
@@ -101,10 +114,10 @@ class BasePublisher(AsyncAPIOperation, Generic[MsgType]):
         """
         raise NotImplementedError()
 
-    def get_payloads(self) -> List[AnyDict]:
-        payloads: List[AnyDict] = []
+    def get_payloads(self) -> List[Tuple[AnyDict, str]]:
+        payloads: List[Tuple[AnyDict, str]] = []
 
-        if not self.calls and self._schema:
+        if self._schema:
             call_model: CallModel[Any, Any] = CallModel(
                 call=lambda: None,
                 model=create_model("Fake"),
@@ -117,18 +130,19 @@ class BasePublisher(AsyncAPIOperation, Generic[MsgType]):
 
             body = get_response_schema(
                 call_model,
-                prefix=self.title or "",
-            )
-            if body:
-                payloads.append(body)
-
-        for call in self.calls:
-            call_model = build_call_model(call)
-            body = get_response_schema(
-                call_model,
-                prefix=to_camelcase(call_model.call_name),
+                prefix=f"{self.name}:Message",
             )
             if body:
-                payloads.append(body)
+                payloads.append((body, ""))
+
+        else:
+            for call in self.calls:
+                call_model = build_call_model(call)
+                body = get_response_schema(
+                    call_model,
+                    prefix=f"{self.name}:Message",
+                )
+                if body:
+                    payloads.append((body, to_camelcase(unwrap(call).__name__)))
 
         return payloads