streamlit-nightly 1.35.1.dev20240610__py2.py3-none-any.whl → 1.35.1.dev20240612__py2.py3-none-any.whl

streamlit/elements/image.py

@@ -150,7 +150,7 @@ class ImageMixin:
 
         if use_column_width == "auto" or (use_column_width is None and width is None):
             width = WidthBehaviour.AUTO
-        elif use_column_width == "always" or use_column_width == True:
+        elif use_column_width == "always" or use_column_width is True:
             width = WidthBehaviour.COLUMN
         elif width is None:
             width = WidthBehaviour.ORIGINAL
@@ -513,7 +513,7 @@ def marshall_images(
     else:
         images = [image]
 
-    if type(caption) is list:
+    if isinstance(caption, list):
         captions: Sequence[str | None] = caption
     else:
         if isinstance(caption, str):
@@ -528,7 +528,9 @@ def marshall_images(
         else:
             captions = [str(caption)]
 
-    assert type(captions) == list, "If image is a list then caption should be as well"
+    assert isinstance(
+        captions, list
+    ), "If image is a list then caption should be as well"
     assert len(captions) == len(images), "Cannot pair %d captions with %d images." % (
         len(captions),
         len(images),

streamlit/elements/layouts.py

@@ -130,6 +130,7 @@ class LayoutsMixin:
         block_proto = BlockProto()
         block_proto.allow_empty = False
         block_proto.vertical.border = border or False
+
         if height:
             # Activate scrolling container behavior:
             block_proto.allow_empty = True
@@ -144,7 +145,11 @@ class LayoutsMixin:
 
     @gather_metrics("columns")
     def columns(
-        self, spec: SpecType, *, gap: str | None = "small"
+        self,
+        spec: SpecType,
+        *,
+        gap: Literal["small", "medium", "large"] = "small",
+        vertical_alignment: Literal["top", "center", "bottom"] = "top",
     ) -> list[DeltaGenerator]:
         """Insert containers laid out as side-by-side columns.
 
@@ -176,6 +181,9 @@ class LayoutsMixin:
         gap : "small", "medium", or "large"
             The size of the gap between the columns. Defaults to "small".
 
+        vertical_alignment : "top", "center", or "bottom"
+            The vertical alignment of the content inside the columns. Defaults to "top".
+
         Returns
         -------
         list of containers
@@ -225,13 +233,6 @@ class LayoutsMixin:
 
         """
         weights = spec
-        weights_exception = StreamlitAPIException(
-            "The input argument to st.columns must be either a "
-            + "positive integer or a list of positive numeric weights. "
-            + "See [documentation](https://docs.streamlit.io/library/api-reference/layout/st.columns) "
-            + "for more information."
-        )
-
         if isinstance(weights, int):
             # If the user provided a single number, expand into equal weights.
             # E.g. (1,) * 3 => (1, 1, 1)
@@ -239,10 +240,29 @@ class LayoutsMixin:
             weights = (1,) * weights
 
         if len(weights) == 0 or any(weight <= 0 for weight in weights):
-            raise weights_exception
+            raise StreamlitAPIException(
+                "The input argument to st.columns must be either a "
+                "positive integer or a list of positive numeric weights. "
+                "See [documentation](https://docs.streamlit.io/library/api-reference/layout/st.columns) "
+                "for more information."
+            )
+
+        vertical_alignment_mapping: dict[
+            str, BlockProto.Column.VerticalAlignment.ValueType
+        ] = {
+            "top": BlockProto.Column.VerticalAlignment.TOP,
+            "center": BlockProto.Column.VerticalAlignment.CENTER,
+            "bottom": BlockProto.Column.VerticalAlignment.BOTTOM,
+        }
+
+        if vertical_alignment not in vertical_alignment_mapping:
+            raise StreamlitAPIException(
+                'The `vertical_alignment` argument to st.columns must be "top", "center", or "bottom". \n'
+                f"The argument passed was {vertical_alignment}."
+            )
 
         def column_gap(gap):
-            if type(gap) == str:
+            if isinstance(gap, str):
                 gap_size = gap.lower()
                 valid_sizes = ["small", "medium", "large"]
 
@@ -260,6 +280,9 @@ class LayoutsMixin:
             col_proto = BlockProto()
             col_proto.column.weight = normalized_weight
             col_proto.column.gap = gap_size
+            col_proto.column.vertical_alignment = vertical_alignment_mapping[
+                vertical_alignment
+            ]
             col_proto.allow_empty = True
             return col_proto
 
@@ -368,7 +391,7 @@ class LayoutsMixin:
                 "The input argument to st.tabs must contain at least one tab label."
             )
 
-        if any(isinstance(tab, str) == False for tab in tabs):
+        if any(not isinstance(tab, str) for tab in tabs):
             raise StreamlitAPIException(
                 "The tabs input list to st.tabs is only allowed to contain strings."
             )
@@ -490,7 +513,7 @@ class LayoutsMixin:
         help: str | None = None,
         disabled: bool = False,
         use_container_width: bool = False,
-    ) -> "DeltaGenerator":
+    ) -> DeltaGenerator:
         r"""Insert a popover container.
 
         Inserts a multi-element container as a popover. It consists of a button-like
@@ -737,7 +760,7 @@ class LayoutsMixin:
         *,
         dismissible: bool = True,
         width: Literal["small", "large"] = "small",
-    ) -> "Dialog":
+    ) -> Dialog:
         """Inserts the dialog container.
 
         Marked as internal because it is used by the dialog_decorator and is not supposed to be used directly.

