✨ 完善 retry 装饰器的类型，并添加消息提示功能

nonebot_plugin_tetris_stats/utils/retry.py

@@ -1,38 +1,40 @@
 from asyncio import sleep
 from collections.abc import Awaitable, Callable
+from contextlib import suppress
 from datetime import timedelta
 from functools import wraps
-from typing import TypeVar, cast
+from typing import ParamSpec, TypeVar, cast
 
 from nonebot.log import logger
+from nonebot_plugin_alconna.uniseg import SerializeFailed, UniMessage
 
 T = TypeVar('T')
+P = ParamSpec('P')
 
 
 def retry(
     max_attempts: int = 3,
     exception_type: type[BaseException] | tuple[type[BaseException], ...] = Exception,
     delay: timedelta | None = None,
-) -> Callable[[Callable[..., Awaitable[T]]], Callable[..., Awaitable[T]]]:
+    reply: str | UniMessage | None = None,
-    def decorator(func: Callable[..., Awaitable[T]]) -> Callable[..., Awaitable[T]]:
+) -> Callable[[Callable[P, Awaitable[T]]], Callable[P, Awaitable[T]]]:
+    def decorator(func: Callable[P, Awaitable[T]]) -> Callable[P, Awaitable[T]]:
         @wraps(func)
-        async def wrapper(*args, **kwargs) -> T:  # noqa: ANN002, ANN003
+        async def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
-            attempts = 0
+            for i in range(1, max_attempts + 1):
-            while attempts < max_attempts + 1:
                 try:
                     return await func(*args, **kwargs)
                 except exception_type as e:  # noqa: PERF203
                     logger.exception(e)
-                    attempts += 1
+                    if delay is not None:
-                    if attempts <= max_attempts:
+                        await sleep(delay.total_seconds())
-                        if delay is not None:
+                    message = f'Retrying: {func.__name__} ({i}/{max_attempts})'
-                            await sleep(delay.total_seconds())
+                    logger.debug(message)
-                        logger.debug(f'Retrying: {func.__name__} ({attempts}/{max_attempts})')
+                    with suppress(SerializeFailed):
-                        continue
+                        await UniMessage(reply or message).send()
-                    raise
             msg = 'Unexpectedly reached the end of the retry loop'
             raise RuntimeError(msg)
 
-        return cast(Callable[..., Awaitable[T]], wrapper)
+        return cast(Callable[P, Awaitable[T]], wrapper)
 
     return decorator