version 3.23.1

seratch · Nov 14, 2023 · 774b0e1 · 774b0e1
1 parent 2afeba6
commit 774b0e1
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 11 deletions.
diff --git a/docs/api-docs/slack_sdk/index.html b/docs/api-docs/slack_sdk/index.html
@@ -1905,6 +1905,8 @@ <h2 id="note">Note</h2>
         self,
         *,
         team_id: str,
+        include_deactivated_user_workspaces: Optional[bool] = None,
+        is_active: Optional[bool] = None,
         cursor: Optional[str] = None,
         limit: Optional[int] = None,
         **kwargs,
@@ -1915,6 +1917,8 @@ <h2 id="note">Note</h2>
         kwargs.update(
             {
                 &#34;team_id&#34;: team_id,
+                &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+                &#34;is_active&#34;: is_active,
                 &#34;cursor&#34;: cursor,
                 &#34;limit&#34;: limit,
             }
@@ -7507,7 +7511,7 @@ <h3>Methods</h3>
 </details>
 </dd>
 <dt id="slack_sdk.WebClient.admin_users_list"><code class="name flex">
-<span>def <span class="ident">admin_users_list</span></span>(<span>self, *, team_id: str, cursor: Optional[str] = None, limit: Optional[int] = None, **kwargs) ‑> <a title="slack_sdk.web.slack_response.SlackResponse" href="web/slack_response.html#slack_sdk.web.slack_response.SlackResponse">SlackResponse</a></span>
+<span>def <span class="ident">admin_users_list</span></span>(<span>self, *, team_id: str, include_deactivated_user_workspaces: Optional[bool] = None, is_active: Optional[bool] = None, cursor: Optional[str] = None, limit: Optional[int] = None, **kwargs) ‑> <a title="slack_sdk.web.slack_response.SlackResponse" href="web/slack_response.html#slack_sdk.web.slack_response.SlackResponse">SlackResponse</a></span>
 </code></dt>
 <dd>
 <div class="desc"><p>List users on a workspace
@@ -7520,6 +7524,8 @@ <h3>Methods</h3>
     self,
     *,
     team_id: str,
+    include_deactivated_user_workspaces: Optional[bool] = None,
+    is_active: Optional[bool] = None,
     cursor: Optional[str] = None,
     limit: Optional[int] = None,
     **kwargs,
@@ -7530,6 +7536,8 @@ <h3>Methods</h3>
     kwargs.update(
         {
             &#34;team_id&#34;: team_id,
+            &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+            &#34;is_active&#34;: is_active,
             &#34;cursor&#34;: cursor,
             &#34;limit&#34;: limit,
         }

diff --git a/docs/api-docs/slack_sdk/version.html b/docs/api-docs/slack_sdk/version.html
@@ -28,7 +28,7 @@ <h1 class="title">Module <code>slack_sdk.version</code></h1>
 <span>Expand source code</span>
 </summary>
 <pre><code class="python">&#34;&#34;&#34;Check the latest version at https://pypi.org/project/slack-sdk/&#34;&#34;&#34;
-__version__ = &#34;3.23.0&#34;</code></pre>
+__version__ = &#34;3.23.1&#34;</code></pre>
 </details>
 </section>
 <section>

diff --git a/docs/api-docs/slack_sdk/web/async_client.html b/docs/api-docs/slack_sdk/web/async_client.html
@@ -1704,6 +1704,8 @@ <h1 class="title">Module <code>slack_sdk.web.async_client</code></h1>
         self,
         *,
         team_id: str,
+        include_deactivated_user_workspaces: Optional[bool] = None,
+        is_active: Optional[bool] = None,
         cursor: Optional[str] = None,
         limit: Optional[int] = None,
         **kwargs,
@@ -1714,6 +1716,8 @@ <h1 class="title">Module <code>slack_sdk.web.async_client</code></h1>
         kwargs.update(
             {
                 &#34;team_id&#34;: team_id,
+                &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+                &#34;is_active&#34;: is_active,
                 &#34;cursor&#34;: cursor,
                 &#34;limit&#34;: limit,
             }
@@ -6751,6 +6755,8 @@ <h2 id="note">Note</h2>
         self,
         *,
         team_id: str,
+        include_deactivated_user_workspaces: Optional[bool] = None,
+        is_active: Optional[bool] = None,
         cursor: Optional[str] = None,
         limit: Optional[int] = None,
         **kwargs,
@@ -6761,6 +6767,8 @@ <h2 id="note">Note</h2>
         kwargs.update(
             {
                 &#34;team_id&#34;: team_id,
+                &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+                &#34;is_active&#34;: is_active,
                 &#34;cursor&#34;: cursor,
                 &#34;limit&#34;: limit,
             }
@@ -12353,7 +12361,7 @@ <h3>Methods</h3>
 </details>
 </dd>
 <dt id="slack_sdk.web.async_client.AsyncWebClient.admin_users_list"><code class="name flex">
-<span>async def <span class="ident">admin_users_list</span></span>(<span>self, *, team_id: str, cursor: Optional[str] = None, limit: Optional[int] = None, **kwargs) ‑> <a title="slack_sdk.web.async_slack_response.AsyncSlackResponse" href="async_slack_response.html#slack_sdk.web.async_slack_response.AsyncSlackResponse">AsyncSlackResponse</a></span>
+<span>async def <span class="ident">admin_users_list</span></span>(<span>self, *, team_id: str, include_deactivated_user_workspaces: Optional[bool] = None, is_active: Optional[bool] = None, cursor: Optional[str] = None, limit: Optional[int] = None, **kwargs) ‑> <a title="slack_sdk.web.async_slack_response.AsyncSlackResponse" href="async_slack_response.html#slack_sdk.web.async_slack_response.AsyncSlackResponse">AsyncSlackResponse</a></span>
 </code></dt>
 <dd>
 <div class="desc"><p>List users on a workspace
@@ -12366,6 +12374,8 @@ <h3>Methods</h3>
     self,
     *,
     team_id: str,
+    include_deactivated_user_workspaces: Optional[bool] = None,
+    is_active: Optional[bool] = None,
     cursor: Optional[str] = None,
     limit: Optional[int] = None,
     **kwargs,
@@ -12376,6 +12386,8 @@ <h3>Methods</h3>
     kwargs.update(
         {
             &#34;team_id&#34;: team_id,
+            &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+            &#34;is_active&#34;: is_active,
             &#34;cursor&#34;: cursor,
             &#34;limit&#34;: limit,
         }

diff --git a/docs/api-docs/slack_sdk/web/base_client.html b/docs/api-docs/slack_sdk/web/base_client.html
@@ -48,7 +48,6 @@ <h1 class="title">Module <code>slack_sdk.web.base_client</code></h1>
 from urllib.parse import urlencode
 from urllib.request import Request, urlopen, OpenerDirector, ProxyHandler, HTTPSHandler
 
-import slack_sdk.errors as err
 from slack_sdk.errors import SlackRequestError
 from .deprecation import show_deprecation_warning_if_any
 from .internal_utils import (
@@ -328,7 +327,8 @@ <h1 class="title">Module <code>slack_sdk.web.base_client</code></h1>
                     response_body_data = json.loads(response[&#34;body&#34;])
                 except json.decoder.JSONDecodeError:
                     message = _build_unexpected_body_error_message(response.get(&#34;body&#34;, &#34;&#34;))
-                    raise err.SlackApiError(message, response)
+                    self._logger.error(f&#34;Failed to decode Slack API response: {message}&#34;)
+                    response_body_data = {&#34;ok&#34;: False, &#34;error&#34;: message}
 
             all_params: Dict[str, Any] = copy.copy(body_params) if body_params is not None else {}
             if query_params:
@@ -911,7 +911,8 @@ <h2 class="section-title" id="header-classes">Classes</h2>
                     response_body_data = json.loads(response[&#34;body&#34;])
                 except json.decoder.JSONDecodeError:
                     message = _build_unexpected_body_error_message(response.get(&#34;body&#34;, &#34;&#34;))
-                    raise err.SlackApiError(message, response)
+                    self._logger.error(f&#34;Failed to decode Slack API response: {message}&#34;)
+                    response_body_data = {&#34;ok&#34;: False, &#34;error&#34;: message}
 
             all_params: Dict[str, Any] = copy.copy(body_params) if body_params is not None else {}
             if query_params:

diff --git a/docs/api-docs/slack_sdk/web/client.html b/docs/api-docs/slack_sdk/web/client.html
@@ -1695,6 +1695,8 @@ <h1 class="title">Module <code>slack_sdk.web.client</code></h1>
         self,
         *,
         team_id: str,
+        include_deactivated_user_workspaces: Optional[bool] = None,
+        is_active: Optional[bool] = None,
         cursor: Optional[str] = None,
         limit: Optional[int] = None,
         **kwargs,
@@ -1705,6 +1707,8 @@ <h1 class="title">Module <code>slack_sdk.web.client</code></h1>
         kwargs.update(
             {
                 &#34;team_id&#34;: team_id,
+                &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+                &#34;is_active&#34;: is_active,
                 &#34;cursor&#34;: cursor,
                 &#34;limit&#34;: limit,
             }
@@ -6742,6 +6746,8 @@ <h2 id="note">Note</h2>
         self,
         *,
         team_id: str,
+        include_deactivated_user_workspaces: Optional[bool] = None,
+        is_active: Optional[bool] = None,
         cursor: Optional[str] = None,
         limit: Optional[int] = None,
         **kwargs,
@@ -6752,6 +6758,8 @@ <h2 id="note">Note</h2>
         kwargs.update(
             {
                 &#34;team_id&#34;: team_id,
+                &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+                &#34;is_active&#34;: is_active,
                 &#34;cursor&#34;: cursor,
                 &#34;limit&#34;: limit,
             }
@@ -12344,7 +12352,7 @@ <h3>Methods</h3>
 </details>
 </dd>
 <dt id="slack_sdk.web.client.WebClient.admin_users_list"><code class="name flex">
-<span>def <span class="ident">admin_users_list</span></span>(<span>self, *, team_id: str, cursor: Optional[str] = None, limit: Optional[int] = None, **kwargs) ‑> <a title="slack_sdk.web.slack_response.SlackResponse" href="slack_response.html#slack_sdk.web.slack_response.SlackResponse">SlackResponse</a></span>
+<span>def <span class="ident">admin_users_list</span></span>(<span>self, *, team_id: str, include_deactivated_user_workspaces: Optional[bool] = None, is_active: Optional[bool] = None, cursor: Optional[str] = None, limit: Optional[int] = None, **kwargs) ‑> <a title="slack_sdk.web.slack_response.SlackResponse" href="slack_response.html#slack_sdk.web.slack_response.SlackResponse">SlackResponse</a></span>
 </code></dt>
 <dd>
 <div class="desc"><p>List users on a workspace
@@ -12357,6 +12365,8 @@ <h3>Methods</h3>
     self,
     *,
     team_id: str,
+    include_deactivated_user_workspaces: Optional[bool] = None,
+    is_active: Optional[bool] = None,
     cursor: Optional[str] = None,
     limit: Optional[int] = None,
     **kwargs,
@@ -12367,6 +12377,8 @@ <h3>Methods</h3>
     kwargs.update(
         {
             &#34;team_id&#34;: team_id,
+            &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+            &#34;is_active&#34;: is_active,
             &#34;cursor&#34;: cursor,
             &#34;limit&#34;: limit,
         }

diff --git a/docs/api-docs/slack_sdk/web/index.html b/docs/api-docs/slack_sdk/web/index.html
@@ -2116,6 +2116,8 @@ <h2 id="note">Note</h2>
         self,
         *,
         team_id: str,
+        include_deactivated_user_workspaces: Optional[bool] = None,
+        is_active: Optional[bool] = None,
         cursor: Optional[str] = None,
         limit: Optional[int] = None,
         **kwargs,
@@ -2126,6 +2128,8 @@ <h2 id="note">Note</h2>
         kwargs.update(
             {
                 &#34;team_id&#34;: team_id,
+                &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+                &#34;is_active&#34;: is_active,
                 &#34;cursor&#34;: cursor,
                 &#34;limit&#34;: limit,
             }
@@ -7718,7 +7722,7 @@ <h3>Methods</h3>
 </details>
 </dd>
 <dt id="slack_sdk.web.WebClient.admin_users_list"><code class="name flex">
-<span>def <span class="ident">admin_users_list</span></span>(<span>self, *, team_id: str, cursor: Optional[str] = None, limit: Optional[int] = None, **kwargs) ‑> <a title="slack_sdk.web.slack_response.SlackResponse" href="slack_response.html#slack_sdk.web.slack_response.SlackResponse">SlackResponse</a></span>
+<span>def <span class="ident">admin_users_list</span></span>(<span>self, *, team_id: str, include_deactivated_user_workspaces: Optional[bool] = None, is_active: Optional[bool] = None, cursor: Optional[str] = None, limit: Optional[int] = None, **kwargs) ‑> <a title="slack_sdk.web.slack_response.SlackResponse" href="slack_response.html#slack_sdk.web.slack_response.SlackResponse">SlackResponse</a></span>
 </code></dt>
 <dd>
 <div class="desc"><p>List users on a workspace
@@ -7731,6 +7735,8 @@ <h3>Methods</h3>
     self,
     *,
     team_id: str,
+    include_deactivated_user_workspaces: Optional[bool] = None,
+    is_active: Optional[bool] = None,
     cursor: Optional[str] = None,
     limit: Optional[int] = None,
     **kwargs,
@@ -7741,6 +7747,8 @@ <h3>Methods</h3>
     kwargs.update(
         {
             &#34;team_id&#34;: team_id,
+            &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+            &#34;is_active&#34;: is_active,
             &#34;cursor&#34;: cursor,
             &#34;limit&#34;: limit,
         }

diff --git a/docs/api-docs/slack_sdk/web/internal_utils.html b/docs/api-docs/slack_sdk/web/internal_utils.html
@@ -258,9 +258,10 @@ <h1 class="title">Module <code>slack_sdk.web.internal_utils</code></h1>
         A boolean value.
     &#34;&#34;&#34;
     # Only admin.conversations.search returns next_cursor at the top level
-    present = (&#34;next_cursor&#34; in data and data[&#34;next_cursor&#34;] != &#34;&#34;) or (
+    present = (&#34;next_cursor&#34; in data and data[&#34;next_cursor&#34;] is not None and data[&#34;next_cursor&#34;] != &#34;&#34;) or (
         &#34;response_metadata&#34; in data
         and &#34;next_cursor&#34; in data[&#34;response_metadata&#34;]
+        and data[&#34;response_metadata&#34;][&#34;next_cursor&#34;] is not None
         and data[&#34;response_metadata&#34;][&#34;next_cursor&#34;] != &#34;&#34;
     )
     return present

diff --git a/docs/api-docs/slack_sdk/web/legacy_client.html b/docs/api-docs/slack_sdk/web/legacy_client.html
@@ -1705,6 +1705,8 @@ <h1 class="title">Module <code>slack_sdk.web.legacy_client</code></h1>
         self,
         *,
         team_id: str,
+        include_deactivated_user_workspaces: Optional[bool] = None,
+        is_active: Optional[bool] = None,
         cursor: Optional[str] = None,
         limit: Optional[int] = None,
         **kwargs,
@@ -1715,6 +1717,8 @@ <h1 class="title">Module <code>slack_sdk.web.legacy_client</code></h1>
         kwargs.update(
             {
                 &#34;team_id&#34;: team_id,
+                &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+                &#34;is_active&#34;: is_active,
                 &#34;cursor&#34;: cursor,
                 &#34;limit&#34;: limit,
             }
@@ -6752,6 +6756,8 @@ <h2 id="note">Note</h2>
         self,
         *,
         team_id: str,
+        include_deactivated_user_workspaces: Optional[bool] = None,
+        is_active: Optional[bool] = None,
         cursor: Optional[str] = None,
         limit: Optional[int] = None,
         **kwargs,
@@ -6762,6 +6768,8 @@ <h2 id="note">Note</h2>
         kwargs.update(
             {
                 &#34;team_id&#34;: team_id,
+                &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+                &#34;is_active&#34;: is_active,
                 &#34;cursor&#34;: cursor,
                 &#34;limit&#34;: limit,
             }
@@ -12354,7 +12362,7 @@ <h3>Methods</h3>
 </details>
 </dd>
 <dt id="slack_sdk.web.legacy_client.LegacyWebClient.admin_users_list"><code class="name flex">
-<span>def <span class="ident">admin_users_list</span></span>(<span>self, *, team_id: str, cursor: Optional[str] = None, limit: Optional[int] = None, **kwargs) ‑> Union[_asyncio.Future, <a title="slack_sdk.web.legacy_slack_response.LegacySlackResponse" href="legacy_slack_response.html#slack_sdk.web.legacy_slack_response.LegacySlackResponse">LegacySlackResponse</a>]</span>
+<span>def <span class="ident">admin_users_list</span></span>(<span>self, *, team_id: str, include_deactivated_user_workspaces: Optional[bool] = None, is_active: Optional[bool] = None, cursor: Optional[str] = None, limit: Optional[int] = None, **kwargs) ‑> Union[_asyncio.Future, <a title="slack_sdk.web.legacy_slack_response.LegacySlackResponse" href="legacy_slack_response.html#slack_sdk.web.legacy_slack_response.LegacySlackResponse">LegacySlackResponse</a>]</span>
 </code></dt>
 <dd>
 <div class="desc"><p>List users on a workspace
@@ -12367,6 +12375,8 @@ <h3>Methods</h3>
     self,
     *,
     team_id: str,
+    include_deactivated_user_workspaces: Optional[bool] = None,
+    is_active: Optional[bool] = None,
     cursor: Optional[str] = None,
     limit: Optional[int] = None,
     **kwargs,
@@ -12377,6 +12387,8 @@ <h3>Methods</h3>
     kwargs.update(
         {
             &#34;team_id&#34;: team_id,
+            &#34;include_deactivated_user_workspaces&#34;: include_deactivated_user_workspaces,
+            &#34;is_active&#34;: is_active,
             &#34;cursor&#34;: cursor,
             &#34;limit&#34;: limit,
         }

diff --git a/slack_sdk/version.py b/slack_sdk/version.py
@@ -1,2 +1,2 @@
 """Check the latest version at https://pypi.org/project/slack-sdk/"""
-__version__ = "3.23.0"
+__version__ = "3.23.1"