streamlit/elements/lib/built_in_chart_utils.py

@@ -88,8 +88,8 @@ class ChartType(Enum):
 # NOTE #2: In theory, we could move COLOR_LEGEND_SETTINGS into
 # ArrowVegaLiteChart/CustomTheme.tsx, but this would impact existing behavior.
 # (See https://github.com/streamlit/streamlit/pull/7164#discussion_r1307707345)
-_COLOR_LEGEND_SETTINGS: Final = dict(titlePadding=5, offset=5, orient="bottom")
-_SIZE_LEGEND_SETTINGS: Final = dict(titlePadding=0.5, offset=5, orient="bottom")
+_COLOR_LEGEND_SETTINGS: Final = {"titlePadding": 5, "offset": 5, "orient": "bottom"}
+_SIZE_LEGEND_SETTINGS: Final = {"titlePadding": 0.5, "offset": 5, "orient": "bottom"}
 
 # User-readable names to give the index and melted columns.
 _SEPARATED_INDEX_COLUMN_TITLE: Final = "index"
@@ -116,6 +116,8 @@ def generate_chart(
     data: Data | None,
     x_from_user: str | None = None,
     y_from_user: str | Sequence[str] | None = None,
+    x_axis_label: str | None = None,
+    y_axis_label: str | None = None,
     color_from_user: str | Color | list[Color] | None = None,
     size_from_user: str | float | None = None,
     width: int | None = None,
@@ -146,12 +148,12 @@ def generate_chart(
         # The last index of df so we can adjust the input df in add_rows:
         last_index=_last_index_for_melted_dataframes(df),
         # This is the input to prep_data (except for the df):
-        columns=dict(
-            x_column=x_column,
-            y_column_list=y_column_list,
-            color_column=color_column,
-            size_column=size_column,
-        ),
+        columns={
+            "x_column": x_column,
+            "y_column_list": y_column_list,
+            "color_column": color_column,
+            "size_column": size_column,
+        },
     )
 
     # At this point, all foo_column variables are either None/empty or contain actual
@@ -170,8 +172,8 @@ def generate_chart(
         width=width or 0,
         height=height or 0,
     ).encode(
-        x=_get_x_encoding(df, x_column, x_from_user, chart_type),
-        y=_get_y_encoding(df, y_column, y_from_user),
+        x=_get_x_encoding(df, x_column, x_from_user, x_axis_label, chart_type),
+        y=_get_y_encoding(df, y_column, y_from_user, y_axis_label),
     )
 
     # Set up opacity encoding.
@@ -539,7 +541,7 @@ def _parse_y_columns(
         y_column_list = [y_from_user]
 
     elif type_util.is_sequence(y_from_user):
-        y_column_list = list(str(col) for col in y_from_user)
+        y_column_list = [str(col) for col in y_from_user]
 
     else:
         raise StreamlitAPIException(
@@ -619,6 +621,7 @@ def _get_x_encoding(
     df: pd.DataFrame,
     x_column: str | None,
     x_from_user: str | None,
+    x_axis_label: str | None,
     chart_type: ChartType,
 ) -> alt.X:
     import altair as alt
@@ -646,6 +649,10 @@ def _get_x_encoding(
         else:
             x_title = x_column
 
+    # User specified x-axis label takes precedence
+    if x_axis_label is not None:
+        x_title = x_axis_label
+
     return alt.X(
         x_field,
         title=x_title,
@@ -659,6 +666,7 @@ def _get_y_encoding(
     df: pd.DataFrame,
     y_column: str | None,
     y_from_user: str | Sequence[str] | None,
+    y_axis_label: str | None,
 ) -> alt.Y:
     import altair as alt
 
@@ -685,6 +693,10 @@ def _get_y_encoding(
         else:
             y_title = y_column
 
+    # User specified y-axis label takes precedence
+    if y_axis_label is not None:
+        y_title = y_axis_label
+
     return alt.Y(
         field=y_field,
         title=y_title,
@@ -703,7 +715,7 @@ def _get_color_encoding(
 ) -> alt.Color | alt.ColorValue | None:
     import altair as alt
 
-    has_color_value = color_value not in [None, [], tuple()]
+    has_color_value = color_value not in [None, [], ()]  # type: ignore[comparison-overlap]
 
     # If user passed a color value, that should win over colors coming from the
     # color column (be they manual or auto-assigned due to melting)

streamlit/elements/lib/column_config_utils.py

@@ -24,13 +24,14 @@ from typing_extensions import TypeAlias
 from streamlit.elements.lib.column_types import ColumnConfig, ColumnType
 from streamlit.elements.lib.dicttools import remove_none_values
 from streamlit.errors import StreamlitAPIException
-from streamlit.proto.Arrow_pb2 import Arrow as ArrowProto
 from streamlit.type_util import DataFormat, is_colum_type_arrow_incompatible
 
 if TYPE_CHECKING:
     import pyarrow as pa
     from pandas import DataFrame, Index, Series
 
+    from streamlit.proto.Arrow_pb2 import Arrow as ArrowProto
+
 
 # The index identifier can be used to apply configuration options
 IndexIdentifierType = Literal["_index"]

streamlit/elements/lib/dialog.py

@@ -15,18 +15,21 @@
 from __future__ import annotations
 
 import time
-from types import TracebackType
-from typing import Literal, cast
+from typing import TYPE_CHECKING, Literal, cast
 
-from typing_extensions import TypeAlias
+from typing_extensions import Self, TypeAlias
 
-from streamlit.cursor import Cursor
 from streamlit.delta_generator import DeltaGenerator, _enqueue_message
 from streamlit.errors import StreamlitAPIException
 from streamlit.proto.Block_pb2 import Block as BlockProto
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
 from streamlit.runtime.scriptrunner import get_script_run_ctx
 
+if TYPE_CHECKING:
+    from types import TracebackType
+
+    from streamlit.cursor import Cursor
+
 DialogWidth: TypeAlias = Literal["small", "large"]
 
 
@@ -132,7 +135,7 @@ class Dialog(DeltaGenerator):
     def close(self) -> None:
         self._update(False)
 
-    def __enter__(self) -> Dialog:  # type: ignore[override]
+    def __enter__(self) -> Self:  # type: ignore[override]
         # This is a little dubious: we're returning a different type than
         # our superclass' `__enter__` function. Maybe DeltaGenerator.__enter__
         # should always return `self`?

streamlit/elements/lib/dicttools.py

@@ -56,7 +56,7 @@ def _unflatten_single_dict(flat_dict: dict[Any, Any]) -> dict[Any, Any]:
         A tree made of dicts inside of dicts.
 
     """
-    out: dict[str, Any] = dict()
+    out: dict[str, Any] = {}
     for pathstr, v in flat_dict.items():
         path = pathstr.split("_")
 
@@ -65,7 +65,7 @@ def _unflatten_single_dict(flat_dict: dict[Any, Any]) -> dict[Any, Any]:
 
         for k in path:
             if k not in curr_dict:
-                curr_dict[k] = dict()
+                curr_dict[k] = {}
             prev_dict = curr_dict
             curr_dict = curr_dict[k]
 
@@ -133,7 +133,7 @@ def unflatten(
         # Move items into 'encoding' if needed:
         if k in encodings:
             if "encoding" not in out_dict:
-                out_dict["encoding"] = dict()
+                out_dict["encoding"] = {}
             out_dict["encoding"][k] = v
             out_dict.pop(k)
 

streamlit/elements/lib/mutable_status_container.py

@@ -15,17 +15,20 @@
 from __future__ import annotations
 
 import time
-from types import TracebackType
-from typing import Literal, cast
+from typing import TYPE_CHECKING, Literal, cast
 
-from typing_extensions import TypeAlias
+from typing_extensions import Self, TypeAlias
 
-from streamlit.cursor import Cursor
 from streamlit.delta_generator import DeltaGenerator, _enqueue_message
 from streamlit.errors import StreamlitAPIException
 from streamlit.proto.Block_pb2 import Block as BlockProto
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
 
+if TYPE_CHECKING:
+    from types import TracebackType
+
+    from streamlit.cursor import Cursor
+
 States: TypeAlias = Literal["running", "complete", "error"]
 
 
@@ -149,7 +152,7 @@ class StatusContainer(DeltaGenerator):
         self._current_proto = msg.delta.add_block
         _enqueue_message(msg)
 
-    def __enter__(self) -> StatusContainer:  # type: ignore[override]
+    def __enter__(self) -> Self:  # type: ignore[override]
         # This is a little dubious: we're returning a different type than
         # our superclass' `__enter__` function. Maybe DeltaGenerator.__enter__
         # should always return `self`?

streamlit/elements/lib/pandas_styler_utils.py

@@ -18,12 +18,13 @@ from typing import TYPE_CHECKING, Any, Mapping, TypeVar
 
 from streamlit import type_util
 from streamlit.errors import StreamlitAPIException
-from streamlit.proto.Arrow_pb2 import Arrow as ArrowProto
 
 if TYPE_CHECKING:
     from pandas import DataFrame
     from pandas.io.formats.style import Styler
 
+    from streamlit.proto.Arrow_pb2 import Arrow as ArrowProto
+
 
 def marshall_styler(proto: ArrowProto, styler: Styler, default_uuid: str) -> None:
     """Marshall pandas.Styler into an Arrow proto.

streamlit/elements/lib/subtitle_utils.py

@@ -150,7 +150,6 @@ def process_subtitle_data(
     data: str | bytes | Path | io.BytesIO,
     label: str,
 ) -> str:
-
     # Determine the type of data and process accordingly
     if isinstance(data, (str, Path)):
         subtitle_data = _handle_string_or_path_data(data)

streamlit/elements/lib/utils.py

@@ -15,12 +15,14 @@
 from __future__ import annotations
 
 from enum import Enum, EnumMeta
-from typing import Any, Iterable, Sequence, overload
+from typing import TYPE_CHECKING, Any, Iterable, Sequence, overload
 
 from streamlit import type_util
 from streamlit.proto.LabelVisibilityMessage_pb2 import LabelVisibilityMessage
 from streamlit.runtime.state.common import RegisterWidgetResult
-from streamlit.type_util import T
+
+if TYPE_CHECKING:
+    from streamlit.type_util import T
 
 
 def get_label_visibility_proto_value(
@@ -43,8 +45,7 @@ def maybe_coerce_enum(
     register_widget_result: RegisterWidgetResult[Enum],
     options: type[Enum],
     opt_sequence: Sequence[Any],
-) -> RegisterWidgetResult[Enum]:
-    ...
+) -> RegisterWidgetResult[Enum]: ...
 
 
 @overload
@@ -52,8 +53,7 @@ def maybe_coerce_enum(
     register_widget_result: RegisterWidgetResult[T],
     options: type_util.OptionSequence[T],
     opt_sequence: Sequence[T],
-) -> RegisterWidgetResult[T]:
-    ...
+) -> RegisterWidgetResult[T]: ...
 
 
 def maybe_coerce_enum(register_widget_result, options, opt_sequence):
@@ -86,8 +86,7 @@ def maybe_coerce_enum_sequence(
     register_widget_result: RegisterWidgetResult[list[T]],
     options: type_util.OptionSequence[T],
     opt_sequence: Sequence[T],
-) -> RegisterWidgetResult[list[T]]:
-    ...
+) -> RegisterWidgetResult[list[T]]: ...
 
 
 @overload
@@ -95,8 +94,7 @@ def maybe_coerce_enum_sequence(
     register_widget_result: RegisterWidgetResult[tuple[T, T]],
     options: type_util.OptionSequence[T],
     opt_sequence: Sequence[T],
-) -> RegisterWidgetResult[tuple[T, T]]:
-    ...
+) -> RegisterWidgetResult[tuple[T, T]]: ...
 
 
 def maybe_coerce_enum_sequence(register_widget_result, options, opt_sequence):

streamlit/elements/plotly_chart.py

@@ -279,15 +279,13 @@ class PlotlyMixin:
         theme: Literal["streamlit"] | None = "streamlit",
         key: Key | None = None,
         on_select: Literal["ignore"],  # No default value here to make it work with mypy
-        selection_mode: SelectionMode
-        | Iterable[SelectionMode] = (
+        selection_mode: SelectionMode | Iterable[SelectionMode] = (
             "points",
             "box",
             "lasso",
         ),
         **kwargs: Any,
-    ) -> DeltaGenerator:
-        ...
+    ) -> DeltaGenerator: ...
 
     @overload
     def plotly_chart(
@@ -298,15 +296,13 @@ class PlotlyMixin:
         theme: Literal["streamlit"] | None = "streamlit",
         key: Key | None = None,
         on_select: Literal["rerun"] | WidgetCallback = "rerun",
-        selection_mode: SelectionMode
-        | Iterable[SelectionMode] = (
+        selection_mode: SelectionMode | Iterable[SelectionMode] = (
             "points",
             "box",
             "lasso",
         ),
         **kwargs: Any,
-    ) -> PlotlyState:
-        ...
+    ) -> PlotlyState: ...
 
     @gather_metrics("plotly_chart")
     def plotly_chart(
@@ -317,8 +313,7 @@ class PlotlyMixin:
         theme: Literal["streamlit"] | None = "streamlit",
         key: Key | None = None,
         on_select: Literal["rerun", "ignore"] | WidgetCallback = "ignore",
-        selection_mode: SelectionMode
-        | Iterable[SelectionMode] = (
+        selection_mode: SelectionMode | Iterable[SelectionMode] = (
             "points",
             "box",
             "lasso",

streamlit/elements/pyplot.py

@@ -134,7 +134,6 @@ def marshall(
     **kwargs: Any,
 ) -> None:
     try:
-        import matplotlib
         import matplotlib.pyplot as plt
 
         plt.ioff()

streamlit/elements/toast.py

@@ -20,16 +20,16 @@ from streamlit.errors import StreamlitAPIException
 from streamlit.proto.Toast_pb2 import Toast as ToastProto
 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
 
 if TYPE_CHECKING:
     from streamlit.delta_generator import DeltaGenerator
+    from streamlit.type_util import SupportsStr
 
 
 def validate_text(toast_text: SupportsStr) -> SupportsStr:
     if str(toast_text) == "":
         raise StreamlitAPIException(
-            f"Toast body cannot be blank - please provide a message."
+            "Toast body cannot be blank - please provide a message."
         )
     else:
         return toast_text