streamlit 1.45.1__py3-none-any.whl → 1.46.1__py3-none-any.whl

streamlit/elements/arrow.py

@@ -37,7 +37,6 @@ from streamlit.elements.lib.column_config_utils import (
     process_config_mapping,
     update_column_config,
 )
-from streamlit.elements.lib.event_utils import AttributeDictionary
 from streamlit.elements.lib.form_utils import current_form_id
 from streamlit.elements.lib.pandas_styler_utils import marshall_styler
 from streamlit.elements.lib.policies import check_widget_policies
@@ -51,6 +50,7 @@ from streamlit.runtime.scriptrunner_utils.script_run_context import (
     get_script_run_ctx,
 )
 from streamlit.runtime.state import WidgetCallback, register_widget
+from streamlit.util import AttributeDictionary
 
 if TYPE_CHECKING:
     from collections.abc import Hashable, Iterable
@@ -93,7 +93,7 @@ class DataframeSelectionState(TypedDict, total=False):
         The selected rows, identified by their integer position. The integer
         positions match the original dataframe, even if the user sorts the
         dataframe in their browser. For a ``pandas.DataFrame``, you can
-        retrieve data from its interger position using methods like ``.iloc[]``
+        retrieve data from its integer position using methods like ``.iloc[]``
         or ``.iat[]``.
     columns : list[str]
         The selected columns, identified by their names.
@@ -160,7 +160,7 @@ class DataframeState(TypedDict, total=False):
 class DataframeSelectionSerde:
     """DataframeSelectionSerde is used to serialize and deserialize the dataframe selection state."""
 
