streamlit 1.45.0__py3-none-any.whl → 1.46.0__py3-none-any.whl

streamlit/elements/lib/subtitle_utils.py

@@ -104,9 +104,7 @@ def _srt_to_vtt(srt_data: str | bytes) -> bytes:
     # Add WebVTT file header
     vtt_content = "WEBVTT\n\n" + vtt_data
     # Convert the vtt content to bytes
-    vtt_content = vtt_content.strip().encode("utf-8")
-
-    return vtt_content
+    return vtt_content.strip().encode("utf-8")
 
 
 def _handle_string_or_path_data(data_or_path: str | Path) -> bytes:
@@ -123,14 +121,14 @@ def _handle_string_or_path_data(data_or_path: str | Path) -> bytes:
         with open(data_or_path, "rb") as file:
             content = file.read()
         return _srt_to_vtt(content) if file_extension == ".srt" else content
-    elif isinstance(data_or_path, Path):
-        raise ValueError(f"File {data_or_path} does not exist.")
+    if isinstance(data_or_path, Path):
+        raise ValueError(f"File {data_or_path} does not exist.")  # noqa: TRY004
 
     content_string = data_or_path.strip()
 
     if content_string.startswith("WEBVTT") or content_string == "":
         return content_string.encode("utf-8")
-    elif _is_srt(content_string):
+    if _is_srt(content_string):
         return _srt_to_vtt(content_string)
     raise ValueError("The provided string neither matches valid VTT nor SRT format.")
 
@@ -173,6 +171,5 @@ def process_subtitle_data(
         )
         caching.save_media_data(subtitle_data, "text/vtt", coordinates)
         return file_url
-    else:
-        # When running in "raw mode", we can't access the MediaFileManager.
-        return ""
+    # When running in "raw mode", we can't access the MediaFileManager.
+    return ""

streamlit/elements/lib/utils.py

@@ -31,6 +31,7 @@ from streamlit import config
 from streamlit.errors import StreamlitDuplicateElementId, StreamlitDuplicateElementKey
 from streamlit.proto.ChatInput_pb2 import ChatInput
 from streamlit.proto.LabelVisibilityMessage_pb2 import LabelVisibilityMessage
