From 82e54750fa587c6cac6cf8c3ef63ac26157c0373 Mon Sep 17 00:00:00 2001 From: Grigory Bukovsky Date: Mon, 27 Mar 2023 17:03:46 +0300 Subject: [PATCH 1/3] Add super.shutdown() call in redis brokers --- taskiq_redis/redis_broker.py | 1 + 1 file changed, 1 insertion(+) diff --git a/taskiq_redis/redis_broker.py b/taskiq_redis/redis_broker.py index 50cc212..87f1f51 100644 --- a/taskiq_redis/redis_broker.py +++ b/taskiq_redis/redis_broker.py @@ -49,6 +49,7 @@ def __init__( async def shutdown(self) -> None: """Closes redis connection pool.""" + await super().shutdown() await self.connection_pool.disconnect() async def listen(self) -> AsyncGenerator[BrokerMessage, None]: From 61027af1501a0858c014250deaf32120e5b44280 Mon Sep 17 00:00:00 2001 From: Grigory Bukovsky <32143244+booqoffsky@users.noreply.github.com> Date: Tue, 28 Mar 2023 14:55:24 +0300 Subject: [PATCH 2/3] Add PubSubBroker in __init__.py (#31) --- README.md | 3 +-- taskiq_redis/__init__.py | 8 ++++++-- tests/test_backend.py | 2 +- tests/test_broker.py | 2 +- tests/test_result_backend.py | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 90ee3a0..961f7f2 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,7 @@ Let's see the example with the redis broker and redis async result: ```python import asyncio -from taskiq_redis.redis_broker import ListQueueBroker -from taskiq_redis.redis_backend import RedisAsyncResultBackend +from taskiq_redis import ListQueueBroker, RedisAsyncResultBackend redis_async_result = RedisAsyncResultBackend( redis_url="redis://localhost:6379", diff --git a/taskiq_redis/__init__.py b/taskiq_redis/__init__.py index d8c4ab5..09e9e2d 100644 --- a/taskiq_redis/__init__.py +++ b/taskiq_redis/__init__.py @@ -1,5 +1,9 @@ """Package for redis integration.""" from taskiq_redis.redis_backend import RedisAsyncResultBackend -from taskiq_redis.redis_broker import ListQueueBroker +from taskiq_redis.redis_broker import ListQueueBroker, PubSubBroker -__all__ = ["RedisAsyncResultBackend", "ListQueueBroker"] +__all__ = [ + "RedisAsyncResultBackend", + "ListQueueBroker", + "PubSubBroker", +] diff --git a/tests/test_backend.py b/tests/test_backend.py index 458ded1..af22f79 100644 --- a/tests/test_backend.py +++ b/tests/test_backend.py @@ -5,11 +5,11 @@ import pytest from taskiq import TaskiqResult +from taskiq_redis import RedisAsyncResultBackend from taskiq_redis.exceptions import ( DuplicateExpireTimeSelectedError, ExpireTimeMustBeMoreThanZeroError, ) -from taskiq_redis.redis_backend import RedisAsyncResultBackend _ReturnType = TypeVar("_ReturnType") diff --git a/tests/test_broker.py b/tests/test_broker.py index 5dd3a08..d2fdcee 100644 --- a/tests/test_broker.py +++ b/tests/test_broker.py @@ -4,7 +4,7 @@ import pytest from taskiq import AsyncBroker, BrokerMessage -from taskiq_redis.redis_broker import ListQueueBroker, PubSubBroker +from taskiq_redis import ListQueueBroker, PubSubBroker async def get_message(broker: AsyncBroker) -> BrokerMessage: # type: ignore diff --git a/tests/test_result_backend.py b/tests/test_result_backend.py index aceea0d..56f1864 100644 --- a/tests/test_result_backend.py +++ b/tests/test_result_backend.py @@ -3,7 +3,7 @@ import pytest from taskiq import TaskiqResult -from taskiq_redis.redis_backend import RedisAsyncResultBackend +from taskiq_redis import RedisAsyncResultBackend @pytest.mark.anyio From d47db2b2d838b27bbb1d5266afea91da727a7a1c Mon Sep 17 00:00:00 2001 From: "chandr-andr (Kiselev Aleksandr)" Date: Wed, 29 Mar 2023 01:05:33 +0400 Subject: [PATCH 3/3] Set version in pyproject.toml to 0.2.3 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ffbf7e7..2ca6924 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "taskiq-redis" -version = "0.2.2" +version = "0.2.3" description = "Redis integration for taskiq" authors = ["taskiq-team "] readme = "README.md"