-    def deserialize(self, ui_value: str | None, widget_id: str = "") -> DataframeState:
+    def deserialize(self, ui_value: str | None) -> DataframeState:
         empty_selection_state: DataframeState = {
             "selection": {
                 "rows": [],
@@ -208,14 +208,14 @@ def parse_selection_mode(
         )
 
     parsed_selection_modes = []
-    for selection_mode in selection_mode_set:
-        if selection_mode == "single-row":
+    for mode in selection_mode_set:
+        if mode == "single-row":
             parsed_selection_modes.append(ArrowProto.SelectionMode.SINGLE_ROW)
-        elif selection_mode == "multi-row":
+        elif mode == "multi-row":
             parsed_selection_modes.append(ArrowProto.SelectionMode.MULTI_ROW)
-        elif selection_mode == "single-column":
+        elif mode == "single-column":
             parsed_selection_modes.append(ArrowProto.SelectionMode.SINGLE_COLUMN)
-        elif selection_mode == "multi-column":
+        elif mode == "multi-column":
             parsed_selection_modes.append(ArrowProto.SelectionMode.MULTI_COLUMN)
     return set(parsed_selection_modes)
 
@@ -327,7 +327,7 @@ class ArrowMixin:
             Desired height of the dataframe expressed in pixels. If ``height``
             is ``None`` (default), Streamlit sets the height to show at most
             ten rows. Vertical scrolling within the dataframe element is
-            enabled when the height does not accomodate all rows.
+            enabled when the height does not accommodate all rows.
 
         use_container_width : bool
             Whether to override ``width`` with the width of the parent
@@ -370,7 +370,7 @@ class ArrowMixin:
 
             - A column type within ``st.column_config``: Streamlit applies the
               defined configuration to the column. For example, use
-              ``st.column_config.NumberColumn("Dollar values”, format=”$ %d")``
+              ``st.column_config.NumberColumn("Dollar values", format="$ %d")``
               to change the displayed name of the column to "Dollar values"
               and add a "$" prefix in each cell. For more info on the
               available column types and config options, see
@@ -563,7 +563,7 @@ class ArrowMixin:
         if use_container_width is None:
             # If use_container_width was not explicitly set by the user, we set
             # it to True if width was not set explicitly, and False otherwise.
-            use_container_width = True if width is None else False
+            use_container_width = width is None
 
         proto.use_container_width = use_container_width
 
@@ -623,6 +623,7 @@ class ArrowMixin:
                 "dataframe",
                 user_key=key,
                 form_id=proto.form_id,
+                dg=self.dg,
                 data=proto.data,
                 width=width,
                 height=height,
@@ -645,8 +646,7 @@ class ArrowMixin:
             )
             self.dg._enqueue("arrow_data_frame", proto)
             return cast("DataframeState", widget_state.value)
-        else:
-            return self.dg._enqueue("arrow_data_frame", proto)
+        return self.dg._enqueue("arrow_data_frame", proto)
 
     @gather_metrics("table")
     def table(self, data: Data = None) -> DeltaGenerator:
@@ -733,7 +733,7 @@ class ArrowMixin:
         return self.dg._enqueue("arrow_table", proto)
 
     @gather_metrics("add_rows")
-    def add_rows(self, data: Data = None, **kwargs) -> DeltaGenerator | None:
+    def add_rows(self, data: Data = None, **kwargs: Any) -> DeltaGenerator | None:
         """Concatenate a dataframe to the bottom of the current one.
 
         Parameters
@@ -789,7 +789,7 @@ class ArrowMixin:
         ... )
         >>> my_chart.add_rows(some_fancy_name=df2)  # <-- name used as keyword
 
-        """
+        """  # noqa: E501
         return _arrow_add_rows(self.dg, data, **kwargs)
 
     @property
@@ -823,9 +823,7 @@ def _prep_data_for_add_rows(
 def _arrow_add_rows(
     dg: DeltaGenerator,
     data: Data = None,
-    **kwargs: (
-        DataFrame | npt.NDArray[Any] | Iterable[Any] | dict[Hashable, Any] | None
-    ),
+    **kwargs: DataFrame | npt.NDArray[Any] | Iterable[Any] | dict[Hashable, Any] | None,
 ) -> DeltaGenerator | None:
     """Concatenate a dataframe to the bottom of the current one.
 
@@ -909,6 +907,25 @@ def _arrow_add_rows(
         and dg._cursor.props["add_rows_metadata"].last_index is None
     ):
         st_method = getattr(dg, dg._cursor.props["add_rows_metadata"].chart_command)
+        metadata = dg._cursor.props["add_rows_metadata"]
+
+        # Pass the styling properties stored in add_rows_metadata
+        # to the new element call.
+        kwargs = {}
+        if metadata.color is not None:
+            kwargs["color"] = metadata.color
+        if metadata.width is not None:
+            kwargs["width"] = metadata.width
+        if metadata.height is not None:
+            kwargs["height"] = metadata.height
+        if metadata.stack is not None:
+            kwargs["stack"] = metadata.stack
+
+        if metadata.chart_command == "bar_chart":
+            kwargs["horizontal"] = metadata.horizontal
+
+        kwargs["use_container_width"] = metadata.use_container_width
+
         st_method(data, **kwargs)
         return None
 
@@ -948,14 +965,15 @@ def marshall(proto: ArrowProto, data: Data, default_uuid: str | None = None) ->
         This attribute is optional and only used for pandas.Styler, other elements
         (e.g. charts) can ignore it.
 
-    """
+    """  # noqa: E501
 
     if dataframe_util.is_pandas_styler(data):
         # default_uuid is a string only if the data is a `Styler`,
         # and `None` otherwise.
-        assert isinstance(default_uuid, str), (
-            "Default UUID must be a string for Styler data."
-        )
+        if not isinstance(default_uuid, str):
+            raise StreamlitAPIException(
+                "Default UUID must be a string for Styler data."
+            )
         marshall_styler(proto, data, default_uuid)
 
     proto.data = dataframe_util.convert_anything_to_arrow_bytes(data)

streamlit/elements/code.py

@@ -14,11 +14,17 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, cast
-
+import re
+from typing import TYPE_CHECKING, Literal, cast
+
+from streamlit.elements.lib.layout_utils import (
+    LayoutConfig,
+    WidthWithoutContent,
+    validate_height,
+    validate_width,
+)
 from streamlit.proto.Code_pb2 import Code as CodeProto
 from streamlit.runtime.metrics_util import gather_metrics
-from streamlit.string_util import clean_text
 
 if TYPE_CHECKING:
     from streamlit.delta_generator import DeltaGenerator
@@ -34,7 +40,8 @@ class CodeMixin:
         *,
         line_numbers: bool = False,
         wrap_lines: bool = False,
-        height: int | None = None,
+        height: int | Literal["content"] | None = "content",
+        width: WidthWithoutContent = "stretch",
     ) -> DeltaGenerator:
         """Display a code block with optional syntax highlighting.
 
@@ -61,11 +68,31 @@ class CodeMixin:
             An optional boolean indicating whether to wrap lines. This defaults
             to ``False``.
 
-        height : int or None
-            Desired height of the code block expressed in pixels. If ``height``
-            is ``None`` (default), Streamlit sets the element's height to fit
-            its content. Vertical scrolling within the element is enabled when
-            the height does not accomodate all lines.
+        height : "content" or int
+            The height of the code block element. This can be one of the following:
+
+            - ``"content"`` (default): The height of the element matches the
+              height of its content.
+            - An integer specifying the height in pixels: The element has a
+              fixed height. If the content is larger than the specified
+              height, scrolling is enabled.
+
+            .. note::
+                Use scrolling containers sparingly. If you use scrolling
+                containers, avoid heights that exceed 500 pixels. Otherwise,
+                the scroll surface of the container might cover the majority of
+                the screen on mobile devices, which makes it hard to scroll the
+                rest of the app.
+
+        width : "stretch" or int
+            The width of the code block element. This can be one of the following:
+
+            - ``"stretch"`` (default): The width of the element matches the
+              width of the parent container.
+            - An integer specifying the width in pixels: The element has a
+              fixed width. If the specified width is greater than the width of
+              the parent container, the width of the element matches the width
+              of the parent container.
 
         Examples
         --------
@@ -100,13 +127,19 @@ class CodeMixin:
             height: 380px
         """
         code_proto = CodeProto()
