Add assistant middleware inheritance option

Author: Cr1stal

slack_bolt/app/app.py

@@ -683,19 +683,26 @@ def middleware_func(logger, body, next):
                 self._middleware_list.append(middleware)
                 if isinstance(middleware, Assistant) and middleware.thread_context_store is not None:
                     self._assistant_thread_context_store = middleware.thread_context_store
+                elif not isinstance(middleware, Assistant):
+                    self._inherit_app_middleware_for_assistants(middleware)
             elif callable(middleware_or_callable):
-                self._middleware_list.append(
-                    CustomMiddleware(
-                        app_name=self.name,
-                        func=middleware_or_callable,
-                        base_logger=self._base_logger,
-                    )
+                middleware = CustomMiddleware(
+                    app_name=self.name,
+                    func=middleware_or_callable,
+                    base_logger=self._base_logger,
                 )
+                self._middleware_list.append(middleware)
+                self._inherit_app_middleware_for_assistants(middleware)
                 return middleware_or_callable
             else:
                 raise BoltError(f"Unexpected type for a middleware ({type(middleware_or_callable)})")
         return None
 
+    def _inherit_app_middleware_for_assistants(self, middleware: Middleware) -> None:
+        for registered_middleware in self._middleware_list[:-1]:
+            if isinstance(registered_middleware, Assistant):
+                registered_middleware.inherit_app_middleware(middleware)
+
     # -------------------------
     # AI Agents & Assistants
 

slack_bolt/app/async_app.py

@@ -710,19 +710,26 @@ async def middleware_func(logger, body, next):
                 self._async_middleware_list.append(middleware)
                 if isinstance(middleware, AsyncAssistant) and middleware.thread_context_store is not None:
                     self._assistant_thread_context_store = middleware.thread_context_store
+                elif not isinstance(middleware, AsyncAssistant):
+                    self._inherit_app_middleware_for_assistants(middleware)
             elif callable(middleware_or_callable):
-                self._async_middleware_list.append(
-                    AsyncCustomMiddleware(
-                        app_name=self.name,
-                        func=middleware_or_callable,
-                        base_logger=self._base_logger,
-                    )
+                middleware = AsyncCustomMiddleware(
+                    app_name=self.name,
+                    func=middleware_or_callable,
+                    base_logger=self._base_logger,
                 )
+                self._async_middleware_list.append(middleware)
+                self._inherit_app_middleware_for_assistants(middleware)
                 return middleware_or_callable
             else:
                 raise BoltError(f"Unexpected type for a middleware ({type(middleware_or_callable)})")
         return None
 
+    def _inherit_app_middleware_for_assistants(self, middleware: AsyncMiddleware) -> None:
+        for registered_middleware in self._async_middleware_list[:-1]:
+            if isinstance(registered_middleware, AsyncAssistant):
+                registered_middleware.inherit_app_middleware(middleware)
+
     def assistant(self, assistant: AsyncAssistant) -> Optional[Callable]:
         return self.middleware(assistant)
 

slack_bolt/middleware/assistant/assistant.py

@@ -42,16 +42,43 @@ def __init__(
         app_name: str = "assistant",
         thread_context_store: Optional[AssistantThreadContextStore] = None,
         logger: Optional[logging.Logger] = None,
+        auto_inherit_app_middleware: bool = False,
     ):
         self.app_name = app_name
         self.thread_context_store = thread_context_store
         self.base_logger = logger
+        self.auto_inherit_app_middleware = auto_inherit_app_middleware
+        self._inherited_app_middleware: List[Middleware] = []
 
         self._thread_started_listeners = None
         self._thread_context_changed_listeners = None
         self._user_message_listeners = None
         self._bot_message_listeners = None
 
+    def inherit_app_middleware(self, middleware: Middleware) -> None:
+        if self.auto_inherit_app_middleware is False:
+            return
+
+        insertion_index = len(self._inherited_app_middleware) + 1
+        self._inherited_app_middleware.append(middleware)
+        for listener in self._listeners:
+            listener_middleware = list(listener.middleware)
+            listener_middleware.insert(insertion_index, middleware)
+            listener.middleware = listener_middleware
+
+    @property
+    def _listeners(self) -> List[Listener]:
+        listeners: List[Listener] = []
+        for listener_list in [
+            self._thread_started_listeners,
+            self._thread_context_changed_listeners,
+            self._user_message_listeners,
+            self._bot_message_listeners,
+        ]:
+            if listener_list is not None:
+                listeners.extend(listener_list)
+        return listeners
+
     def thread_started(
         self,
         *args,
@@ -271,8 +298,11 @@ def build_listener(
         if isinstance(listener_or_functions, Listener):
             return listener_or_functions
         elif isinstance(listener_or_functions, list):
-            middleware = middleware if middleware else []
-            middleware.insert(0, AttachingConversationKwargs(self.thread_context_store))
+            middleware = [
+                AttachingConversationKwargs(self.thread_context_store),
+                *self._inherited_app_middleware,
+                *(middleware if middleware else []),
+            ]
             functions = listener_or_functions
             ack_function = functions.pop(0)
 

slack_bolt/middleware/assistant/async_assistant.py

@@ -42,16 +42,43 @@ def __init__(
         app_name: str = "assistant",
         thread_context_store: Optional[AsyncAssistantThreadContextStore] = None,
         logger: Optional[logging.Logger] = None,
+        auto_inherit_app_middleware: bool = False,
     ):
         self.app_name = app_name
         self.thread_context_store = thread_context_store
         self.base_logger = logger
+        self.auto_inherit_app_middleware = auto_inherit_app_middleware
+        self._inherited_app_middleware: List[AsyncMiddleware] = []
 
         self._thread_started_listeners = None
         self._thread_context_changed_listeners = None
         self._user_message_listeners = None
         self._bot_message_listeners = None
 
+    def inherit_app_middleware(self, middleware: AsyncMiddleware) -> None:
+        if self.auto_inherit_app_middleware is False:
+            return
+
+        insertion_index = len(self._inherited_app_middleware) + 1
+        self._inherited_app_middleware.append(middleware)
+        for listener in self._listeners:
+            listener_middleware = list(listener.middleware)
+            listener_middleware.insert(insertion_index, middleware)
+            listener.middleware = listener_middleware
+
+    @property
+    def _listeners(self) -> List[AsyncListener]:
+        listeners: List[AsyncListener] = []
+        for listener_list in [
+            self._thread_started_listeners,
+            self._thread_context_changed_listeners,
+            self._user_message_listeners,
+            self._bot_message_listeners,
+        ]:
+            if listener_list is not None:
+                listeners.extend(listener_list)
+        return listeners
+
     def thread_started(
         self,
         *args,
@@ -302,8 +329,11 @@ def build_listener(
         if isinstance(listener_or_functions, AsyncListener):
             return listener_or_functions
         elif isinstance(listener_or_functions, list):
-            middleware = middleware if middleware else []
-            middleware.insert(0, AsyncAttachingConversationKwargs(self.thread_context_store))
+            middleware = [
+                AsyncAttachingConversationKwargs(self.thread_context_store),
+                *self._inherited_app_middleware,
+                *(middleware if middleware else []),
+            ]
             functions = listener_or_functions
             ack_function = functions.pop(0)