latest changes

WilliamBergamin · WilliamBergamin · commit 68c43d865176 · 2026-03-11T14:30:04.000-04:00
diff --git a/slack_bolt/context/base_context.py b/slack_bolt/context/base_context.py
@@ -38,6 +38,7 @@ class BaseContext(dict):
         "set_status",
         "set_title",
         "set_suggested_prompts",
+        "say_stream",
     ]
     # Note that these items are not copyable, so when you add new items to this list,
     # you must modify ThreadListenerRunner/AsyncioListenerRunner's _build_lazy_request method to pass the values.
diff --git a/slack_bolt/context/say_stream/async_say_stream.py b/slack_bolt/context/say_stream/async_say_stream.py
@@ -15,9 +15,9 @@ def __init__(
         self,
         client: AsyncWebClient,
         channel_id: Optional[str],
-        thread_ts: Optional[str] = None,
-        team_id: Optional[str] = None,
-        user_id: Optional[str] = None,
+        thread_ts: Optional[str],
+        team_id: Optional[str],
+        user_id: Optional[str],
     ):
         self.client = client
         self.channel_id = channel_id
@@ -39,15 +39,16 @@ async def __call__(
             raise ValueError(
                 "Either provide all of channel, thread_ts, recipient_team_id, and recipient_user_id, or none of them"
             )
-        resolved_channel = channel or self.channel_id
-        resolved_thread_ts = thread_ts or self.thread_ts
-        if resolved_channel is None:
+        channel = channel or self.channel_id
+        thread_ts = thread_ts or self.thread_ts
+        if channel is None:
             raise ValueError("say_stream is unsupported here as there is no channel_id")
-        if resolved_thread_ts is None:
+        if thread_ts is None:
             raise ValueError("say_stream is unsupported here as there is no thread_ts")
+
         return await self.client.chat_stream(
-            channel=resolved_channel,
-            thread_ts=resolved_thread_ts,
+            channel=channel,
+            thread_ts=thread_ts,
             recipient_team_id=recipient_team_id or self.team_id,
             recipient_user_id=recipient_user_id or self.user_id,
             **kwargs,
diff --git a/slack_bolt/context/say_stream/say_stream.py b/slack_bolt/context/say_stream/say_stream.py
@@ -15,9 +15,9 @@ def __init__(
         self,
         client: WebClient,
         channel_id: Optional[str],
-        thread_ts: Optional[str] = None,
-        team_id: Optional[str] = None,
-        user_id: Optional[str] = None,
+        thread_ts: Optional[str],
+        team_id: Optional[str],
+        user_id: Optional[str],
     ):
         self.client = client
         self.channel_id = channel_id
@@ -39,16 +39,16 @@ def __call__(
             raise ValueError(
                 "Either provide all of channel, thread_ts, recipient_team_id, and recipient_user_id, or none of them"
             )
-        resolved_channel = channel or self.channel_id
-        resolved_thread_ts = thread_ts or self.thread_ts
-        if resolved_channel is None:
+        channel = channel or self.channel_id
+        thread_ts = thread_ts or self.thread_ts
+        if channel is None:
             raise ValueError("say_stream is unsupported here as there is no channel_id")
-        if resolved_thread_ts is None:
+        if thread_ts is None:
             raise ValueError("say_stream is unsupported here as there is no thread_ts")
 
         return self.client.chat_stream(
-            channel=resolved_channel,
-            thread_ts=resolved_thread_ts,
+            channel=channel,
+            thread_ts=thread_ts,
             recipient_team_id=recipient_team_id or self.team_id,
             recipient_user_id=recipient_user_id or self.user_id,
             **kwargs,
diff --git a/slack_bolt/middleware/attaching_agent_kwargs/async_attaching_agent_kwargs.py b/slack_bolt/middleware/attaching_agent_kwargs/async_attaching_agent_kwargs.py
@@ -21,20 +21,20 @@ async def async_process(
         channel_id = req.context.channel_id
         # TODO: improve the logic around extracting thread_ts and event ts
         event = req.body.get("event", {})
+        req.context.thread_ts
         thread_ts = event.get("thread_ts") or event.get("ts")
 
         if channel_id and thread_ts:
             client = req.context.client
             req.context["set_status"] = AsyncSetStatus(client, channel_id, thread_ts)
             req.context["set_title"] = AsyncSetTitle(client, channel_id, thread_ts)
             req.context["set_suggested_prompts"] = AsyncSetSuggestedPrompts(client, channel_id, thread_ts)
-
-        req.context["say_stream"] = AsyncSayStream(
-            client=req.context.client,
-            channel_id=channel_id,
-            thread_ts=thread_ts,
-            team_id=req.context.team_id,
-            user_id=req.context.user_id,
-        )
+            req.context["say_stream"] = AsyncSayStream(
+                client=req.context.client,
+                channel_id=channel_id,
+                thread_ts=thread_ts,
+                team_id=req.context.team_id,
+                user_id=req.context.user_id,
+            )
 
         return await next()
diff --git a/slack_bolt/middleware/attaching_agent_kwargs/attaching_agent_kwargs.py b/slack_bolt/middleware/attaching_agent_kwargs/attaching_agent_kwargs.py
@@ -28,13 +28,12 @@ def process(
             req.context["set_status"] = SetStatus(client, channel_id, thread_ts)
             req.context["set_title"] = SetTitle(client, channel_id, thread_ts)
             req.context["set_suggested_prompts"] = SetSuggestedPrompts(client, channel_id, thread_ts)
-
-        req.context["say_stream"] = SayStream(
-            client=req.context.client,
-            channel_id=channel_id,
-            thread_ts=thread_ts,
-            team_id=req.context.team_id,
-            user_id=req.context.user_id,
-        )
+            req.context["say_stream"] = SayStream(
+                client=req.context.client,
+                channel_id=channel_id,
+                thread_ts=thread_ts,
+                team_id=req.context.team_id,
+                user_id=req.context.user_id,
+            )
 
         return next()
diff --git a/slack_bolt/request/internals.py b/slack_bolt/request/internals.py
@@ -240,6 +240,16 @@ def extract_thread_ts(payload: Dict[str, Any]) -> Optional[str]:
             elif event.get("previous_message", {}).get("thread_ts") is not None:
                 # message_deleted
                 return event["previous_message"]["thread_ts"]
+        return None
+    thread_ts = payload.get("thread_ts")
+    if thread_ts is not None:
+        return thread_ts
+    if payload.get("event") is not None:
+        return extract_thread_ts(payload["event"])
+    if isinstance(payload.get("message"), dict):
+        return extract_thread_ts(payload["message"])
+    if isinstance(payload.get("previous_message"), dict):
+        return extract_thread_ts(payload["previous_message"])
     return None
 
 
diff --git a/tests/slack_bolt/request/test_internals.py b/tests/slack_bolt/request/test_internals.py
@@ -13,6 +13,7 @@
     extract_actor_team_id,
     extract_actor_user_id,
     extract_function_execution_id,
+    extract_thread_ts,
 )
 
 
@@ -111,6 +112,143 @@ def teardown_method(self):
         },
     ]
 
+    thread_ts_event_requests = [
+        {
+            "event": {
+                "type": "app_mention",
+                "channel": "C111",
+                "user": "U111",
+                "ts": "123.420",
+                "thread_ts": "123.456",
+            },
+        },
+        {
+            "event": {
+                "type": "message",
+                "channel": "C111",
+                "user": "U111",
+                "ts": "123.420",
+                "thread_ts": "123.456",
+            },
+        },
+        {
+            "event": {
+                "type": "message",
+                "subtype": "bot_message",
+                "channel": "C111",
+                "bot_id": "B111",
+                "ts": "123.420",
+                "thread_ts": "123.456",
+            },
+        },
+        {
+            "event": {
+                "type": "message",
+                "subtype": "file_share",
+                "channel": "C111",
+                "user": "U111",
+                "ts": "123.420",
+                "thread_ts": "123.456",
+            },
+        },
+        {
+            "event": {
+                "type": "message",
+                "subtype": "thread_broadcast",
+                "channel": "C111",
+                "user": "U111",
+                "ts": "123.420",
+                "thread_ts": "123.456",
+                "root": {"thread_ts": "123.420"},
+            },
+        },
+        {
+            "event": {
+                "type": "link_shared",
+                "channel": "C111",
+                "user": "U111",
+                "thread_ts": "123.456",
+                "links": [{"url": "https://example.com"}],
+            },
+        },
+        {
+            "event": {
+                "type": "message",
+                "subtype": "message_changed",
+                "channel": "C111",
+                "message": {
+                    "type": "message",
+                    "user": "U111",
+                    "text": "edited",
+                    "ts": "123.420",
+                    "thread_ts": "123.456",
+                },
+            },
+        },
+        {
+            "event": {
+                "type": "message",
+                "subtype": "message_changed",
+                "channel": "C111",
+                "message": {
+                    "type": "message",
+                    "user": "U111",
+                    "text": "edited",
+                    "ts": "123.420",
+                    "thread_ts": "123.456",
+                },
+                "previous_message": {
+                    "type": "message",
+                    "user": "U111",
+                    "text": "deleted",
+                    "ts": "123.420",
+                    "thread_ts": "123.420",
+                },
+            },
+        },
+        {
+            "event": {
+                "type": "message",
+                "subtype": "message_deleted",
+                "channel": "C111",
+                "previous_message": {
+                    "type": "message",
+                    "user": "U111",
+                    "text": "deleted",
+                    "ts": "123.420",
+                    "thread_ts": "123.456",
+                },
+            },
+        },
+    ]
+
+    no_thread_ts_requests = [
+        {
+            "event": {
+                "type": "reaction_added",
+                "user": "U111",
+                "reaction": "thumbsup",
+                "item": {"type": "message", "channel": "C111", "ts": "123.420"},
+            },
+        },
+        {
+            "event": {
+                "type": "channel_created",
+                "channel": {"id": "C222", "name": "test", "created": 1678455198},
+            },
+        },
+        {
+            "event": {
+                "type": "message",
+                "channel": "C111",
+                "user": "U111",
+                "text": "hello",
+                "ts": "123.420",
+            },
+        },
+        {},
+    ]
+
     slack_connect_authorizations = [
         {
             "enterprise_id": "INSTALLED_ENTERPRISE_ID",
@@ -223,10 +361,10 @@ def teardown_method(self):
                 "type": "message",
                 "text": "<@INSTALLED_BOT_USER_ID> Hey!",
                 "user": "USER_ID_ACTOR",
-                "ts": "1678455198.838499",
+                "ts": "123.456",
                 "team": "TEAM_ID_ACTOR",
                 "channel": "C111",
-                "event_ts": "1678455198.838499",
+                "event_ts": "123.456",
                 "channel_type": "channel",
             },
             "type": "event_callback",
@@ -337,6 +475,47 @@ def test_function_inputs_extraction(self):
             inputs = extract_function_inputs(req)
             assert inputs == {"customer_id": "Ux111"}
 
+    def test_extract_thread_ts(self):
+        for req in self.thread_ts_event_requests:
+            thread_ts = extract_thread_ts(req)
+            assert thread_ts == "123.456", f"Expected thread_ts for {req}"
+
+    def test_extract_thread_ts_fail(self):
+        for req in self.no_thread_ts_requests:
+            thread_ts = extract_thread_ts(req)
+            assert thread_ts is None, f"Expected None for {req}"
+
+    def test_extract_thread_ts_edge_cases(self):
+        # message_changed where only previous_message has thread_ts (no message key)
+        req = {
+            "event": {
+                "type": "message",
+                "subtype": "message_deleted",
+                "channel": "C111",
+                "previous_message": {
+                    "type": "message",
+                    "ts": "1678455205.000000",
+                    "thread_ts": "123.456",
+                },
+            },
+        }
+        assert extract_thread_ts(req) == "123.456"
+
+        # Payload with thread_ts directly at root level (non-event payload)
+        req = {"thread_ts": "123.456"}
+        assert extract_thread_ts(req) == "123.456"
+
+        # Event with thread_ts as empty string (truthy check: empty string is falsy)
+        req = {
+            "event": {
+                "type": "message",
+                "channel": "C111",
+                "thread_ts": "",
+            },
+        }
+        # Empty string is falsy, so .get() returns "" but `is not None` is True
+        assert extract_thread_ts(req) == ""
+
     def test_is_enterprise_install_extraction(self):
         for req in self.requests:
             should_be_false = extract_is_enterprise_install(req)

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ class BaseContext(dict):`
`38`	`38`	`"set_status",`
`39`	`39`	`"set_title",`
`40`	`40`	`"set_suggested_prompts",`
	`41`	`+ "say_stream",`
`41`	`42`	`]`
`42`	`43`	`# Note that these items are not copyable, so when you add new items to this list,`
`43`	`44`	`# you must modify ThreadListenerRunner/AsyncioListenerRunner's _build_lazy_request method to pass the values.`