Fix #688 kwarg injection does not work with decorated functions (#689)

seratch · web-flow · commit 656ce6fd0b64 · 2022-07-26T10:43:32.000+09:00
diff --git a/slack_bolt/authorization/async_authorize.py b/slack_bolt/authorization/async_authorize.py
@@ -1,4 +1,3 @@
-import inspect
 from logging import Logger
 from typing import Optional, Callable, Awaitable, Dict, Any
 
@@ -14,6 +13,7 @@
 from slack_bolt.authorization import AuthorizeResult
 from slack_bolt.context.async_context import AsyncBoltContext
 from slack_bolt.error import BoltError
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 class AsyncAuthorize:
@@ -42,7 +42,7 @@ class AsyncCallableAuthorize(AsyncAuthorize):
     def __init__(self, *, logger: Logger, func: Callable[..., Awaitable[AuthorizeResult]]):
         self.logger = logger
         self.func = func
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
 
     async def __call__(
         self,
diff --git a/slack_bolt/authorization/authorize.py b/slack_bolt/authorization/authorize.py
@@ -1,4 +1,3 @@
-import inspect
 from logging import Logger
 from typing import Optional, Callable, Dict, Any
 
@@ -13,6 +12,7 @@
 from slack_bolt.authorization.authorize_result import AuthorizeResult
 from slack_bolt.context.context import BoltContext
 from slack_bolt.error import BoltError
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 class Authorize:
@@ -46,7 +46,7 @@ def __init__(
     ):
         self.logger = logger
         self.func = func
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
 
     def __call__(
         self,
diff --git a/slack_bolt/lazy_listener/async_internals.py b/slack_bolt/lazy_listener/async_internals.py
@@ -1,18 +1,18 @@
-import inspect
 from functools import wraps
 from logging import Logger
 from typing import Callable, Awaitable
 
 from slack_bolt.kwargs_injection.async_utils import build_async_required_kwargs
 from slack_bolt.request.async_request import AsyncBoltRequest
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 async def to_runnable_function(
     internal_func: Callable[..., Awaitable[None]],
     logger: Logger,
     request: AsyncBoltRequest,
 ):
-    arg_names = inspect.getfullargspec(internal_func).args
+    arg_names = get_arg_names_of_callable(internal_func)
 
     @wraps(internal_func)
     async def request_wired_wrapper() -> None:
diff --git a/slack_bolt/lazy_listener/internals.py b/slack_bolt/lazy_listener/internals.py
@@ -1,18 +1,18 @@
-import inspect
 from functools import wraps
 from logging import Logger
 from typing import Callable
 
 from slack_bolt.kwargs_injection import build_required_kwargs
 from slack_bolt.request import BoltRequest
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 def build_runnable_function(
     func: Callable[..., None],
     logger: Logger,
     request: BoltRequest,
 ) -> Callable[[], None]:
-    arg_names = inspect.getfullargspec(func).args
+    arg_names = get_arg_names_of_callable(func)
 
     @wraps(func)
     def request_wired_func_wrapper() -> None:
diff --git a/slack_bolt/listener/async_listener.py b/slack_bolt/listener/async_listener.py
@@ -6,6 +6,7 @@
 from slack_bolt.request.async_request import AsyncBoltRequest
 from slack_bolt.response import BoltResponse
 from ..kwargs_injection.async_utils import build_async_required_kwargs
+from ..util.utils import get_arg_names_of_callable
 
 
 class AsyncListener(metaclass=ABCMeta):
@@ -69,7 +70,6 @@ async def run_ack_function(self, *, request: AsyncBoltRequest, response: BoltRes
         raise NotImplementedError()
 
 
-import inspect
 from logging import Logger
 from typing import Callable, Awaitable
 
@@ -107,7 +107,7 @@ def __init__(
         self.matchers = matchers
         self.middleware = middleware
         self.auto_acknowledgement = auto_acknowledgement
-        self.arg_names = inspect.getfullargspec(ack_function).args
+        self.arg_names = get_arg_names_of_callable(ack_function)
         self.logger = get_bolt_app_logger(app_name, self.ack_function, base_logger)
 
     async def run_ack_function(
diff --git a/slack_bolt/listener/async_listener_completion_handler.py b/slack_bolt/listener/async_listener_completion_handler.py
@@ -1,11 +1,11 @@
-import inspect
 from abc import ABCMeta, abstractmethod
 from logging import Logger
 from typing import Callable, Dict, Any, Awaitable, Optional
 
 from slack_bolt.kwargs_injection.async_utils import build_async_required_kwargs
 from slack_bolt.request.async_request import AsyncBoltRequest
 from slack_bolt.response import BoltResponse
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 class AsyncListenerCompletionHandler(metaclass=ABCMeta):
@@ -28,7 +28,7 @@ class AsyncCustomListenerCompletionHandler(AsyncListenerCompletionHandler):
     def __init__(self, logger: Logger, func: Callable[..., Awaitable[None]]):
         self.func = func
         self.logger = logger
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
 
     async def handle(
         self,
diff --git a/slack_bolt/listener/async_listener_error_handler.py b/slack_bolt/listener/async_listener_error_handler.py
@@ -1,11 +1,11 @@
-import inspect
 from abc import ABCMeta, abstractmethod
 from logging import Logger
 from typing import Callable, Dict, Any, Awaitable, Optional
 
 from slack_bolt.kwargs_injection.async_utils import build_async_required_kwargs
 from slack_bolt.request.async_request import AsyncBoltRequest
 from slack_bolt.response import BoltResponse
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 class AsyncListenerErrorHandler(metaclass=ABCMeta):
@@ -30,7 +30,7 @@ class AsyncCustomListenerErrorHandler(AsyncListenerErrorHandler):
     def __init__(self, logger: Logger, func: Callable[..., Awaitable[Optional[BoltResponse]]]):
         self.func = func
         self.logger = logger
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
 
     async def handle(
         self,
diff --git a/slack_bolt/listener/async_listener_start_handler.py b/slack_bolt/listener/async_listener_start_handler.py
@@ -1,11 +1,11 @@
-import inspect
 from abc import ABCMeta, abstractmethod
 from logging import Logger
 from typing import Callable, Dict, Any, Awaitable, Optional
 
 from slack_bolt.kwargs_injection.async_utils import build_async_required_kwargs
 from slack_bolt.request.async_request import AsyncBoltRequest
 from slack_bolt.response import BoltResponse
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 class AsyncListenerStartHandler(metaclass=ABCMeta):
@@ -28,7 +28,7 @@ class AsyncCustomListenerStartHandler(AsyncListenerStartHandler):
     def __init__(self, logger: Logger, func: Callable[..., Awaitable[None]]):
         self.func = func
         self.logger = logger
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
 
     async def handle(
         self,
diff --git a/slack_bolt/listener/custom_listener.py b/slack_bolt/listener/custom_listener.py
@@ -1,4 +1,3 @@
-import inspect
 from logging import Logger
 from typing import Callable, Optional, Sequence
 
@@ -9,6 +8,7 @@
 from .listener import Listener
 from ..logger import get_bolt_app_logger
 from ..middleware import Middleware
+from ..util.utils import get_arg_names_of_callable
 
 
 class CustomListener(Listener):
@@ -38,7 +38,7 @@ def __init__(
         self.matchers = matchers
         self.middleware = middleware
         self.auto_acknowledgement = auto_acknowledgement
-        self.arg_names = inspect.getfullargspec(ack_function).args
+        self.arg_names = get_arg_names_of_callable(ack_function)
         self.logger = get_bolt_app_logger(app_name, self.ack_function, base_logger)
 
     def run_ack_function(
diff --git a/slack_bolt/listener/listener_completion_handler.py b/slack_bolt/listener/listener_completion_handler.py
@@ -1,11 +1,11 @@
-import inspect
 from abc import ABCMeta, abstractmethod
 from logging import Logger
 from typing import Callable, Dict, Any, Optional
 
 from slack_bolt.kwargs_injection import build_required_kwargs
 from slack_bolt.request.request import BoltRequest
 from slack_bolt.response.response import BoltResponse
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 class ListenerCompletionHandler(metaclass=ABCMeta):
@@ -28,7 +28,7 @@ class CustomListenerCompletionHandler(ListenerCompletionHandler):
     def __init__(self, logger: Logger, func: Callable[..., None]):
         self.func = func
         self.logger = logger
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
 
     def handle(
         self,
diff --git a/slack_bolt/listener/listener_error_handler.py b/slack_bolt/listener/listener_error_handler.py
@@ -1,11 +1,11 @@
-import inspect
 from abc import ABCMeta, abstractmethod
 from logging import Logger
 from typing import Callable, Dict, Any, Optional
 
 from slack_bolt.kwargs_injection import build_required_kwargs
 from slack_bolt.request.request import BoltRequest
 from slack_bolt.response.response import BoltResponse
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 class ListenerErrorHandler(metaclass=ABCMeta):
@@ -30,7 +30,7 @@ class CustomListenerErrorHandler(ListenerErrorHandler):
     def __init__(self, logger: Logger, func: Callable[..., Optional[BoltResponse]]):
         self.func = func
         self.logger = logger
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
 
     def handle(
         self,
diff --git a/slack_bolt/listener/listener_start_handler.py b/slack_bolt/listener/listener_start_handler.py
@@ -1,11 +1,11 @@
-import inspect
 from abc import ABCMeta, abstractmethod
 from logging import Logger
 from typing import Callable, Dict, Any, Optional
 
 from slack_bolt.kwargs_injection import build_required_kwargs
 from slack_bolt.request.request import BoltRequest
 from slack_bolt.response.response import BoltResponse
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 class ListenerStartHandler(metaclass=ABCMeta):
@@ -32,7 +32,7 @@ class CustomListenerStartHandler(ListenerStartHandler):
     def __init__(self, logger: Logger, func: Callable[..., None]):
         self.func = func
         self.logger = logger
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
 
     def handle(
         self,
diff --git a/slack_bolt/listener_matcher/async_listener_matcher.py b/slack_bolt/listener_matcher/async_listener_matcher.py
@@ -2,6 +2,7 @@
 
 from slack_bolt.request.async_request import AsyncBoltRequest
 from slack_bolt.response import BoltResponse
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 class AsyncListenerMatcher(metaclass=ABCMeta):
@@ -19,7 +20,6 @@ async def async_matches(self, req: AsyncBoltRequest, resp: BoltResponse) -> bool
         raise NotImplementedError()
 
 
-import inspect
 from logging import Logger
 from typing import Callable, Awaitable, Sequence, Optional
 
@@ -38,7 +38,7 @@ class AsyncCustomListenerMatcher(AsyncListenerMatcher):
     def __init__(self, *, app_name: str, func: Callable[..., Awaitable[bool]], base_logger: Optional[Logger] = None):
         self.app_name = app_name
         self.func = func
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
         self.logger = get_bolt_app_logger(self.app_name, self.func, base_logger)
 
     async def async_matches(self, req: AsyncBoltRequest, resp: BoltResponse) -> bool:
diff --git a/slack_bolt/listener_matcher/builtins.py b/slack_bolt/listener_matcher/builtins.py
@@ -1,5 +1,4 @@
 # pytype: skip-file
-import inspect
 import re
 import sys
 from logging import Logger
@@ -24,6 +23,7 @@
     is_workflow_step_save,
 )
 from ..logger.messages import error_message_event_type
+from ..util.utils import get_arg_names_of_callable
 
 if sys.version_info.major == 3 and sys.version_info.minor <= 6:
     from re import _pattern_type as Pattern
@@ -47,7 +47,7 @@ def __init__(
         base_logger: Optional[Logger] = None,
     ):
         self.func = func
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
         self.logger = get_bolt_logger(self.func, base_logger)
 
     def matches(self, req: BoltRequest, resp: BoltResponse) -> bool:
diff --git a/slack_bolt/listener_matcher/custom_listener_matcher.py b/slack_bolt/listener_matcher/custom_listener_matcher.py
@@ -1,4 +1,3 @@
-import inspect
 from logging import Logger
 from typing import Callable, Sequence, Optional
 
@@ -7,6 +6,7 @@
 from slack_bolt.request import BoltRequest
 from slack_bolt.response import BoltResponse
 from .listener_matcher import ListenerMatcher
+from ..util.utils import get_arg_names_of_callable
 
 
 class CustomListenerMatcher(ListenerMatcher):
@@ -18,7 +18,7 @@ class CustomListenerMatcher(ListenerMatcher):
     def __init__(self, *, app_name: str, func: Callable[..., bool], base_logger: Optional[Logger] = None):
         self.app_name = app_name
         self.func = func
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
         self.logger = get_bolt_app_logger(self.app_name, self.func, base_logger)
 
     def matches(self, req: BoltRequest, resp: BoltResponse) -> bool:
diff --git a/slack_bolt/middleware/async_custom_middleware.py b/slack_bolt/middleware/async_custom_middleware.py
@@ -7,7 +7,7 @@
 from slack_bolt.request.async_request import AsyncBoltRequest
 from slack_bolt.response import BoltResponse
 from .async_middleware import AsyncMiddleware
-from slack_bolt.util.utils import get_name_for_callable
+from slack_bolt.util.utils import get_name_for_callable, get_arg_names_of_callable
 
 
 class AsyncCustomMiddleware(AsyncMiddleware):
@@ -29,7 +29,7 @@ def __init__(
         else:
             raise ValueError("Async middleware function must be an async function")
 
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
         self.logger = get_bolt_app_logger(self.app_name, self.func, base_logger)
 
     async def async_process(
diff --git a/slack_bolt/middleware/async_middleware_error_handler.py b/slack_bolt/middleware/async_middleware_error_handler.py
@@ -1,11 +1,11 @@
-import inspect
 from abc import ABCMeta, abstractmethod
 from logging import Logger
 from typing import Callable, Dict, Any, Awaitable, Optional
 
 from slack_bolt.kwargs_injection.async_utils import build_async_required_kwargs
 from slack_bolt.request.async_request import AsyncBoltRequest
 from slack_bolt.response import BoltResponse
+from slack_bolt.util.utils import get_arg_names_of_callable
 
 
 class AsyncMiddlewareErrorHandler(metaclass=ABCMeta):
@@ -30,7 +30,7 @@ class AsyncCustomMiddlewareErrorHandler(AsyncMiddlewareErrorHandler):
     def __init__(self, logger: Logger, func: Callable[..., Awaitable[Optional[BoltResponse]]]):
         self.func = func
         self.logger = logger
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
 
     async def handle(
         self,
diff --git a/slack_bolt/middleware/custom_middleware.py b/slack_bolt/middleware/custom_middleware.py
@@ -1,4 +1,3 @@
-import inspect
 from logging import Logger
 from typing import Callable, Any, Sequence, Optional
 
@@ -7,7 +6,7 @@
 from slack_bolt.request import BoltRequest
 from slack_bolt.response import BoltResponse
 from .middleware import Middleware
-from slack_bolt.util.utils import get_name_for_callable
+from slack_bolt.util.utils import get_name_for_callable, get_arg_names_of_callable
 
 
 class CustomMiddleware(Middleware):
@@ -19,7 +18,7 @@ class CustomMiddleware(Middleware):
     def __init__(self, *, app_name: str, func: Callable, base_logger: Optional[Logger] = None):
         self.app_name = app_name
         self.func = func
-        self.arg_names = inspect.getfullargspec(func).args
+        self.arg_names = get_arg_names_of_callable(func)
         self.logger = get_bolt_app_logger(self.app_name, self.func, base_logger)
 
     def process(
diff --git a/slack_bolt/middleware/middleware_error_handler.py b/slack_bolt/middleware/middleware_error_handler.py
diff --git a/slack_bolt/util/utils.py b/slack_bolt/util/utils.py
diff --git a/tests/scenario_tests/test_events.py b/tests/scenario_tests/test_events.py
diff --git a/tests/scenario_tests_async/test_events.py b/tests/scenario_tests_async/test_events.py