-        code_proto.code_text = clean_text(body)
+        code_proto.code_text = re.sub(r"\n\Z", "", re.sub(r"\A\n", "", str(body)))
         code_proto.language = language or "plaintext"
         code_proto.show_line_numbers = line_numbers
         code_proto.wrap_lines = wrap_lines
-        if height:
-            code_proto.height = height
-        return self.dg._enqueue("code", code_proto)
+
+        if height is None:
+            height = "content"
+        else:
+            validate_height(height, allow_content=True)
+        validate_width(width)
+        layout_config = LayoutConfig(height=height, width=width)
+
+        return self.dg._enqueue("code", code_proto, layout_config=layout_config)
 
     @property
     def dg(self) -> DeltaGenerator:

streamlit/elements/deck_gl_json_chart.py

@@ -29,7 +29,6 @@ from typing import (
 from typing_extensions import TypeAlias
 
 from streamlit import config
-from streamlit.elements.lib.event_utils import AttributeDictionary
 from streamlit.elements.lib.form_utils import current_form_id
 from streamlit.elements.lib.policies import check_widget_policies
 from streamlit.elements.lib.utils import Key, compute_and_register_element_id, to_key
@@ -41,6 +40,7 @@ from streamlit.runtime.state import (
     WidgetCallback,
     register_widget,
 )
+from streamlit.util import AttributeDictionary
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Mapping
@@ -91,10 +91,10 @@ def parse_selection_mode(
         )
 
     parsed_selection_modes = []
-    for selection_mode in selection_mode_set:
-        if selection_mode == "single-object":
+    for mode in selection_mode_set:
+        if mode == "single-object":
             parsed_selection_modes.append(PydeckProto.SelectionMode.SINGLE_OBJECT)
-        elif selection_mode == "multi-object":
+        elif mode == "multi-object":
             parsed_selection_modes.append(PydeckProto.SelectionMode.MULTI_OBJECT)
     return set(parsed_selection_modes)
 
@@ -233,7 +233,7 @@ class PydeckState(TypedDict, total=False):
 class PydeckSelectionSerde:
     """PydeckSelectionSerde is used to serialize and deserialize the Pydeck selection state."""
 
-    def deserialize(self, ui_value: str | None, widget_id: str = "") -> PydeckState:
+    def deserialize(self, ui_value: str | None) -> PydeckState:
         empty_selection_state: PydeckState = {
             "selection": {
                 "indices": {},
@@ -268,8 +268,9 @@ class PydeckMixin:
         height: int | None = None,
         selection_mode: Literal[
             "single-object"
-        ],  # Selection mode will only be activated by on_select param, this is a default value here to make it work with mypy
-        on_select: Literal["ignore"],  # No default value here to make it work with mypy
+        ],  # Selection mode will only be activated by on_select param; default value here to make it work with mypy
+        # No default value here to make it work with mypy
+        on_select: Literal["ignore"],
         key: Key | None = None,
     ) -> DeltaGenerator: ...
 
@@ -308,21 +309,26 @@ class PydeckMixin:
         - DeckGL docs: https://github.com/uber/deck.gl/tree/master/docs
         - DeckGL JSON docs: https://github.com/uber/deck.gl/tree/master/modules/json
 
-        When using this command, Mapbox provides the map tiles to render map
-        content. Note that Mapbox is a third-party product and Streamlit accepts
-        no responsibility or liability of any kind for Mapbox or for any content
-        or information made available by Mapbox.
+        When using this command, a service called Carto_ provides the map tiles to render
+        map content. If you're using advanced PyDeck features you may need to obtain
+        an API key from Carto first. You can do that as
+        ``pydeck.Deck(api_keys={"carto": YOUR_KEY})`` or by setting the CARTO_API_KEY
+        environment variable. See `PyDeck's documentation`_ for more information.
 
-        Mapbox requires users to register and provide a token before users can
-        request map tiles. Currently, Streamlit provides this token for you, but
-        this could change at any time. We strongly recommend all users create and
-        use their own personal Mapbox token to avoid any disruptions to their
-        experience. You can do this with the ``mapbox.token`` config option. The
-        use of Mapbox is governed by Mapbox's Terms of Use.
+        Another common provider for map tiles is Mapbox_. If you prefer to use that,
+        you'll need to create an account at https://mapbox.com and specify your Mapbox
+        key when creating the ``pydeck.Deck`` object. You can do that as
+        ``pydeck.Deck(api_keys={"mapbox": YOUR_KEY})`` or by setting the MAPBOX_API_KEY
+        environment variable.
 
-        To get a token for yourself, create an account at https://mapbox.com.
-        For more info on how to set config options, see
-        https://docs.streamlit.io/develop/api-reference/configuration/config.toml.
+        .. _Carto: https://carto.com
+        .. _Mapbox: https://mapbox.com
+        .. _PyDeck's documentation: https://deckgl.readthedocs.io/en/latest/deck.html
+
+        Carto and Mapbox are third-party products and Streamlit accepts no responsibility
+        or liability of any kind for Carto or Mapbox, or for any content or information
+        made available by Carto or Mapbox. The use of Carto or Mapbox is governed by
+        their respective Terms of Use.
 
         Parameters
         ----------
@@ -408,7 +414,7 @@ class PydeckMixin:
         >>>
         >>> st.pydeck_chart(
         ...     pdk.Deck(
-        ...         map_style=None,
+        ...         map_style=None,  # Use Streamlit theme to pick map style
         ...         initial_view_state=pdk.ViewState(
         ...             latitude=37.76,
         ...             longitude=-122.4,
@@ -450,10 +456,7 @@ class PydeckMixin:
 
         ctx = get_script_run_ctx()
 
-        if pydeck_obj is None:
-            spec = json.dumps(EMPTY_MAP)
-        else:
-            spec = pydeck_obj.to_json()
+        spec = json.dumps(EMPTY_MAP) if pydeck_obj is None else pydeck_obj.to_json()
 
         pydeck_proto.json = spec
         pydeck_proto.use_container_width = use_container_width
@@ -467,7 +470,13 @@ class PydeckMixin:
         if tooltip:
             pydeck_proto.tooltip = json.dumps(tooltip)
 
-        mapbox_token = config.get_option("mapbox.token")
+        # Get the Mapbox key from the PyDeck object first, and then fallback to the
+        # old mapbox.token config option.
+
+        mapbox_token = getattr(pydeck_obj, "mapbox_key", None)
+        if mapbox_token is None or mapbox_token == "":
+            mapbox_token = config.get_option("mapbox.token")
+
         if mapbox_token:
             pydeck_proto.mapbox_token = mapbox_token
 
@@ -476,7 +485,8 @@ class PydeckMixin:
 
         if on_select not in ["ignore", "rerun"] and not callable(on_select):
             raise StreamlitAPIException(
-                f"You have passed {on_select} to `on_select`. But only 'ignore', 'rerun', or a callable is supported."
+                f"You have passed {on_select} to `on_select`. "
+                "But only 'ignore', 'rerun', or a callable is supported."
             )
 
         if is_selection_activated:
@@ -498,6 +508,7 @@ class PydeckMixin:
             pydeck_proto.id = compute_and_register_element_id(
                 "deck_gl_json_chart",
                 user_key=key,
+                dg=self.dg,
                 is_selection_activated=is_selection_activated,
                 selection_mode=selection_mode,
                 use_container_width=use_container_width,

streamlit/elements/dialog_decorator.py

@@ -15,7 +15,7 @@
 from __future__ import annotations
 
 from functools import wraps
-from typing import TYPE_CHECKING, Callable, TypeVar, cast, overload
+from typing import TYPE_CHECKING, Any, Callable, TypeVar, cast, overload
 
 from streamlit.delta_generator_singletons import (
     get_dg_singleton_instance,
@@ -74,7 +74,7 @@ def _dialog_decorator(
         )
 
     @wraps(non_optional_func)
-    def wrap(*args, **kwargs) -> None:
+    def wrap(*args: Any, **kwargs: Any) -> None:
         _assert_no_nested_dialogs()
         # Call the Dialog on the event_dg because it lives outside of the normal
         # Streamlit UI flow. For example, if it is called from the sidebar, it should
@@ -97,7 +97,6 @@ def _dialog_decorator(
             # if the dialog should be closed, st.rerun() has to be called
             # (same behavior as with st.fragment)
             _ = non_optional_func(*args, **kwargs)
-            return None
 
         # the fragment decorator has multiple return types so that you can pass
         # arguments to it. Here we know the return type, so we cast
@@ -110,7 +109,7 @@ def _dialog_decorator(
 
         with dialog:
             fragmented_dialog_content()
-            return None
+            return
 
     return cast("F", wrap)