Fix 0.6.0 AsyncAPI

docs/docs/SUMMARY.md

@@ -816,21 +816,14 @@ search:
                 - [SASLScram256](api/faststream/security/SASLScram256.md)
                 - [SASLScram512](api/faststream/security/SASLScram512.md)
             - specification
+                - [AsyncAPI](api/faststream/specification/AsyncAPI.md)
+                - [Contact](api/faststream/specification/Contact.md)
+                - [ExternalDocs](api/faststream/specification/ExternalDocs.md)
+                - [License](api/faststream/specification/License.md)
+                - [Tag](api/faststream/specification/Tag.md)
                 - asyncapi
                     - [AsyncAPI](api/faststream/specification/asyncapi/AsyncAPI.md)
-                    - [AsyncAPIProto](api/faststream/specification/asyncapi/AsyncAPIProto.md)
                     - [get_asyncapi_html](api/faststream/specification/asyncapi/get_asyncapi_html.md)
-                    - base
-                        - [AsyncAPIProto](api/faststream/specification/asyncapi/base/AsyncAPIProto.md)
-                        - asyncapi
-                            - [AsyncAPIProto](api/faststream/specification/asyncapi/base/asyncapi/AsyncAPIProto.md)
-                        - schema
-                            - [BaseInfo](api/faststream/specification/asyncapi/base/schema/BaseInfo.md)
-                            - [BaseSchema](api/faststream/specification/asyncapi/base/schema/BaseSchema.md)
-                            - info
-                                - [BaseInfo](api/faststream/specification/asyncapi/base/schema/info/BaseInfo.md)
-                            - schema
-                                - [BaseSchema](api/faststream/specification/asyncapi/base/schema/schema/BaseSchema.md)
                     - factory
                         - [AsyncAPI](api/faststream/specification/asyncapi/factory/AsyncAPI.md)
                     - message
@@ -1041,10 +1034,20 @@ search:
                                 - [Schema](api/faststream/specification/asyncapi/v3_0_0/schema/schema/Schema.md)
                             - servers
                                 - [Server](api/faststream/specification/asyncapi/v3_0_0/schema/servers/Server.md)
-                - proto
-                    - [SpecApplication](api/faststream/specification/proto/SpecApplication.md)
-                    - [SpecificationProto](api/faststream/specification/proto/SpecificationProto.md)
+                - base
+                    - info
+                        - [BaseInfo](api/faststream/specification/base/info/BaseInfo.md)
+                    - proto
+                        - [EndpointProto](api/faststream/specification/base/proto/EndpointProto.md)
+                    - schema
+                        - [BaseSchema](api/faststream/specification/base/schema/BaseSchema.md)
+                    - specification
+                        - [Specification](api/faststream/specification/base/specification/Specification.md)
                 - schema
+                    - [Contact](api/faststream/specification/schema/Contact.md)
+                    - [ExternalDocs](api/faststream/specification/schema/ExternalDocs.md)
+                    - [License](api/faststream/specification/schema/License.md)
+                    - [Tag](api/faststream/specification/schema/Tag.md)
                     - bindings
                         - [ChannelBinding](api/faststream/specification/schema/bindings/ChannelBinding.md)
                         - [OperationBinding](api/faststream/specification/schema/bindings/OperationBinding.md)
@@ -1088,8 +1091,6 @@ search:
                         - [Message](api/faststream/specification/schema/message/Message.md)
                     - operation
                         - [Operation](api/faststream/specification/schema/operation/Operation.md)
-                    - schema
-                        - [BaseSchema](api/faststream/specification/schema/schema/BaseSchema.md)
                     - security
                         - [OauthFlowObj](api/faststream/specification/schema/security/OauthFlowObj.md)
                         - [OauthFlows](api/faststream/specification/schema/security/OauthFlows.md)

docs/docs/en/api/faststream/specification/proto/SpecApplication.md → docs/docs/en/api/faststream/specification/AsyncAPI.md

@@ -8,4 +8,4 @@ search:
   boost: 0.5
 ---
 
-::: faststream.specification.proto.SpecApplication
+::: faststream.specification.AsyncAPI

docs/docs/en/api/faststream/specification/asyncapi/AsyncAPIProto.md → docs/docs/en/api/faststream/specification/Contact.md

@@ -8,4 +8,4 @@ search:
   boost: 0.5
 ---
 
-::: faststream.specification.asyncapi.AsyncAPIProto
+::: faststream.specification.Contact

docs/docs/en/api/faststream/specification/proto/SpecificationProto.md → docs/docs/en/api/faststream/specification/ExternalDocs.md

@@ -8,4 +8,4 @@ search:
   boost: 0.5
 ---
 
-::: faststream.specification.proto.SpecificationProto
+::: faststream.specification.ExternalDocs

