Skip to content

Commit 4c9c247

Browse files
WilliamBergaminWilliamBergamin
authored
Merge branch 'main' into set-assistant-say-in-middleware
2 parents ebc67bb + f0db283 commit 4c9c247

13 files changed

Lines changed: 827 additions & 227 deletions

‎slack_bolt/app/app.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,7 @@ def _register_listener(
14461446
CustomListener(
14471447
app_name=self.name,
14481448
ack_function=functions.pop(0),
1449-
lazy_functions=functions, # type:ignore[arg-type]
1449+
lazy_functions=functions, # type: ignore[arg-type]
14501450
matchers=listener_matchers,
14511451
middleware=listener_middleware,
14521452
auto_acknowledgement=auto_acknowledgement,

‎slack_bolt/app/async_app.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ async def async_middleware_next():
617617
self._framework_logger.debug(debug_checking_listener(listener_name))
618618
if await listener.async_matches(req=req, resp=resp): # type: ignore[arg-type]
619619
# run all the middleware attached to this listener first
620-
(middleware_resp, next_was_not_called) = await listener.run_async_middleware(
620+
middleware_resp, next_was_not_called = await listener.run_async_middleware(
621621
req=req, resp=resp # type: ignore[arg-type]
622622
)
623623
if next_was_not_called:
@@ -1487,7 +1487,7 @@ def _register_listener(
14871487
AsyncCustomListener(
14881488
app_name=self.name,
14891489
ack_function=functions.pop(0),
1490-
lazy_functions=functions, # type:ignore[arg-type]
1490+
lazy_functions=functions, # type: ignore[arg-type]
14911491
matchers=listener_matchers,
14921492
middleware=listener_middleware,
14931493
auto_acknowledgement=auto_acknowledgement,

‎slack_bolt/middleware/assistant/assistant.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def thread_started(
6868
self.build_listener(
6969
listener_or_functions=func,
7070
matchers=all_matchers,
71-
middleware=middleware, # type:ignore[arg-type]
71+
middleware=middleware, # type: ignore[arg-type]
7272
)
7373
)
7474
return func
@@ -107,7 +107,7 @@ def user_message(
107107
self.build_listener(
108108
listener_or_functions=func,
109109
matchers=all_matchers,
110-
middleware=middleware, # type:ignore[arg-type]
110+
middleware=middleware, # type: ignore[arg-type]
111111
)
112112
)
113113
return func
@@ -146,7 +146,7 @@ def bot_message(
146146
self.build_listener(
147147
listener_or_functions=func,
148148
matchers=all_matchers,
149-
middleware=middleware, # type:ignore[arg-type]
149+
middleware=middleware, # type: ignore[arg-type]
150150
)
151151
)
152152
return func
@@ -185,7 +185,7 @@ def thread_context_changed(
185185
self.build_listener(
186186
listener_or_functions=func,
187187
matchers=all_matchers,
188-
middleware=middleware, # type:ignore[arg-type]
188+
middleware=middleware, # type: ignore[arg-type]
189189
)
190190
)
191191
return func
@@ -215,13 +215,13 @@ def _merge_matchers(
215215
):
216216
return [CustomListenerMatcher(app_name=self.app_name, func=primary_matcher)] + (
217217
custom_matchers or []
218-
) # type:ignore[operator]
218+
) # type: ignore[operator]
219219

220220
@staticmethod
221221
def default_thread_context_changed(save_thread_context: SaveThreadContext, payload: dict):
222222
save_thread_context(payload["assistant_thread"]["context"])
223223

224-
def process( # type:ignore[return]
224+
def process( # type: ignore[return]
225225
self, *, req: BoltRequest, resp: BoltResponse, next: Callable[[], BoltResponse]
226226
) -> Optional[BoltResponse]:
227227
if self._thread_context_changed_listeners is None:
@@ -265,8 +265,8 @@ def build_listener(
265265
middleware: Optional[List[Middleware]] = None,
266266
base_logger: Optional[Logger] = None,
267267
) -> Listener:
268-
if isinstance(listener_or_functions, Callable): # type:ignore[arg-type]
269-
listener_or_functions = [listener_or_functions] # type:ignore[list-item]
268+
if isinstance(listener_or_functions, Callable): # type: ignore[arg-type]
269+
listener_or_functions = [listener_or_functions] # type: ignore[list-item]
270270

271271
if isinstance(listener_or_functions, Listener):
272272
return listener_or_functions
@@ -281,7 +281,7 @@ def build_listener(
281281
for matcher in matchers:
282282
if isinstance(matcher, ListenerMatcher):
283283
listener_matchers.append(matcher)
284-
elif isinstance(matcher, Callable): # type:ignore[arg-type]
284+
elif isinstance(matcher, Callable): # type: ignore[arg-type]
285285
listener_matchers.append(
286286
build_listener_matcher(
287287
func=matcher,

‎slack_bolt/middleware/assistant/async_assistant.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def thread_started(
6464
func=is_assistant_thread_started_event,
6565
asyncio=True,
6666
base_logger=self.base_logger,
67-
), # type:ignore[arg-type]
67+
), # type: ignore[arg-type]
6868
matchers,
6969
)
7070
if is_used_without_argument(args):
@@ -73,7 +73,7 @@ def thread_started(
7373
self.build_listener(
7474
listener_or_functions=func,
7575
matchers=all_matchers,
76-
middleware=middleware, # type:ignore[arg-type]
76+
middleware=middleware, # type: ignore[arg-type]
7777
)
7878
)
7979
return func
@@ -110,7 +110,7 @@ def user_message(
110110
func=is_user_message_event_in_assistant_thread,
111111
asyncio=True,
112112
base_logger=self.base_logger,
113-
), # type:ignore[arg-type]
113+
), # type: ignore[arg-type]
114114
matchers,
115115
)
116116
if is_used_without_argument(args):
@@ -119,7 +119,7 @@ def user_message(
119119
self.build_listener(
120120
listener_or_functions=func,
121121
matchers=all_matchers,
122-
middleware=middleware, # type:ignore[arg-type]
122+
middleware=middleware, # type: ignore[arg-type]
123123
)
124124
)
125125
return func
@@ -156,7 +156,7 @@ def bot_message(
156156
func=is_bot_message_event_in_assistant_thread,
157157
asyncio=True,
158158
base_logger=self.base_logger,
159-
), # type:ignore[arg-type]
159+
), # type: ignore[arg-type]
160160
matchers,
161161
)
162162
if is_used_without_argument(args):
@@ -165,7 +165,7 @@ def bot_message(
165165
self.build_listener(
166166
listener_or_functions=func,
167167
matchers=all_matchers,
168-
middleware=middleware, # type:ignore[arg-type]
168+
middleware=middleware, # type: ignore[arg-type]
169169
)
170170
)
171171
return func
@@ -202,7 +202,7 @@ def thread_context_changed(
202202
func=is_assistant_thread_context_changed_event,
203203
asyncio=True,
204204
base_logger=self.base_logger,
205-
), # type:ignore[arg-type]
205+
), # type: ignore[arg-type]
206206
matchers,
207207
)
208208
if is_used_without_argument(args):
@@ -211,7 +211,7 @@ def thread_context_changed(
211211
self.build_listener(
212212
listener_or_functions=func,
213213
matchers=all_matchers,
214-
middleware=middleware, # type:ignore[arg-type]
214+
middleware=middleware, # type: ignore[arg-type]
215215
)
216216
)
217217
return func
@@ -239,14 +239,14 @@ def _merge_matchers(
239239
primary_matcher: Union[Callable[..., bool], AsyncListenerMatcher],
240240
custom_matchers: Optional[Union[Callable[..., bool], AsyncListenerMatcher]],
241241
):
242-
return [primary_matcher] + (custom_matchers or []) # type:ignore[operator]
242+
return [primary_matcher] + (custom_matchers or []) # type: ignore[operator]
243243