+from streamlit.proto.RootContainer_pb2 import RootContainer
 from streamlit.runtime.scriptrunner_utils.script_run_context import (
     ScriptRunContext,
     get_script_run_ctx,
@@ -45,6 +46,8 @@ if TYPE_CHECKING:
     from builtins import ellipsis
     from collections.abc import Iterable
 
+    from streamlit.delta_generator import DeltaGenerator
+
 
 Key: TypeAlias = Union[str, int]
 
@@ -70,9 +73,9 @@ def get_label_visibility_proto_value(
 
     if label_visibility_string == "visible":
         return LabelVisibilityMessage.LabelVisibilityOptions.VISIBLE
-    elif label_visibility_string == "hidden":
+    if label_visibility_string == "hidden":
         return LabelVisibilityMessage.LabelVisibilityOptions.HIDDEN
-    elif label_visibility_string == "collapsed":
+    if label_visibility_string == "collapsed":
         return LabelVisibilityMessage.LabelVisibilityOptions.COLLAPSED
 
     raise ValueError(f"Unknown label visibility value: {label_visibility_string}")
@@ -85,9 +88,9 @@ def get_chat_input_accept_file_proto_value(
 
     if accept_file_value is False:
         return ChatInput.AcceptFile.NONE
-    elif accept_file_value is True:
+    if accept_file_value is True:
         return ChatInput.AcceptFile.SINGLE
-    elif accept_file_value == "multiple":
+    if accept_file_value == "multiple":
         return ChatInput.AcceptFile.MULTIPLE
 
     raise ValueError(f"Unknown accept file value: {accept_file_value}")
@@ -182,6 +185,7 @@ def compute_and_register_element_id(
     *,
     user_key: str | None,
     form_id: str | None,
+    dg: DeltaGenerator | None = None,
     **kwargs: SAFE_VALUES | Iterable[SAFE_VALUES],
 ) -> str:
     """Compute and register the ID for the given element.
@@ -212,6 +216,9 @@ def compute_and_register_element_id(
         The ID of the form that the element belongs to. `None` or empty string
         if the element doesn't belong to a form or doesn't support forms.
 
+    dg : DeltaGenerator | None
+        The DeltaGenerator of each element. `None` if the element is not a widget.
+
     kwargs : SAFE_VALUES | Iterable[SAFE_VALUES]
         The arguments to use to compute the element ID.
         The arguments must be stable, deterministic values.
@@ -229,6 +236,14 @@ def compute_and_register_element_id(
         # pages unique IDs.
         kwargs_to_use["active_script_hash"] = ctx.active_script_hash
 
+    if dg:
+        # If no key is provided and the widget element is inside the sidebar area
+        # add it to the kwargs
+        # allowing the same widget to be both in main area and sidebar.
+        active_dg_root_container = dg._active_dg._root_container
+        if active_dg_root_container == RootContainer.SIDEBAR and user_key is None:
+            kwargs_to_use["active_dg_root_container"] = str(active_dg_root_container)
+
     element_id = _compute_element_id(
         element_type,
         user_key,
@@ -240,7 +255,7 @@ def compute_and_register_element_id(
     return element_id
 
 
-def save_for_app_testing(ctx: ScriptRunContext, k: str, v: Any):
+def save_for_app_testing(ctx: ScriptRunContext, k: str, v: Any) -> None:
     if config.get_option("global.appTest"):
         try:
             ctx.session_state[TESTING_KEY][k] = v

streamlit/elements/map.py

@@ -20,8 +20,8 @@ import copy
 import json
 from typing import TYPE_CHECKING, Any, Final, cast
 
-import streamlit.elements.deck_gl_json_chart as deck_gl_json_chart
 from streamlit import config, dataframe_util
+from streamlit.elements import deck_gl_json_chart
 from streamlit.elements.lib.color_util import (
     Color,
     IntColorTuple,
@@ -94,21 +94,26 @@ class MapMixin:
         This is a wrapper around ``st.pydeck_chart`` to quickly create
         scatterplot charts on top of a map, with auto-centering and auto-zoom.
 
-        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
         ----------
@@ -225,23 +230,8 @@ class MapMixin:
            height: 600px
 
         """
-        # This feature was turned off while we investigate why different
-        # map styles cause DeckGL to crash.
-        #
-        # For reference, this was the docstring for map_style:
-        #
-        #   map_style : str or None
-        #       One of Mapbox's map style URLs. A full list can be found here:
-        #       https://docs.mapbox.com/api/maps/styles/#mapbox-styles
-        #
-        #       This feature requires a Mapbox token. See the top of these docs
-        #       for information on how to get one and set it up in Streamlit.
-        #
-        map_style = None
         map_proto = DeckGlJsonChartProto()
-        deck_gl_json = to_deckgl_json(
-            data, latitude, longitude, size, color, map_style, zoom
-        )
+        deck_gl_json = to_deckgl_json(data, latitude, longitude, size, color, zoom)
         marshall(
             map_proto, deck_gl_json, use_container_width, width=width, height=height
         )
@@ -259,7 +249,6 @@ def to_deckgl_json(
     lon: str | None,
     size: None | str | float,
     color: None | str | Collection[float],
-    map_style: str | None,
     zoom: int | None,
 ) -> str:
     if data is None:
@@ -291,7 +280,7 @@ def to_deckgl_json(
     )
     df = df[used_columns]
 
-    color_arg = _convert_color_arg_or_column(df, color_arg, color_col_name)
+    converted_color_arg = _convert_color_arg_or_column(df, color_arg, color_col_name)
 
     zoom, center_lat, center_lon = _get_viewport_details(
         df, lat_col_name, lon_col_name, zoom
@@ -308,19 +297,11 @@ def to_deckgl_json(
             "getRadius": size_arg,
             "radiusMinPixels": 3,
             "radiusUnits": "meters",
-            "getFillColor": color_arg,
+            "getFillColor": converted_color_arg,
             "data": df.to_dict("records"),
         }
     ]
 
-    if map_style:
-        if not config.get_option("mapbox.token"):
-            raise StreamlitAPIException(
-                "You need a Mapbox token in order to select a map type. "
-                "Refer to the docs for st.map for more information."
-            )
-        default["mapStyle"] = map_style
-
     return json.dumps(default)
 
 
@@ -352,8 +333,7 @@ def _get_lat_or_lon_col_name(
                 f"Map data must contain a {human_readable_name} column named: "
                 f"{formatted_allowed_col_name}. Existing columns: {formmated_col_names}"
             )
-        else:
-            col_name = candidate_col_name
+        col_name = candidate_col_name
 
     # Check that the column is well-formed.
     # IMPLEMENTATION NOTE: We can't use isnull().values.any() because .values can return
@@ -374,7 +354,7 @@ def _get_value_and_col_name(
     data: DataFrame,
     value_or_name: Any,
     default_value: Any,
-) -> tuple[Any, str | None]:
+) -> tuple[str, str | None]:
     """Take a value_or_name passed in by the Streamlit developer and return a PyDeck
     argument and column name for that property.
 
@@ -386,7 +366,7 @@ def _get_value_and_col_name(
     - If the user passes size="my_col_123", this returns "@@=my_col_123" and "my_col_123".
     """
 
-    pydeck_arg: str | float
+    pydeck_arg: str
 
     if isinstance(value_or_name, str) and value_or_name in data.columns:
         col_name = value_or_name
@@ -394,17 +374,14 @@ def _get_value_and_col_name(
     else:
         col_name = None
 
-        if value_or_name is None:
-            pydeck_arg = default_value
-        else:
-            pydeck_arg = value_or_name
+        pydeck_arg = default_value if value_or_name is None else value_or_name
 
     return pydeck_arg, col_name
 
 
 def _convert_color_arg_or_column(
     data: DataFrame,
-    color_arg: str | Color,
+    color_arg: str,
     color_col_name: str | None,
 ) -> None | str | IntColorTuple:
     """Converts color to a format accepted by PyDeck.
@@ -433,8 +410,6 @@ def _convert_color_arg_or_column(
                 f'Column "{color_col_name}" does not appear to contain valid colors.'
             )
 
-        # This is guaranteed to be a str because of _get_value_and_col_name
-        assert isinstance(color_arg, str)
         color_arg_out = color_arg
 
     elif color_arg is not None:
@@ -457,10 +432,7 @@ def _get_viewport_details(
     range_lat = abs(max_lat - min_lat)
 
     if zoom is None:
-        if range_lon > range_lat:
-            longitude_distance = range_lon
-        else:
-            longitude_distance = range_lat
+        longitude_distance = max(range_lat, range_lon)
         zoom = _get_zoom_level(longitude_distance)
 
     return zoom, center_lat, center_lon
@@ -506,3 +478,7 @@ def marshall(
         pydeck_proto.height = height
 
     pydeck_proto.id = ""
+
+    mapbox_token = config.get_option("mapbox.token")
+    if mapbox_token:
+        pydeck_proto.mapbox_token = mapbox_token

streamlit/elements/markdown.py

@@ -16,13 +16,19 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Final, Literal, cast
 
+from streamlit.elements.lib.layout_utils import (
+    LayoutConfig,
+    Width,
+    WidthWithoutContent,
+    validate_width,
+)
 from streamlit.proto.Markdown_pb2 import Markdown as MarkdownProto
 from streamlit.runtime.metrics_util import gather_metrics
 from streamlit.string_util import clean_text, validate_icon_or_emoji
 from streamlit.type_util import SupportsStr, is_sympy_expression
 
 if TYPE_CHECKING:
-    import sympy  # type: ignore
+    import sympy
 
     from streamlit.delta_generator import DeltaGenerator
 
@@ -37,6 +43,7 @@ class MarkdownMixin:
         unsafe_allow_html: bool = False,
         *,  # keyword-only arguments:
         help: str | None = None,
+        width: Width = "stretch",
     ) -> DeltaGenerator:
         r"""Display string formatted as Markdown.
 
@@ -110,6 +117,18 @@ class MarkdownMixin:
             including the Markdown directives described in the ``body``
             parameter of ``st.markdown``.
 
+        width : "stretch", "content", or int
+            The width of the Markdown element. This can be one of the following:
+
+            - ``"stretch"`` (default): The width of the element matches the
+              width of the parent container.
+            - ``"content"``: The width of the element matches the width of its
+              content, but doesn't exceed 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
         --------
         >>> import streamlit as st
@@ -141,7 +160,10 @@ class MarkdownMixin:
         if help:
             markdown_proto.help = help
 
-        return self.dg._enqueue("markdown", markdown_proto)
+        validate_width(width, allow_content=True)
+        layout_config = LayoutConfig(width=width)
+
+        return self.dg._enqueue("markdown", markdown_proto, layout_config=layout_config)
 
     @gather_metrics("caption")
     def caption(
@@ -150,6 +172,7 @@ class MarkdownMixin:
         unsafe_allow_html: bool = False,
         *,  # keyword-only arguments:
         help: str | None = None,
+        width: Width = "stretch",
     ) -> DeltaGenerator:
         """Display text in small font.
 
@@ -189,6 +212,18 @@ class MarkdownMixin:
             including the Markdown directives described in the ``body``
             parameter of ``st.markdown``.
 
+        width : "stretch", "content", or int
+            The width of the caption element. This can be one of the following:
+
+            - ``"stretch"`` (default): The width of the element matches the
+              width of the parent container.
+            - ``"content"``: The width of the element matches the width of its
+              content, but doesn't exceed 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
         --------
         >>> import streamlit as st
@@ -204,7 +239,11 @@ class MarkdownMixin:
         caption_proto.element_type = MarkdownProto.Type.CAPTION
         if help:
             caption_proto.help = help
-        return self.dg._enqueue("markdown", caption_proto)
+
+        validate_width(width, allow_content=True)
+        layout_config = LayoutConfig(width=width)
+
+        return self.dg._enqueue("markdown", caption_proto, layout_config=layout_config)
 
     @gather_metrics("latex")
     def latex(
@@ -212,6 +251,7 @@ class MarkdownMixin:
         body: SupportsStr | sympy.Expr,
         *,  # keyword-only arguments:
         help: str | None = None,
+        width: Width = "stretch",
     ) -> DeltaGenerator:
         # This docstring needs to be "raw" because of the backslashes in the
         # example below.
@@ -235,6 +275,18 @@ class MarkdownMixin:
             including the Markdown directives described in the ``body``
             parameter of ``st.markdown``.
 
+        width : "stretch", "content", or int
+            The width of the LaTeX element. This can be one of the following:
+
+            - ``"stretch"`` (default): The width of the element matches the
+              width of the parent container.
+            - ``"content"``: The width of the element matches the width of its
+              content, but doesn't exceed 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.
+
         Example
         -------
         >>> import streamlit as st
@@ -246,26 +298,43 @@ class MarkdownMixin:
         ...     ''')
 
         """
+
         if is_sympy_expression(body):
             import sympy
 
             body = sympy.latex(body)
 
         latex_proto = MarkdownProto()
-        latex_proto.body = "$$\n%s\n$$" % clean_text(body)
+        latex_proto.body = f"$$\n{clean_text(body)}\n$$"
         latex_proto.element_type = MarkdownProto.Type.LATEX
         if help:
             latex_proto.help = help
-        return self.dg._enqueue("markdown", latex_proto)
+
+        validate_width(width, allow_content=True)
+        layout_config = LayoutConfig(width=width)
+
+        return self.dg._enqueue("markdown", latex_proto, layout_config=layout_config)
 
     @gather_metrics("divider")
-    def divider(self) -> DeltaGenerator:
+    def divider(self, *, width: WidthWithoutContent = "stretch") -> DeltaGenerator:
         """Display a horizontal rule.
 
         .. note::
             You can achieve the same effect with st.write("---") or
             even just "---" in your script (via magic).
 
+        Parameters
+        ----------
+        width : "stretch" or int
+            The width of the divider 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.
+
         Example
         -------
         >>> import streamlit as st
@@ -273,10 +342,15 @@ class MarkdownMixin:
         >>> st.divider()
 
         """
+
         divider_proto = MarkdownProto()
         divider_proto.body = MARKDOWN_HORIZONTAL_RULE_EXPRESSION
         divider_proto.element_type = MarkdownProto.Type.DIVIDER
-        return self.dg._enqueue("markdown", divider_proto)
+
+        validate_width(width, allow_content=False)
+        layout_config = LayoutConfig(width=width)
+
+        return self.dg._enqueue("markdown", divider_proto, layout_config=layout_config)
 
     @gather_metrics("badge")
     def badge(
@@ -294,6 +368,7 @@ class MarkdownMixin:
             "grey",
             "primary",
         ] = "blue",
+        width: Width = "content",
     ) -> DeltaGenerator:
         """Display a colored badge with an icon and label.
 
@@ -348,6 +423,19 @@ class MarkdownMixin:
             ``"primary"``, Streamlit will use the default primary accent color
             unless you set the ``theme.primaryColor`` configuration option.
 
+        width : "content", "stretch", or int
+            The width of the badge element. This can be one of the following:
+
+            - ``"content"`` (default): The width of the element matches the
+              width of its content, but doesn't exceed the width of the parent
+              container.
+            - ``"stretch"``: 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
         --------
         Create standalone badges with ``st.badge`` (with or without icons). If
@@ -368,10 +456,7 @@ class MarkdownMixin:
             height: 220px
 
         """
-        if icon is not None:
-            icon_str = validate_icon_or_emoji(icon) + " "
-        else:
-            icon_str = ""
+        icon_str = validate_icon_or_emoji(icon) + " " if icon is not None else ""
 
         # Escape [ and ] characters in the label to prevent breaking the directive syntax
         escaped_label = label.replace("[", "\\[").replace("]", "\\]")
@@ -379,7 +464,11 @@ class MarkdownMixin:
         badge_proto = MarkdownProto()
         badge_proto.body = f":{color}-badge[{icon_str}{escaped_label}]"
         badge_proto.element_type = MarkdownProto.Type.NATIVE
-        return self.dg._enqueue("markdown", badge_proto)
+
+        validate_width(width, allow_content=True)
+        layout_config = LayoutConfig(width=width)
+
+        return self.dg._enqueue("markdown", badge_proto, layout_config=layout_config)
 
     @property
     def dg(self) -> DeltaGenerator: