pycascadeui 3.3.3__tar.gz → 3.4.0__tar.gz

{pycascadeui-3.3.3/pycascadeui.egg-info → pycascadeui-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycascadeui
-Version: 3.3.3
+Version: 3.4.0
 Summary: Redux-inspired UI framework for discord.py
 Author-email: HollowTheSilver <hollow@users.noreply.github.com>
 License-Expression: MIT
@@ -651,7 +651,8 @@ for row in rows:
 ### Components
 - Stateful buttons, selects, and modals with state integration
 - Select callbacks can opt into a `values` second parameter
-- V2 builders: `card()`, `stats_card()`, `action_section()`, `toggle_section()`, `image_section()`, `link_section()`, `confirm_section()`, `button_row()`, `cycle_button()`, `toggle_button()`, `tab_nav()`, `key_value()`, `alert()`, `progress_bar()`, `divider()`, `gap()`, `gallery()`, `file_attachment()`
+- V2 builders: `card()`, `stats_card()`, `action_section()`, `toggle_section()`, `image_section()`, `link_section()`, `confirm_section()`, `button_row()`, `cycle_button()`, `toggle_button()`, `tab_nav()`, `choice_row()`, `key_value()`, `alert()`, `progress_bar()`, `divider()`, `gap()`, `gallery()`, `file_attachment()`
+- V2 stateful composites: `PaginatedRegion` (per-section pager), `Collapsible` (inline disclosure)
 - Grid helpers: `emoji_grid()` and `button_grid()`
 - Typed modal fields (`text`, `integer`, `float`, `date`) with per-field validation
 - Declarative `FormSchema` and `WizardSchema` base classes

{pycascadeui-3.3.3 → pycascadeui-3.4.0}/README.md

@@ -608,7 +608,8 @@ for row in rows:
 ### Components
 - Stateful buttons, selects, and modals with state integration
 - Select callbacks can opt into a `values` second parameter
-- V2 builders: `card()`, `stats_card()`, `action_section()`, `toggle_section()`, `image_section()`, `link_section()`, `confirm_section()`, `button_row()`, `cycle_button()`, `toggle_button()`, `tab_nav()`, `key_value()`, `alert()`, `progress_bar()`, `divider()`, `gap()`, `gallery()`, `file_attachment()`
+- V2 builders: `card()`, `stats_card()`, `action_section()`, `toggle_section()`, `image_section()`, `link_section()`, `confirm_section()`, `button_row()`, `cycle_button()`, `toggle_button()`, `tab_nav()`, `choice_row()`, `key_value()`, `alert()`, `progress_bar()`, `divider()`, `gap()`, `gallery()`, `file_attachment()`
+- V2 stateful composites: `PaginatedRegion` (per-section pager), `Collapsible` (inline disclosure)
 - Grid helpers: `emoji_grid()` and `button_grid()`
 - Typed modal fields (`text`, `integer`, `float`, `date`) with per-field validation
 - Declarative `FormSchema` and `WizardSchema` base classes

{pycascadeui-3.3.3 → pycascadeui-3.4.0}/cascadeui/__init__.py

@@ -22,8 +22,11 @@ from .components.buttons import (
 )
 from .components.inputs import Checkbox, CheckboxGroup, FileUpload, Modal, RadioGroup, TextInput
 from .components.patterns import (
+    Choice,
+    Collapsible,
     ConfirmationButtons,
     EmojiGrid,
+    PaginatedRegion,
     PaginationControls,
     ProgressBar,
     ToggleGroup,
@@ -32,6 +35,7 @@ from .components.patterns import (
     button_grid,
     button_row,
     card,
+    choice_row,
     confirm_section,
     cycle_button,
     divider,
@@ -55,7 +59,7 @@ from .components.selects import (
     RoleSelect,
     UserSelect,
 )
-from .components.types import EmojiInput, MediaInput
+from .components.types import MAX_SELECT_OPTIONS, EmojiInput, MediaInput
 from .components.v1_composition import CompositeComponent, get_component, register_component
 from .components.wrappers import with_confirmation, with_cooldown, with_loading_state
 from .devtools import DevToolsCog, InspectorView
@@ -100,11 +104,12 @@ from .utils.decorators import cascade_component, cascade_reducer
 from .utils.errors import safe_execute, with_error_boundary, with_retry
 from .utils.fetch import fetch_as_file
 from .utils.logging import setup_logging
-from .utils.strings import slugify
+from .utils.strings import is_emoji, slugify
 from .utils.tasks import get_task_manager
 from .validation import (
     ValidationResult,
     choices,
+    emoji,
     max_length,
     max_value,
     min_length,
@@ -147,7 +152,7 @@ if "SQLiteBackend" in _persistence_all:
 # // ========================================( Script )======================================== // #
 
 
-__version__ = "3.3.3"
+__version__ = "3.4.0"
 
 # Export public API
 __all__ = [
@@ -226,6 +231,7 @@ __all__ = [
     # Type aliases
     "EmojiInput",
     "MediaInput",
+    "MAX_SELECT_OPTIONS",
     # V2 Cards & Sections
     "card",
     "action_section",
@@ -237,6 +243,9 @@ __all__ = [
     "button_row",
     "cycle_button",
     "toggle_button",
+    # V2 Choices
+    "Choice",
+    "choice_row",
     # V2 Content
     "key_value",
     "alert",
@@ -247,6 +256,10 @@ __all__ = [
     "gap",
     # V2 Navigation
     "tab_nav",
+    # V2 Pagination
+    "PaginatedRegion",
+    # V2 Collapsible
+    "Collapsible",
     # V2 Media
     "gallery",
     "file_attachment",
@@ -279,6 +292,7 @@ __all__ = [
     "ValidationResult",
     "validate_field",
     "validate_fields",
+    "emoji",
     "min_length",
     "max_length",
     "regex",
@@ -307,6 +321,7 @@ __all__ = [
     "cascade_reducer",
     "cascade_component",
     "slugify",
+    "is_emoji",
     "fetch_as_file",
     # DevTools
     "InspectorView",

{pycascadeui-3.3.3 → pycascadeui-3.4.0}/cascadeui/components/inputs.py

@@ -1,14 +1,18 @@
 # // ========================================( Modules )======================================== // #
 
 
+import logging
 from typing import Any, Callable, Dict, List, Optional, Union
 
 import discord
 from discord import CheckboxGroupOption, Interaction, RadioGroupOption, TextStyle
 
+from ..utils.strings import slugify
 from ..validation import validate_fields
 from .base import StatefulComponent
 
+logger = logging.getLogger(__name__)
+
 # // ========================================( Classes )======================================== // #
 
 
@@ -72,11 +76,12 @@ class TextInput(StatefulComponent):
     def _slug(cls, label: str) -> str:
         """Derive a stable ``custom_id`` slug from a field label.
 
-        Single source of truth for the slug rule. Used both during
-        :class:`TextInput` construction and by form patterns when
-        round-tripping ``"text"`` field values through a modal.
+        Single source of truth for the modal-input slug rule. Prefixes
+        ``input_`` and delegates to :func:`slugify`, so modal inputs share
+        the one safe lowercase-alphanumeric derivation the rest of the
+        library uses.
         """
-        return f"input_{label.lower().replace(' ', '_')}"
+        return f"input_{slugify(label)}"
 
     def create_discord_component(self):
         """Build a ``ui.Label`` wrapping the inner ``ui.TextInput``."""
@@ -418,6 +423,7 @@ class Modal(discord.ui.Modal, StatefulComponent):
             if isinstance(input_item, _WRAPPED_INPUT_TYPES):
                 label_wrapper = input_item.create_discord_component()
                 inner = label_wrapper.component
+                self._reject_duplicate_input(input_item.custom_id)
                 self.add_item(label_wrapper)
                 self.inputs[input_item.custom_id] = input_item
                 self._wrapped_pairs.append((input_item, inner))
@@ -428,10 +434,28 @@ class Modal(discord.ui.Modal, StatefulComponent):
                 # modal-compatible component the user constructed directly.
                 self.add_item(input_item)
                 inner = _unwrap_label(input_item)
+                self._reject_duplicate_input(inner.custom_id)
                 self.inputs[inner.custom_id] = input_item
 
         self.user_callback = callback
 
+    def _reject_duplicate_input(self, custom_id: str) -> None:
+        """Raise before a duplicate input custom_id silently overwrites.
+
+        Modal input ids derive from the label (``input_{label}``), so two
+        inputs with the same label collide on one key. Without this guard
+        the second silently overwrites the first in ``self.inputs`` and
+        its submitted value is lost at ``on_submit``.
+        """
+        if custom_id in self.inputs:
+            raise ValueError(
+                f"Duplicate modal input custom_id: {custom_id!r}. Modal input ids derive "
+                f"from the label ('input_{{label}}'), so two inputs with the same label "
+                f"collide on one key: one would silently overwrite the other and its "
+                f"submitted value would be lost.\n"
+                f"  Fix: Give the colliding inputs distinct labels."
+            )
+
     async def on_submit(self, interaction: Interaction):
         """Handle modal submission with optional validation."""
         # Collect values from the underlying discord.py components,
@@ -469,8 +493,11 @@ class Modal(discord.ui.Modal, StatefulComponent):
             if errors:
                 lines = []
                 for field_id, field_errors in errors.items():
+                    # Field label ("Emoji"), not the derived custom_id slug ("input_emoji").
+                    field = self.inputs.get(field_id)
+                    name = getattr(field, "label", field_id)
                     for err in field_errors:
-                        lines.append(f"**{field_id}**: {err.message}")
+                        lines.append(f"**{name}**: {err.message}")
                 await interaction.response.send_message("\n".join(lines), ephemeral=True)
                 return
 
@@ -492,7 +519,29 @@ class Modal(discord.ui.Modal, StatefulComponent):
         if self.user_callback:
             await self.user_callback(interaction, values)
             # Safety net: defer if the callback forgot to respond
-            if not interaction.response.is_done():
-                await interaction.response.defer()
+            await self._safe_post_submit_defer(interaction)
         else:
+            await self._safe_post_submit_defer(interaction)
+
+    async def _safe_post_submit_defer(self, interaction: Interaction) -> None:
+        """Acknowledge the modal submission if the callback left it unanswered.
+
+        Mirrors the post-callback defer in the view's ``_scheduled_task``:
+        the submission's state dispatch has already landed, so a dead or
+        already-acked interaction on the trailing ack must not turn a
+        successful submit into an unhandled error routed to ``on_error``.
+        """
+        if interaction.response.is_done():
+            return
+        try:
             await interaction.response.defer()
+        except discord.NotFound:
+            # 10062: the interaction token is already gone -- nothing to ack.
+            logger.debug("Modal post-submit defer hit a dead interaction (10062)")
+        except discord.HTTPException as e:
+            # 40060 (already acknowledged) is a benign cancellation race; any
+            # other status is a genuine ack failure the user saw as a toast.
+            if e.code == 40060:
+                logger.debug("Modal post-submit defer raced an existing ack (40060)")
+            else:
+                logger.warning(f"Modal post-submit defer failed: status={e.status} code={e.code}")

{pycascadeui-3.3.3 → pycascadeui-3.4.0}/cascadeui/components/patterns/__init__.py

@@ -3,12 +3,16 @@
 
 from .v1 import ConfirmationButtons, PaginationControls, ProgressBar, ToggleGroup
 from .v2 import (
+    Choice,
+    Collapsible,
     EmojiGrid,
+    PaginatedRegion,
     action_section,
     alert,
     button_grid,
     button_row,
     card,
+    choice_row,
     confirm_section,
     cycle_button,
     divider,
@@ -46,6 +50,9 @@ __all__ = [
     "button_row",
     "cycle_button",
     "toggle_button",
+    # V2 choices
+    "Choice",
+    "choice_row",
     # V2 content
     "key_value",
     "alert",
@@ -56,6 +63,10 @@ __all__ = [
     "gap",
     # V2 navigation
     "tab_nav",
+    # V2 pagination
+    "PaginatedRegion",
+    # V2 collapsible
+    "Collapsible",
     # V2 media
     "gallery",
     "file_attachment",