version 3.27.2

slackapi · May 16, 2024 · 70cf7ba · 70cf7ba
1 parent a1c0d3e
commit 70cf7ba
Show file tree

Hide file tree

Showing 15 changed files with 352 additions and 77 deletions.
diff --git a/docs/api-docs/slack_sdk/index.html b/docs/api-docs/slack_sdk/index.html
@@ -3814,17 +3814,17 @@ <h2 id="note">Note</h2>
 
         # step2: &#34;https://files.slack.com/upload/v1/...&#34; per file
         for f in files:
-            upload_result = _upload_file_via_v2_url(
+            upload_result = self._upload_file(
                 url=f[&#34;upload_url&#34;],
                 data=f[&#34;data&#34;],
                 logger=self._logger,
                 timeout=self.timeout,
                 proxy=self.proxy,
                 ssl=self.ssl,
             )
-            if upload_result.get(&#34;status&#34;) != 200:
-                status = upload_result.get(&#34;status&#34;)
-                body = upload_result.get(&#34;body&#34;)
+            if upload_result.status != 200:
+                status = upload_result.status
+                body = upload_result.body
                 message = (
                     &#34;Failed to upload a file &#34;
                     f&#34;(status: {status}, body: {body}, filename: {f.get(&#39;filename&#39;)}, title: {f.get(&#39;title&#39;)})&#34;
@@ -10963,17 +10963,17 @@ <h3>Methods</h3>
 
     # step2: &#34;https://files.slack.com/upload/v1/...&#34; per file
     for f in files:
-        upload_result = _upload_file_via_v2_url(
+        upload_result = self._upload_file(
             url=f[&#34;upload_url&#34;],
             data=f[&#34;data&#34;],
             logger=self._logger,
             timeout=self.timeout,
             proxy=self.proxy,
             ssl=self.ssl,
         )
-        if upload_result.get(&#34;status&#34;) != 200:
-            status = upload_result.get(&#34;status&#34;)
-            body = upload_result.get(&#34;body&#34;)
+        if upload_result.status != 200:
+            status = upload_result.status
+            body = upload_result.body
             message = (
                 &#34;Failed to upload a file &#34;
                 f&#34;(status: {status}, body: {body}, filename: {f.get(&#39;filename&#39;)}, title: {f.get(&#39;title&#39;)})&#34;

diff --git a/docs/api-docs/slack_sdk/models/blocks/block_elements.html b/docs/api-docs/slack_sdk/models/blocks/block_elements.html
@@ -1896,7 +1896,7 @@ <h1 class="title">Module <code>slack_sdk.models.blocks.block_elements</code></h1
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements
+        self.elements = BlockElement.parse_all(elements)
         self.style = style
         self.indent = indent
         self.offset = offset
@@ -1919,7 +1919,7 @@ <h1 class="title">Module <code>slack_sdk.models.blocks.block_elements</code></h1
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements
+        self.elements = BlockElement.parse_all(elements)
         self.border = border
 
 
@@ -1938,7 +1938,7 @@ <h1 class="title">Module <code>slack_sdk.models.blocks.block_elements</code></h1
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements
+        self.elements = BlockElement.parse_all(elements)
 
 
 class RichTextSectionElement(RichTextElement):
@@ -1956,7 +1956,7 @@ <h1 class="title">Module <code>slack_sdk.models.blocks.block_elements</code></h1
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements
+        self.elements = BlockElement.parse_all(elements)
 
 
 class RichTextElementParts:
@@ -5350,7 +5350,7 @@ <h3>Inherited members</h3>
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements
+        self.elements = BlockElement.parse_all(elements)
         self.style = style
         self.indent = indent
         self.offset = offset
@@ -5425,7 +5425,7 @@ <h3>Inherited members</h3>
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements
+        self.elements = BlockElement.parse_all(elements)
         self.border = border</code></pre>
 </details>
 <h3>Ancestors</h3>
@@ -5496,7 +5496,7 @@ <h3>Inherited members</h3>
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements</code></pre>
+        self.elements = BlockElement.parse_all(elements)</code></pre>
 </details>
 <h3>Ancestors</h3>
 <ul class="hlist">
@@ -5566,7 +5566,7 @@ <h3>Inherited members</h3>
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements</code></pre>
+        self.elements = BlockElement.parse_all(elements)</code></pre>
 </details>
 <h3>Ancestors</h3>
 <ul class="hlist">

diff --git a/docs/api-docs/slack_sdk/models/blocks/index.html b/docs/api-docs/slack_sdk/models/blocks/index.html
@@ -5464,7 +5464,7 @@ <h3>Inherited members</h3>
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements
+        self.elements = BlockElement.parse_all(elements)
         self.style = style
         self.indent = indent
         self.offset = offset
@@ -5539,7 +5539,7 @@ <h3>Inherited members</h3>
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements
+        self.elements = BlockElement.parse_all(elements)
         self.border = border</code></pre>
 </details>
 <h3>Ancestors</h3>
@@ -5610,7 +5610,7 @@ <h3>Inherited members</h3>
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements</code></pre>
+        self.elements = BlockElement.parse_all(elements)</code></pre>
 </details>
 <h3>Ancestors</h3>
 <ul class="hlist">
@@ -5680,7 +5680,7 @@ <h3>Inherited members</h3>
     ):
         super().__init__(type=self.type)
         show_unknown_key_warning(self, others)
-        self.elements = elements</code></pre>
+        self.elements = BlockElement.parse_all(elements)</code></pre>
 </details>
 <h3>Ancestors</h3>
 <ul class="hlist">

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.27.1&#34;</code></pre>
+__version__ = &#34;3.27.2&#34;</code></pre>
 </details>
 </section>
 <section>

diff --git a/docs/api-docs/slack_sdk/web/async_base_client.html b/docs/api-docs/slack_sdk/web/async_base_client.html
@@ -39,6 +39,7 @@ <h1 class="title">Module <code>slack_sdk.web.async_base_client</code></h1>
 )  # type: ignore
 from .async_slack_response import AsyncSlackResponse
 from .deprecation import show_deprecation_warning_if_any
+from .file_upload_v2_result import FileUploadV2Result
 from .internal_utils import (
     convert_bool_to_0_or_1,
     _build_req_args,
@@ -241,6 +242,31 @@ <h1 class="title">Module <code>slack_sdk.web.async_base_client</code></h1>
             api_url=api_url,
             req_args=req_args,
             retry_handlers=self.retry_handlers,
+        )
+
+    async def _upload_file(
+        self,
+        *,
+        url: str,
+        data: bytes,
+        logger: logging.Logger,
+        timeout: int,
+        proxy: Optional[str],
+        ssl: Optional[SSLContext],
+    ) -&gt; FileUploadV2Result:
+        &#34;&#34;&#34;Upload a file using the issued upload URL&#34;&#34;&#34;
+        result = await _request_with_session(
+            current_session=self.session,
+            timeout=timeout,
+            logger=logger,
+            http_verb=&#34;POST&#34;,
+            api_url=url,
+            req_args={&#34;data&#34;: data, &#34;proxy&#34;: proxy, &#34;ssl&#34;: ssl},
+            retry_handlers=self.retry_handlers,
+        )
+        return FileUploadV2Result(
+            status=result.get(&#34;status_code&#34;),
+            body=result.get(&#34;body&#34;),
         )</code></pre>
 </details>
 </section>
@@ -453,6 +479,31 @@ <h2 class="section-title" id="header-classes">Classes</h2>
             api_url=api_url,
             req_args=req_args,
             retry_handlers=self.retry_handlers,
+        )
+
+    async def _upload_file(
+        self,
+        *,
+        url: str,
+        data: bytes,
+        logger: logging.Logger,
+        timeout: int,
+        proxy: Optional[str],
+        ssl: Optional[SSLContext],
+    ) -&gt; FileUploadV2Result:
+        &#34;&#34;&#34;Upload a file using the issued upload URL&#34;&#34;&#34;
+        result = await _request_with_session(
+            current_session=self.session,
+            timeout=timeout,
+            logger=logger,
+            http_verb=&#34;POST&#34;,
+            api_url=url,
+            req_args={&#34;data&#34;: data, &#34;proxy&#34;: proxy, &#34;ssl&#34;: ssl},
+            retry_handlers=self.retry_handlers,
+        )
+        return FileUploadV2Result(
+            status=result.get(&#34;status_code&#34;),
+            body=result.get(&#34;body&#34;),
         )</code></pre>
 </details>
 <h3>Subclasses</h3>

diff --git a/docs/api-docs/slack_sdk/web/async_client.html b/docs/api-docs/slack_sdk/web/async_client.html
@@ -52,7 +52,6 @@ <h1 class="title">Module <code>slack_sdk.web.async_client</code></h1>
     _warn_if_text_or_attachment_fallback_is_missing,
     _remove_none_values,
     _to_v2_file_upload_item,
-    _upload_file_via_v2_url,
     _validate_for_legacy_client,
     _print_files_upload_v2_suggestion,
 )
@@ -3613,17 +3612,17 @@ <h1 class="title">Module <code>slack_sdk.web.async_client</code></h1>
 
         # step2: &#34;https://files.slack.com/upload/v1/...&#34; per file
         for f in files:
-            upload_result = _upload_file_via_v2_url(
+            upload_result = await self._upload_file(
                 url=f[&#34;upload_url&#34;],
                 data=f[&#34;data&#34;],
                 logger=self._logger,
                 timeout=self.timeout,
                 proxy=self.proxy,
                 ssl=self.ssl,
             )
-            if upload_result.get(&#34;status&#34;) != 200:
-                status = upload_result.get(&#34;status&#34;)
-                body = upload_result.get(&#34;body&#34;)
+            if upload_result.status != 200:
+                status = upload_result.status
+                body = upload_result.body
                 message = (
                     &#34;Failed to upload a file &#34;
                     f&#34;(status: {status}, body: {body}, filename: {f.get(&#39;filename&#39;)}, title: {f.get(&#39;title&#39;)})&#34;
@@ -8781,17 +8780,17 @@ <h2 id="note">Note</h2>
 
         # step2: &#34;https://files.slack.com/upload/v1/...&#34; per file
         for f in files:
-            upload_result = _upload_file_via_v2_url(
+            upload_result = await self._upload_file(
                 url=f[&#34;upload_url&#34;],
                 data=f[&#34;data&#34;],
                 logger=self._logger,
                 timeout=self.timeout,
                 proxy=self.proxy,
                 ssl=self.ssl,
             )
-            if upload_result.get(&#34;status&#34;) != 200:
-                status = upload_result.get(&#34;status&#34;)
-                body = upload_result.get(&#34;body&#34;)
+            if upload_result.status != 200:
+                status = upload_result.status
+                body = upload_result.body
                 message = (
                     &#34;Failed to upload a file &#34;
                     f&#34;(status: {status}, body: {body}, filename: {f.get(&#39;filename&#39;)}, title: {f.get(&#39;title&#39;)})&#34;
@@ -15930,17 +15929,17 @@ <h3>Methods</h3>
 
     # step2: &#34;https://files.slack.com/upload/v1/...&#34; per file
     for f in files:
-        upload_result = _upload_file_via_v2_url(
+        upload_result = await self._upload_file(
             url=f[&#34;upload_url&#34;],
             data=f[&#34;data&#34;],
             logger=self._logger,
             timeout=self.timeout,
             proxy=self.proxy,
             ssl=self.ssl,
         )
-        if upload_result.get(&#34;status&#34;) != 200:
-            status = upload_result.get(&#34;status&#34;)
-            body = upload_result.get(&#34;body&#34;)
+        if upload_result.status != 200:
+            status = upload_result.status
+            body = upload_result.body
             message = (
                 &#34;Failed to upload a file &#34;
                 f&#34;(status: {status}, body: {body}, filename: {f.get(&#39;filename&#39;)}, title: {f.get(&#39;title&#39;)})&#34;

diff --git a/docs/api-docs/slack_sdk/web/async_internal_utils.html b/docs/api-docs/slack_sdk/web/async_internal_utils.html
@@ -136,7 +136,7 @@ <h1 class="title">Module <code>slack_sdk.web.async_internal_utils</code></h1>
 
             try:
                 async with session.request(http_verb, api_url, **req_args) as res:
-                    data: Union[dict, bytes] = {}
+                    data: Union[dict, bytes, str] = {}
                     if res.content_type == &#34;application/gzip&#34;:
                         # admin.analytics.getFile
                         data = await res.read()
@@ -145,6 +145,14 @@ <h1 class="title">Module <code>slack_sdk.web.async_internal_utils</code></h1>
                             headers=res.headers,
                             data=data,
                         )
+                    elif res.content_type == &#34;text/plain&#34;:
+                        # https://files.slack.com/upload/v1/...
+                        data = await res.text()
+                        retry_response = RetryHttpResponse(
+                            status_code=res.status,
+                            headers=res.headers,
+                            data=data,
+                        )
                     else:
                         try:
                             data = await res.json()
@@ -171,7 +179,9 @@ <h1 class="title">Module <code>slack_sdk.web.async_internal_utils</code></h1>
                                 )
 
                     if logger.level &lt;= logging.DEBUG:
-                        body = data if isinstance(data, dict) else &#34;(binary)&#34;
+                        body = &#34;(binary)&#34;
+                        if isinstance(data, dict) or isinstance(data, str):
+                            body = data
                         logger.debug(
                             &#34;Received the following response - &#34;
                             f&#34;status: {res.status}, &#34;