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

streamlit/runtime/secrets.py

@@ -19,12 +19,10 @@ import threading
 from copy import deepcopy
 from typing import (
     Any,
-    Dict,
     Final,
     ItemsView,
     Iterator,
     KeysView,
-    List,
     Mapping,
     NoReturn,
     ValuesView,
@@ -37,8 +35,8 @@ import streamlit.watcher.path_watcher
 from streamlit import file_util, runtime
 from streamlit.logger import get_logger
 
-_LOGGER = get_logger(__name__)
-SECRETS_FILE_LOCS: Final[List[str]] = [
+_LOGGER: Final = get_logger(__name__)
+SECRETS_FILE_LOCS: Final[list[str]] = [
     file_util.get_streamlit_file_path("secrets.toml"),
     # NOTE: The order here is important! Project-level secrets should overwrite global
     # secrets.
@@ -107,7 +105,7 @@ class AttrDict(Mapping[str, Any]):
     def __setattr__(self, key, value) -> NoReturn:
         raise TypeError("Secrets does not support attribute assignment.")
 
-    def to_dict(self) -> Dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:
         return deepcopy(self.__nested_secrets__)
 
 
@@ -118,7 +116,7 @@ class Secrets(Mapping[str, Any]):
     Safe to use from multiple threads.
     """
 
-    def __init__(self, file_paths: List[str]):
+    def __init__(self, file_paths: list[str]):
         # Our secrets dict.
         self._secrets: Mapping[str, Any] | None = None
         self._lock = threading.RLock()

streamlit/runtime/session_manager.py

@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from abc import abstractmethod
 from dataclasses import dataclass
-from typing import Callable, Dict, List, Optional, cast
-
-from typing_extensions import Protocol
+from typing import Callable, Protocol, cast
 
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
 from streamlit.runtime.app_session import AppSession
@@ -64,7 +64,7 @@ class SessionInfo:
     the ForwardMsgCache.
     """
 
-    client: Optional[SessionClient]
+    client: SessionClient | None
     session: AppSession
     script_run_count: int = 0
 
@@ -90,7 +90,7 @@ class SessionStorageError(Exception):
 
 class SessionStorage(Protocol):
     @abstractmethod
-    def get(self, session_id: str) -> Optional[SessionInfo]:
+    def get(self, session_id: str) -> SessionInfo | None:
         """Return the SessionInfo corresponding to session_id, or None if one does not
         exist.
 
@@ -152,7 +152,7 @@ class SessionStorage(Protocol):
         raise NotImplementedError
 
     @abstractmethod
-    def list(self) -> List[SessionInfo]:
+    def list(self) -> list[SessionInfo]:
         """List all sessions tracked by this SessionStorage.
 
         Returns
@@ -210,7 +210,7 @@ class SessionManager(Protocol):
         session_storage: SessionStorage,
         uploaded_file_manager: UploadedFileManager,
         script_cache: ScriptCache,
-        message_enqueued_callback: Optional[Callable[[], None]],
+        message_enqueued_callback: Callable[[], None] | None,
     ) -> None:
         """Initialize a SessionManager with the given SessionStorage.
 
@@ -235,9 +235,9 @@ class SessionManager(Protocol):
         self,
         client: SessionClient,
         script_data: ScriptData,
-        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.
 
@@ -290,7 +290,7 @@ class SessionManager(Protocol):
         raise NotImplementedError
 
     @abstractmethod
-    def get_session_info(self, session_id: str) -> Optional[SessionInfo]:
+    def get_session_info(self, session_id: str) -> SessionInfo | None:
         """Return the SessionInfo for the given id, or None if no such session
         exists.
 
@@ -306,7 +306,7 @@ class SessionManager(Protocol):
         raise NotImplementedError
 
     @abstractmethod
-    def list_sessions(self) -> List[SessionInfo]:
+    def list_sessions(self) -> list[SessionInfo]:
         """Return the SessionInfo for all sessions managed by this SessionManager.
 
         Returns
@@ -344,7 +344,7 @@ class SessionManager(Protocol):
         """
         self.close_session(session_id)
 
-    def get_active_session_info(self, session_id: str) -> Optional[ActiveSessionInfo]:
+    def get_active_session_info(self, session_id: str) -> ActiveSessionInfo | None:
         """Return the ActiveSessionInfo for the given id, or None if either no such
         session exists or the session is not active.
 
@@ -371,7 +371,7 @@ class SessionManager(Protocol):
         """
         return self.get_active_session_info(session_id) is not None
 
-    def list_active_sessions(self) -> List[ActiveSessionInfo]:
+    def list_active_sessions(self) -> list[ActiveSessionInfo]:
         """Return the session info for all active sessions tracked by this SessionManager.
 
         Returns

streamlit/runtime/state/common.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 """Functions and data structures shared by session_state.py and widgets.py"""
+
 from __future__ import annotations
 
 import hashlib
@@ -23,8 +24,8 @@ from typing import (
     Any,
     Callable,
     Dict,
+    Final,
     Generic,
-    Optional,
     Sequence,
     Tuple,
     TypeVar,
@@ -32,7 +33,7 @@ from typing import (
 )
 
 from google.protobuf.message import Message
-from typing_extensions import Final, TypeAlias
+from typing_extensions import TypeAlias
 
 from streamlit import util
 from streamlit.errors import StreamlitAPIException
@@ -151,7 +152,7 @@ class RegisterWidgetResult(Generic[T_co]):
     @classmethod
     def failure(
         cls, deserializer: WidgetDeserializer[T_co]
-    ) -> "RegisterWidgetResult[T_co]":
+    ) -> RegisterWidgetResult[T_co]:
         """The canonical way to construct a RegisterWidgetResult in cases
         where the true widget value could not be determined.
         """
@@ -200,7 +201,7 @@ def compute_widget_id(
     return f"{GENERATED_WIDGET_ID_PREFIX}-{h.hexdigest()}-{user_key}"
 
 
-def user_key_from_widget_id(widget_id: str) -> Optional[str]:
+def user_key_from_widget_id(widget_id: str) -> str | None:
     """Return the user key portion of a widget id, or None if the id does not
     have a user key.
 

streamlit/runtime/state/query_params.py

@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from dataclasses import dataclass, field
-from typing import Dict, Iterable, Iterator, List, MutableMapping, Union
+from typing import Iterable, Iterator, MutableMapping
 from urllib import parse
 
 from streamlit.constants import EMBED_QUERY_PARAMS_KEYS
@@ -27,7 +29,7 @@ class QueryParams(MutableMapping[str, str]):
     It stores str keys with str and List[str] values.
     """
 
-    _query_params: Dict[str, Union[List[str], str]] = field(default_factory=dict)
+    _query_params: dict[str, list[str] | str] = field(default_factory=dict)
 
     def __iter__(self) -> Iterator[str]:
         self._ensure_single_query_api_used()
@@ -59,7 +61,7 @@ class QueryParams(MutableMapping[str, str]):
         except KeyError:
             raise KeyError(missing_key_error_message(key))
 
-    def __setitem__(self, key: str, value: Union[str, Iterable[str]]) -> None:
+    def __setitem__(self, key: str, value: str | Iterable[str]) -> None:
         if isinstance(value, dict):
             raise StreamlitAPIException(
                 f"You cannot set a query params key `{key}` to a dictionary."
@@ -86,7 +88,7 @@ class QueryParams(MutableMapping[str, str]):
         except KeyError:
             raise KeyError(missing_key_error_message(key))
 
-    def get_all(self, key: str) -> List[str]:
+    def get_all(self, key: str) -> list[str]:
         self._ensure_single_query_api_used()
         if key not in self._query_params or key in EMBED_QUERY_PARAMS_KEYS:
             return []
@@ -128,7 +130,7 @@ class QueryParams(MutableMapping[str, str]):
 
         self._send_query_param_msg()
 
-    def to_dict(self) -> Dict[str, str]:
+    def to_dict(self) -> dict[str, str]:
         self._ensure_single_query_api_used()
         # return the last query param if multiple values are set
         return {
@@ -137,7 +139,7 @@ class QueryParams(MutableMapping[str, str]):
             if key not in EMBED_QUERY_PARAMS_KEYS
         }
 
-    def set_with_no_forward_msg(self, key: str, val: Union[List[str], str]) -> None:
+    def set_with_no_forward_msg(self, key: str, val: list[str] | str) -> None:
         self._query_params[key] = val
 
     def clear_with_no_forward_msg(self) -> None:

streamlit/runtime/state/query_params_proxy.py

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Dict, Iterable, Iterator, List, MutableMapping, Union
+from __future__ import annotations
+
+from typing import Iterable, Iterator, MutableMapping
 
 from streamlit.runtime.metrics_util import gather_metrics
 from streamlit.runtime.state.query_params import missing_key_error_message
@@ -47,7 +49,7 @@ class QueryParamsProxy(MutableMapping[str, str]):
             del qp[key]
 
     @gather_metrics("query_params.set_item")
-    def __setitem__(self, key: str, value: Union[str, Iterable[str]]) -> None:
+    def __setitem__(self, key: str, value: str | Iterable[str]) -> None:
         with get_session_state().query_params() as qp:
             qp[key] = value
 
@@ -67,12 +69,12 @@ class QueryParamsProxy(MutableMapping[str, str]):
                 raise AttributeError(missing_key_error_message(key))
 
     @gather_metrics("query_params.set_attr")
-    def __setattr__(self, key: str, value: Union[str, Iterable[str]]) -> None:
+    def __setattr__(self, key: str, value: str | Iterable[str]) -> None:
         with get_session_state().query_params() as qp:
             qp[key] = value
 
     @gather_metrics("query_params.get_all")
-    def get_all(self, key: str) -> List[str]:
+    def get_all(self, key: str) -> list[str]:
         """
         Get a list of all query parameter values associated to a given key.
 
@@ -107,7 +109,7 @@ class QueryParamsProxy(MutableMapping[str, str]):
             qp.clear()
 
     @gather_metrics("query_params.to_dict")
-    def to_dict(self) -> Dict[str, str]:
+    def to_dict(self) -> dict[str, str]:
         """
         Get all query parameters as a dictionary.
 

streamlit/runtime/state/safe_session_state.py

@@ -12,9 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import threading
 from contextlib import contextmanager
-from typing import Any, Callable, Dict, Iterator, List, Optional, Set
+from typing import Any, Callable, Iterator
 
 from streamlit.proto.WidgetStates_pb2 import WidgetState as WidgetStateProto
 from streamlit.proto.WidgetStates_pb2 import WidgetStates as WidgetStatesProto
@@ -47,7 +49,7 @@ class SafeSessionState:
         object.__setattr__(self, "_yield_callback", yield_callback)
 
     def register_widget(
-        self, metadata: WidgetMetadata[T], user_key: Optional[str]
+        self, metadata: WidgetMetadata[T], user_key: str | None
     ) -> RegisterWidgetResult[T]:
         self._yield_callback()
         with self._lock:
@@ -62,7 +64,7 @@ class SafeSessionState:
             #  to a Lock.)
             self._state.on_script_will_rerun(latest_widget_states)
 
-    def on_script_finished(self, widget_ids_this_run: Set[str]) -> None:
+    def on_script_finished(self, widget_ids_this_run: set[str]) -> None:
         with self._lock:
             self._state.on_script_finished(widget_ids_this_run)
 
@@ -70,7 +72,7 @@ class SafeSessionState:
         with self._lock:
             self._state.maybe_check_serializable()
 
-    def get_widget_states(self) -> List[WidgetStateProto]:
+    def get_widget_states(self) -> list[WidgetStateProto]:
         """Return a list of serialized widget values for each widget with a value."""
         with self._lock:
             return self._state.get_widget_states()
@@ -80,7 +82,7 @@ class SafeSessionState:
             return self._state.is_new_state_value(user_key)
 
     @property
-    def filtered_state(self) -> Dict[str, Any]:
+    def filtered_state(self) -> dict[str, Any]:
         """The combined session and widget state, excluding keyless widgets."""
         with self._lock:
             return self._state.filtered_state

streamlit/runtime/state/session_state.py

@@ -152,8 +152,7 @@ class WStates(MutableMapping[str, Any]):
         # For this and many other methods, we can't simply delegate to the
         # states field, because we need to invoke `__getitem__` for any
         # values, to handle deserialization and unwrapping of values.
-        for key in self.states:
-            yield key
+        yield from self.states
 
     def keys(self) -> KeysView[str]:
         return KeysView(self.states)
@@ -164,7 +163,7 @@ class WStates(MutableMapping[str, Any]):
     def values(self) -> set[Any]:  # type: ignore[override]
         return {self[wid] for wid in self}
 
-    def update(self, other: "WStates") -> None:  # type: ignore[override]
+    def update(self, other: WStates) -> None:  # type: ignore[override]
         """Copy all widget values and metadata from 'other' into this mapping,
         overwriting any data in this mapping that's also present in 'other'.
         """
@@ -674,7 +673,7 @@ def _is_internal_key(key: str) -> bool:
 
 @dataclass
 class SessionStateStatProvider(CacheStatsProvider):
-    _session_mgr: "SessionManager"
+    _session_mgr: SessionManager
 
     def get_stats(self) -> list[CacheStat]:
         stats: list[CacheStat] = []

streamlit/runtime/state/session_state_proxy.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Dict, Iterator, MutableMapping
+from __future__ import annotations
 
-from typing_extensions import Final
+from typing import Any, Final, Iterator, MutableMapping
 
 from streamlit import logger as _logger
 from streamlit import runtime
@@ -24,7 +24,7 @@ from streamlit.runtime.state.safe_session_state import SafeSessionState
 from streamlit.runtime.state.session_state import SessionState
 from streamlit.type_util import Key
 
-LOGGER: Final = _logger.get_logger(__name__)
+_LOGGER: Final = _logger.get_logger(__name__)
 
 
 _state_use_warning_already_displayed: bool = False
@@ -48,7 +48,7 @@ def get_session_state() -> SafeSessionState:
         if not _state_use_warning_already_displayed:
             _state_use_warning_already_displayed = True
             if not runtime.exists():
-                LOGGER.warning(
+                _LOGGER.warning(
                     "Session state does not function when running a script without `streamlit run`"
                 )
         return SafeSessionState(SessionState(), lambda: None)
@@ -130,7 +130,7 @@ class SessionStateProxy(MutableMapping[Key, Any]):
         except KeyError:
             raise AttributeError(_missing_attr_error_message(key))
 
-    def to_dict(self) -> Dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:
         """Return a dict containing all session_state and keyed widget values."""
         return get_session_state().filtered_state
 

streamlit/runtime/state/widgets.py

@@ -12,11 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import textwrap
 from types import MappingProxyType
-from typing import TYPE_CHECKING, Dict, Mapping, Optional
+from typing import TYPE_CHECKING, Final, Mapping
 
-from typing_extensions import Final, TypeAlias
+from typing_extensions import TypeAlias
 
 from streamlit.errors import DuplicateWidgetID
 from streamlit.proto.WidgetStates_pb2 import WidgetState, WidgetStates
@@ -86,12 +88,12 @@ def register_widget(
     element_proto: WidgetProto,
     deserializer: WidgetDeserializer[T],
     serializer: WidgetSerializer[T],
-    ctx: Optional["ScriptRunContext"],
-    user_key: Optional[str] = None,
-    widget_func_name: Optional[str] = None,
-    on_change_handler: Optional[WidgetCallback] = None,
-    args: Optional[WidgetArgs] = None,
-    kwargs: Optional[WidgetKwargs] = None,
+    ctx: ScriptRunContext | None,
+    user_key: str | None = None,
+    widget_func_name: str | None = None,
+    on_change_handler: WidgetCallback | None = None,
+    args: WidgetArgs | None = None,
+    kwargs: WidgetKwargs | None = None,
 ) -> RegisterWidgetResult[T]:
     """Register a widget with Streamlit, and return its current value.
     NOTE: This function should be called after the proto has been filled.
@@ -107,21 +109,21 @@ def register_widget(
         its st.<widget_name> function.
     serializer : WidgetSerializer[T]
         Called to convert a widget's value to its protobuf representation.
-    ctx : Optional[ScriptRunContext]
+    ctx : ScriptRunContext or None
         Used to ensure uniqueness of widget IDs, and to look up widget values.
-    user_key : Optional[str]
+    user_key : str or None
         Optional user-specified string to use as the widget ID.
         If this is None, we'll generate an ID by hashing the element.
-    widget_func_name : Optional[str]
+    widget_func_name : str or None
         The widget's DeltaGenerator function name, if it's different from
         its element_type. Custom components are a special case: they all have
         the element_type "component_instance", but are instantiated with
         dynamically-named functions.
-    on_change_handler : Optional[WidgetCallback]
+    on_change_handler : WidgetCallback or None
         An optional callback invoked when the widget's value changes.
-    args : Optional[WidgetArgs]
+    args : WidgetArgs or None
         args to pass to on_change_handler when invoked
-    kwargs : Optional[WidgetKwargs]
+    kwargs : WidgetKwargs or None
         kwargs to pass to on_change_handler when invoked
 
     Returns
@@ -163,8 +165,8 @@ def register_widget(
 
 def register_widget_from_metadata(
     metadata: WidgetMetadata[T],
-    ctx: Optional["ScriptRunContext"],
-    widget_func_name: Optional[str],
+    ctx: ScriptRunContext | None,
+    widget_func_name: str | None,
     element_type: ElementType,
 ) -> RegisterWidgetResult[T]:
     """Register a widget and return its value, using an already constructed
@@ -226,7 +228,7 @@ def coalesce_widget_states(
     `old_states` will be set to True in the coalesced result, so that button
     presses don't go missing.
     """
-    states_by_id: Dict[str, WidgetState] = {
+    states_by_id: dict[str, WidgetState] = {
         wstate.id: wstate for wstate in new_states.widgets
     }
 
@@ -254,7 +256,7 @@ def coalesce_widget_states(
 
 
 def _build_duplicate_widget_message(
-    widget_func_name: str, user_key: Optional[str] = None
+    widget_func_name: str, user_key: str | None = None
 ) -> str:
     if user_key is not None:
         message = textwrap.dedent(

streamlit/runtime/uploaded_file_manager.py

@@ -11,11 +11,12 @@
 # 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
+
 import io
 from abc import abstractmethod
-from typing import List, NamedTuple, Sequence
-
-from typing_extensions import Protocol
+from typing import NamedTuple, Protocol, Sequence
 
 from streamlit import util
 from streamlit.proto.Common_pb2 import FileURLs as FileURLsProto
@@ -98,7 +99,7 @@ class UploadedFileManager(CacheStatsProvider, Protocol):
     @abstractmethod
     def get_files(
         self, session_id: str, file_ids: Sequence[str]
-    ) -> List[UploadedFileRec]:
+    ) -> list[UploadedFileRec]:
         """Return a  list of UploadedFileRec for a given sequence of file_ids.
 
         Parameters
@@ -123,7 +124,7 @@ class UploadedFileManager(CacheStatsProvider, Protocol):
 
     def get_upload_urls(
         self, session_id: str, file_names: Sequence[str]
-    ) -> List[UploadFileUrlInfo]:
+    ) -> list[UploadFileUrlInfo]:
         """Return a list of UploadFileUrlInfo for a given sequence of file_names.
         Optional to implement, issuing of URLs could be done by other service.
 

streamlit/runtime/websocket_session_manager.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Callable, Dict, List, Optional, cast
+from __future__ import annotations
 
-from typing_extensions import Final
+from typing import Callable, Final, List, cast
 
 from streamlit.logger import get_logger
 from streamlit.runtime.app_session import AppSession
@@ -30,7 +30,7 @@ from streamlit.runtime.session_manager import (
 from streamlit.runtime.uploaded_file_manager import UploadedFileManager
 from streamlit.watcher import LocalSourcesWatcher
 
-LOGGER: Final = get_logger(__name__)
+_LOGGER: Final = get_logger(__name__)
 
 
 class WebsocketSessionManager(SessionManager):
@@ -48,7 +48,7 @@ class WebsocketSessionManager(SessionManager):
         session_storage: SessionStorage,
         uploaded_file_manager: UploadedFileManager,
         script_cache: ScriptCache,
-        message_enqueued_callback: Optional[Callable[[], None]],
+        message_enqueued_callback: Callable[[], None] | None,
     ) -> None:
         self._session_storage = session_storage
         self._uploaded_file_mgr = uploaded_file_manager
@@ -56,22 +56,22 @@ class WebsocketSessionManager(SessionManager):
         self._message_enqueued_callback = message_enqueued_callback
 
         # Mapping of AppSession.id -> ActiveSessionInfo.
-        self._active_session_info_by_id: Dict[str, ActiveSessionInfo] = {}
+        self._active_session_info_by_id: dict[str, ActiveSessionInfo] = {}
 
     def connect_session(
         self,
         client: SessionClient,
         script_data: ScriptData,
-        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:
         assert not (
             existing_session_id and session_id_override
         ), "Only one of existing_session_id and session_id_override should be truthy"
 
         if existing_session_id in self._active_session_info_by_id:
-            LOGGER.warning(
+            _LOGGER.warning(
                 "Session with id %s is already connected! Connecting to a new session.",
                 existing_session_id,
             )
@@ -105,7 +105,7 @@ class WebsocketSessionManager(SessionManager):
             session_id_override=session_id_override,
         )
 
-        LOGGER.debug(
+        _LOGGER.debug(
             "Created new session for client %s. Session ID: %s", id(client), session.id
         )
 
@@ -133,13 +133,13 @@ class WebsocketSessionManager(SessionManager):
             )
             del self._active_session_info_by_id[session_id]
 
-    def get_active_session_info(self, session_id: str) -> Optional[ActiveSessionInfo]:
+    def get_active_session_info(self, session_id: str) -> ActiveSessionInfo | None:
         return self._active_session_info_by_id.get(session_id)
 
     def is_active_session(self, session_id: str) -> bool:
         return session_id in self._active_session_info_by_id
 
-    def list_active_sessions(self) -> List[ActiveSessionInfo]:
+    def list_active_sessions(self) -> list[ActiveSessionInfo]:
         return list(self._active_session_info_by_id.values())
 
     def close_session(self, session_id: str) -> None:
@@ -154,13 +154,13 @@ class WebsocketSessionManager(SessionManager):
             self._session_storage.delete(session_id)
             session_info.session.shutdown()
 
-    def get_session_info(self, session_id: str) -> Optional[SessionInfo]:
+    def get_session_info(self, session_id: str) -> SessionInfo | None:
         session_info = self.get_active_session_info(session_id)
         if session_info:
             return cast(SessionInfo, session_info)
         return self._session_storage.get(session_id)
 
-    def list_sessions(self) -> List[SessionInfo]:
+    def list_sessions(self) -> list[SessionInfo]:
         return (
             cast(List[SessionInfo], self.list_active_sessions())
             + self._session_storage.list()