streamlit-nightly 1.31.2.dev20240213__py2.py3-none-any.whl → 1.31.2.dev20240214__py2.py3-none-any.whl

streamlit/runtime/metrics_util.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import contextlib
 import inspect
 import os
@@ -21,17 +23,14 @@ import time
 import uuid
 from collections.abc import Sized
 from functools import wraps
-from timeit import default_timer as timer
-from typing import Any, Callable, List, Optional, Set, TypeVar, Union, cast, overload
-
-from typing_extensions import Final
+from typing import Any, Callable, Final, TypeVar, cast, overload
 
 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
 
-_LOGGER = get_logger(__name__)
+_LOGGER: Final = get_logger(__name__)
 
 # Limit the number of commands to keep the page profile message small
 # since Segment allows only a maximum of 32kb per event.
@@ -161,11 +160,11 @@ def _get_machine_id_v3() -> str:
 
     machine_id = str(uuid.getnode())
     if os.path.isfile(_ETC_MACHINE_ID_PATH):
-        with open(_ETC_MACHINE_ID_PATH, "r") as f:
+        with open(_ETC_MACHINE_ID_PATH) as f:
             machine_id = f.read()
 
     elif os.path.isfile(_DBUS_MACHINE_ID_PATH):
-        with open(_DBUS_MACHINE_ID_PATH, "r") as f:
+        with open(_DBUS_MACHINE_ID_PATH) as f:
             machine_id = f.read()
 
     return machine_id
@@ -173,10 +172,10 @@ def _get_machine_id_v3() -> str:
 
 class Installation:
     _instance_lock = threading.Lock()
-    _instance: Optional["Installation"] = None
+    _instance: Installation | None = None
 
     @classmethod
-    def instance(cls) -> "Installation":
+    def instance(cls) -> Installation:
         """Returns the singleton Installation"""
         # We use a double-checked locking optimization to avoid the overhead
         # of acquiring the lock in the common case:
@@ -228,7 +227,7 @@ def _get_top_level_module(func: Callable[..., Any]) -> str:
     return module.__name__.split(".")[0]
 
 
-def _get_arg_metadata(arg: object) -> Optional[str]:
+def _get_arg_metadata(arg: object) -> str | None:
     """Get metadata information related to the value of the given object."""
     with contextlib.suppress(Exception):
         if isinstance(arg, (bool)):
@@ -245,8 +244,8 @@ def _get_command_telemetry(
 ) -> Command:
     """Get telemetry information for the given callable and its arguments."""
     arg_keywords = inspect.getfullargspec(_command_func).args
-    self_arg: Optional[Any] = None
-    arguments: List[Argument] = []
+    self_arg: Any | None = None
+    arguments: list[Argument] = []
     is_method = inspect.ismethod(_command_func)
     name = _command_name
 
