streamlit-nightly 1.36.1.dev20240709__tar.gz → 1.36.1.dev20240711__tar.gz

{streamlit_nightly-1.36.1.dev20240709/streamlit_nightly.egg-info → streamlit_nightly-1.36.1.dev20240711}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: streamlit-nightly
-Version: 1.36.1.dev20240709
+Version: 1.36.1.dev20240711
 Summary: A faster way to build and share data apps
 Home-page: https://streamlit.io
 Author: Snowflake Inc

{streamlit_nightly-1.36.1.dev20240709 → streamlit_nightly-1.36.1.dev20240711}/setup.py

@@ -21,7 +21,7 @@ from setuptools.command.install import install
 
 THIS_DIRECTORY = Path(__file__).parent
 
-VERSION = "1.36.1.dev20240709"  # PEP-440
+VERSION = "1.36.1.dev20240711"  # PEP-440
 
 # IMPORTANT: We should try very hard *not* to add dependencies to Streamlit.
 # And if you do add one, make the required version as general as possible:

{streamlit_nightly-1.36.1.dev20240709 → streamlit_nightly-1.36.1.dev20240711}/streamlit/__init__.py

@@ -157,6 +157,7 @@ date_input = _main.date_input
 divider = _main.divider
 download_button = _main.download_button
 expander = _main.expander
+feedback = _main.feedback
 pydeck_chart = _main.pydeck_chart
 empty = _main.empty
 error = _main.error

{streamlit_nightly-1.36.1.dev20240709 → streamlit_nightly-1.36.1.dev20240711}/streamlit/delta_generator.py

@@ -73,6 +73,7 @@ from streamlit.elements.text import TextMixin
 from streamlit.elements.toast import ToastMixin
 from streamlit.elements.vega_charts import VegaChartsMixin
 from streamlit.elements.widgets.button import ButtonMixin
+from streamlit.elements.widgets.button_group import ButtonGroupMixin
 from streamlit.elements.widgets.camera_input import CameraInputMixin
 from streamlit.elements.widgets.chat import ChatMixin
 from streamlit.elements.widgets.checkbox import CheckboxMixin
@@ -148,6 +149,7 @@ class DeltaGenerator(
     BalloonsMixin,
     BokehMixin,
     ButtonMixin,
+    ButtonGroupMixin,
     CameraInputMixin,
     ChatMixin,
     CheckboxMixin,

streamlit_nightly-1.36.1.dev20240711/streamlit/elements/lib/options_selector_utils.py

@@ -0,0 +1,76 @@
+# Copyright (c) Streamlit Inc. (2018-2022) Snowflake Inc. (2022-2024)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+from typing import (
+    Any,
+    Sequence,
+    cast,
+)
+
+from streamlit.dataframe_util import OptionSequence, convert_anything_to_sequence
+from streamlit.errors import StreamlitAPIException
+from streamlit.type_util import (
+    T,
+    check_python_comparable,
+    is_type,
+)
+
+
+def check_and_convert_to_indices(
+    opt: Sequence[Any], default_values: Sequence[Any] | Any | None
+) -> list[int] | None:
+    """Perform validation checks and return indices based on the default values."""
+    if default_values is None and None not in opt:
+        return None
+
+    if not isinstance(default_values, list):
+        # This if is done before others because calling if not x (done
+        # right below) when x is of type pd.Series() or np.array() throws a
+        # ValueError exception.
+        if is_type(default_values, "numpy.ndarray") or is_type(
+            default_values, "pandas.core.series.Series"
+        ):
+            default_values = list(cast(Sequence[Any], default_values))
+        elif (
+            isinstance(default_values, (tuple, set))
+            or default_values
+            and default_values not in opt
+        ):
+            default_values = list(default_values)
+        else:
+            default_values = [default_values]
+    for value in default_values:
+        if value not in opt:
+            raise StreamlitAPIException(
+                f"The default value '{value}' is not part of the options. "
+                "Please make sure that every default values also exists in the options."
+            )
+
+    return [opt.index(value) for value in default_values]
+
+
+def convert_to_sequence_and_check_comparable(options: OptionSequence[T]) -> Sequence[T]:
+    indexable_options = convert_anything_to_sequence(options)
+    check_python_comparable(indexable_options)
+    return indexable_options
+
+
+def get_default_indices(
+    indexable_options: Sequence[T], default: Sequence[Any] | Any | None = None
+) -> list[int]:
+    default_indices = check_and_convert_to_indices(indexable_options, default)
+    default_indices = default_indices if default_indices is not None else []
+    return default_indices