244244
@staticmethod
245245
async def default_thread_context_changed(save_thread_context: AsyncSaveThreadContext, payload: dict):
246246
new_context: dict = payload["assistant_thread"]["context"]
247247
await save_thread_context(new_context)
248248

249-
async def async_process( # type:ignore[return]
249+
async def async_process( # type: ignore[return]
250250
self,
251251
*,
252252
req: AsyncBoltRequest,
@@ -294,8 +294,8 @@ def build_listener(
294294
middleware: Optional[List[AsyncMiddleware]] = None,
295295
base_logger: Optional[Logger] = None,
296296
) -> AsyncListener:
297-
if isinstance(listener_or_functions, Callable): # type:ignore[arg-type]
298-
listener_or_functions = [listener_or_functions] # type:ignore[list-item]
297+
if isinstance(listener_or_functions, Callable): # type: ignore[arg-type]
298+
listener_or_functions = [listener_or_functions] # type: ignore[list-item]
299299

300300
if isinstance(listener_or_functions, AsyncListener):
301301
return listener_or_functions
@@ -313,7 +313,7 @@ def build_listener(
313313
else:
314314
listener_matchers.append(
315315
build_listener_matcher(
316-
func=matcher, # type:ignore[arg-type]
316+
func=matcher, # type: ignore[arg-type]
317317
asyncio=True,
318318
base_logger=base_logger,
319319
)

‎slack_bolt/request/payload_utils.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from typing import Dict, Any, Optional
22

3-
43
# ------------------------------------------
54
# Public Utilities
65
# ------------------------------------------

0 commit comments

Comments
 (0)