From c1faafc6a092634d3c51eeffbe0c72aa48a03d3e Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Fri, 12 Jan 2024 11:42:10 +0100
Subject: [PATCH] Add decorator typing [zha] (#107599)

---
 homeassistant/components/zha/core/helpers.py | 25 +++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/zha/core/helpers.py b/homeassistant/components/zha/core/helpers.py
index bb87cb2cf58..8e518d805c6 100644
--- a/homeassistant/components/zha/core/helpers.py
+++ b/homeassistant/components/zha/core/helpers.py
@@ -8,7 +8,7 @@ from __future__ import annotations
 import asyncio
 import binascii
 import collections
-from collections.abc import Callable, Iterator
+from collections.abc import Callable, Collection, Coroutine, Iterator
 import dataclasses
 from dataclasses import dataclass
 import enum
@@ -17,7 +17,7 @@ import itertools
 import logging
 from random import uniform
 import re
-from typing import TYPE_CHECKING, Any, TypeVar
+from typing import TYPE_CHECKING, Any, Concatenate, ParamSpec, TypeVar
 
 import voluptuous as vol
 import zigpy.exceptions
@@ -37,10 +37,14 @@ from .const import CLUSTER_TYPE_IN, CLUSTER_TYPE_OUT, CUSTOM_CONFIGURATION, DATA
 from .registries import BINDABLE_CLUSTERS
 
 if TYPE_CHECKING:
+    from .cluster_handlers import ClusterHandler
     from .device import ZHADevice
     from .gateway import ZHAGateway
 
+_ClusterHandlerT = TypeVar("_ClusterHandlerT", bound="ClusterHandler")
 _T = TypeVar("_T")
+_R = TypeVar("_R")
+_P = ParamSpec("_P")
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -319,8 +323,12 @@ class LogMixin:
 
 
 def retryable_req(
-    delays=(1, 5, 10, 15, 30, 60, 120, 180, 360, 600, 900, 1800), raise_=False
-):
+    delays: Collection[float] = (1, 5, 10, 15, 30, 60, 120, 180, 360, 600, 900, 1800),
+    raise_: bool = False,
+) -> Callable[
+    [Callable[Concatenate[_ClusterHandlerT, _P], Coroutine[Any, Any, _R]]],
+    Callable[Concatenate[_ClusterHandlerT, _P], Coroutine[Any, Any, _R | None]],
+]:
     """Make a method with ZCL requests retryable.
 
     This adds delays keyword argument to function.
@@ -328,9 +336,13 @@ def retryable_req(
     raise_ if the final attempt should raise the exception.
     """
 
-    def decorator(func):
+    def decorator(
+        func: Callable[Concatenate[_ClusterHandlerT, _P], Coroutine[Any, Any, _R]],
+    ) -> Callable[Concatenate[_ClusterHandlerT, _P], Coroutine[Any, Any, _R | None]]:
         @functools.wraps(func)
-        async def wrapper(cluster_handler, *args, **kwargs):
+        async def wrapper(
+            cluster_handler: _ClusterHandlerT, *args: _P.args, **kwargs: _P.kwargs
+        ) -> _R | None:
             exceptions = (zigpy.exceptions.ZigbeeException, asyncio.TimeoutError)
             try_count, errors = 1, []
             for delay in itertools.chain(delays, [None]):
@@ -355,6 +367,7 @@ def retryable_req(
                         )
                         if raise_:
                             raise
+            return None
 
         return wrapper