Fix types for serverless

Author: sl0thentr0py

sentry_sdk/integrations/serverless.py

@@ -8,29 +8,36 @@
 from typing import TYPE_CHECKING, overload
 
 if TYPE_CHECKING:
-    from typing import Any
+    from typing import NoReturn
     from typing import Callable
     from typing import TypeVar
+    from typing import ParamSpec
     from typing import Union
     from typing import Optional
 
-    F = TypeVar("F", bound=Callable[..., Any])
+    T = TypeVar("T")
+    P = ParamSpec("P")
+
+
+if TYPE_CHECKING:
 
     @overload
-    def serverless_function(f: F, flush: bool = True) -> F:
+    def serverless_function(f: Callable[P, T], flush: bool = True) -> Callable[P, T]:
         pass
 
     @overload
-    def serverless_function(f: None = None, flush: bool = True) -> Callable[[F], F]:
+    def serverless_function(
+        f: None = None, flush: bool = True
+    ) -> Callable[[Callable[P, T]], Callable[P, T]]:
         pass
 
 
 def serverless_function(
-    f: Optional[F] = None, flush: bool = True
-) -> Union[F, Callable[[F], F]]:
-    def wrapper(f: F) -> F:
+    f: Optional[Callable[P, T]] = None, flush: bool = True
+) -> Union[Callable[P, T], Callable[[Callable[P, T]], Callable[P, T]]]:
+    def wrapper(f: Callable[P, T]) -> Callable[P, T]:
         @wraps(f)
-        def inner(*args: Any, **kwargs: Any) -> Any:
+        def inner(*args: P.args, **kwargs: P.kwargs) -> T:
             with sentry_sdk.isolation_scope() as scope:
                 scope.clear_breadcrumbs()
 
@@ -42,15 +49,15 @@ def inner(*args: Any, **kwargs: Any) -> Any:
                     if flush:
                         sentry_sdk.flush()
 
-        return inner  # type: ignore
+        return inner
 
     if f is None:
         return wrapper
     else:
         return wrapper(f)
 
 
-def _capture_and_reraise() -> None:
+def _capture_and_reraise() -> NoReturn:
     exc_info = sys.exc_info()
     client = sentry_sdk.get_client()
     if client.is_active():