refactor: fix depricated annotaion

Author: vldmrdev

taskiq_redis/redis_sentinel_broker.py

@@ -1,18 +1,11 @@
-import sys
 import uuid
+from collections.abc import AsyncGenerator, AsyncIterator, Awaitable, Callable
 from contextlib import asynccontextmanager
 from logging import getLogger
 from typing import (
     TYPE_CHECKING,
     Any,
-    AsyncGenerator,
-    AsyncIterator,
-    Awaitable,
-    Callable,
-    Dict,
-    List,
-    Optional,
-    Tuple,
+    TypeAlias,
     TypeVar,
 )
 
@@ -21,11 +14,6 @@
 from taskiq import AckableMessage, AsyncResultBackend, BrokerMessage
 from taskiq.abc.broker import AsyncBroker
 
-if sys.version_info >= (3, 10):
-    from typing import TypeAlias
-else:
-    from typing_extensions import TypeAlias
-
 if TYPE_CHECKING:
     _Redis: TypeAlias = Redis[bytes]  # type: ignore
 else:
@@ -41,13 +29,13 @@ class BaseSentinelBroker(AsyncBroker):
 
     def __init__(
         self,
-        sentinels: List[Tuple[str, int]],
+        sentinels: list[tuple[str, int]],
         master_name: str,
-        result_backend: Optional[AsyncResultBackend[_T]] = None,
-        task_id_generator: Optional[Callable[[], str]] = None,
+        result_backend: AsyncResultBackend[_T] | None = None,
+        task_id_generator: Callable[[], str] | None = None,
         queue_name: str = "taskiq",
         min_other_sentinels: int = 0,
-        sentinel_kwargs: Optional[Any] = None,
+        sentinel_kwargs: Any | None = None,
         **connection_kwargs: Any,
     ) -> None:
         super().__init__(
@@ -148,18 +136,18 @@ class RedisStreamSentinelBroker(BaseSentinelBroker):
 
     def __init__(
         self,
-        sentinels: List[Tuple[str, int]],
+        sentinels: list[tuple[str, int]],
         master_name: str,
         min_other_sentinels: int = 0,
         queue_name: str = "taskiq",
         consumer_group_name: str = "taskiq",
-        consumer_name: Optional[str] = None,
+        consumer_name: str | None = None,
         consumer_id: str = "$",
         mkstream: bool = True,
         xread_block: int = 10000,
-        maxlen: Optional[int] = None,
+        maxlen: int | None = None,
         approximate: bool = True,
-        additional_streams: Optional[Dict[str, str]] = None,
+        additional_streams: dict[str, str] | None = None,
         **connection_kwargs: Any,
     ) -> None:
         """

taskiq_redis/schedule_source.py

@@ -1,7 +1,7 @@
-import sys
 import warnings
+from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
-from typing import TYPE_CHECKING, Any, AsyncIterator, List, Optional, Tuple
+from typing import TYPE_CHECKING, Any, TypeAlias
 
 from redis.asyncio import (
     BlockingConnectionPool,
@@ -16,11 +16,6 @@
 from taskiq.scheduler.scheduled_task import ScheduledTask
 from taskiq.serializers import PickleSerializer
 
-if sys.version_info >= (3, 10):
-    from typing import TypeAlias
-else:
-    from typing_extensions import TypeAlias
-
 if TYPE_CHECKING:
     _Redis: TypeAlias = Redis[bytes]  # type: ignore
     _BlockingConnectionPool: TypeAlias = BlockingConnectionPool[Connection]  # type: ignore
@@ -50,8 +45,8 @@ def __init__(
         url: str,
         prefix: str = "schedule",
         buffer_size: int = 50,
-        max_connection_pool_size: Optional[int] = None,
-        serializer: Optional[TaskiqSerializer] = None,
+        max_connection_pool_size: int | None = None,
+        serializer: TaskiqSerializer | None = None,
         **connection_kwargs: Any,
     ) -> None:
         warnings.warn(
@@ -89,7 +84,7 @@ async def add_schedule(self, schedule: ScheduledTask) -> None:
                 self.serializer.dumpb(model_dump(schedule)),
             )
 
-    async def get_schedules(self) -> List[ScheduledTask]:
+    async def get_schedules(self) -> list[ScheduledTask]:
         """
         Get all schedules from redis.
 
@@ -143,11 +138,11 @@ def __init__(
         self,
         url: str,
         prefix: str = "schedule",
-        serializer: Optional[TaskiqSerializer] = None,
+        serializer: TaskiqSerializer | None = None,
         **connection_kwargs: Any,
     ) -> None:
         self.prefix = prefix
-        self.redis: "RedisCluster" = RedisCluster.from_url(
+        self.redis: RedisCluster = RedisCluster.from_url(
             url,
             **connection_kwargs,
         )
@@ -171,7 +166,7 @@ async def add_schedule(self, schedule: ScheduledTask) -> None:
             self.serializer.dumpb(model_dump(schedule)),
         )
 
-    async def get_schedules(self) -> List[ScheduledTask]:
+    async def get_schedules(self) -> list[ScheduledTask]:
         """
         Get all schedules from redis.
 
@@ -218,13 +213,13 @@ class RedisSentinelScheduleSource(ScheduleSource):
 
     def __init__(
         self,
-        sentinels: List[Tuple[str, int]],
+        sentinels: list[tuple[str, int]],
         master_name: str,
         prefix: str = "schedule",
         buffer_size: int = 50,
-        serializer: Optional[TaskiqSerializer] = None,
+        serializer: TaskiqSerializer | None = None,
         min_other_sentinels: int = 0,
-        sentinel_kwargs: Optional[Any] = None,
+        sentinel_kwargs: Any | None = None,
         **connection_kwargs: Any,
     ) -> None:
         self.prefix = prefix
@@ -263,7 +258,7 @@ async def add_schedule(self, schedule: ScheduledTask) -> None:
                 self.serializer.dumpb(model_dump(schedule)),
             )
 
-    async def get_schedules(self) -> List[ScheduledTask]:
+    async def get_schedules(self) -> list[ScheduledTask]:
         """
         Get all schedules from redis.