refactor: remove side effects

Author: Lancetnik

faststream/asyncapi/generate.py

@@ -145,6 +145,10 @@ def _resolve_msg_payloads(
     payloads: Dict[str, Any],
     messages: Dict[str, Any],
 ) -> Reference:
+    """Replace message payload by reference and normalize payloads.
+
+    Payloads and messages are editable dicts to store schemas for reference in AsyncAPI.
+    """
     one_of_list: List[Reference] = []
     m.payload = _move_pydantic_refs(m.payload, DEF_KEY)
 
@@ -156,30 +160,21 @@ def _resolve_msg_payloads(
         for p_title, p in one_of.items():
             payloads.update(p.pop(DEF_KEY, {}))
             if p_title not in payloads:
-                if p.pop("empty", False):
-                    payloads[p_title] = {}
-                else:
-                    payloads[p_title] = p
+                payloads[p_title] = p
             one_of_list.append(Reference(**{"$ref": f"#/components/schemas/{p_title}"}))
 
     elif one_of is not None:
         for p in one_of:
             p_title = next(iter(p.values())).split("/")[-1]
             if p_title not in payloads:
-                if p.pop("empty", False):
-                    payloads[p_title] = {}
-                else:
-                    payloads[p_title] = p
+                payloads[p_title] = p
             one_of_list.append(Reference(**{"$ref": f"#/components/schemas/{p_title}"}))
 
     if not one_of_list:
         payloads.update(m.payload.pop(DEF_KEY, {}))
         p_title = m.payload.get("title", f"{channel_name}Payload")
         if p_title not in payloads:
-            if m.payload.pop("empty", False):
-                payloads[p_title] = {}
-            else:
-                payloads[p_title] = m.payload
+            payloads[p_title] = m.payload
         m.payload = {"$ref": f"#/components/schemas/{p_title}"}
 
     else:
@@ -194,6 +189,7 @@ def _move_pydantic_refs(
     original: Any,
     key: str,
 ) -> Any:
+    """Remove pydantic references and replacem them by real schemas."""
     if not isinstance(original, Dict):
         return original
 

faststream/asyncapi/utils.py

@@ -22,7 +22,7 @@ def resolve_payloads(
             title = body["title"]
             words = title.split(":")
 
-            if len(words) > 1 and not body.get("empty", False):  # not pydantic model case
+            if len(words) > 1:  # not pydantic model case
                 body["title"] = title = ":".join(
                     filter(
                         lambda x: bool(x),

faststream/broker/subscriber/usecase.py

@@ -436,12 +436,13 @@ def get_payloads(self) -> List[Tuple["AnyDict", str]]:
             payloads.append((body, to_camelcase(h.call_name)))
 
         if not self.calls:
-            payloads.append((  # TODO: fix
-                {
-                    "title": to_camelcase("Subscriber:Message:Payload"),
-                    "empty": True,
-                },
-                "",
-            ))
+            payloads.append(
+                (
+                    {
+                        "title": f"{self.title_ or self.call_name}:Message:Payload",
+                    },
+                    to_camelcase(self.call_name),
+                )
+            )
 
         return payloads

tests/asyncapi/base/naming.py

@@ -105,10 +105,29 @@ def test_subscriber_naming_default(self):
             IsStr(regex=r"test[\w:]*:Subscriber:Message")
         ]
 
+        for key, v in schema["components"]["schemas"].items():
+            assert key == "Subscriber:Message:Payload"
+            assert v == {"title": key}
+
+    def test_subscriber_naming_default_with_title(self):
+        broker = self.broker_class()
+
+        broker.subscriber("test", title="custom")
+
+        schema = get_app_schema(FastStream(broker)).to_jsonable()
+
+        assert list(schema["channels"].keys()) == ["custom"]
+
+        assert list(schema["components"]["messages"].keys()) == ["custom:Message"]
+
         assert list(schema["components"]["schemas"].keys()) == [
-            "Subscriber:Message:Payload"
+            "custom:Message:Payload"
         ]
 
+        assert schema["components"]["schemas"]["custom:Message:Payload"] == {
+            "title": "custom:Message:Payload"
+        }
+
     def test_multi_subscribers_naming_default(self):
         broker = self.broker_class()
 
@@ -137,6 +156,10 @@ async def handle_user_created(msg: str): ...
             "Subscriber:Message:Payload",
         ]
 
+        assert schema["components"]["schemas"]["Subscriber:Message:Payload"] == {
+            "title": "Subscriber:Message:Payload"
+        }
+
 
 class FilterNaming(BaseNaming):
     def test_subscriber_filter_base(self):