Merge branch 'main' into ale-new-block-kit-elements

Author: srtaalej

AGENTS.md

@@ -281,6 +281,10 @@ Defined in `.github/workflows/ci-build.yml`, runs on push to `main`, all PRs, an
 3. Add tests mirroring the module structure
 4. Validate: `./scripts/run_validation.sh`
 
+### Adding a New Block Kit Type
+
+See [`slack_sdk/models/AGENTS.md`](slack_sdk/models/AGENTS.md) for detailed steps on defining, registering, exporting, and testing new Block Kit blocks, elements, and composition objects.
+
 ### Fixing a Bug
 
 1. Write a test that reproduces the bug

requirements/testing.txt

@@ -5,6 +5,8 @@ pytest-asyncio<2  # for async
 pytest-cov>=2,<8
 click==8.0.4  # black is affected by https://github.com/pallets/click/issues/2225
 psutil>=6.0.0,<8
+# cryptography 46+ dropped PyPy 3.10 wheels; pin to <46 for PyPy 3.10 only
+cryptography<46; implementation_name == "pypy" and python_version == "3.10"
 #  used only under slack_sdk/*_store
 boto3<=2
 # For AWS tests

slack_sdk/models/AGENTS.md

@@ -0,0 +1,67 @@
+# AGENTS.md — Block Kit Models
+
+The `slack_sdk/models/` package provides Python classes for building [Block Kit](https://api.slack.com/block-kit) UI layouts. Each class serializes to/from the JSON payloads that the Slack API expects, with helper methods for parsing nested composition objects.
+
+## Adding a New Block Kit Type
+
+Block Kit models live in `slack_sdk/models/blocks/` across three files:
+
+| File | Contents |
+| --- | --- |
+| `blocks.py` | Layout blocks (`SectionBlock`, `ActionsBlock`, `HeaderBlock`, etc.) |
+| `block_elements.py` | Interactive elements (`ButtonElement`, `StaticSelectElement`, `DatePickerElement`, etc.) |
+| `basic_components.py` | Composition objects (`TextObject`, `Option`, `ConfirmObject`, etc.) |
+
+All types are exported from `slack_sdk/models/blocks/__init__.py`.
+
+### Base class hierarchy
+
+```
+JsonObject
+├── Block                      → layout blocks
+├── BlockElement               → non-interactive elements
+│   └── InteractiveElement     → elements with action_id
+│       └── InputInteractiveElement → elements usable inside InputBlock
+├── TextObject                 → PlainTextObject, MarkdownTextObject
+├── Option / OptionGroup
+└── ConfirmObject, etc.
+```
+
+Choose the base class that matches the type you're adding.
+
+### Steps
+
+1. **Define the class** in the appropriate file. Follow this pattern:
+
+   ```python
+   class MyNewBlock(Block):
+       type = "my_new_block"
+
+       @property
+       def attributes(self) -> Set[str]:
+           return super().attributes.union({"text", "optional_field"})
+
+       def __init__(self, *, text: Union[str, dict, TextObject], optional_field: Optional[str] = None, block_id: Optional[str] = None, **others: dict):
+           super().__init__(type=self.type, block_id=block_id)
+           show_unknown_key_warning(self, others)
+           self.text = TextObject.parse(text, default_type=PlainTextObject.type)
+           self.optional_field = optional_field
+   ```
+
+   Key conventions:
+   - Set `type` class attribute to the Slack API type string
+   - Override `attributes` to return the set of JSON field names for serialization
+   - Call `super().__init__()` with `type=self.type`
+   - Call `show_unknown_key_warning(self, others)` to log unexpected kwargs
+   - Use `TextObject.parse()`, `ConfirmObject.parse()`, and `BlockElement.parse()` for nested composition objects
+
+2. **Register for deserialization:**
+   - **Elements:** Automatic — `BlockElement.parse()` discovers subclasses at runtime via `__subclasses__()`. No manual step needed.
+   - **Blocks:** Manual — add an `elif` clause in `Block.parse()` (in `blocks.py`) mapping the type string to the new class.
+
+3. **Export the class** — add it to the imports and `__all__` list in `slack_sdk/models/blocks/__init__.py`.
+
+4. **Add tests** in `tests/slack_sdk/models/test_blocks.py`. Cover:
+   - Round-trip: `input_dict == MyNewBlock(**input_dict).to_dict()`
+
+5. **Validate:** `./scripts/run_validation.sh`

slack_sdk/oauth/installation_store/amazon_s3/__init__.py

@@ -106,7 +106,7 @@ def save(self, installation: Installation):
 
     def save_bot(self, bot: Bot):
         if bot.bot_token is None:
-            self.logger.debug("Skipped saving a new row because of the absense of bot token in it")
+            self.logger.debug("Skipped saving a new row because of the absence of bot token in it")
             return
 
         none = "none"
@@ -273,7 +273,7 @@ def delete_bot(self, *, enterprise_id: Optional[str], team_id: Optional[str]) ->
                         Key=content.get("Key"),
                     )
                 except Exception as e:
