Merge branch 'release/0.4.0'

Author: s3rius

.github/workflows/test.yml

@@ -65,7 +65,7 @@ jobs:
           - 6379:6379
     strategy:
       matrix:
-        py_version: ["3.7", "3.8", "3.9", "3.10"]
+        py_version: ["3.8", "3.9", "3.10", "3.11"]
     runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v2

README.md

@@ -79,8 +79,8 @@ RedisAsyncResultBackend parameters:
 * `keep_results` - flag to not remove results from Redis after reading.
 * `result_ex_time` - expire time in seconds (by default - not specified)
 * `result_px_time` - expire time in milliseconds (by default - not specified)
-> IMPORTANT: **It is highly recommended to use expire time ​​in RedisAsyncResultBackend**  
-> If you want to add expiration, either `result_ex_time` or `result_px_time` must be set.  
+> IMPORTANT: **It is highly recommended to use expire time ​​in RedisAsyncResultBackend**
+> If you want to add expiration, either `result_ex_time` or `result_px_time` must be set.
 >```python
 ># First variant
 >redis_async_result = RedisAsyncResultBackend(
@@ -93,4 +93,4 @@ RedisAsyncResultBackend parameters:
 >    redis_url="redis://localhost:6379",
 >    result_px_time=1000000,
 >)
->```
+>```

poetry.lock

@@ -1,34 +1,34 @@
 [tool.poetry]
 name = "taskiq-redis"
-version = "0.3.1"
+version = "0.4.0"
 description = "Redis integration for taskiq"
 authors = ["taskiq-team <taskiq@norely.com>"]
 readme = "README.md"
 classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
 ]
 homepage = "https://github.com/taskiq-python/taskiq-redis"
 repository = "https://github.com/taskiq-python/taskiq-redis"
 keywords = ["taskiq", "tasks", "distributed", "async", "redis", "result_backend"]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8.1"
 taskiq = "^0"
 redis = "^4.2.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.0"
-flake8 = "^4.0.1"
+flake8 = "^6"
 mypy = "^0.961"
 isort = "^5.10.1"
 yesqa = "^1.3.0"
-wemake-python-styleguide = "^0.16.1"
+wemake-python-styleguide = "^0.18"
 black = "^22.3.0"
 autoflake = "^1.4"
 pytest-cov = "^3.0.0"

pyproject.toml

@@ -1,14 +1,17 @@
-class TaskIQRedisError(Exception):
+from taskiq.exceptions import ResultBackendError, ResultGetError, TaskiqError
+
+
+class TaskIQRedisError(TaskiqError):
     """Base error for all taskiq-redis exceptions."""
 
 
-class DuplicateExpireTimeSelectedError(TaskIQRedisError):
+class DuplicateExpireTimeSelectedError(ResultBackendError, TaskIQRedisError):
     """Error if two lifetimes are selected."""
 
 
-class ExpireTimeMustBeMoreThanZeroError(TaskIQRedisError):
+class ExpireTimeMustBeMoreThanZeroError(ResultBackendError, TaskIQRedisError):
     """Error if two lifetimes are less or equal zero."""
 
 
-class ResultIsMissingError(TaskIQRedisError):
+class ResultIsMissingError(TaskIQRedisError, ResultGetError):
     """Error if there is no result when trying to get it."""

taskiq_redis/exceptions.py

@@ -100,7 +100,7 @@ async def is_result_ready(self, task_id: str) -> bool:
         async with Redis(connection_pool=self.redis_pool) as redis:
             return bool(await redis.exists(task_id))
 
-    async def get_result(  # noqa: WPS210
+    async def get_result(
         self,
         task_id: str,
         with_logs: bool = False,

taskiq_redis/redis_backend.py

@@ -1,13 +1,16 @@
 import asyncio
 import uuid
+from typing import Union
 
 import pytest
-from taskiq import AsyncBroker, BrokerMessage
+from taskiq import AckableMessage, AsyncBroker, BrokerMessage
 
 from taskiq_redis import ListQueueBroker, PubSubBroker
 
 
-async def get_message(broker: AsyncBroker) -> bytes:  # type: ignore
+async def get_message(  # type: ignore
+    broker: AsyncBroker,
+) -> Union[bytes, AckableMessage]:
     """
     Get a message from the broker.
 

tests/test_broker.py

@@ -4,6 +4,7 @@
 from taskiq import TaskiqResult
 
 from taskiq_redis import RedisAsyncResultBackend
+from taskiq_redis.exceptions import ResultIsMissingError
 
 
 @pytest.mark.anyio
@@ -94,7 +95,7 @@ async def test_remove_results_after_reading(redis_url: str) -> None:
     )
 
     await result_backend.get_result(task_id=task_id)
-    with pytest.raises(Exception):
+    with pytest.raises(ResultIsMissingError):
         await result_backend.get_result(task_id=task_id)