docs/docs/en/api/faststream/specification/License.md

@@ -0,0 +1,11 @@
+---
+# 0.5 - API
+# 2 - Release
+# 3 - Contributing
+# 5 - Template Page
+# 10 - Default
+search:
+  boost: 0.5
+---
+
+::: faststream.specification.License

docs/docs/en/api/faststream/specification/Tag.md

@@ -0,0 +1,11 @@
+---
+# 0.5 - API
+# 2 - Release
+# 3 - Contributing
+# 5 - Template Page
+# 10 - Default
+search:
+  boost: 0.5
+---
+
+::: faststream.specification.Tag

docs/docs/en/api/faststream/specification/base/info/BaseInfo.md

@@ -0,0 +1,11 @@
+---
+# 0.5 - API
+# 2 - Release
+# 3 - Contributing
+# 5 - Template Page
+# 10 - Default
+search:
+  boost: 0.5
+---
+
+::: faststream.specification.base.info.BaseInfo

docs/docs/en/api/faststream/specification/base/proto/EndpointProto.md

@@ -0,0 +1,11 @@
+---
+# 0.5 - API
+# 2 - Release
+# 3 - Contributing
+# 5 - Template Page
+# 10 - Default
+search:
+  boost: 0.5
+---
+
+::: faststream.specification.base.proto.EndpointProto

docs/docs/en/api/faststream/specification/schema/schema/BaseSchema.md → docs/docs/en/api/faststream/specification/base/schema/BaseSchema.md

@@ -8,4 +8,4 @@ search:
   boost: 0.5
 ---
 
-::: faststream.specification.schema.schema.BaseSchema
+::: faststream.specification.base.schema.BaseSchema

docs/docs/en/api/faststream/specification/asyncapi/base/AsyncAPIProto.md → docs/docs/en/api/faststream/specification/base/specification/Specification.md

@@ -8,4 +8,4 @@ search:
   boost: 0.5
 ---
 
-::: faststream.specification.asyncapi.base.AsyncAPIProto
+::: faststream.specification.base.specification.Specification

docs/docs/en/api/faststream/specification/schema/Contact.md

@@ -0,0 +1,11 @@
+---
+# 0.5 - API
+# 2 - Release
+# 3 - Contributing
+# 5 - Template Page
+# 10 - Default
+search:
+  boost: 0.5
+---
+
+::: faststream.specification.schema.Contact

docs/docs/en/api/faststream/specification/schema/ExternalDocs.md

@@ -0,0 +1,11 @@
+---
+# 0.5 - API
+# 2 - Release
+# 3 - Contributing
+# 5 - Template Page
+# 10 - Default
+search:
+  boost: 0.5
+---
+
+::: faststream.specification.schema.ExternalDocs

docs/docs/en/api/faststream/specification/schema/License.md

@@ -0,0 +1,11 @@
+---
+# 0.5 - API
+# 2 - Release
+# 3 - Contributing
+# 5 - Template Page
+# 10 - Default
+search:
+  boost: 0.5
+---
+
+::: faststream.specification.schema.License

docs/docs/en/api/faststream/specification/schema/Tag.md

@@ -0,0 +1,11 @@
+---
+# 0.5 - API
+# 2 - Release
+# 3 - Contributing
+# 5 - Template Page
+# 10 - Default
+search:
+  boost: 0.5
+---
+
+::: faststream.specification.schema.Tag

faststream/rabbit/subscriber/subscriber.py

@@ -41,28 +41,24 @@ def get_schema(self) -> dict[str, Channel]:
                 ),
                 bindings=ChannelBinding(
                     amqp=amqp.ChannelBinding(
-                        is_="routingKey",
-                        queue=amqp.Queue(
-                            name=self.queue.name,
-                            durable=self.queue.durable,
-                            exclusive=self.queue.exclusive,
-                            autoDelete=self.queue.auto_delete,
-                            vhost=self.virtual_host,
-                        )
-                        if is_routing_exchange(self.exchange) and self.queue.name
-                        else None,
-                        exchange=(
-                            amqp.Exchange(type="default", vhost=self.virtual_host)
-                            if not self.exchange.name
-                            else amqp.Exchange(
-                                type=self.exchange.type.value,
-                                name=self.exchange.name,
-                                durable=self.exchange.durable,
-                                autoDelete=self.exchange.auto_delete,
+                        is_="queue", queue=amqp.Queue(
+                                name=self.queue.name,
+                                durable=self.queue.durable,
+                                exclusive=self.queue.exclusive,
+                                autoDelete=self.queue.auto_delete,
                                 vhost=self.virtual_host,
+                            ), exchange=(
+                                amqp.Exchange(type="default", vhost=self.virtual_host)
+                                if not self.exchange.name
+                                else amqp.Exchange(
+                                    type=self.exchange.type.value,
+                                    name=self.exchange.name,
+                                    durable=self.exchange.durable,
+                                    autoDelete=self.exchange.auto_delete,
+                                    vhost=self.virtual_host,
+                                )
                             )
-                        ),
-                    ),
+                    )
                 ),
             ),
         }

