typing: Fix signature of Redis.transaction

redis/client.py

@@ -15,7 +15,9 @@
     Optional,
     Set,
     Type,
+    TypeVar,
     Union,
+    overload,
 )
 
 from redis._parsers.encoders import Encoder
@@ -97,6 +99,9 @@
 logger = logging.getLogger(__name__)
 
 
+T = TypeVar('T')
+
+
 def is_debug_log_enabled():
     return logger.isEnabledFor(logging.DEBUG)
 
@@ -545,17 +550,42 @@ def pipeline(self, transaction=True, shard_hint=None) -> "Pipeline":
             self.connection_pool, self.response_callbacks, transaction, shard_hint
         )
 
+    @overload
+    def transaction(
+        self,
+        func: Callable[["Pipeline"], T],
+        *watches: str | None,
+        shard_hint: Any = None,
+        value_from_callable: Literal[False] = False,
+        watch_delay: int | None = None,
+        **kwargs: Any,
+    ) -> List[Any]: ...
+
+    @overload
+    def transaction(
+        self,
+        func: Callable[["Pipeline"], T],
+        *watches: str | None,
+        shard_hint: Any = None,
+        value_from_callable: Literal[True] = ...,
+        watch_delay: int | None = None,
+        **kwargs: Any,
+    ) -> T: ...
+
     def transaction(
-        self, func: Callable[["Pipeline"], None], *watches, **kwargs
-    ) -> Union[List[Any], Any, None]:
+        self,
+        func: Callable[["Pipeline"], T],
+        *watches: str | None,
+        shard_hint: Any = None,
+        value_from_callable: bool = False,
+        watch_delay: int | None = None,
+        **kwargs: Any,
+    ) -> Union[List[Any], T]:
         """
         Convenience method for executing the callable `func` as a transaction
         while watching all keys specified in `watches`. The 'func' callable
         should expect a single argument which is a Pipeline object.
         """
-        shard_hint = kwargs.pop("shard_hint", None)
-        value_from_callable = kwargs.pop("value_from_callable", False)
-        watch_delay = kwargs.pop("watch_delay", None)
         with self.pipeline(True, shard_hint) as pipe:
             while True:
                 try: