proper file upload support

Author: NeloBlivion

discord/ui/file_upload.py

@@ -6,6 +6,7 @@
 from ..components import FileUpload as FileUploadComponent
 from ..enums import ComponentType
 from ..message import Attachment
+from .item import ModalItem
 
 __all__ = ("FileUpload",)
 
@@ -14,21 +15,15 @@
     from ..types.components import FileUploadComponent as FileUploadComponentPayload
 
 
-class FileUpload:
+class FileUpload(ModalItem):
     """Represents a UI File Upload component.
 
     .. versionadded:: 2.7
 
     Parameters
     ----------
-    label: :class:`str`
-        The label for this component
-        Must be 45 characters or fewer.
     custom_id: Optional[:class:`str`]
         The ID of the input text field that gets received during an interaction.
-    description: Optional[:class:`str`]
-        The description for the file upload field.
-        Must be 100 characters or fewer.
     min_values: Optional[:class:`int`]
         The minimum number of files that must be uploaded.
         Defaults to 0 and must be between 0 and 10, inclusive.
@@ -37,41 +32,28 @@ class FileUpload:
         Must be between 1 and 10, inclusive.
     required: Optional[:class:`bool`]
         Whether the file upload field is required or not. Defaults to ``True``.
-    row: Optional[:class:`int`]
-        The relative row this file upload field belongs to. A modal dialog can only have 5
-        rows. By default, items are arranged automatically into those 5 rows. If you'd
-        like to control the relative positioning of the row then passing an index is advised.
-        For example, row=1 will show up before row=2. Defaults to ``None``, which is automatic
-        ordering. The row number must be between 0 and 4 (i.e. zero indexed).
+    id: Optional[:class:`int`]
+        The file upload field's ID.
     """
 
     __item_repr_attributes__: tuple[str, ...] = (
-        "label",
         "required",
         "min_values",
         "max_values",
         "custom_id",
         "id",
-        "description",
     )
 
     def __init__(
         self,
         *,
-        label: str,
         custom_id: str | None = None,
         min_values: int | None = None,
         max_values: int | None = None,
         required: bool = True,
-        row: int | None = None,
         id: int | None = None,
-        description: str | None = None,
     ):
         super().__init__()
-        if len(str(label)) > 45:
-            raise ValueError("label must be 45 characters or fewer")
-        if description and len(description) > 100:
-            raise ValueError("description must be 100 characters or fewer")
         if min_values and (min_values < 0 or min_values > 10):
             raise ValueError("min_values must be between 0 and 10")
         if max_values and (max_values < 1 or max_values > 10):
@@ -83,8 +65,6 @@ def __init__(
         if not isinstance(required, bool):
             raise TypeError(f"required must be bool not {required.__class__.__name__}")  # type: ignore
         custom_id = os.urandom(16).hex() if custom_id is None else custom_id
-        self.label: str = str(label)
-        self.description: str | None = description
 
         self._underlying: FileUploadComponent = FileUploadComponent._raw_construct(
             type=ComponentType.file_upload,
@@ -168,10 +148,6 @@ def values(self) -> list[Attachment] | None:
         """The files that were uploaded to the field."""
         return self._attachments
 
-    @property
-    def width(self) -> int:
-        return 5
-
     def to_component_dict(self) -> FileUploadComponentPayload:
         return self._underlying.to_dict()
 
@@ -184,7 +160,3 @@ def refresh_from_modal(self, interaction: Interaction, data: dict) -> None:
             )
             for attachment_id in values
         ]
-
-    @staticmethod
-    def uses_label() -> bool:
-        return True

discord/ui/label.py

@@ -35,6 +35,7 @@
 from .input_text import InputText
 from .item import ItemCallbackType, ModalItem
 from .select import Select
+from .file_upload import FileUpload
 
 __all__ = ("Label",)
 
@@ -59,6 +60,7 @@ class Label(ModalItem[M]):
 
     - :class:`discord.ui.Select`
     - :class:`discord.ui.InputText`
+    - :class:`discord.ui.FileUpload`
 
     .. versionadded:: 2.7
 
@@ -118,9 +120,8 @@ def set_item(self, item: ModalItem) -> Self:
 
         Parameters
         ----------
-        item: Union[:class:`ModalItem`, :class:`InputText`]
+        item: Union[:class:`ModalItem`]
             The item to set.
-            Currently only supports :class:`~discord.ui.Select` and :class:`~discord.ui.InputText`.
 
         Raises
         ------
@@ -328,6 +329,46 @@ def set_select(
 
         return self.set_item(select)
 
+    def set_file_upload(
+        self,
+        *,
+        custom_id: str | None = None,
+        min_values: int | None = None,
+        max_values: int | None = None,
+        required: bool | None = True,
+        id: int | None = None,
+    ) -> Self:
+        """Set this label's item to a file upload.
+
+        To set a pre-existing :class:`FileUpload`, use the
+        :meth:`set_item` method, instead.
+
+        Parameters
+        ----------
+        custom_id: Optional[:class:`str`]
+            The ID of the input text field that gets received during an interaction.
+        min_values: Optional[:class:`int`]
+            The minimum number of files that must be uploaded.
+            Defaults to 0 and must be between 0 and 10, inclusive.
+        max_values: Optional[:class:`int`]
+            The maximum number of files that can be uploaded.
+            Must be between 1 and 10, inclusive.
+        required: Optional[:class:`bool`]
+            Whether the file upload field is required or not. Defaults to ``True``.
+        id: Optional[:class:`int`]
+            The file upload field's ID.
+        """
+
+        upload = FileUpload(
+            custom_id=custom_id,
+            min_values=min_values,
+            max_values=max_values,
+            required=required,
+            id=id,
+        )
+
+        return self.set_item(upload)
+
     @property
     def label(self) -> str:
         """The label text. Must be 45 characters or fewer."""

docs/api/models.rst

@@ -445,6 +445,11 @@ UI Components
     :members:
     :inherited-members:
 
+.. attributetable:: Label
+
+.. autoclass:: Label()
+    :members:
+
 .. attributetable:: FileUpload
 
 .. autoclass:: FileUpload()