Fix a bug where some of the files.remote API parameters do not work since v3.10 (#1173)

Author: seratch

integration_tests/web/test_remote_file_replacement.py

@@ -32,6 +32,7 @@ def test_replacing_remote_file_blocks_in_a_message(self):
             external_id=external_id,
             external_url=url,
             title="Slack Logo",
+            indexable_file_contents="so many keywords!".encode("utf-8"),
             preview_image=f"{current_dir}/../../tests/data/slack_logo.png",
         )
         self.assertIsNotNone(remote_file_creation)
@@ -61,6 +62,7 @@ def test_replacing_remote_file_blocks_in_a_message(self):
             external_id=external_id,
             external_url=url,
             title="Slack Logo",
+            indexable_file_contents="more and more keywords!".encode("utf-8"),
             preview_image=f"{current_dir}/../../tests/data/slack_logo_new.png",
         )
         self.assertIsNotNone(new_version)

slack_sdk/web/async_client.py

@@ -2794,14 +2794,10 @@ async def files_remote_add(
         )
         files = None
         # preview_image (file): Preview of the document via multipart/form-data.
-        if "preview_image" in kwargs or "indexable_file_contents" in kwargs:
+        if preview_image is not None or indexable_file_contents is not None:
             files = {
-                "preview_image": preview_image
-                if preview_image is not None
-                else kwargs.pop("preview_image"),
-                "indexable_file_contents": indexable_file_contents
-                if indexable_file_contents is not None
-                else kwargs.pop("indexable_file_contents"),
+                "preview_image": preview_image,
+                "indexable_file_contents": indexable_file_contents,
             }
 
         return await self.api_call(
@@ -2834,16 +2830,14 @@ async def files_remote_update(
                 "file": file,
                 "title": title,
                 "filetype": filetype,
-                "indexable_file_contents": indexable_file_contents,
             }
         )
         files = None
         # preview_image (file): Preview of the document via multipart/form-data.
-        if "preview_image" in kwargs:
+        if preview_image is not None or indexable_file_contents is not None:
             files = {
-                "preview_image": preview_image
-                if preview_image is not None
-                else kwargs.pop("preview_image")
+                "preview_image": preview_image,
+                "indexable_file_contents": indexable_file_contents,
             }
 
         return await self.api_call(

slack_sdk/web/client.py

@@ -2739,14 +2739,10 @@ def files_remote_add(
         )
         files = None
         # preview_image (file): Preview of the document via multipart/form-data.
-        if "preview_image" in kwargs or "indexable_file_contents" in kwargs:
+        if preview_image is not None or indexable_file_contents is not None:
             files = {
-                "preview_image": preview_image
-                if preview_image is not None
-                else kwargs.pop("preview_image"),
-                "indexable_file_contents": indexable_file_contents
-                if indexable_file_contents is not None
-                else kwargs.pop("indexable_file_contents"),
+                "preview_image": preview_image,
+                "indexable_file_contents": indexable_file_contents,
             }
 
         return self.api_call(
@@ -2779,16 +2775,14 @@ def files_remote_update(
                 "file": file,
                 "title": title,
                 "filetype": filetype,
-                "indexable_file_contents": indexable_file_contents,
             }
         )
         files = None
         # preview_image (file): Preview of the document via multipart/form-data.
-        if "preview_image" in kwargs:
+        if preview_image is not None or indexable_file_contents is not None:
             files = {
-                "preview_image": preview_image
-                if preview_image is not None
-                else kwargs.pop("preview_image")
+                "preview_image": preview_image,
+                "indexable_file_contents": indexable_file_contents,
             }
 
         return self.api_call(

slack_sdk/web/legacy_client.py

@@ -2750,14 +2750,10 @@ def files_remote_add(
         )
         files = None
         # preview_image (file): Preview of the document via multipart/form-data.
-        if "preview_image" in kwargs or "indexable_file_contents" in kwargs:
+        if preview_image is not None or indexable_file_contents is not None:
             files = {
-                "preview_image": preview_image
-                if preview_image is not None
-                else kwargs.pop("preview_image"),
-                "indexable_file_contents": indexable_file_contents
-                if indexable_file_contents is not None
-                else kwargs.pop("indexable_file_contents"),
+                "preview_image": preview_image,
+                "indexable_file_contents": indexable_file_contents,
             }
 
         return self.api_call(
@@ -2790,16 +2786,14 @@ def files_remote_update(
                 "file": file,
                 "title": title,
                 "filetype": filetype,
-                "indexable_file_contents": indexable_file_contents,
             }
         )
         files = None
         # preview_image (file): Preview of the document via multipart/form-data.
-        if "preview_image" in kwargs:
+        if preview_image is not None or indexable_file_contents is not None:
             files = {
-                "preview_image": preview_image
-                if preview_image is not None
-                else kwargs.pop("preview_image")
+                "preview_image": preview_image,
+                "indexable_file_contents": indexable_file_contents,
             }
 
         return self.api_call(