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

streamlit/commands/execution_control.py

@@ -16,12 +16,11 @@ from __future__ import annotations
 
 import os
 from itertools import dropwhile
-from typing import Final, Literal, NoReturn
+from typing import Literal, NoReturn
 
 import streamlit as st
 from streamlit.errors import NoSessionContext, StreamlitAPIException
 from streamlit.file_util import get_main_script_directory, normalize_path_join
-from streamlit.logger import get_logger
 from streamlit.navigation.page import StreamlitPage
 from streamlit.runtime.metrics_util import gather_metrics
 from streamlit.runtime.scriptrunner import (
@@ -30,8 +29,6 @@ from streamlit.runtime.scriptrunner import (
     get_script_run_ctx,
 )
 
-_LOGGER: Final = get_logger(__name__)
-
 
 @gather_metrics("stop")
 def stop() -> NoReturn:  # type: ignore[misc]

streamlit/commands/experimental_query_params.py

@@ -26,7 +26,7 @@ from streamlit.constants import (
 from streamlit.errors import StreamlitAPIException
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
 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
 
 
 @gather_metrics("experimental_get_query_params")

streamlit/commands/logo.py

@@ -21,7 +21,7 @@ from streamlit.elements.image import AtomicImage, WidthBehaviour, image_to_url
 from streamlit.errors import StreamlitAPIException
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
 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
 
 
 def _invalid_logo_text(field_name: str):

streamlit/commands/navigation.py

@@ -23,7 +23,7 @@ from streamlit.errors import StreamlitAPIException
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
 from streamlit.proto.Navigation_pb2 import Navigation as NavigationProto
 from streamlit.runtime.metrics_util import gather_metrics
-from streamlit.runtime.scriptrunner.script_run_context import (
+from streamlit.runtime.scriptrunner_utils.script_run_context import (
     ScriptRunContext,
     get_script_run_ctx,
 )

streamlit/commands/page_config.py

@@ -25,7 +25,7 @@ from streamlit.errors import StreamlitAPIException
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg as ForwardProto
 from streamlit.proto.PageConfig_pb2 import PageConfig as PageConfigProto
 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.string_util import is_emoji, validate_material_icon
 from streamlit.url_util import is_url
 from streamlit.util import lower_clean_dict_keys

streamlit/components/v1/component_registry.py

@@ -20,7 +20,7 @@ from typing import TYPE_CHECKING
 
 from streamlit.components.v1.custom_component import CustomComponent
 from streamlit.runtime import get_instance
-from streamlit.runtime.scriptrunner import get_script_run_ctx
+from streamlit.runtime.scriptrunner_utils.script_run_context import get_script_run_ctx
 
 if TYPE_CHECKING:
     from types import FrameType

streamlit/components/v1/custom_component.py

@@ -27,7 +27,7 @@ from streamlit.proto.Components_pb2 import ArrowTable as ArrowTableProto
 from streamlit.proto.Components_pb2 import SpecialArg
 from streamlit.proto.Element_pb2 import Element
 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 NoValue, register_widget
 from streamlit.runtime.state.common import compute_widget_id
 from streamlit.type_util import is_bytes_like, to_bytes

streamlit/cursor.py

@@ -17,7 +17,7 @@ from __future__ import annotations
 from typing import Any
 
 from streamlit import util
-from streamlit.runtime.scriptrunner import get_script_run_ctx
+from streamlit.runtime.scriptrunner_utils.script_run_context import get_script_run_ctx
 
 
 def make_delta_path(

streamlit/dataframe_util.py

@@ -33,9 +33,11 @@ from typing import (
     Iterable,
     List,
     Protocol,
+    Sequence,
     TypeVar,
     Union,
     cast,
+    runtime_checkable,
 )
 
 from typing_extensions import TypeAlias, TypeGuard
@@ -87,6 +89,7 @@ _DASK_SERIES: Final = "dask.dataframe.core.Series"
 _DASK_INDEX: Final = "dask.dataframe.core.Index"
 _RAY_MATERIALIZED_DATASET: Final = "ray.data.dataset.MaterializedDataset"
 _RAY_DATASET: Final = "ray.data.dataset.Dataset"
+_DUCKDB_RELATION: Final = "duckdb.duckdb.DuckDBPyRelation"
 
 V_co = TypeVar(
     "V_co",
@@ -94,6 +97,39 @@ V_co = TypeVar(
 )
 
 
+@runtime_checkable
+class DBAPICursor(Protocol):
+    """Protocol for DBAPI 2.0 Cursor objects (PEP 249).
+
+    This is a simplified version of the DBAPI Cursor protocol
+    that only contains the methods that are relevant or used for
+    our DB API Integration.
+
+    Specification: https://peps.python.org/pep-0249/
+    Inspired by: https://github.com/python/typeshed/blob/main/stdlib/_typeshed/dbapi.pyi
+    """
+
+    @property
+    def description(
+        self,
+    ) -> (
+        Sequence[
+            tuple[
+                str,
+                Any | None,
+                int | None,
+                int | None,
+                int | None,
+                int | None,
+                bool | None,
+            ]
+        ]
+        | None
+    ): ...
+    def fetchmany(self, size: int = ..., /) -> Sequence[Sequence[Any]]: ...
+    def fetchall(self) -> Sequence[Sequence[Any]]: ...
+
+
 class DataFrameGenericAlias(Protocol[V_co]):
     """Technically not a GenericAlias, but serves the same purpose in
     OptionSequence below, in that it is a type which admits DataFrame,
@@ -125,6 +161,7 @@ Data: TypeAlias = Union[
     "np.ndarray[Any, np.dtype[Any]]",
     Iterable[Any],
     Dict[Any, Any],
+    DBAPICursor,
     None,
 ]
 
@@ -163,6 +200,8 @@ class DataFormat(Enum):
     COLUMN_VALUE_MAPPING = auto()  # {column: List[values]}
     COLUMN_SERIES_MAPPING = auto()  # {column: Series(values)}
     KEY_VALUE_DICT = auto()  # {index: value}
+    DBAPI_CURSOR = auto()  # DBAPI Cursor (PEP 249)
+    DUCKDB_RELATION = auto()  # DuckDB Relation
 
 
 def is_dataframe_like(obj: object) -> bool:
@@ -200,6 +239,7 @@ def is_dataframe_like(obj: object) -> bool:
         DataFormat.DASK_OBJECT,
         DataFormat.RAY_DATASET,
         DataFormat.COLUMN_SERIES_MAPPING,
+        DataFormat.DBAPI_CURSOR,
     ]
 
 
@@ -215,6 +255,8 @@ def is_unevaluated_data_object(obj: object) -> bool:
     - Ray Dataset
     - Polars LazyFrame
     - Generator functions
+    - DB API 2.0 Cursor (PEP 249)
+    - DuckDB Relation (Relational API)
 
     Unevaluated means that the data is not yet in the local memory.
     Unevaluated data objects are treated differently from other data objects by only
@@ -228,6 +270,8 @@ def is_unevaluated_data_object(obj: object) -> bool:
         or is_ray_dataset(obj)
         or is_polars_lazyframe(obj)
         or is_dask_object(obj)
+        or is_duckdb_relation(obj)
+        or is_dbapi_cursor(obj)
         or inspect.isgeneratorfunction(obj)
     )
 
@@ -319,6 +363,23 @@ def is_pandas_styler(obj: object) -> TypeGuard[Styler]:
     return is_type(obj, _PANDAS_STYLER_TYPE_STR)
 
 
+def is_dbapi_cursor(obj: object) -> TypeGuard[DBAPICursor]:
+    """True if obj looks like a DB API 2.0 Cursor.
+
+    https://peps.python.org/pep-0249/
+    """
+    return isinstance(obj, DBAPICursor)
+
+
+def is_duckdb_relation(obj: object) -> bool:
+    """True if obj is a DuckDB relation.
+
+    https://duckdb.org/docs/api/python/relational_api
+    """
+
+    return is_type(obj, _DUCKDB_RELATION)
+
+
 def _is_list_of_scalars(data: Iterable[Any]) -> bool:
     """Check if the list only contains scalar values."""
     from pandas.api.types import infer_dtype
@@ -533,6 +594,29 @@ def convert_anything_to_pandas_df(
             )
         return cast(pd.DataFrame, data)
 
+    if is_duckdb_relation(data):
+        data = data.limit(max_unevaluated_rows).df()
+        if data.shape[0] == max_unevaluated_rows:
+            _show_data_information(
+                f"⚠️ Showing only {string_util.simplify_number(max_unevaluated_rows)} "
+                "rows. Call `df()` on the relation to show more."
+            )
+        return data
+
+    if is_dbapi_cursor(data):
+        # Based on the specification, the first item in the description is the
+        # column name (if available)
+        columns = (
+            [d[0] if d else "" for d in data.description] if data.description else None
+        )
+        data = pd.DataFrame(data.fetchmany(max_unevaluated_rows), columns=columns)
+        if data.shape[0] == max_unevaluated_rows:
+            _show_data_information(
+                f"⚠️ Showing only {string_util.simplify_number(max_unevaluated_rows)} "
+                "rows. Call `fetchall()` on the Cursor to show more."
+            )
+        return data
+
     if is_snowpark_row_list(data):
         return pd.DataFrame([row.as_dict() for row in data])
 
@@ -891,6 +975,7 @@ def is_colum_type_arrow_incompatible(column: Series[Any] | Index) -> bool:
         "period[ns]",
         "period[U]",
         "period[us]",
+        "geometry",
     }:
         return True
 
@@ -1044,6 +1129,10 @@ def determine_data_format(input_data: Any) -> DataFormat:
         return DataFormat.DASK_OBJECT
     elif is_snowpark_data_object(input_data) or is_snowpark_row_list(input_data):
         return DataFormat.SNOWPARK_OBJECT
+    elif is_duckdb_relation(input_data):
+        return DataFormat.DUCKDB_RELATION
+    elif is_dbapi_cursor(input_data):
+        return DataFormat.DBAPI_CURSOR
     elif (
         isinstance(
             input_data,
@@ -1164,6 +1253,8 @@ def convert_pandas_df_to_data_format(
         DataFormat.SNOWPANDAS_OBJECT,
         DataFormat.DASK_OBJECT,
         DataFormat.RAY_DATASET,
+        DataFormat.DBAPI_CURSOR,
+        DataFormat.DUCKDB_RELATION,
     ]:
         return df
     elif data_format == DataFormat.NUMPY_LIST:

streamlit/elements/arrow.py

@@ -48,7 +48,7 @@ from streamlit.errors import StreamlitAPIException
 from streamlit.proto.Arrow_pb2 import Arrow as ArrowProto
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
 from streamlit.runtime.metrics_util import gather_metrics
-from streamlit.runtime.scriptrunner.script_run_context import (
+from streamlit.runtime.scriptrunner_utils.script_run_context import (
     enqueue_message,
     get_script_run_ctx,
 )

streamlit/elements/json.py

@@ -79,7 +79,6 @@ class JsonMixin:
            height: 385px
 
         """
-        import streamlit as st
 
         if is_custom_dict(body):
             body = body.to_dict()
@@ -98,7 +97,7 @@ class JsonMixin:
                 # Serialize body to string and try to interpret sets as lists
                 body = json.dumps(body, default=_ensure_serialization)
             except TypeError as err:
-                st.warning(
+                self.dg.warning(
                     "Warning: this data structure was not fully serializable as "
                     f"JSON due to one or more unexpected keys.  (Error was: {err})"
                 )

streamlit/elements/lib/dialog.py

@@ -23,7 +23,7 @@ from streamlit.delta_generator import DeltaGenerator
 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.script_run_context import (
+from streamlit.runtime.scriptrunner_utils.script_run_context import (
     enqueue_message,
     get_script_run_ctx,
 )

streamlit/elements/lib/mutable_status_container.py

@@ -23,7 +23,7 @@ from streamlit.delta_generator import DeltaGenerator
 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.script_run_context import enqueue_message
+from streamlit.runtime.scriptrunner_utils.script_run_context import enqueue_message
 
 if TYPE_CHECKING:
     from types import TracebackType

streamlit/elements/lib/policies.py

@@ -19,7 +19,7 @@ from typing import TYPE_CHECKING, Any, Final, Sequence
 from streamlit import config, errors, logger, runtime
 from streamlit.elements.form_utils import is_in_form
 from streamlit.errors import StreamlitAPIException, StreamlitAPIWarning
-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.state import WidgetCallback, get_session_state
 
 if TYPE_CHECKING:

streamlit/elements/media.py

@@ -22,7 +22,6 @@ from typing import TYPE_CHECKING, Dict, Final, Union, cast
 
 from typing_extensions import TypeAlias
 
-import streamlit as st
 from streamlit import runtime, type_util, url_util
 from streamlit.elements.lib.subtitle_utils import process_subtitle_data
 from streamlit.errors import StreamlitAPIException
@@ -30,7 +29,7 @@ from streamlit.proto.Audio_pb2 import Audio as AudioProto
 from streamlit.proto.Video_pb2 import Video as VideoProto
 from streamlit.runtime import caching
 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.common import compute_widget_id
 from streamlit.time_util import time_to_seconds
 from streamlit.type_util import NumpyShape
@@ -169,7 +168,6 @@ class MediaMixin:
         start_time, end_time = _parse_start_time_end_time(start_time, end_time)
 
         audio_proto = AudioProto()
-        coordinates = self.dg._get_delta_path_str()
 
         is_data_numpy_array = type_util.is_type(data, "numpy.ndarray")
 
@@ -178,11 +176,11 @@ class MediaMixin:
                 "`sample_rate` must be specified when `data` is a numpy array."
             )
         if not is_data_numpy_array and sample_rate is not None:
-            st.warning(
+            self.dg.warning(
                 "Warning: `sample_rate` will be ignored since data is not a numpy "
                 "array."
             )
-
+        coordinates = self.dg._get_delta_path_str()
         marshall_audio(
             coordinates,
             audio_proto,

streamlit/elements/plotly_chart.py

@@ -46,7 +46,7 @@ from streamlit.elements.lib.utils import Key, to_key
 from streamlit.errors import StreamlitAPIException
 from streamlit.proto.PlotlyChart_pb2 import PlotlyChart as PlotlyChartProto
 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 WidgetCallback, register_widget
 from streamlit.runtime.state.common import compute_widget_id
 

streamlit/elements/vega_charts.py

@@ -53,7 +53,7 @@ from streamlit.proto.ArrowVegaLiteChart_pb2 import (
     ArrowVegaLiteChart as ArrowVegaLiteChartProto,
 )
 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 WidgetCallback, register_widget
 from streamlit.runtime.state.common import compute_widget_id
 from streamlit.util import HASHLIB_KWARGS

streamlit/elements/widgets/button.py

@@ -740,10 +740,13 @@ class ButtonMixin:
                     page_link_proto.page = page_name
                     break
 
-        if page_link_proto.page_script_hash == "":
-            raise StreamlitAPIException(
-                f"Could not find page: `{page}`. Must be the file path relative to the main script, from the directory: `{os.path.basename(main_script_directory)}`. Only the main app file and files in the `pages/` directory are supported."
-            )
+            if page_link_proto.page_script_hash == "":
+                raise StreamlitAPIException(
+                    f"Could not find page: `{page}`. Must be the file path relative to "
+                    "the main script, from the directory: "
+                    f"`{os.path.basename(main_script_directory)}`. Only the main app "
+                    "file and files in the `pages/` directory are supported."
+                )
 
         return self.dg._enqueue("page_link", page_link_proto)
 

streamlit/elements/widgets/button_group.py

@@ -43,7 +43,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,

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/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: