Merge branch 'ai-apps' into zimeg-feat-assistant-set-status-arguments

Author: zimeg

pyproject.toml

@@ -20,7 +20,7 @@ classifiers = [
 	"Operating System :: OS Independent",
 ]
 requires-python = ">=3.7"
-dependencies = ["slack_sdk>=3.35.0,<4"]
+dependencies = ["slack_sdk==3.36.0.dev3"]
 
 
 [project.urls]

requirements/adapter.txt

@@ -4,6 +4,7 @@
 boto3<=2
 bottle>=0.12,<1
 chalice>=1.28,<2;
+cheroot<11                              # https://github.com/slackapi/bolt-python/issues/1374
 CherryPy>=18,<19
 Django>=3,<6
 falcon>=2,<5; python_version<"3.11"

slack_bolt/context/say/async_say.py

@@ -1,14 +1,14 @@
-from typing import Optional, Union, Dict, Sequence, Callable, Awaitable
+from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
 
-from slack_sdk.models.metadata import Metadata
-
-from slack_bolt.context.say.internals import _can_say
-from slack_bolt.util.utils import create_copy
 from slack_sdk.models.attachments import Attachment
 from slack_sdk.models.blocks import Block
+from slack_sdk.models.metadata import Metadata
 from slack_sdk.web.async_client import AsyncWebClient
 from slack_sdk.web.async_slack_response import AsyncSlackResponse
 
+from slack_bolt.context.say.internals import _can_say
+from slack_bolt.util.utils import create_copy
+
 
 class AsyncSay:
     client: Optional[AsyncWebClient]
@@ -42,6 +42,7 @@ async def __call__(
         icon_emoji: Optional[str] = None,
         icon_url: Optional[str] = None,
         username: Optional[str] = None,
+        markdown_text: Optional[str] = None,
         mrkdwn: Optional[bool] = None,
         link_names: Optional[bool] = None,
         parse: Optional[str] = None,  # none, full
@@ -67,6 +68,7 @@ async def __call__(
                     icon_emoji=icon_emoji,
                     icon_url=icon_url,
                     username=username,
+                    markdown_text=markdown_text,
                     mrkdwn=mrkdwn,
                     link_names=link_names,
                     parse=parse,

slack_bolt/context/say/say.py

@@ -1,4 +1,4 @@
-from typing import Optional, Union, Dict, Sequence, Callable
+from typing import Callable, Dict, Optional, Sequence, Union
 
 from slack_sdk import WebClient
 from slack_sdk.models.attachments import Attachment
@@ -45,6 +45,7 @@ def __call__(
         icon_emoji: Optional[str] = None,
         icon_url: Optional[str] = None,
         username: Optional[str] = None,
+        markdown_text: Optional[str] = None,
         mrkdwn: Optional[bool] = None,
         link_names: Optional[bool] = None,
         parse: Optional[str] = None,  # none, full
@@ -70,6 +71,7 @@ def __call__(
                     icon_emoji=icon_emoji,
                     icon_url=icon_url,
                     username=username,
+                    markdown_text=markdown_text,
                     mrkdwn=mrkdwn,
                     link_names=link_names,
                     parse=parse,

slack_bolt/version.py

@@ -1,3 +1,3 @@
 """Check the latest version at https://pypi.org/project/slack-bolt/"""
 
-__version__ = "1.25.0"
+__version__ = "1.26.0.dev0"

tests/slack_bolt/context/test_say.py

@@ -3,10 +3,7 @@
 from slack_sdk.web import SlackResponse
 
 from slack_bolt import Say
-from tests.mock_web_api_server import (
-    setup_mock_web_api_server,
-    cleanup_mock_web_api_server,
-)
+from tests.mock_web_api_server import cleanup_mock_web_api_server, setup_mock_web_api_server
 
 
 class TestSay:
@@ -24,6 +21,11 @@ def test_say(self):
         response: SlackResponse = say(text="Hi there!")
         assert response.status_code == 200
 
+    def test_say_markdown_text(self):
+        say = Say(client=self.web_client, channel="C111")
+        response: SlackResponse = say(markdown_text="**Greetings!**")
+        assert response.status_code == 200
+
     def test_say_unfurl_options(self):
         say = Say(client=self.web_client, channel="C111")
         response: SlackResponse = say(text="Hi there!", unfurl_media=True, unfurl_links=True)

tests/slack_bolt_async/context/test_async_say.py

@@ -2,12 +2,9 @@
 from slack_sdk.web.async_client import AsyncWebClient
 from slack_sdk.web.async_slack_response import AsyncSlackResponse
 
-from tests.utils import get_event_loop
 from slack_bolt.context.say.async_say import AsyncSay
-from tests.mock_web_api_server import (
-    cleanup_mock_web_api_server_async,
-    setup_mock_web_api_server_async,
-)
+from tests.mock_web_api_server import cleanup_mock_web_api_server_async, setup_mock_web_api_server_async
+from tests.utils import get_event_loop
 
 
 class TestAsyncSay:
@@ -29,6 +26,12 @@ async def test_say(self):
         response: AsyncSlackResponse = await say(text="Hi there!")
         assert response.status_code == 200
 
+    @pytest.mark.asyncio
+    async def test_say_markdown_text(self):
+        say = AsyncSay(client=self.web_client, channel="C111")
+        response: AsyncSlackResponse = await say(markdown_text="**Greetings!**")
+        assert response.status_code == 200
+
     @pytest.mark.asyncio
     async def test_say_unfurl_options(self):
         say = AsyncSay(client=self.web_client, channel="C111")