@@ -315,7 +314,7 @@ def gather_metrics(
     ...
 
 
-def gather_metrics(name: str, func: Optional[F] = None) -> Union[Callable[[F], F], F]:
+def gather_metrics(name: str, func: F | None = None) -> Callable[[F], F] | F:
     """Function decorator to add telemetry tracking to commands.
 
     Parameters
@@ -351,11 +350,13 @@ def gather_metrics(name: str, func: Optional[F] = None) -> Union[Callable[[F], F
 
         return wrapper
     else:
-        # To make mypy type narrow Optional[F] -> F
+        # To make mypy type narrow F | None -> F
         non_optional_func = func
 
     @wraps(non_optional_func)
     def wrapped_func(*args, **kwargs):
+        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
@@ -371,8 +372,7 @@ def gather_metrics(name: str, func: Optional[F] = None) -> Union[Callable[[F], F
             < _MAX_TRACKED_COMMANDS  # Prevent too much memory usage
         )
 
-        deferred_exception: Optional[RerunException] = None
-        command_telemetry: Optional[Command] = None
+        command_telemetry: Command | None = None
 
         if ctx and tracking_activated:
             try:
@@ -421,10 +421,10 @@ def gather_metrics(name: str, func: Optional[F] = None) -> Union[Callable[[F], F
 
 
 def create_page_profile_message(
-    commands: List[Command],
+    commands: list[Command],
     exec_time: int,
     prep_time: int,
-    uncaught_exception: Optional[str] = None,
+    uncaught_exception: str | None = None,
 ) -> ForwardMsg:
     """Create and return the full PageProfile ForwardMsg."""
     msg = ForwardMsg()
@@ -435,7 +435,7 @@ def create_page_profile_message(
     msg.page_profile.headless = config.get_option("server.headless")
 
     # Collect all config options that have been manually set
-    config_options: Set[str] = set()
+    config_options: set[str] = set()
     if config._config_options:
         for option_name in config._config_options.keys():
             if not config.is_manually_set(option_name):
@@ -450,7 +450,7 @@ def create_page_profile_message(
     msg.page_profile.config.extend(config_options)
 
     # Check the predefined set of modules for attribution
-    attributions: Set[str] = {
+    attributions: set[str] = {
         attribution
         for attribution in _ATTRIBUTIONS_TO_CHECK
         if attribution in sys.modules

streamlit/runtime/runtime.py

@@ -19,9 +19,7 @@ import time
 import traceback
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import TYPE_CHECKING, Awaitable, Dict, NamedTuple, Optional, Tuple, Type
-
-from typing_extensions import Final
+from typing import TYPE_CHECKING, Awaitable, Final, NamedTuple
 
 from streamlit import config
 from streamlit.logger import get_logger
@@ -69,7 +67,7 @@ if TYPE_CHECKING:
 # Wait for the script run result for 60s and if no result is available give up
 SCRIPT_RUN_CHECK_TIMEOUT: Final = 60
 
-LOGGER: Final = get_logger(__name__)
+_LOGGER: Final = get_logger(__name__)
 
 
 class RuntimeStoppedError(Exception):
@@ -85,7 +83,7 @@ class RuntimeConfig:
 
     # DEPRECATED: We need to keep this field around for compatibility reasons, but we no
     # longer use this anywhere.
-    command_line: Optional[str]
+    command_line: str | None
 
     # The storage backend for Streamlit's MediaFileManager.
     media_file_storage: MediaFileStorage
@@ -99,7 +97,7 @@ class RuntimeConfig:
     )
 
     # The SessionManager class to be used.
-    session_manager_class: Type[SessionManager] = WebsocketSessionManager
+    session_manager_class: type[SessionManager] = WebsocketSessionManager
 
     # The SessionStorage instance for the SessionManager to use.
     session_storage: SessionStorage = field(default_factory=MemorySessionStorage)
@@ -141,7 +139,7 @@ class AsyncObjects(NamedTuple):
 
 
 class Runtime:
-    _instance: Optional[Runtime] = None
+    _instance: Runtime | None = None
 
     @classmethod
     def instance(cls) -> Runtime:
@@ -179,11 +177,11 @@ class Runtime:
         Runtime._instance = self
 
         # Will be created when we start.
-        self._async_objs: Optional[AsyncObjects] = None
+        self._async_objs: AsyncObjects | None = None
 
         # The task that runs our main loop. We need to save a reference
         # to it so that it doesn't get garbage collected while running.
-        self._loop_coroutine_task: Optional[asyncio.Task[None]] = None
+        self._loop_coroutine_task: asyncio.Task[None] | None = None
 
         self._main_script_path = config.script_path
         self._is_hello = config.is_hello
@@ -247,7 +245,7 @@ class Runtime:
     # happen to be threadsafe. This may change with future SessionManager implementations,
     # at which point we'll need to formalize our thread safety rules for each
     # SessionManager method.
-    def get_client(self, session_id: str) -> Optional[SessionClient]:
+    def get_client(self, session_id: str) -> SessionClient | None:
         """Get the SessionClient for the given session_id, or None
         if no such session exists.
 
@@ -304,7 +302,7 @@ class Runtime:
             if self._state in (RuntimeState.STOPPING, RuntimeState.STOPPED):
                 return
 
-            LOGGER.debug("Runtime stopping...")
+            _LOGGER.debug("Runtime stopping...")
             self._set_state(RuntimeState.STOPPING)
             async_objs.must_stop.set()
 
@@ -322,9 +320,9 @@ class Runtime:
     def connect_session(
         self,
         client: SessionClient,
-        user_info: Dict[str, Optional[str]],
-        existing_session_id: Optional[str] = None,
-        session_id_override: Optional[str] = None,
+        user_info: dict[str, str | None],
+        existing_session_id: str | None = None,
+        session_id_override: str | None = None,
     ) -> str:
         """Create a new session (or connect to an existing one) and return its unique ID.
 
@@ -383,9 +381,9 @@ class Runtime:
     def create_session(
         self,
         client: SessionClient,
-        user_info: Dict[str, Optional[str]],
-        existing_session_id: Optional[str] = None,
-        session_id_override: Optional[str] = None,
+        user_info: dict[str, str | None],
+        existing_session_id: str | None = None,
+        session_id_override: str | None = None,
     ) -> str:
         """Create a new session (or connect to an existing one) and return its unique ID.
 
@@ -394,7 +392,7 @@ class Runtime:
         This method is simply an alias for connect_session added for backwards
         compatibility.
         """
-        LOGGER.warning("create_session is deprecated! Use connect_session instead.")
+        _LOGGER.warning("create_session is deprecated! Use connect_session instead.")
         return self.connect_session(
             client=client,
             user_info=user_info,
@@ -478,7 +476,7 @@ class Runtime:
 
         session_info = self._session_mgr.get_active_session_info(session_id)
         if session_info is None:
-            LOGGER.debug(
+            _LOGGER.debug(
                 "Discarding BackMsg for disconnected session (id=%s)", session_id
             )
             return
@@ -508,7 +506,7 @@ class Runtime:
 
         session_info = self._session_mgr.get_active_session_info(session_id)
         if session_info is None:
-            LOGGER.debug(
+            _LOGGER.debug(
                 "Discarding BackMsg Exception for disconnected session (id=%s)",
                 session_id,
             )
@@ -517,7 +515,7 @@ class Runtime:
         session_info.session.handle_backmsg_exception(exc)
 
     @property
-    async def is_ready_for_browser_connection(self) -> Tuple[bool, str]:
+    async def is_ready_for_browser_connection(self) -> tuple[bool, str]:
         if self._state not in (
             RuntimeState.INITIAL,
             RuntimeState.STOPPING,
@@ -527,7 +525,7 @@ class Runtime:
 
         return False, "unavailable"
 
-    async def does_script_run_without_error(self) -> Tuple[bool, str]:
+    async def does_script_run_without_error(self) -> tuple[bool, str]:
         """Load and execute the app's script to verify it runs without an error.
 
         Returns
@@ -572,7 +570,7 @@ class Runtime:
             session.shutdown()
 
     def _set_state(self, new_state: RuntimeState) -> None:
-        LOGGER.debug("Runtime state: %s -> %s", self._state, new_state)
+        _LOGGER.debug("Runtime state: %s -> %s", self._state, new_state)
         self._state = new_state
 
     async def _loop_coroutine(self) -> None:
@@ -655,7 +653,7 @@ class Runtime:
         except Exception as e:
             async_objs.stopped.set_exception(e)
             traceback.print_exc()
-            LOGGER.info(
+            _LOGGER.info(
                 """
 Please report this bug at https://github.com/streamlit/streamlit/issues.
 """
@@ -689,13 +687,13 @@ Please report this bug at https://github.com/streamlit/streamlit/issues.
             ):
                 # This session has probably cached this message. Send
                 # a reference instead.
-                LOGGER.debug("Sending cached message ref (hash=%s)", msg.hash)
+                _LOGGER.debug("Sending cached message ref (hash=%s)", msg.hash)
                 msg_to_send = create_reference_msg(msg)
 
             # Cache the message so it can be referenced in the future.
             # If the message is already cached, this will reset its
             # age.
-            LOGGER.debug("Caching message (hash=%s)", msg.hash)
+            _LOGGER.debug("Caching message (hash=%s)", msg.hash)
             self._message_cache.add_message(
                 msg, session_info.session, session_info.script_run_count
             )
@@ -706,7 +704,7 @@ Please report this bug at https://github.com/streamlit/streamlit/issues.
             msg.WhichOneof("type") == "script_finished"
             and msg.script_finished == ForwardMsg.FINISHED_SUCCESSFULLY
         ):
-            LOGGER.debug(
+            _LOGGER.debug(
                 "Script run finished successfully; "
                 "removing expired entries from MessageCache "
                 "(max_age=%s)",

streamlit/runtime/runtime_util.py

@@ -14,7 +14,9 @@
 
 """Runtime-related utility functions"""
 
-from typing import Any, Optional
+from __future__ import annotations
+
+from typing import Any
 
 from streamlit import config
 from streamlit.errors import MarkdownFormattedException
@@ -27,7 +29,7 @@ class MessageSizeError(MarkdownFormattedException):
 
     def __init__(self, failed_msg_str: Any):
         msg = self._get_message(failed_msg_str)
-        super(MessageSizeError, self).__init__(msg)
+        super().__init__(msg)
 
     def _get_message(self, failed_msg_str: Any) -> str:
         # This needs to have zero indentation otherwise the markdown will render incorrectly.
@@ -82,7 +84,7 @@ def serialize_forward_msg(msg: ForwardMsg) -> bytes:
 
 # This needs to be initialized lazily to avoid calling config.get_option() and
 # thus initializing config options when this file is first imported.
-_max_message_size_bytes: Optional[int] = None
+_max_message_size_bytes: int | None = None
 
 
 def get_max_message_size_bytes() -> int:

streamlit/runtime/script_data.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import os
 from dataclasses import dataclass, field
 

streamlit/runtime/scriptrunner/magic.py

@@ -12,9 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import ast
+from __future__ import annotations
 
-from typing_extensions import Final
+import ast
+from typing import Any, Final
 
 from streamlit import config
 
@@ -24,7 +25,7 @@ from streamlit import config
 MAGIC_MODULE_NAME: Final = "__streamlitmagic__"
 
 
-def add_magic(code, script_path):
+def add_magic(code: str, script_path: str) -> Any:
     """Modifies the code to support magic Streamlit commands.
 
     Parameters
@@ -51,7 +52,10 @@ def add_magic(code, script_path):
 
 
 def _modify_ast_subtree(
-    tree, body_attr="body", is_root=False, file_ends_in_semicolon=False
+    tree: Any,
+    body_attr: str = "body",
+    is_root: bool = False,
+    file_ends_in_semicolon: bool = False,
 ):
     """Parses magic commands and modifies the given AST (sub)tree."""
 
@@ -118,7 +122,7 @@ def _modify_ast_subtree(
     return tree
 
 
-def _insert_import_statement(tree):
+def _insert_import_statement(tree: Any) -> None:
     """Insert Streamlit import statement at the top(ish) of the tree."""
 
     st_import = _build_st_import_statement()
@@ -226,11 +230,11 @@ def _get_st_write_from_expr(
     return st_write
 
 
-def _is_string_constant_node(node):
+def _is_string_constant_node(node) -> bool:
     return type(node) is ast.Constant and type(node.value) is str
 
 
-def _is_docstring_node(node, node_index, parent_type):
+def _is_docstring_node(node, node_index, parent_type) -> bool:
     return (
         node_index == 0
         and _is_string_constant_node(node)
@@ -238,7 +242,7 @@ def _is_docstring_node(node, node_index, parent_type):
     )
 
 
-def _does_file_end_in_semicolon(tree, code):
+def _does_file_end_in_semicolon(tree, code: str) -> bool:
     file_ends_in_semicolon = False
 
     # Avoid spending time with this operation if magic.displayLastExprIfNoSemicolon is
@@ -247,13 +251,15 @@ def _does_file_end_in_semicolon(tree, code):
         last_line_num = getattr(tree.body[-1], "end_lineno", None)
 
         if last_line_num is not None:
-            last_line_str = code.split("\n")[last_line_num - 1]
+            last_line_str: str = code.split("\n")[last_line_num - 1]
             file_ends_in_semicolon = last_line_str.strip(" ").endswith(";")
 
     return file_ends_in_semicolon
 
 
-def _is_displayable_last_expr(is_root, is_last_expr, file_ends_in_semicolon):
+def _is_displayable_last_expr(
+    is_root: bool, is_last_expr: bool, file_ends_in_semicolon: bool
+) -> bool:
     return (
         # This is a "displayable last expression" if...
         # ...it's actually the last expression...
@@ -267,5 +273,5 @@ def _is_displayable_last_expr(is_root, is_last_expr, file_ends_in_semicolon):
     )
 
 
-def _should_display_docstring_like_node_anyway(is_root):
+def _should_display_docstring_like_node_anyway(is_root: bool) -> bool:
     return config.get_option("magic.displayRootDocString") and is_root

streamlit/runtime/scriptrunner/magic_funcs.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from typing import Any
 
 from streamlit.runtime.metrics_util import gather_metrics

streamlit/runtime/scriptrunner/script_requests.py

@@ -12,10 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import threading
 from dataclasses import dataclass
 from enum import Enum
-from typing import Optional, cast
+from typing import cast
 
 from streamlit import util
 from streamlit.proto.WidgetStates_pb2 import WidgetStates
@@ -41,7 +43,7 @@ class RerunData:
     """Data attached to RERUN requests. Immutable."""
 
     query_string: str = ""
-    widget_states: Optional[WidgetStates] = None
+    widget_states: WidgetStates | None = None
     page_script_hash: str = ""
     page_name: str = ""
 
@@ -54,7 +56,7 @@ class ScriptRequest:
     """A STOP or RERUN request and associated data."""
 
     type: ScriptRequestType
-    _rerun_data: Optional[RerunData] = None
+    _rerun_data: RerunData | None = None
 
     @property
     def rerun_data(self) -> RerunData:
@@ -141,7 +143,7 @@ class ScriptRequests:
             # We'll never get here
             raise RuntimeError(f"Unrecognized ScriptRunnerState: {self._state}")
 
-    def on_scriptrunner_yield(self) -> Optional[ScriptRequest]:
+    def on_scriptrunner_yield(self) -> ScriptRequest | None:
         """Called by the ScriptRunner when it's at a yield point.
 
         If we have no request, return None.

streamlit/runtime/scriptrunner/script_run_context.py

@@ -12,14 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import collections
 import contextvars
 import threading
 from dataclasses import dataclass, field
-from typing import Callable, Counter, Dict, List, Optional, Set, Tuple
+from typing import Callable, Counter, Dict, Final, Union
 from urllib import parse
 
-from typing_extensions import Final, TypeAlias
+from typing_extensions import TypeAlias
 
 from streamlit import runtime
 from streamlit.errors import StreamlitAPIException
@@ -30,16 +32,16 @@ from streamlit.runtime.scriptrunner.script_requests import ScriptRequests
 from streamlit.runtime.state import SafeSessionState
 from streamlit.runtime.uploaded_file_manager import UploadedFileManager
 
-LOGGER: Final = get_logger(__name__)
+_LOGGER: Final = get_logger(__name__)
 
-UserInfo: TypeAlias = Dict[str, Optional[str]]
+UserInfo: TypeAlias = Dict[str, Union[str, None]]
 
 
 # The dg_stack tracks the currently active DeltaGenerator, and is pushed to when
 # a DeltaGenerator is entered via a `with` block. This is implemented as a ContextVar
 # so that different threads or async tasks can have their own stacks.
 dg_stack: contextvars.ContextVar[
-    Tuple["streamlit.delta_generator.DeltaGenerator", ...]
+    tuple["streamlit.delta_generator.DeltaGenerator", ...]
 ] = contextvars.ContextVar("dg_stack", default=tuple())
 
 
@@ -69,15 +71,15 @@ class ScriptRunContext:
 
     gather_usage_stats: bool = False
     command_tracking_deactivated: bool = False
-    tracked_commands: List[Command] = field(default_factory=list)
+    tracked_commands: list[Command] = field(default_factory=list)
     tracked_commands_counter: Counter[str] = field(default_factory=collections.Counter)
     _set_page_config_allowed: bool = True
     _has_script_started: bool = False
-    widget_ids_this_run: Set[str] = field(default_factory=set)
-    widget_user_keys_this_run: Set[str] = field(default_factory=set)
-    form_ids_this_run: Set[str] = field(default_factory=set)
-    cursors: Dict[int, "streamlit.cursor.RunningCursor"] = field(default_factory=dict)
-    script_requests: Optional[ScriptRequests] = None
+    widget_ids_this_run: set[str] = field(default_factory=set)
+    widget_user_keys_this_run: set[str] = field(default_factory=set)
+    form_ids_this_run: set[str] = field(default_factory=set)
+    cursors: dict[int, "streamlit.cursor.RunningCursor"] = field(default_factory=dict)
+    script_requests: ScriptRequests | None = None
 
     # TODO(willhuang1997): Remove this variable when experimental query params are removed
     _experimental_query_params_used = False
@@ -153,7 +155,7 @@ SCRIPT_RUN_CONTEXT_ATTR_NAME: Final = "streamlit_script_run_ctx"
 
 
 def add_script_run_ctx(
-    thread: Optional[threading.Thread] = None, ctx: Optional[ScriptRunContext] = None
+    thread: threading.Thread | None = None, ctx: ScriptRunContext | None = None
 ):
     """Adds the current ScriptRunContext to a newly-created thread.
 
@@ -183,7 +185,7 @@ def add_script_run_ctx(
     return thread
 
 
-def get_script_run_ctx(suppress_warning: bool = False) -> Optional[ScriptRunContext]:
+def get_script_run_ctx(suppress_warning: bool = False) -> ScriptRunContext | None:
     """
     Parameters
     ----------
@@ -196,15 +198,13 @@ def get_script_run_ctx(suppress_warning: bool = False) -> Optional[ScriptRunCont
 
     """
     thread = threading.current_thread()
-    ctx: Optional[ScriptRunContext] = getattr(
-        thread, SCRIPT_RUN_CONTEXT_ATTR_NAME, None
-    )
+    ctx: ScriptRunContext | None = getattr(thread, SCRIPT_RUN_CONTEXT_ATTR_NAME, None)
     if ctx is None and runtime.exists() and not suppress_warning:
         # Only warn about a missing ScriptRunContext if suppress_warning is False, and
         # we were started via `streamlit run`. Otherwise, the user is likely running a
         # script "bare", and doesn't need to be warned about streamlit
         # bits that are irrelevant when not connected to a session.
-        LOGGER.warning("Thread '%s': missing ScriptRunContext", thread.name)
+        _LOGGER.warning("Thread '%s': missing ScriptRunContext", thread.name)
 
     return ctx
 

streamlit/runtime/scriptrunner/script_runner.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import gc
 import sys
 import threading
@@ -19,7 +21,7 @@ import types
 from contextlib import contextmanager
 from enum import Enum
 from timeit import default_timer as timer
-from typing import Callable, Dict, Optional
+from typing import Callable, Final
 
 from blinker import Signal
 
@@ -47,7 +49,7 @@ from streamlit.runtime.state import (
 from streamlit.runtime.uploaded_file_manager import UploadedFileManager
 from streamlit.vendor.ipython.modified_sys_path import modified_sys_path
 
-_LOGGER = get_logger(__name__)
+_LOGGER: Final = get_logger(__name__)
 
 
 class ScriptRunnerEvent(Enum):
@@ -103,7 +105,7 @@ class ScriptRunner:
         uploaded_file_mgr: UploadedFileManager,
         script_cache: ScriptCache,
         initial_rerun_data: RerunData,
-        user_info: Dict[str, Optional[str]],
+        user_info: dict[str, str | None],
     ):
         """Initialize the ScriptRunner.
 
@@ -181,7 +183,7 @@ class ScriptRunner:
         self._execing = False
 
         # This is initialized in start()
-        self._script_thread: Optional[threading.Thread] = None
+        self._script_thread: threading.Thread | None = None
 
     def __repr__(self) -> str:
         return util.repr_(self)
@@ -493,7 +495,7 @@ class ScriptRunner:
 
             # This will be set to a RerunData instance if our execution
             # is interrupted by a RerunException.
-            rerun_exception_data: Optional[RerunData] = None
+            rerun_exception_data: RerunData | None = None
 
             # If the script stops early, we don't want to remove unseen widgets,
             # so we track this to potentially skip session state cleanup later.