streamlit 1.48.1__py3-none-any.whl → 1.49.0__py3-none-any.whl

streamlit/elements/widgets/file_uploader.py

@@ -67,6 +67,12 @@ SomeUploadedFiles: TypeAlias = Union[
     None,
 ]
 
+# Type alias for accept_multiple_files parameter.
+# If True, multiple files can be uploaded.
+# If False, only a single file can be uploaded.
+# If set to the literal "directory", users can upload an entire directory (folder) of files.
+AcceptMultipleFiles: TypeAlias = Union[bool, Literal["directory"]]
+
 
 def _get_upload_files(
     widget_value: FileUploaderStateProto | None,
@@ -104,7 +110,7 @@ def _get_upload_files(
 
 @dataclass
 class FileUploaderSerde:
-    accept_multiple_files: bool
+    accept_multiple_files: AcceptMultipleFiles
     allowed_types: Sequence[str] | None = None
 
     def deserialize(self, ui_value: FileUploaderStateProto | None) -> SomeUploadedFiles:
@@ -117,12 +123,16 @@ class FileUploaderSerde:
             if self.allowed_types:
                 enforce_filename_restriction(file.name, self.allowed_types)
 
+        # Directory uploads always return a list, similar to multiple files
+        is_multiple_or_directory = (
+            self.accept_multiple_files is True
+            or self.accept_multiple_files == "directory"
+        )
+
         if len(upload_files) == 0:
-            return_value: SomeUploadedFiles = [] if self.accept_multiple_files else None
+            return_value: SomeUploadedFiles = [] if is_multiple_or_directory else None
         else:
-            return_value = (
-                upload_files if self.accept_multiple_files else upload_files[0]
-            )
+            return_value = upload_files if is_multiple_or_directory else upload_files[0]
         return return_value
 
     def serialize(self, files: SomeUploadedFiles) -> FileUploaderStateProto:
@@ -149,21 +159,22 @@ class FileUploaderMixin:
     # Multiple overloads are defined on `file_uploader()` below to represent
     # the different return types of `file_uploader()`.
     # These return types differ according to the value of the `accept_multiple_files` argument.
-    # There are 2 associated variables, each with 2 options.
-    # 1. The `accept_multiple_files` argument is set as `True`,
-    #    or it is set as `False` or omitted, in which case the default value `False`.
-    # 2. The `type` argument may or may not be provided as a keyword-only argument.
     # There must be 2x2=4 overloads to cover all the possible arguments,
     # as these overloads must be mutually exclusive for mypy.
+    # There are 3 associated variables, each with 2+ options.
+    # 1. The `accept_multiple_files` argument is set as `True` or `"directory"`,
+    #    or it is set as `False` or omitted, in which case the default value `False`.
+    # 2. The `type` argument may or may not be provided as a keyword-only argument.
+    # 3. Directory uploads always return a list of UploadedFile objects.
 
     # 1. type is given as not a keyword-only argument
-    # 2. accept_multiple_files = True
+    # 2. accept_multiple_files = True or "directory"
     @overload
     def file_uploader(
         self,
         label: str,
         type: str | Sequence[str] | None,
-        accept_multiple_files: Literal[True],
+        accept_multiple_files: Literal[True, "directory"],
         key: Key | None = None,
         help: str | None = None,
         on_change: WidgetCallback | None = None,
@@ -200,13 +211,13 @@ class FileUploaderMixin:
     # for the related discussions and examples.
 
     # 1. type is skipped or a keyword argument
-    # 2. accept_multiple_files = True
+    # 2. accept_multiple_files = True or "directory"
     @overload
     def file_uploader(
         self,
         label: str,
         *,
-        accept_multiple_files: Literal[True],
+        accept_multiple_files: Literal[True, "directory"],
         type: str | Sequence[str] | None = None,
         key: Key | None = None,
         help: str | None = None,
@@ -242,7 +253,7 @@ class FileUploaderMixin:
         self,
         label: str,
         type: str | Sequence[str] | None = None,
-        accept_multiple_files: bool = False,
+        accept_multiple_files: AcceptMultipleFiles = False,
         key: Key | None = None,
         help: str | None = None,
         on_change: WidgetCallback | None = None,
@@ -285,7 +296,7 @@ class FileUploaderMixin:
             .. |st.markdown| replace:: ``st.markdown``
             .. _st.markdown: https://docs.streamlit.io/develop/api-reference/text/st.markdown
 
-        type : str or list of str or None
+        type : str, list of str, or None
             The allowed file extension(s) for uploaded files. This can be one
             of the following types:
 
@@ -302,11 +313,19 @@ class FileUploaderMixin:
                 or type extensions. The correct handling of uploaded files is
                 part of the app developer's responsibility.
 
-        accept_multiple_files : bool
-            Whether to accept more than one file in a submission. If this is
-            ``False`` (default), the user can only submit one file at a time.
-            If this is ``True``, the user can upload multiple files at the same
-            time, in which case the return value will be a list of files.
+        accept_multiple_files : bool or "directory"
+            Whether to accept more than one file in a submission. This can be one
+            of the following values:
+
+            - ``False`` (default): The user can only submit one file at a time.
+            - ``True``: The user can upload multiple files at the same time.
+            - ``"directory"``: The user can select a directory to upload all
+              files in the directory and its subdirectories. If ``type`` is
+              set, only files matching those type(s) will be uploaded.
+
+            When this is ``True`` or ``"directory"``, the return value will be
+            a list and a user can additively select files if they click the
+            browse button on the widget multiple times.
 
         key : str or int
             An optional string or integer to use as the unique key for the widget.
@@ -356,19 +375,19 @@ class FileUploaderMixin:
         Returns
         -------
         None, UploadedFile, or list of UploadedFile
-            - If accept_multiple_files is False, returns either None or
-              an UploadedFile object.
-            - If accept_multiple_files is True, returns a list with the
-              uploaded files as UploadedFile objects. If no files were
-              uploaded, returns an empty list.
+            - If accept_multiple_files is ``False``, returns either ``None`` or
+              an ``UploadedFile`` object.
+            - If accept_multiple_files is ``True`` or ``"directory"``, returns
+              a list with the uploaded files as ``UploadedFile`` objects. If no
+              files were uploaded, returns an empty list.
 
-            The UploadedFile class is a subclass of BytesIO, and therefore is
-            "file-like". This means you can pass an instance of it anywhere a
-            file is expected.
+            The ``UploadedFile`` class is a subclass of ``BytesIO``, and
+            therefore is "file-like". This means you can pass an instance of it
+            anywhere a file is expected.
 
         Examples
         --------
-        Insert a file uploader that accepts a single file at a time:
+        **Example 1: Accept a single file at a time**
 
         >>> import streamlit as st
         >>> import pandas as pd
@@ -392,22 +411,36 @@ class FileUploaderMixin:
         ...     dataframe = pd.read_csv(uploaded_file)
         ...     st.write(dataframe)
 
-        Insert a file uploader that accepts multiple files at a time:
+        **Example 2: Accept multiple files at a time**
 
+        >>> import pandas as pd
         >>> import streamlit as st
         >>>
         >>> uploaded_files = st.file_uploader(
-        ...     "Choose a CSV file", accept_multiple_files=True
+        ...     "Upload data", accept_multiple_files=True, type="csv"
         ... )
         >>> for uploaded_file in uploaded_files:
-        ...     bytes_data = uploaded_file.read()
-        ...     st.write("filename:", uploaded_file.name)
-        ...     st.write(bytes_data)
+        ...     df = pd.read_csv(uploaded_file)
+        ...     st.write(df)
 
         .. output::
            https://doc-file-uploader.streamlit.app/
            height: 375px
 
+        **Example 3: Accept an entire directory**
+
+        >>> import streamlit as st
+        >>>
+        >>> uploaded_files = st.file_uploader(
+        ...     "Upload images", accept_multiple_files="directory", type=["jpg", "png"]
+        ... )
+        >>> for uploaded_file in uploaded_files:
+        ...     st.image(uploaded_file)
+
+        .. output::
+           https://doc-file-uploader-directory.streamlit.app/
+           height: 375px
+
         """
         ctx = get_script_run_ctx()
         return self._file_uploader(
@@ -429,7 +462,7 @@ class FileUploaderMixin:
         self,
         label: str,
         type: str | Sequence[str] | None = None,
-        accept_multiple_files: bool = False,
+        accept_multiple_files: AcceptMultipleFiles = False,
         key: Key | None = None,
         help: str | None = None,
         on_change: WidgetCallback | None = None,
@@ -455,7 +488,6 @@ class FileUploaderMixin:
         element_id = compute_and_register_element_id(
             "file_uploader",
             user_key=key,
-            form_id=current_form_id(self.dg),
             dg=self.dg,
             label=label,
             type=type,
@@ -475,7 +507,12 @@ class FileUploaderMixin:
         file_uploader_proto.max_upload_size_mb = config.get_option(
             "server.maxUploadSize"
         )
-        file_uploader_proto.multiple_files = accept_multiple_files
+        # Handle directory uploads - they should enable multiple files and set the directory flag
+        is_directory_upload = accept_multiple_files == "directory"
+        file_uploader_proto.multiple_files = (
+            accept_multiple_files is True or is_directory_upload
+        )
+        file_uploader_proto.accept_directory = is_directory_upload
         file_uploader_proto.form_id = current_form_id(self.dg)
         file_uploader_proto.disabled = disabled
         file_uploader_proto.label_visibility.value = get_label_visibility_proto_value(

streamlit/elements/widgets/multiselect.py

@@ -492,7 +492,6 @@ class MultiSelectMixin:
         element_id = compute_and_register_element_id(
             widget_name,
             user_key=key,
-            form_id=form_id,
             dg=self.dg,
             label=label,
             options=formatted_options,

streamlit/elements/widgets/number_input.py

@@ -452,7 +452,6 @@ class NumberInputMixin:
         element_id = compute_and_register_element_id(
             "number_input",
             user_key=key,
-            form_id=current_form_id(self.dg),
             dg=self.dg,
             label=label,
             min_value=min_value,

streamlit/elements/widgets/radio.py

@@ -369,7 +369,6 @@ class RadioMixin:
         element_id = compute_and_register_element_id(
             "radio",
             user_key=key,
-            form_id=current_form_id(self.dg),
             dg=self.dg,
             label=label,
             options=[str(format_func(option)) for option in opt],

streamlit/elements/widgets/select_slider.py

@@ -377,7 +377,6 @@ class SelectSliderMixin:
         element_id = compute_and_register_element_id(
             "select_slider",
             user_key=key,
-            form_id=current_form_id(self.dg),
             dg=self.dg,
             label=label,
             options=[str(format_func(option)) for option in opt],

streamlit/elements/widgets/selectbox.py

@@ -541,7 +541,6 @@ class SelectboxMixin:
         element_id = compute_and_register_element_id(
             "selectbox",
             user_key=key,
-            form_id=current_form_id(self.dg),
             dg=self.dg,
             label=label,
             options=formatted_options,

streamlit/elements/widgets/slider.py

@@ -680,7 +680,6 @@ class SliderMixin:
         element_id = compute_and_register_element_id(
             "slider",
             user_key=key,
-            form_id=current_form_id(self.dg),
             dg=self.dg,
             label=label,
             min_value=min_value,

streamlit/elements/widgets/text_widgets.py

@@ -328,7 +328,6 @@ class TextWidgetsMixin:
         element_id = compute_and_register_element_id(
             "text_input",
             user_key=key,
-            form_id=current_form_id(self.dg),
             dg=self.dg,
             label=label,
             value=value,
@@ -643,7 +642,6 @@ class TextWidgetsMixin:
         element_id = compute_and_register_element_id(
             "text_area",
             user_key=key,
-            form_id=current_form_id(self.dg),
             dg=self.dg,
             label=label,
             value=value,

streamlit/elements/widgets/time_widgets.py

@@ -529,7 +529,6 @@ class TimeWidgetsMixin:
         element_id = compute_and_register_element_id(
             "time_input",
             user_key=key,
-            form_id=current_form_id(self.dg),
             dg=self.dg,
             label=label,
             value=parsed_time if isinstance(value, (datetime, time)) else value,
@@ -912,7 +911,6 @@ class TimeWidgetsMixin:
         element_id = compute_and_register_element_id(
             "date_input",
             user_key=key,
-            form_id=current_form_id(self.dg),
             dg=self.dg,
             label=label,
             value=parsed,

streamlit/errors.py

@@ -517,3 +517,14 @@ class StreamlitInvalidHeightError(LocalizableStreamlitException):
             height=repr(height),
             valid_values=valid_values,
         )
+
+
+class StreamlitValueError(LocalizableStreamlitException):
+    """Exception raised when a value is not valid for a parameter."""
+
+    def __init__(self, parameter: str, valid_values: list[str]) -> None:
+        super().__init__(
+            "Invalid `{parameter}` value. Supported values: {valid_values}.",
+            parameter=parameter,
+            valid_values=", ".join(valid_values),
+        )