streamlit-nightly 1.37.2.dev20240814__py2.py3-none-any.whl → 1.37.2.dev20240816__py2.py3-none-any.whl

streamlit/elements/widgets/button_group.py

@@ -23,11 +23,9 @@ from typing import (
     Sequence,
     TypeVar,
     cast,
-    get_args,
+    overload,
 )
 
-from typing_extensions import TypeAlias
-
 from streamlit.elements.form_utils import current_form_id
 from streamlit.elements.lib.options_selector_utils import (
     convert_to_sequence_and_check_comparable,
@@ -43,7 +41,7 @@ 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.scriptrunner_utils.script_run_context import get_script_run_ctx
 from streamlit.runtime.state import register_widget
 from streamlit.runtime.state.common import (
     RegisterWidgetResult,
@@ -80,8 +78,6 @@ _STAR_ICON: Final = ":material/star:"
 # in base64 format and send it over the wire as an image.
 _SELECTED_STAR_ICON: Final = ":material/star_filled:"
 
-_FeedbackOptions: TypeAlias = Literal["thumbs", "faces", "stars"]
-
 
 class FeedbackSerde:
     """Uses the MultiSelectSerde under-the-hood, but accepts a single index value
@@ -114,7 +110,7 @@ class FeedbackSerde:
 
 
 def get_mapped_options(
-    feedback_option: _FeedbackOptions,
+    feedback_option: Literal["thumbs", "faces", "stars"],
 ) -> tuple[list[ButtonGroupProto.Option], list[int]]:
     # options object understandable by the web app
     options: list[ButtonGroupProto.Option] = []
@@ -168,10 +164,33 @@ def _build_proto(
 
 
 class ButtonGroupMixin:
+    @overload  # These overloads are not documented in the docstring, at least not at this time, on the theory that most people won't know what it means. And the Literals here are a subclass of int anyway.
+    # Usually, we would make a type alias for Literal["thumbs", "faces", "stars"]; but, in this case, we don't use it in too many other places, and it's a more helpful autocomplete if we just enumerate the values explicitly, so a decision has been made to keep it as not an alias.
+    def feedback(
+        self,
+        options: Literal["thumbs"] = ...,
+        *,
+        key: str | None = None,
+        disabled: bool = False,
+        on_change: WidgetCallback | None = None,
+        args: Any | None = None,
+        kwargs: Any | None = None,
+    ) -> Literal[0, 1] | None: ...
+    @overload
+    def feedback(
+        self,
+        options: Literal["faces", "stars"] = ...,
+        *,
+        key: str | None = None,
+        disabled: bool = False,
+        on_change: WidgetCallback | None = None,
+        args: Any | None = None,
+        kwargs: Any | None = None,
+    ) -> Literal[0, 1, 2, 3, 4] | None: ...
     @gather_metrics("feedback")
     def feedback(
         self,
-        options: _FeedbackOptions = "thumbs",
+        options: Literal["thumbs", "faces", "stars"] = "thumbs",
         *,
         key: str | None = None,
         disabled: bool = False,
@@ -262,7 +281,7 @@ class ButtonGroupMixin:
 
         """
 
-        if not isinstance(options, list) and options not in get_args(_FeedbackOptions):
+        if options not in ["thumbs", "faces", "stars"]:
             raise StreamlitAPIException(
                 "The options argument to st.feedback must be one of "
                 "['thumbs', 'faces', 'stars']. "

streamlit/elements/widgets/chat.py

@@ -30,7 +30,7 @@ from streamlit.proto.ChatInput_pb2 import ChatInput as ChatInputProto
 from streamlit.proto.Common_pb2 import StringTriggerValue as StringTriggerValueProto
 from streamlit.proto.RootContainer_pb2 import RootContainer
 from streamlit.runtime.metrics_util import gather_metrics
-from streamlit.runtime.scriptrunner import get_script_run_ctx
+from streamlit.runtime.scriptrunner_utils.script_run_context import get_script_run_ctx
 from streamlit.runtime.state import (
     WidgetArgs,
     WidgetCallback,

streamlit/elements/widgets/data_editor.py

@@ -59,7 +59,7 @@ from streamlit.elements.lib.utils import Key, to_key
 from streamlit.errors import StreamlitAPIException
 from streamlit.proto.Arrow_pb2 import Arrow as ArrowProto
 from streamlit.runtime.metrics_util import gather_metrics
-from streamlit.runtime.scriptrunner import get_script_run_ctx
+from streamlit.runtime.scriptrunner_utils.script_run_context import get_script_run_ctx
 from streamlit.runtime.state import (
     WidgetArgs,
     WidgetCallback,

streamlit/elements/write.py

@@ -18,6 +18,7 @@ import dataclasses
 import inspect
 import types
 from collections import ChainMap, UserDict, UserList
+from collections.abc import ItemsView, KeysView, ValuesView
 from io import StringIO
 from typing import (
     TYPE_CHECKING,
@@ -258,13 +259,13 @@ class WriteMixin:
             - write(string)         : Prints the formatted Markdown string, with
                 support for LaTeX expression, emoji shortcodes, and colored text.
                 See docs for st.markdown for more.
-            - write(data_frame)     : Displays any dataframe-compatible value
-                as read-only table.
+            - write(dataframe)      : Displays any dataframe-like object in a table.
+            - write(dict)           : Displays dict-like in an interactive viewer.
+            - write(list)           : Displays list-like in an interactive viewer.
             - write(error)          : Prints an exception specially.
             - write(func)           : Displays information about a function.
             - write(module)         : Displays information about the module.
             - write(class)          : Displays information about a class.
-            - write(dict)           : Displays dict in an interactive widget.
             - write(mpl_fig)        : Displays a Matplotlib figure.
             - write(generator)      : Streams the output of a generator.
             - write(openai.Stream)  : Streams the output of an OpenAI stream.
@@ -276,8 +277,10 @@ class WriteMixin:
             - write(bokeh_fig)      : Displays a Bokeh figure.
             - write(sympy_expr)     : Prints SymPy expression using LaTeX.
             - write(htmlable)       : Prints _repr_html_() for the object if available.
+            - write(db_cursor)      : Displays DB API 2.0 cursor results in a table.
             - write(obj)            : Prints str(obj) if otherwise unknown.
 
+
         unsafe_allow_html : bool
             Whether to render HTML within ``*args``. This only applies to
             strings or objects falling back on ``_repr_html_()``. If this is
@@ -457,10 +460,14 @@ class WriteMixin:
                         UserDict,
                         ChainMap,
                         UserList,
+                        ItemsView,
+                        KeysView,
+                        ValuesView,
                     ),
                 )
                 or type_util.is_custom_dict(arg)
                 or type_util.is_namedtuple(arg)
+                or type_util.is_pydantic_model(arg)
             ):
                 flush_buffer()
                 self.dg.json(arg)
@@ -495,6 +502,14 @@ class WriteMixin:
             ):
                 # We either explicitly allow HTML or infer it's not HTML
                 self.dg.markdown(repr_html, unsafe_allow_html=unsafe_allow_html)
+            elif type_util.has_callable_attr(
+                arg, "to_pandas"
+            ) or type_util.has_callable_attr(arg, "__dataframe__"):
+                # This object can very likely be converted to a DataFrame
+                # using the to_pandas, to_arrow, or the dataframe interchange
+                # protocol.
+                flush_buffer()
+                self.dg.dataframe(arg)
             else:
                 stringified_arg = str(arg)
 

streamlit/error_util.py

@@ -16,7 +16,7 @@ from __future__ import annotations
 
 from typing import Final
 
-import streamlit as st
+import streamlit
 from streamlit import config
 from streamlit.errors import UncaughtAppException
 from streamlit.logger import get_logger
@@ -52,9 +52,6 @@ def _print_rich_exception(e: BaseException) -> None:
         tab_size=8,
     )
 
-    # Import script_runner here to prevent circular import
-    import streamlit.runtime.scriptrunner.script_runner as script_runner
-
     # Print exception via rich
     console.print(
         rich_traceback.Traceback.from_exception(
@@ -66,11 +63,16 @@ def _print_rich_exception(e: BaseException) -> None:
             max_frames=100,
             word_wrap=False,
             extra_lines=3,
-            suppress=[script_runner],  # Ignore script runner
+            suppress=[streamlit],
         )
     )
 
 
+def _show_exception(ex: BaseException) -> None:
+    """Show the exception on the frontend."""
+    streamlit.exception(ex)
+
+
 def handle_uncaught_app_exception(ex: BaseException) -> None:
     """Handle an exception that originated from a user app.
 
@@ -78,6 +80,7 @@ def handle_uncaught_app_exception(ex: BaseException) -> None:
     if the user has disabled client error details, we display a generic
     warning in the frontend instead.
     """
+
     error_logged = False
 
     if config.get_option("logger.enableRich"):
@@ -95,12 +98,11 @@ def handle_uncaught_app_exception(ex: BaseException) -> None:
 
     if config.get_option("client.showErrorDetails"):
         if not error_logged:
-            # TODO: Clean up the stack trace, so it doesn't include ScriptRunner.
             _LOGGER.warning("Uncaught app exception", exc_info=ex)
-        st.exception(ex)
+        _show_exception(ex)
     else:
         if not error_logged:
             # Use LOGGER.error, rather than LOGGER.debug, since we don't
             # show debug logs by default.
             _LOGGER.error("Uncaught app exception", exc_info=ex)
-        st.exception(UncaughtAppException(ex))
+        _show_exception(UncaughtAppException(ex))

streamlit/navigation/page.py

@@ -20,7 +20,7 @@ from typing import Callable
 
 from streamlit.errors import StreamlitAPIException
 from streamlit.runtime.metrics_util import gather_metrics
-from streamlit.runtime.scriptrunner.script_run_context import get_script_run_ctx
+from streamlit.runtime.scriptrunner_utils.script_run_context import get_script_run_ctx
 from streamlit.source_util import page_icon_and_name
 from streamlit.string_util import validate_icon_or_emoji
 from streamlit.util import calc_md5

streamlit/platform.py

@@ -17,7 +17,7 @@
 from __future__ import annotations
 
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
-from streamlit.runtime.scriptrunner import get_script_run_ctx
+from streamlit.runtime.scriptrunner_utils.script_run_context import get_script_run_ctx
 
 
 def post_parent_message(message: str) -> None:

streamlit/runtime/caching/cache_data_api.py

@@ -66,7 +66,7 @@ from streamlit.runtime.caching.storage.dummy_cache_storage import (
     MemoryCacheStorageManager,
 )
 from streamlit.runtime.metrics_util import gather_metrics
-from streamlit.runtime.scriptrunner.script_run_context import get_script_run_ctx
+from streamlit.runtime.scriptrunner_utils.script_run_context import get_script_run_ctx
 from streamlit.runtime.stats import CacheStat, CacheStatsProvider, group_stats
 from streamlit.time_util import time_to_seconds
 

streamlit/runtime/caching/cache_resource_api.py

@@ -43,7 +43,7 @@ from streamlit.runtime.caching.cached_message_replay import (
     show_widget_replay_deprecation,
 )
 from streamlit.runtime.metrics_util import gather_metrics
-from streamlit.runtime.scriptrunner.script_run_context import get_script_run_ctx
+from streamlit.runtime.scriptrunner_utils.script_run_context import get_script_run_ctx
 from streamlit.runtime.stats import CacheStat, CacheStatsProvider, group_stats
 from streamlit.time_util import time_to_seconds
 

streamlit/runtime/caching/cached_message_replay.py

@@ -25,7 +25,7 @@ from streamlit import runtime, util
 from streamlit.deprecation_util import show_deprecation_warning
 from streamlit.runtime.caching.cache_errors import CacheReplayClosureError
 from streamlit.runtime.caching.hashing import update_hash
-from streamlit.runtime.scriptrunner.script_run_context import (
+from streamlit.runtime.scriptrunner_utils.script_run_context import (
     ScriptRunContext,
     get_script_run_ctx,
 )

streamlit/runtime/context.py

@@ -20,8 +20,7 @@ from typing import TYPE_CHECKING, Any, Iterable, Iterator, Mapping, cast
 
 from streamlit import runtime
 from streamlit.runtime.metrics_util import gather_metrics
-from streamlit.runtime.scriptrunner import get_script_run_ctx
-from streamlit.type_util import is_type
+from streamlit.runtime.scriptrunner_utils.script_run_context import get_script_run_ctx
 
 if TYPE_CHECKING:
     from http.cookies import Morsel
@@ -42,11 +41,13 @@ def _get_request() -> HTTPServerRequest | None:
     # We return websocket request only if session_client is an instance of
     # BrowserWebSocketHandler (which is True for the Streamlit open-source
     # implementation). For any other implementation, we return None.
-    if not is_type(
-        session_client,
-        "streamlit.web.server.browser_websocket_handler.BrowserWebSocketHandler",
+    # We are not using `type_util.is_type` here to avoid circular import.
+    if (
+        f"{type(session_client).__module__}.{type(session_client).__qualname__}"
+        != "streamlit.web.server.browser_websocket_handler.BrowserWebSocketHandler"
     ):
         return None
+
     return cast("RequestHandler", session_client).request
 
 

streamlit/runtime/forward_msg_queue.py

@@ -94,7 +94,7 @@ class ForwardMsgQueue:
             self._queue = []
         else:
             self._queue = [
-                msg
+                _update_script_finished_message(msg)
                 for msg in self._queue
                 if msg.WhichOneof("type")
                 in {
@@ -166,3 +166,20 @@ def _maybe_compose_deltas(old_delta: Delta, new_delta: Delta) -> Delta | None:
         return new_delta
 
     return None
+
+
+def _update_script_finished_message(msg: ForwardMsg) -> ForwardMsg:
+    """
+    When we are here, the message queue is cleared from non-lifecycle messages
+    before they were flushed to the browser.
+
+    If there were no non-lifecycle messages in the queue, changing the type here
+    should not matter for the frontend anyways, so we optimistically change the
+    `script_finished` message to `FINISHED_EARLY_FOR_RERUN`. This indicates to
+    the frontend that the previous run was interrupted by a new script start.
+    Otherwise, a `FINISHED_SUCCESSFULLY` message might trigger a reset of widget
+    states on the frontend.
+    """
+    if msg.WhichOneof("type") == "script_finished":
+        msg.script_finished = ForwardMsg.ScriptFinishedStatus.FINISHED_EARLY_FOR_RERUN
+    return msg

streamlit/runtime/fragment.py

@@ -30,8 +30,11 @@ from streamlit.error_util import handle_uncaught_app_exception
 from streamlit.errors import FragmentHandledException, FragmentStorageKeyError
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
 from streamlit.runtime.metrics_util import gather_metrics
-from streamlit.runtime.scriptrunner.exceptions import RerunException, StopException
-from streamlit.runtime.scriptrunner.script_run_context import get_script_run_ctx
+from streamlit.runtime.scriptrunner_utils.exceptions import (
+    RerunException,
+    StopException,
+)
+from streamlit.runtime.scriptrunner_utils.script_run_context import get_script_run_ctx
 from streamlit.time_util import time_to_seconds
 
 if TYPE_CHECKING:
@@ -160,7 +163,7 @@ def _fragment(
 
         ctx = get_script_run_ctx()
         if ctx is None:
-            return
+            return None
 
         cursors_snapshot = deepcopy(ctx.cursors)
         dg_stack_snapshot = deepcopy(context_dg_stack.get())
@@ -265,8 +268,7 @@ def _fragment(
                 ctx.current_fragment_id = prev_fragment_id
                 ctx.current_fragment_delta_path = []
 
-        if not ctx.fragment_storage.contains(fragment_id):
-            ctx.fragment_storage.set(fragment_id, wrapped_fragment)
+        ctx.fragment_storage.set(fragment_id, wrapped_fragment)
 
         if run_every:
             msg = ForwardMsg()

streamlit/runtime/media_file_manager.py

@@ -28,7 +28,9 @@ _LOGGER: Final = get_logger(__name__)
 
 def _get_session_id() -> str:
     """Get the active AppSession's session_id."""
-    from streamlit.runtime.scriptrunner import get_script_run_ctx
+    from streamlit.runtime.scriptrunner_utils.script_run_context import (
+        get_script_run_ctx,
+    )
 
     ctx = get_script_run_ctx()
     if ctx is None:

streamlit/runtime/metrics_util.py

@@ -29,6 +29,8 @@ from streamlit import config, util
 from streamlit.logger import get_logger
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
 from streamlit.proto.PageProfile_pb2 import Argument, Command
+from streamlit.runtime.scriptrunner_utils.exceptions import RerunException
+from streamlit.runtime.scriptrunner_utils.script_run_context import get_script_run_ctx
 
 _LOGGER: Final = get_logger(__name__)
 
@@ -364,10 +366,6 @@ def gather_metrics(name: str, func: F | None = None) -> Callable[[F], F] | F:
         from timeit import default_timer as timer
 
         exec_start = timer()
-        # Local imports to prevent circular dependencies
-        from streamlit.runtime.scriptrunner import get_script_run_ctx
-        from streamlit.runtime.scriptrunner.exceptions import RerunException
-
         ctx = get_script_run_ctx(suppress_warning=True)
 
         tracking_activated = (
@@ -444,9 +442,6 @@ def create_page_profile_message(
     uncaught_exception: str | None = None,
 ) -> ForwardMsg:
     """Create and return the full PageProfile ForwardMsg."""
-    # Local import to prevent circular dependencies
-    from streamlit.runtime.scriptrunner import get_script_run_ctx
-
     msg = ForwardMsg()
     page_profile = msg.page_profile
 

streamlit/runtime/scriptrunner/__init__.py

@@ -12,15 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from streamlit.runtime.scriptrunner.exceptions import RerunException, StopException
-from streamlit.runtime.scriptrunner.script_requests import RerunData
-from streamlit.runtime.scriptrunner.script_run_context import (
+from streamlit.runtime.scriptrunner.script_runner import ScriptRunner, ScriptRunnerEvent
+from streamlit.runtime.scriptrunner_utils.exceptions import (
+    RerunException,
+    StopException,
+)
+from streamlit.runtime.scriptrunner_utils.script_requests import RerunData
+from streamlit.runtime.scriptrunner_utils.script_run_context import (
     ScriptRunContext,
     add_script_run_ctx,
     enqueue_message,
     get_script_run_ctx,
 )
-from streamlit.runtime.scriptrunner.script_runner import ScriptRunner, ScriptRunnerEvent
 
 __all__ = [
     "RerunData",

streamlit/runtime/scriptrunner/exec_code.py

@@ -22,11 +22,14 @@ from streamlit.delta_generator_singletons import (
 )
 from streamlit.error_util import handle_uncaught_app_exception
 from streamlit.errors import FragmentHandledException
-from streamlit.runtime.scriptrunner.exceptions import RerunException, StopException
+from streamlit.runtime.scriptrunner_utils.exceptions import (
+    RerunException,
+    StopException,
+)
 
 if TYPE_CHECKING:
-    from streamlit.runtime.scriptrunner.script_requests import RerunData
-    from streamlit.runtime.scriptrunner.script_run_context import ScriptRunContext
+    from streamlit.runtime.scriptrunner_utils.script_requests import RerunData
+    from streamlit.runtime.scriptrunner_utils.script_run_context import ScriptRunContext
 
 
 def exec_func_with_error_handling(

streamlit/runtime/scriptrunner/script_runner.py

@@ -30,15 +30,22 @@ from streamlit.errors import FragmentStorageKeyError
 from streamlit.logger import get_logger
 from streamlit.proto.ClientState_pb2 import ClientState
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
-from streamlit.runtime.scriptrunner.exceptions import RerunException, StopException
+from streamlit.runtime.metrics_util import (
+    create_page_profile_message,
+    to_microseconds,
+)
 from streamlit.runtime.scriptrunner.exec_code import exec_func_with_error_handling
 from streamlit.runtime.scriptrunner.script_cache import ScriptCache
-from streamlit.runtime.scriptrunner.script_requests import (
+from streamlit.runtime.scriptrunner_utils.exceptions import (
+    RerunException,
+    StopException,
+)
+from streamlit.runtime.scriptrunner_utils.script_requests import (
     RerunData,
     ScriptRequests,
     ScriptRequestType,
 )
-from streamlit.runtime.scriptrunner.script_run_context import (
+from streamlit.runtime.scriptrunner_utils.script_run_context import (
     ScriptRunContext,
     add_script_run_ctx,
     get_script_run_ctx,
@@ -612,12 +619,6 @@ class ScriptRunner:
 
             if ctx.gather_usage_stats:
                 try:
-                    # Prevent issues with circular import
-                    from streamlit.runtime.metrics_util import (
-                        create_page_profile_message,
-                        to_microseconds,
-                    )
-
                     # Create and send page profile information
                     ctx.enqueue(
                         create_page_profile_message(

streamlit/runtime/scriptrunner_utils/__init__.py

@@ -0,0 +1,19 @@
+# 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.
+
+"""The modules in this package are separated from
+the scriptrunner-package, because they are more or less
+standalone and other modules import them quite frequently.
+This separation helps us to remove dependency cycles.
+"""

streamlit/runtime/{scriptrunner → scriptrunner_utils}/exceptions.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from streamlit.runtime.scriptrunner.script_requests import RerunData
+from streamlit.runtime.scriptrunner_utils.script_requests import RerunData
 from streamlit.util import repr_
 
 

streamlit/runtime/{scriptrunner → scriptrunner_utils}/script_requests.py

@@ -17,13 +17,11 @@ from __future__ import annotations
 import threading
 from dataclasses import dataclass, field, replace
 from enum import Enum
-from typing import TYPE_CHECKING, cast
+from typing import cast
 
 from streamlit import util
-from streamlit.runtime.state import coalesce_widget_states
-
-if TYPE_CHECKING:
-    from streamlit.proto.WidgetStates_pb2 import WidgetStates
+from streamlit.proto.Common_pb2 import StringTriggerValue as StringTriggerValueProto
+from streamlit.proto.WidgetStates_pb2 import WidgetState, WidgetStates
 
 
 class ScriptRequestType(Enum):
@@ -91,6 +89,63 @@ def _fragment_run_should_not_preempt_script(
     return bool(fragment_id_queue) and not is_fragment_scoped_rerun
 
 
+def _coalesce_widget_states(
+    old_states: WidgetStates | None, new_states: WidgetStates | None
+) -> WidgetStates | None:
+    """Coalesce an older WidgetStates into a newer one, and return a new
+    WidgetStates containing the result.
+
+    For most widget values, we just take the latest version.
+
+    However, any trigger_values (which are set by buttons) that are True in
+    `old_states` will be set to True in the coalesced result, so that button
+    presses don't go missing.
+    """
+    if not old_states and not new_states:
+        return None
+    elif not old_states:
+        return new_states
+    elif not new_states:
+        return old_states
+
+    states_by_id: dict[str, WidgetState] = {
+        wstate.id: wstate for wstate in new_states.widgets
+    }
+
+    trigger_value_types = [
+        ("trigger_value", False),
+        ("string_trigger_value", StringTriggerValueProto(data=None)),
+    ]
+    for old_state in old_states.widgets:
+        for trigger_value_type, unset_value in trigger_value_types:
+            if (
+                old_state.WhichOneof("value") == trigger_value_type
+                and getattr(old_state, trigger_value_type) != unset_value
+            ):
+                new_trigger_val = states_by_id.get(old_state.id)
+                # It should nearly always be the case that new_trigger_val is None
+                # here as trigger values are deleted from the client's WidgetStateManager
+                # as soon as a rerun_script BackMsg is sent to the server. Since it's
+                # impossible to test that the client sends us state in the expected
+                # format in a unit test, we test for this behavior in
+                # e2e_playwright/test_fragment_queue_test.py
+                if not new_trigger_val or (
+                    # Ensure the corresponding new_state is also a trigger;
+                    # otherwise, a widget that was previously a button/chat_input but no
+                    # longer is could get a bad value.
+                    new_trigger_val.WhichOneof("value") == trigger_value_type
+                    # We only want to take the value of old_state if new_trigger_val is
+                    # unset as the old value may be stale if a newer one was entered.
+                    and getattr(new_trigger_val, trigger_value_type) == unset_value
+                ):
+                    states_by_id[old_state.id] = old_state
+
+    coalesced = WidgetStates()
+    coalesced.widgets.extend(states_by_id.values())
+
+    return coalesced
+
+
 class ScriptRequests:
     """An interface for communicating with a ScriptRunner. Thread-safe.
 
@@ -146,7 +201,7 @@ class ScriptRequests:
                 # We already have an existing Rerun request, so we can coalesce the new
                 # rerun request into the existing one.
 
-                coalesced_states = coalesce_widget_states(
+                coalesced_states = _coalesce_widget_states(
                     self._rerun_data.widget_states, new_data.widget_states
                 )
 

streamlit/runtime/{scriptrunner → scriptrunner_utils}/script_run_context.py

@@ -31,7 +31,7 @@ if TYPE_CHECKING:
     from streamlit.proto.PageProfile_pb2 import Command
     from streamlit.runtime.fragment import FragmentStorage
     from streamlit.runtime.pages_manager import PagesManager
-    from streamlit.runtime.scriptrunner.script_requests import ScriptRequests
+    from streamlit.runtime.scriptrunner_utils.script_requests import ScriptRequests
     from streamlit.runtime.state import SafeSessionState
     from streamlit.runtime.uploaded_file_manager import UploadedFileManager
 _LOGGER: Final = get_logger(__name__)

streamlit/runtime/state/__init__.py

@@ -26,7 +26,6 @@ from streamlit.runtime.state.session_state_proxy import (
 )
 from streamlit.runtime.state.widgets import (
     NoValue,
-    coalesce_widget_states,
     register_widget,
 )
 
@@ -42,6 +41,5 @@ __all__ = [
     "SessionStateProxy",
     "get_session_state",
     "NoValue",
-    "coalesce_widget_states",
     "register_widget",
 ]

streamlit/runtime/state/common.py

@@ -66,7 +66,7 @@ from streamlit.util import HASHLIB_KWARGS
 if TYPE_CHECKING:
     from builtins import ellipsis
 
-    from streamlit.runtime.scriptrunner.script_run_context import ScriptRunContext
+    from streamlit.runtime.scriptrunner_utils.script_run_context import ScriptRunContext
     from streamlit.runtime.state.widgets import NoValue