🏷️ chore: refine some typing

yutto/utils/funcutils/as_sync.py

@@ -5,10 +5,13 @@
 from functools import wraps
 from typing import Any, Callable, TypeVar
 
-T = TypeVar("T")
+from typing_extensions import ParamSpec
 
+R = TypeVar("R")
+P = ParamSpec("P")
 
-def as_sync(async_func: Callable[..., Coroutine[Any, Any, T]]) -> Callable[..., T]:
+
+def as_sync(async_func: Callable[P, Coroutine[Any, Any, R]]) -> Callable[P, R]:
     """将异步函数变成同步函数，避免在调用时需要显式使用 asyncio.run
 
     ### Examples
@@ -30,7 +33,7 @@ async def itoa(a: int) -> str:
     """
 
     @wraps(async_func)
-    def sync_func(*args: Any, **kwargs: Any):
+    def sync_func(*args: P.args, **kwargs: P.kwargs) -> R:
         return asyncio.run(async_func(*args, **kwargs))
 
     return sync_func

yutto/utils/funcutils/singleton.py

@@ -1,6 +1,9 @@
-# type: ignore
 from __future__ import annotations
 
+from typing import Any, TypeVar
+
+T = TypeVar("T")
+
 
 class Singleton(type):
     """单例模式元类
@@ -21,9 +24,9 @@ class MyClass(BaseClass, metaclass=Singleton):
     ```
     """
 
-    _instances = {}
+    _instances: dict[Any, Any] = {}
 
-    def __call__(cls, *args, **kwargs):
+    def __call__(cls, *args: Any, **kwargs: Any):
         if cls not in cls._instances:
             cls._instances[cls] = super().__call__(*args, **kwargs)
         return cls._instances[cls]