fix: correct All Publisher middlewares order

airtai · Nov 29, 2024 · 797d888 · 797d888
1 parent 8c3d2ea
commit 797d888
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/faststream/confluent/publisher/usecase.py b/faststream/confluent/publisher/usecase.py
@@ -105,11 +105,11 @@ async def request(
         request: AsyncFunc = self._producer.request
 
         for pub_m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             request = partial(pub_m, request)
 
@@ -198,11 +198,11 @@ async def publish(
         call: AsyncFunc = self._producer.publish
 
         for m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             call = partial(m, call)
 
@@ -273,11 +273,11 @@ async def publish(
         call: AsyncFunc = self._producer.publish_batch
 
         for m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             call = partial(m, call)
 

diff --git a/faststream/kafka/publisher/usecase.py b/faststream/kafka/publisher/usecase.py
@@ -149,11 +149,11 @@ async def request(
         request: AsyncFunc = self._producer.request
 
         for pub_m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             request = partial(pub_m, request)
 
@@ -299,11 +299,11 @@ async def publish(
         call: AsyncFunc = self._producer.publish
 
         for m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             call = partial(m, call)
 
@@ -473,11 +473,11 @@ async def publish(
         call: AsyncFunc = self._producer.publish_batch
 
         for m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             call = partial(m, call)
 

diff --git a/faststream/nats/publisher/usecase.py b/faststream/nats/publisher/usecase.py
@@ -190,11 +190,11 @@ async def request(
         request: AsyncFunc = self._producer.request
 
         for pub_m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             request = partial(pub_m, request)
 

diff --git a/faststream/rabbit/publisher/usecase.py b/faststream/rabbit/publisher/usecase.py
@@ -277,11 +277,11 @@ async def publish(
         call: AsyncFunc = self._producer.publish
 
         for m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             call = partial(m, call)
 
@@ -349,11 +349,11 @@ async def request(
         request: AsyncFunc = self._producer.request
 
         for pub_m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             request = partial(pub_m, request)
 

diff --git a/faststream/redis/publisher/usecase.py b/faststream/redis/publisher/usecase.py
@@ -180,11 +180,11 @@ async def publish(
         call: AsyncFunc = self._producer.publish
 
         for m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             call = partial(m, call)
 
@@ -246,11 +246,11 @@ async def request(
         request: AsyncFunc = self._producer.request
 
         for pub_m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             request = partial(pub_m, request)
 
@@ -393,11 +393,11 @@ async def publish(
         call: AsyncFunc = self._producer.publish
 
         for m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             call = partial(m, call)
 
@@ -460,11 +460,11 @@ async def request(
         request: AsyncFunc = self._producer.request
 
         for pub_m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             request = partial(pub_m, request)
 
@@ -524,11 +524,11 @@ async def publish(  # type: ignore[override]
         call: AsyncFunc = self._producer.publish_batch
 
         for m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             call = partial(m, call)
 
@@ -667,11 +667,11 @@ async def publish(
         call: AsyncFunc = self._producer.publish
 
         for m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             call = partial(m, call)
 
@@ -742,11 +742,11 @@ async def request(
         request: AsyncFunc = self._producer.request
 
         for pub_m in chain(
+            self._middlewares[::-1],
             (
                 _extra_middlewares
                 or (m(None).publish_scope for m in self._broker_middlewares[::-1])
             ),
-            self._middlewares[::-1],
         ):
             request = partial(pub_m, request)