faststream/specification/asyncapi/v2_6_0/schema/bindings/amqp/channel.py

@@ -95,10 +95,15 @@ class ChannelBinding(BaseModel):
     def from_spec(cls, binding: spec.bindings.amqp.ChannelBinding) -> Self:
         return cls(
             **{
-                "is": binding.is_,
+                "is": "routingKey",
+
                 "queue": Queue.from_spec(binding.queue)
                 if binding.queue is not None
+                   and binding.queue.name
+                   and binding.exchange
+                   and binding.exchange.type in {"default", "direct", "topic"}
                 else None,
+
                 "exchange": Exchange.from_spec(binding.exchange)
                 if binding.exchange is not None
                 else None,

faststream/specification/asyncapi/v2_6_0/schema/channels.py

@@ -56,12 +56,12 @@ def from_spec(cls, channel: spec.channel.Channel) -> Self:
             bindings=channel_binding_from_spec(channel.bindings)
             if channel.bindings is not None
             else None,
-            subscribe=operation_from_spec(channel.subscribe)
-            if channel.subscribe is not None
-            else None,
-            publish=operation_from_spec(channel.publish)
+            subscribe=operation_from_spec(channel.publish)
             if channel.publish is not None
             else None,
+            publish=operation_from_spec(channel.subscribe)
+            if channel.subscribe is not None
+            else None,
         )
 
 

faststream/specification/asyncapi/v3_0_0/schema/bindings/amqp/channel.py

@@ -12,10 +12,10 @@ def from_spec(binding: spec.bindings.amqp.ChannelBinding) -> ChannelBinding:
             "is": binding.is_,
             "bindingVersion": "0.3.0",
             "queue": Queue.from_spec(binding.queue)
-            if binding.queue is not None
+            if binding.queue is not None and binding.is_ == "queue"
             else None,
             "exchange": Exchange.from_spec(binding.exchange)
-            if binding.exchange is not None
+            if binding.exchange is not None and binding.is_ == "routingKey"
             else None,
         },
     )

tests/a_docs/getting_started/asyncapi/asyncapi_customization/test_basic.py

@@ -13,7 +13,7 @@ def test_basic_customization():
                     "kafka": {"bindingVersion": "0.4.0", "topic": "input_data"},
                 },
                 "servers": ["development"],
-                "subscribe": {
+                "publish": {
                     "message": {
                         "$ref": "#/components/messages/input_data:OnInputData:Message",
                     },
@@ -23,7 +23,7 @@ def test_basic_customization():
                 "bindings": {
                     "kafka": {"bindingVersion": "0.4.0", "topic": "output_data"},
                 },
-                "publish": {
+                "subscribe": {
                     "message": {
                         "$ref": "#/components/messages/output_data:Publisher:Message",
                     },

tests/a_docs/getting_started/asyncapi/asyncapi_customization/test_handler.py

@@ -11,15 +11,15 @@ def test_handler_customization():
             "description": "Consumer function\n\n    Args:\n        msg: input msg\n    ",
             "servers": ["development"],
             "bindings": {"kafka": {"topic": "input_data", "bindingVersion": "0.4.0"}},
-            "subscribe": {
+            "publish": {
                 "message": {"$ref": "#/components/messages/input_data:Consume:Message"},
             },
         },
         "output_data:Produce": {
             "description": "My publisher description",
             "servers": ["development"],
             "bindings": {"kafka": {"topic": "output_data", "bindingVersion": "0.4.0"}},
-            "publish": {
+            "subscribe": {
                 "message": {
                     "$ref": "#/components/messages/output_data:Produce:Message"
                 },

tests/asyncapi/base/v2_6_0/publisher.py

@@ -34,7 +34,7 @@ async def handle(msg): ...
 
         key = tuple(schema["channels"].keys())[0]  # noqa: RUF015
         assert schema["channels"][key].get("description") is None
-        assert schema["channels"][key].get("publish") is not None
+        assert schema["channels"][key].get("subscribe") is not None
 
         payload = schema["components"]["schemas"]
         for v in payload.values():

tests/asyncapi/confluent/v2_6_0/test_naming.py

@@ -29,7 +29,7 @@ async def handle(): ...
                 "test:Handle": {
                     "servers": ["development"],
                     "bindings": {"kafka": {"topic": "test", "bindingVersion": "0.4.0"}},
-                    "subscribe": {
+                    "publish": {
                         "message": {
                             "$ref": "#/components/messages/test:Handle:Message"
                         },