{streamlit_nightly-1.36.1.dev20240709 → streamlit_nightly-1.36.1.dev20240711}/streamlit/elements/widgets/button.py

@@ -18,7 +18,15 @@ import io
 import os
 from dataclasses import dataclass
 from textwrap import dedent
-from typing import TYPE_CHECKING, BinaryIO, Final, Literal, TextIO, Union, cast
+from typing import (
+    TYPE_CHECKING,
+    BinaryIO,
+    Final,
+    Literal,
+    TextIO,
+    Union,
+    cast,
+)
 
 from typing_extensions import TypeAlias
 

streamlit_nightly-1.36.1.dev20240711/streamlit/elements/widgets/button_group.py

@@ -0,0 +1,411 @@
+# Copyright (c) Streamlit Inc. (2018-2022) Snowflake Inc. (2022-2024)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Final,
+    Literal,
+    Sequence,
+    TypeVar,
+    cast,
+    get_args,
+)
+
+from typing_extensions import TypeAlias
+
+from streamlit.elements.form import current_form_id
+from streamlit.elements.lib.options_selector_utils import (
+    convert_to_sequence_and_check_comparable,
+    get_default_indices,
+)
+from streamlit.elements.lib.policies import check_widget_policies
+from streamlit.elements.lib.utils import (
+    Key,
+    maybe_coerce_enum_sequence,
+    to_key,
+)
+from streamlit.elements.widgets.multiselect import MultiSelectSerde
+from streamlit.errors import StreamlitAPIException
+from streamlit.proto.ButtonGroup_pb2 import ButtonGroup as ButtonGroupProto
+from streamlit.runtime.metrics_util import gather_metrics
+from streamlit.runtime.scriptrunner import get_script_run_ctx
+from streamlit.runtime.state import register_widget
+from streamlit.runtime.state.common import (
+    RegisterWidgetResult,
+    WidgetDeserializer,
+    WidgetSerializer,
+    compute_widget_id,
+    save_for_app_testing,
+)
+
+if TYPE_CHECKING:
+    from streamlit.dataframe_util import OptionSequence
+    from streamlit.delta_generator import DeltaGenerator
+    from streamlit.runtime.state import (
+        WidgetArgs,
+        WidgetCallback,
+        WidgetKwargs,
+    )
+    from streamlit.type_util import T
+
+
+V = TypeVar("V")
+
+_THUMB_ICONS: Final = (":material/thumb_up:", ":material/thumb_down:")
+_FACES_ICONS: Final = (
+    ":material/sentiment_sad:",
+    ":material/sentiment_dissatisfied:",
+    ":material/sentiment_neutral:",
+    ":material/sentiment_satisfied:",
+    ":material/sentiment_very_satisfied:",
+)
+_NUMBER_STARS: Final = 5
+_STAR_ICON: Final = ":material/star:"
+# we don't have the filled-material icon library as a dependency. Hence, we have it here
+# in base64 format and send it over the wire as an image.
+_SELECTED_STAR_ICON: Final = (
+    "<img src='data:image/svg+xml;base64,"
+    "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMjRweCIgdmlld0JveD0i"
+    "MCAtOTYwIDk2MCA5NjAiIHdpZHRoPSIyNHB4IiBmaWxsPSIjNWY2MzY4Ij48cGF0aCBkPSJNNDgwLTI2OSAz"
+    "MTQtMTY5cS0xMSA3LTIzIDZ0LTIxLThxLTktNy0xNC0xNy41dC0yLTIzLjVsNDQtMTg5LTE0Ny0xMjdxLTEwL"
+    "TktMTIuNS0yMC41VDE0MC01NzFxNC0xMSAxMi0xOHQyMi05bDE5NC0xNyA3NS0xNzhxNS0xMiAxNS41LTE4dDI"
+    "xLjUtNnExMSAwIDIxLjUgNnQxNS41IDE4bDc1IDE3OCAxOTQgMTdxMTQgMiAyMiA5dDEyIDE4cTQgMTEgMS41I"
+    "DIyLjVUODA5LTUyOEw2NjItNDAxbDQ0IDE4OXEzIDEzLTIgMjMuNVQ2OTAtMTcxcS05IDctMjEgOHQtMjMtNkw"
+    "0ODAtMjY5WiIvPjwvc3ZnPg=='/>"
+)
+
+_FeedbackOptions: TypeAlias = Literal["thumbs", "faces", "stars"]
+
+
+class FeedbackSerde:
+    """Uses the MultiSelectSerde under-the-hood, but accepts a single index value
+    and deserializes to a single index value. This is because for feedback, we always
+    allow just a single selection.
+
+    When a sentiment_mapping is provided, the sentiment corresponding to the index is
+    serialized/deserialized. Otherwise, the index is used as the sentiment.
+    """
+
+    def __init__(self, option_indices: list[int]) -> None:
+        """Initialize the FeedbackSerde with a list of sentimets."""
+        self.multiselect_serde: MultiSelectSerde[int] = MultiSelectSerde(option_indices)
+
+    def serialize(self, value: int | None) -> list[int]:
+        """Serialize the passed sentiment option into its corresponding index
+        (wrapped in a list).
+        """
+        _value = [value] if value is not None else []
+        return self.multiselect_serde.serialize(_value)
+
+    def deserialize(self, ui_value: list[int], widget_id: str = "") -> int | None:
+        """Receive a list of indices and return the corresponding sentiments."""
+        deserialized = self.multiselect_serde.deserialize(ui_value, widget_id)
+
+        if len(deserialized) == 0:
+            return None
+
+        return deserialized[0]
+
+
+def get_mapped_options(
+    feedback_option: _FeedbackOptions,
+) -> tuple[list[ButtonGroupProto.Option], list[int]]:
+    # options object understandable by the web app
+    options: list[ButtonGroupProto.Option] = []
+    # we use the option index in the webapp communication to
+    # indicate which option is selected
+    options_indices: list[int] = []
+
+    if feedback_option == "thumbs":
+        # reversing the index mapping to have thumbs up first (but still with the higher
+        # index (=sentiment) in the list)
+        options_indices = list(reversed(range(len(_THUMB_ICONS))))
+        options = [ButtonGroupProto.Option(content=icon) for icon in _THUMB_ICONS]
+    elif feedback_option == "faces":
+        options_indices = list(range(len(_FACES_ICONS)))
+        options = [ButtonGroupProto.Option(content=icon) for icon in _FACES_ICONS]
+    elif feedback_option == "stars":
+        options_indices = list(range(_NUMBER_STARS))
+        options = [
+            ButtonGroupProto.Option(
+                content=_STAR_ICON,
+                selected_content=_SELECTED_STAR_ICON,
+            )
+        ] * _NUMBER_STARS
+
+    return options, options_indices
+
+
+def _build_proto(
+    widget_id: str,
+    formatted_options: Sequence[ButtonGroupProto.Option],
+    default_values: list[int],
+    disabled: bool,
+    current_form_id: str,
+    click_mode: ButtonGroupProto.ClickMode.ValueType,
+    selection_visualization: ButtonGroupProto.SelectionVisualization.ValueType = (
+        ButtonGroupProto.SelectionVisualization.ONLY_SELECTED
+    ),
+) -> ButtonGroupProto:
+    proto = ButtonGroupProto()
+
+    proto.id = widget_id
+    proto.default[:] = default_values
+    proto.form_id = current_form_id
+    proto.disabled = disabled
+    proto.click_mode = click_mode
+
+    for formatted_option in formatted_options:
+        proto.options.append(formatted_option)
+    proto.selection_visualization = selection_visualization
+    return proto
+
+
+class ButtonGroupMixin:
+    @gather_metrics("feedback")
+    def feedback(
+        self,
+        options: _FeedbackOptions = "thumbs",
+        *,
+        key: str | None = None,
+        disabled: bool = False,
+        on_change: WidgetCallback | None = None,
+        args: Any | None = None,
+        kwargs: Any | None = None,
+    ) -> int | None:
+        """Display a feedback widget.
+
+        This is useful to collect user feedback, especially in chat-based apps.
+
+        Parameters:
+        -----------
+        options: "thumbs", "faces", or "stars"
+            The feedback options displayed to the user. The options are:
+            - "thumbs" (default): displays a row of thumbs-up and thumbs-down buttons.
+            - "faces": displays a row of five buttons with facial expressions, each
+                depicting increasing satisfaction from left to right.
+            - "stars": displays a row of star icons typically used for ratings.
+        key : str or int
+            An optional string or integer to use as the unique key for the widget.
+            If this is omitted, a key will be generated for the widget
+            based on its content. Multiple widgets of the same type may
+            not share the same key.
+        disabled : bool
+            An optional boolean, which disables the multiselect widget if set
+            to True. The default is False. This argument can only be supplied
+            by keyword.
+        on_change : callable
+            An optional callback invoked when this multiselect's value changes.
+        args : tuple
+            An optional tuple of args to pass to the callback.
+        kwargs : dict
+            An optional dict of kwargs to pass to the callback.
+
+        Returns
+        -------
+        An integer indicating the user's selection, where 0 is the lowest
+        feedback and higher values indicate more positive feedback.
+        If no option was selected, returns None.
+            - For "thumbs": a return value of 0 is for thumbs-down and 1 for thumbs-up.
+            - For "faces" and "stars":
+                values range from 0 (least satisfied) to 4 (most satisfied).
+
+
+        Examples
+        --------
+        Example 1: Display a feedback widget with stars and show the selected sentiment
+
+        >>> import streamlit as st
+        >>> sentiment_mapping: = [0.0, 0.25, 0.5, 0.75, 1.0]
+        >>> selected = st.feedback("stars")
+        >>> st.write(f"You selected: {sentiment_mapping[selected]}")
+
+        Example 2: Display a feedback widget with thumbs and show the selected sentiment
+
+        >>> import streamlit as st
+        >>> sentiment_mapping: = [0.0, 1.0]
+        >>> selected = st.feedback("thumbs")
+        >>> st.write(f"You selected: {sentiment_mapping[selected]}")
+        """
+
+        if not isinstance(options, list) and options not in get_args(_FeedbackOptions):
+            raise StreamlitAPIException(
+                "The options argument to st.feedback must be one of "
+                "['thumbs', 'faces', 'stars']. "
+                f"The argument passed was '{options}'."
+            )
+        transformed_options, options_indices = get_mapped_options(options)
+        serde = FeedbackSerde(options_indices)
+
+        selection_visualization = ButtonGroupProto.SelectionVisualization.ONLY_SELECTED
+        if options == "stars":
+            selection_visualization = (
+                ButtonGroupProto.SelectionVisualization.ALL_UP_TO_SELECTED
+            )
+
+        sentiment = self._button_group(
+            transformed_options,
+            default=None,
+            key=key,
+            click_mode=ButtonGroupProto.SINGLE_SELECT,
+            disabled=disabled,
+            deserializer=serde.deserialize,
+            serializer=serde.serialize,
+            on_change=on_change,
+            args=args,
+            kwargs=kwargs,
+            selection_visualization=selection_visualization,
+        )
+        return sentiment.value
+
+    # Disable this more generic widget for now
+    # @gather_metrics("button_group")
+    def _internal_button_group(
+        self,
+        options: OptionSequence[V],
+        *,
+        key: Key | None = None,
+        default: Sequence[Any] | None = None,
+        click_mode: Literal["select", "multiselect"] = "select",
+        disabled: bool = False,
+        format_func: Callable[[V], dict[str, str]] | None = None,
+        on_change: WidgetCallback | None = None,
+        args: WidgetArgs | None = None,
+        kwargs: WidgetKwargs | None = None,
+    ) -> list[V]:
+        def _transformed_format_func(x: V) -> ButtonGroupProto.Option:
+            if format_func is None:
+                return ButtonGroupProto.Option(content=str(x))
+
+            transformed = format_func(x)
+            return ButtonGroupProto.Option(
+                content=transformed["content"],
+                selected_content=transformed["selected_content"],
+            )
+
+        indexable_options = convert_to_sequence_and_check_comparable(options)
+        default_values = get_default_indices(indexable_options, default)
+        serde = MultiSelectSerde(indexable_options, default_values)
+
+        res = self._button_group(
+            indexable_options,
+            key=key,
+            default=default_values,
+            click_mode=ButtonGroupProto.ClickMode.MULTI_SELECT
+            if click_mode == "multiselect"
+            else ButtonGroupProto.SINGLE_SELECT,
+            disabled=disabled,
+            format_func=_transformed_format_func,
+            serializer=serde.serialize,
+            deserializer=serde.deserialize,
+            on_change=on_change,
+            args=args,
+            kwargs=kwargs,
+            after_register_callback=lambda widget_state: maybe_coerce_enum_sequence(
+                widget_state, options, indexable_options
+            ),
+        )
+        return res.value
+
+    def _button_group(
+        self,
+        indexable_options: Sequence[Any],
+        *,
+        key: Key | None = None,
+        default: list[int] | None = None,
+        click_mode: ButtonGroupProto.ClickMode.ValueType = (
+            ButtonGroupProto.SINGLE_SELECT
+        ),
+        disabled: bool = False,
+        format_func: Callable[[V], ButtonGroupProto.Option] | None = None,
+        deserializer: WidgetDeserializer[T],
+        serializer: WidgetSerializer[T],
+        on_change: WidgetCallback | None = None,
+        args: WidgetArgs | None = None,
+        kwargs: WidgetKwargs | None = None,
+        selection_visualization: ButtonGroupProto.SelectionVisualization.ValueType = (
+            ButtonGroupProto.SelectionVisualization.ONLY_SELECTED
+        ),
+        after_register_callback: Callable[
+            [RegisterWidgetResult[T]], RegisterWidgetResult[T]
+        ]
+        | None = None,
+    ) -> RegisterWidgetResult[T]:
+        key = to_key(key)
+
+        check_widget_policies(self.dg, key, on_change, default_value=default)
+
+        widget_name = "button_group"
+        ctx = get_script_run_ctx()
+        form_id = current_form_id(self.dg)
+        formatted_options = (
+            indexable_options
+            if format_func is None
+            else [format_func(option) for option in indexable_options]
+        )
+        widget_id = compute_widget_id(
+            widget_name,
+            user_key=key,
+            key=key,
+            options=formatted_options,
+            default=default,
+            form_id=form_id,
+            click_mode=click_mode,
+            page=ctx.active_script_hash if ctx else None,
+        )
+
+        proto = _build_proto(
+            widget_id,
+            formatted_options,
+            default or [],
+            disabled,
+            form_id,
+            click_mode=click_mode,
+            selection_visualization=selection_visualization,
+        )
+
+        widget_state = register_widget(
+            widget_name,
+            proto,
+            # user_key=key,
+            on_change_handler=on_change,
+            args=args,
+            kwargs=kwargs,
+            deserializer=deserializer,
+            serializer=serializer,
+            ctx=ctx,
+        )
+
+        if after_register_callback is not None:
+            widget_state = after_register_callback(widget_state)
+
+        if widget_state.value_changed:
+            proto.value[:] = serializer(widget_state.value)
+            proto.set_value = True
+
+        if ctx:
+            save_for_app_testing(ctx, widget_id, format_func)
+
+        self.dg._enqueue(widget_name, proto)
+
+        return widget_state
+
+    @property
+    def dg(self) -> DeltaGenerator:
+        """Get our DeltaGenerator."""
+        return cast("DeltaGenerator", self)