taskiq-redis 1.1.1__py3-none-any.whl → 1.1.2__py3-none-any.whl

taskiq_redis/redis_broker.py

@@ -260,11 +260,11 @@ class RedisStreamBroker(BaseRedisBroker):
                 approximate=self.approximate,
             )
 
-    def _ack_generator(self, id: str) -> Callable[[], Awaitable[None]]:
+    def _ack_generator(self, id: str, queue_name: str) -> Callable[[], Awaitable[None]]:
         async def _ack() -> None:
             async with Redis(connection_pool=self.connection_pool) as redis_conn:
                 await redis_conn.xack(
-                    self.queue_name,
+                    queue_name,
                     self.consumer_group_name,
                     id,
                 )
@@ -287,12 +287,12 @@ class RedisStreamBroker(BaseRedisBroker):
                     noack=False,
                     count=self.count,
                 )
-                for _, msg_list in fetched:
+                for stream, msg_list in fetched:
                     for msg_id, msg in msg_list:
                         logger.debug("Received message: %s", msg)
                         yield AckableMessage(
                             data=msg[b"data"],
-                            ack=self._ack_generator(msg_id),
+                            ack=self._ack_generator(id=msg_id, queue_name=stream),
                         )
                 logger.debug("Starting fetching unacknowledged messages")
                 for stream in [self.queue_name, *self.additional_streams.keys()]:
@@ -318,5 +318,5 @@ class RedisStreamBroker(BaseRedisBroker):
                             logger.debug("Received message: %s", msg)
                             yield AckableMessage(
                                 data=msg[b"data"],
-                                ack=self._ack_generator(msg_id),
+                                ack=self._ack_generator(id=msg_id, queue_name=stream),
                             )

taskiq_redis/redis_cluster_broker.py

@@ -171,10 +171,10 @@ class RedisStreamClusterBroker(BaseRedisClusterBroker):
             approximate=self.approximate,
         )
 
-    def _ack_generator(self, id: str) -> Callable[[], Awaitable[None]]:
+    def _ack_generator(self, id: str, queue_name: str) -> Callable[[], Awaitable[None]]:
         async def _ack() -> None:
             await self.redis.xack(
-                self.queue_name,
+                queue_name,
                 self.consumer_group_name,
                 id,
             )
@@ -194,10 +194,10 @@ class RedisStreamClusterBroker(BaseRedisClusterBroker):
                 block=self.block,
                 noack=False,
             )
-            for _, msg_list in fetched:
+            for stream, msg_list in fetched:
                 for msg_id, msg in msg_list:
                     logger.debug("Received message: %s", msg)
                     yield AckableMessage(
                         data=msg[b"data"],
-                        ack=self._ack_generator(msg_id),
+                        ack=self._ack_generator(id=msg_id, queue_name=stream),
                     )

taskiq_redis/redis_sentinel_broker.py

@@ -239,11 +239,11 @@ class RedisStreamSentinelBroker(BaseSentinelBroker):
                 approximate=self.approximate,
             )
 
-    def _ack_generator(self, id: str) -> Callable[[], Awaitable[None]]:
+    def _ack_generator(self, id: str, queue_name: str) -> Callable[[], Awaitable[None]]:
         async def _ack() -> None:
             async with self._acquire_master_conn() as redis_conn:
                 await redis_conn.xack(
-                    self.queue_name,
+                    queue_name,
                     self.consumer_group_name,
                     id,
                 )
@@ -264,10 +264,10 @@ class RedisStreamSentinelBroker(BaseSentinelBroker):
                     block=self.block,
                     noack=False,
                 )
-                for _, msg_list in fetched:
+                for stream, msg_list in fetched:
                     for msg_id, msg in msg_list:
                         logger.debug("Received message: %s", msg)
                         yield AckableMessage(
                             data=msg[b"data"],
-                            ack=self._ack_generator(msg_id),
+                            ack=self._ack_generator(id=msg_id, queue_name=stream),
                         )

{taskiq_redis-1.1.1.dist-info → taskiq_redis-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskiq-redis
-Version: 1.1.1
+Version: 1.1.2
 Summary: Redis integration for taskiq
 License-File: LICENSE
 Keywords: taskiq,tasks,distributed,async,redis,result_backend

{taskiq_redis-1.1.1.dist-info → taskiq_redis-1.1.2.dist-info}/RECORD

@@ -3,11 +3,11 @@ taskiq_redis/exceptions.py,sha256=7buBJ7CRVWd5WqVqSjtHO8cVL7QzZg-DOM3nB87t-Sk,73
 taskiq_redis/list_schedule_source.py,sha256=aMM_LCJrbg2GIb8BTJJEZaFIWxziR68TwGELMTKI1q8,9805
 taskiq_redis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskiq_redis/redis_backend.py,sha256=sE4XeGr1fX0IE5FBdCJ9uP6DH7khAKlt8va2SwTv4go,19850
-taskiq_redis/redis_broker.py,sha256=2FqE3xbQcFW_BBsa4RBCl3hLUIcamR70Sc5Pjen-O8A,12278
-taskiq_redis/redis_cluster_broker.py,sha256=pJfTIMTKg5h0qeS1ia-8R98Yk0zAVseM7ZRZnGTlMGU,7232
-taskiq_redis/redis_sentinel_broker.py,sha256=SxOLXzK6RuInYoS27fSeZac0N1i52sFBig4s5owaU80,9666
+taskiq_redis/redis_broker.py,sha256=COVKtKTy9JTqwwKr0FY4DGbv_CU1aEcYa0hrZNbvQpc,12339
+taskiq_redis/redis_cluster_broker.py,sha256=Kcp2bsrarEcwDfrPnk52iiEpT5HOdnrCbeT79i0xNgY,7271
+taskiq_redis/redis_sentinel_broker.py,sha256=D3EVc2-mpOayU8IYvqeBeGJxNr1rBX4ElQrU0R-CJoA,9705
 taskiq_redis/schedule_source.py,sha256=mDYlAlAuzIzMICpJiQ1AwWOF-9_OHVGJWXA45Gm2Trg,10128
-taskiq_redis-1.1.1.dist-info/METADATA,sha256=LLaOkXmBNm1paLyUTn4G1kpAgHfDDAfLbr-HkWNFEhk,7205
-taskiq_redis-1.1.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-taskiq_redis-1.1.1.dist-info/licenses/LICENSE,sha256=lEHEEE-ZxmuItxYgUMPiFWdRcAITxE8DFMNyAg4eOYE,1075
-taskiq_redis-1.1.1.dist-info/RECORD,,
+taskiq_redis-1.1.2.dist-info/METADATA,sha256=ln415QqFA3Il9AfBx-htyw0KhCdLDYHCipJExCihfLg,7205
+taskiq_redis-1.1.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+taskiq_redis-1.1.2.dist-info/licenses/LICENSE,sha256=lEHEEE-ZxmuItxYgUMPiFWdRcAITxE8DFMNyAg4eOYE,1075
+taskiq_redis-1.1.2.dist-info/RECORD,,