-                    message = f"Failed to find bot installation data for enterprise: {e_id}, team: {t_id}: {e}"
+                    message = f"Failed to delete bot installation data for enterprise: {e_id}, team: {t_id}: {e}"
                     raise SlackClientConfigurationError(message)
 
     async def async_delete_installation(
@@ -316,7 +316,7 @@ def delete_installation(
                     )
                     deleted_keys.append(key)
                 except Exception as e:
-                    message = f"Failed to find bot installation data for enterprise: {e_id}, team: {t_id}: {e}"
+                    message = f"Failed to delete installation data for enterprise: {e_id}, team: {t_id}: {e}"
                     raise SlackClientConfigurationError(message)
 
                 try:
@@ -328,7 +328,7 @@ def delete_installation(
                         )
                         deleted_keys.append(no_user_id_key)
                 except Exception as e:
-                    message = f"Failed to find bot installation data for enterprise: {e_id}, team: {t_id}: {e}"
+                    message = f"Failed to delete installation data for enterprise: {e_id}, team: {t_id}: {e}"
                     raise SlackClientConfigurationError(message)
 
         # Check the remaining installation data
@@ -347,5 +347,5 @@ def delete_installation(
                     Key=content.get("Key"),
                 )
             except Exception as e:
-                message = f"Failed to find bot installation data for enterprise: {e_id}, team: {t_id}: {e}"
+                message = f"Failed to delete installation data for enterprise: {e_id}, team: {t_id}: {e}"
                 raise SlackClientConfigurationError(message)

slack_sdk/oauth/installation_store/async_cacheable_installation_store.py

@@ -98,7 +98,8 @@ async def async_delete_bot(
             team_id=team_id,
         )
         key = f"{enterprise_id or ''}-{team_id or ''}"
-        self.cached_bots.pop(key)
+        if key in self.cached_bots:
+            self.cached_bots.pop(key)
 
     async def async_delete_installation(
         self,

slack_sdk/oauth/installation_store/file/__init__.py

@@ -78,7 +78,7 @@ def save(self, installation: Installation):
 
     def save_bot(self, bot: Bot):
         if bot.bot_token is None:
-            self.logger.debug("Skipped saving a new row because of the absense of bot token in it")
+            self.logger.debug("Skipped saving a new row because of the absence of bot token in it")
             return
 
         none = "none"

slack_sdk/oauth/installation_store/sqlite3/__init__.py

@@ -217,7 +217,7 @@ def save(self, installation: Installation):
 
     def save_bot(self, bot: Bot):
         if bot.bot_token is None:
-            self.logger.debug("Skipped saving a new row because of the absense of bot token in it")
+            self.logger.debug("Skipped saving a new row because of the absence of bot token in it")
             return
 
         with self.connect() as conn: