streamlit-nightly 1.37.2.dev20240819__py2.py3-none-any.whl → 1.37.2.dev20240822__py2.py3-none-any.whl

streamlit/proto/Code_pb2.py

@@ -14,7 +14,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1astreamlit/proto/Code.proto\"F\n\x04\x43ode\x12\x11\n\tcode_text\x18\x01 \x01(\t\x12\x10\n\x08language\x18\x02 \x01(\t\x12\x19\n\x11show_line_numbers\x18\x03 \x01(\x08\x42)\n\x1c\x63om.snowflake.apps.streamlitB\tCodeProtob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1astreamlit/proto/Code.proto\"Z\n\x04\x43ode\x12\x11\n\tcode_text\x18\x01 \x01(\t\x12\x10\n\x08language\x18\x02 \x01(\t\x12\x19\n\x11show_line_numbers\x18\x03 \x01(\x08\x12\x12\n\nwrap_lines\x18\x04 \x01(\x08\x42)\n\x1c\x63om.snowflake.apps.streamlitB\tCodeProtob\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -23,5 +23,5 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\034com.snowflake.apps.streamlitB\tCodeProto'
   _globals['_CODE']._serialized_start=30
-  _globals['_CODE']._serialized_end=100
+  _globals['_CODE']._serialized_end=120
 # @@protoc_insertion_point(module_scope)

streamlit/proto/Code_pb2.pyi

@@ -33,17 +33,20 @@ class Code(google.protobuf.message.Message):
     CODE_TEXT_FIELD_NUMBER: builtins.int
     LANGUAGE_FIELD_NUMBER: builtins.int
     SHOW_LINE_NUMBERS_FIELD_NUMBER: builtins.int
+    WRAP_LINES_FIELD_NUMBER: builtins.int
     code_text: builtins.str
     """Content to display."""
     language: builtins.str
     show_line_numbers: builtins.bool
+    wrap_lines: builtins.bool
     def __init__(
         self,
         *,
         code_text: builtins.str = ...,
         language: builtins.str = ...,
         show_line_numbers: builtins.bool = ...,
+        wrap_lines: builtins.bool = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["code_text", b"code_text", "language", b"language", "show_line_numbers", b"show_line_numbers"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["code_text", b"code_text", "language", b"language", "show_line_numbers", b"show_line_numbers", "wrap_lines", b"wrap_lines"]) -> None: ...
 
 global___Code = Code

streamlit/runtime/caching/__init__.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
 
 from streamlit.runtime.caching.cache_data_api import (
     CACHE_DATA_MESSAGE_REPLAY_CTX,
@@ -33,7 +33,6 @@ if TYPE_CHECKING:
     from google.protobuf.message import Message
 
     from streamlit.proto.Block_pb2 import Block
-    from streamlit.runtime.state.common import WidgetMetadata
 
 
 def save_element_message(
@@ -73,14 +72,6 @@ def save_block_message(
     )
 
 
-def save_widget_metadata(metadata: WidgetMetadata[Any]) -> None:
-    """Save a widget's metadata to a thread-local callstack, so the widget
-    can be registered again when that widget is replayed.
-    """
-    CACHE_DATA_MESSAGE_REPLAY_CTX.save_widget_metadata(metadata)
-    CACHE_RESOURCE_MESSAGE_REPLAY_CTX.save_widget_metadata(metadata)
-
-
 def save_media_data(image_data: bytes | str, mimetype: str, image_id: str) -> None:
     CACHE_DATA_MESSAGE_REPLAY_CTX.save_image_data(image_data, mimetype, image_id)
     CACHE_RESOURCE_MESSAGE_REPLAY_CTX.save_image_data(image_data, mimetype, image_id)
@@ -99,7 +90,6 @@ __all__ = [
     "CACHE_DOCS_URL",
     "save_element_message",
     "save_block_message",
-    "save_widget_metadata",
     "save_media_data",
     "get_data_cache_stats_provider",
     "get_resource_cache_stats_provider",

streamlit/runtime/caching/cache_data_api.py

@@ -47,9 +47,7 @@ from streamlit.runtime.caching.cache_utils import (
 from streamlit.runtime.caching.cached_message_replay import (
     CachedMessageReplayContext,
     CachedResult,
-    ElementMsgData,
     MsgData,
-    MultiCacheResults,
     show_widget_replay_deprecation,
 )
 from streamlit.runtime.caching.storage import (
@@ -66,7 +64,6 @@ from streamlit.runtime.caching.storage.dummy_cache_storage import (
     MemoryCacheStorageManager,
 )
 from streamlit.runtime.metrics_util import gather_metrics
-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
 
@@ -93,13 +90,11 @@ class CachedDataFuncInfo(CachedFuncInfo):
         persist: CachePersistType,
         max_entries: int | None,
         ttl: float | timedelta | str | None,
-        allow_widgets: bool,
         hash_funcs: HashFuncsDict | None = None,
     ):
         super().__init__(
             func,
             show_spinner=show_spinner,
-            allow_widgets=allow_widgets,
             hash_funcs=hash_funcs,
         )
         self.persist = persist
@@ -128,7 +123,6 @@ class CachedDataFuncInfo(CachedFuncInfo):
             max_entries=self.max_entries,
             ttl=self.ttl,
             display_name=self.display_name,
-            allow_widgets=self.allow_widgets,
         )
 
     def validate_params(self) -> None:
@@ -160,7 +154,6 @@ class DataCaches(CacheStatsProvider):
         max_entries: int | None,
         ttl: int | float | timedelta | str | None,
         display_name: str,
-        allow_widgets: bool,
     ) -> DataCache:
         """Return the mem cache for the given key.
 
@@ -220,7 +213,6 @@ class DataCaches(CacheStatsProvider):
                 max_entries=max_entries,
                 ttl_seconds=ttl_seconds,
                 display_name=display_name,
-                allow_widgets=allow_widgets,
             )
             self._function_caches[key] = cache
             return cache
@@ -443,9 +435,6 @@ class CacheDataAPI:
 
         experimental_allow_widgets : bool
             Allow widgets to be used in the cached function. Defaults to False.
-            Support for widgets in cached functions is currently experimental.
-            Setting this parameter to True may lead to excessive memory use since the
-            widget value is treated as an additional input parameter to the cache.
 
         hash_funcs : dict or None
             Mapping of types or fully qualified names to hash functions.
@@ -456,8 +445,10 @@ class CacheDataAPI:
             of how this can be used.
 
         .. deprecated::
-            ``experimental_allow_widgets`` is deprecated and will be removed in
-            a later version.
+            The cached widget replay functionality was removed in 1.38. Please
+            remove the ``experimental_allow_widgets`` parameter from your
+            caching decorators. This parameter will be removed in a future
+            version.
 
         Example
         -------
@@ -574,7 +565,6 @@ class CacheDataAPI:
                     show_spinner=show_spinner,
                     max_entries=max_entries,
                     ttl=ttl,
-                    allow_widgets=experimental_allow_widgets,
                     hash_funcs=hash_funcs,
                 )
             )
@@ -589,7 +579,6 @@ class CacheDataAPI:
                 show_spinner=show_spinner,
                 max_entries=max_entries,
                 ttl=ttl,
-                allow_widgets=experimental_allow_widgets,
                 hash_funcs=hash_funcs,
             )
         )
@@ -611,7 +600,6 @@ class DataCache(Cache):
         max_entries: int | None,
         ttl_seconds: float | None,
         display_name: str,
-        allow_widgets: bool = False,
     ):
         super().__init__()
         self.key = key
@@ -620,7 +608,6 @@ class DataCache(Cache):
         self.ttl_seconds = ttl_seconds
         self.max_entries = max_entries
         self.persist = persist
-        self.allow_widgets = allow_widgets
 
     def get_stats(self) -> list[CacheStat]:
         if isinstance(self.storage, CacheStatsProvider):
@@ -641,21 +628,12 @@ class DataCache(Cache):
 
         try:
             entry = pickle.loads(pickled_entry)
-            if not isinstance(entry, MultiCacheResults):
+            if not isinstance(entry, CachedResult):
                 # Loaded an old cache file format, remove it and let the caller
                 # rerun the function.
                 self.storage.delete(key)
                 raise CacheKeyNotFoundError()
-
-            ctx = get_script_run_ctx()
-            if not ctx:
-                raise CacheKeyNotFoundError()
-
-            widget_key = entry.get_current_widget_key(ctx, CacheType.DATA)
-            if widget_key in entry.results:
-                return entry.results[widget_key]
-            else:
-                raise CacheKeyNotFoundError()
+            return entry
         except pickle.UnpicklingError as exc:
             raise CacheError(f"Failed to unpickle {key}") from exc
 
@@ -664,43 +642,13 @@ class DataCache(Cache):
         """Write a value and associated messages to the cache.
         The value must be pickleable.
         """
-        ctx = get_script_run_ctx()
-        if ctx is None:
-            return
-
-        main_id = st._main.id
-        sidebar_id = st.sidebar.id
-
-        if self.allow_widgets:
-            widgets = {
-                msg.widget_metadata.widget_id
-                for msg in messages
-                if isinstance(msg, ElementMsgData) and msg.widget_metadata is not None
-            }
-        else:
-            widgets = set()
-
-        multi_cache_results: MultiCacheResults | None = None
-
-        # Try to find in cache storage, then falling back to a new result instance
-        try:
-            multi_cache_results = self._read_multi_results_from_storage(key)
-        except (CacheKeyNotFoundError, pickle.UnpicklingError):
-            pass
-
-        if multi_cache_results is None:
-            multi_cache_results = MultiCacheResults(widget_ids=widgets, results={})
-        multi_cache_results.widget_ids.update(widgets)
-        widget_key = multi_cache_results.get_current_widget_key(ctx, CacheType.DATA)
-
-        result = CachedResult(value, messages, main_id, sidebar_id)
-        multi_cache_results.results[widget_key] = result
-
         try:
-            pickled_entry = pickle.dumps(multi_cache_results)
+            main_id = st._main.id
+            sidebar_id = st.sidebar.id
+            entry = CachedResult(value, messages, main_id, sidebar_id)
+            pickled_entry = pickle.dumps(entry)
         except (pickle.PicklingError, TypeError) as exc:
             raise CacheError(f"Failed to pickle {key}") from exc
-
         self.storage.set(key, pickled_entry)
 
     def _clear(self, key: str | None = None) -> None:
@@ -708,22 +656,3 @@ class DataCache(Cache):
             self.storage.clear()
         else:
             self.storage.delete(key)
-
-    def _read_multi_results_from_storage(self, key: str) -> MultiCacheResults:
-        """Look up the results from storage and ensure it has the right type.
-
-        Raises a `CacheKeyNotFoundError` if the key has no entry, or if the
-        entry is malformed.
-        """
-        try:
-            pickled = self.storage.get(key)
-        except CacheStorageKeyNotFoundError as e:
-            raise CacheKeyNotFoundError(str(e)) from e
-
-        maybe_results = pickle.loads(pickled)
-
-        if isinstance(maybe_results, MultiCacheResults):
-            return maybe_results
-        else:
-            self.storage.delete(key)
-            raise CacheKeyNotFoundError()

streamlit/runtime/caching/cache_errors.py

@@ -29,7 +29,7 @@ CACHE_DOCS_URL = "https://docs.streamlit.io/develop/concepts/architecture/cachin
 def get_cached_func_name_md(func: Any) -> str:
     """Get markdown representation of the function name."""
     if hasattr(func, "__name__"):
-        return "`%s()`" % func.__name__
+        return f"`{func.__name__}()`"
     elif hasattr(type(func), "__name__"):
         return f"`{type(func).__name__}`"
     return f"`{type(func)}`"
@@ -105,9 +105,10 @@ class CacheReplayClosureError(StreamlitAPIException):
 
         msg = (
             f"""
-While running {func_name}, a streamlit element is called on some layout block created outside the function.
-This is incompatible with replaying the cached effect of that element, because the
-the referenced block might not exist when the replay happens.
+While running {func_name}, a streamlit element is called on some layout block
+created outside the function. This is incompatible with replaying the cached
+effect of that element, because the the referenced block might not exist when
+the replay happens.
 
 How to fix this:
 * Move the creation of $THING inside {func_name}.
@@ -124,11 +125,14 @@ class UnserializableReturnValueError(MarkdownFormattedException):
         MarkdownFormattedException.__init__(
             self,
             f"""
-            Cannot serialize the return value (of type {get_return_value_type(return_value)}) in {get_cached_func_name_md(func)}.
-            `st.cache_data` uses [pickle](https://docs.python.org/3/library/pickle.html) to
-            serialize the function’s return value and safely store it in the cache without mutating the original object. Please convert the return value to a pickle-serializable type.
-            If you want to cache unserializable objects such as database connections or Tensorflow
-            sessions, use `st.cache_resource` instead (see [our docs]({CACHE_DOCS_URL}) for differences).""",
+            Cannot serialize the return value (of type {get_return_value_type(return_value)})
+            in {get_cached_func_name_md(func)}. `st.cache_data` uses
+            [pickle](https://docs.python.org/3/library/pickle.html) to serialize the
+            function's return value and safely store it in the cache
+            without mutating the original object. Please convert the return value to a
+            pickle-serializable type. If you want to cache unserializable objects such
+            as database connections or Tensorflow sessions, use `st.cache_resource`
+            instead (see [our docs]({CACHE_DOCS_URL}) for differences).""",
         )
 
 

streamlit/runtime/caching/cache_resource_api.py

@@ -37,13 +37,10 @@ from streamlit.runtime.caching.cache_utils import (
 from streamlit.runtime.caching.cached_message_replay import (
     CachedMessageReplayContext,
     CachedResult,
-    ElementMsgData,
     MsgData,
-    MultiCacheResults,
     show_widget_replay_deprecation,
 )
 from streamlit.runtime.metrics_util import gather_metrics
-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
 
@@ -83,7 +80,6 @@ class ResourceCaches(CacheStatsProvider):
         max_entries: int | float | None,
         ttl: float | timedelta | str | None,
         validate: ValidateFunc | None,
-        allow_widgets: bool,
     ) -> ResourceCache:
         """Return the mem cache for the given key.
 
@@ -114,7 +110,6 @@ class ResourceCaches(CacheStatsProvider):
                 max_entries=max_entries,
                 ttl_seconds=ttl_seconds,
                 validate=validate,
-                allow_widgets=allow_widgets,
             )
             self._function_caches[key] = cache
             return cache
@@ -155,13 +150,11 @@ class CachedResourceFuncInfo(CachedFuncInfo):
         max_entries: int | None,
         ttl: float | timedelta | str | None,
         validate: ValidateFunc | None,
-        allow_widgets: bool,
         hash_funcs: HashFuncsDict | None = None,
     ):
         super().__init__(
             func,
             show_spinner=show_spinner,
-            allow_widgets=allow_widgets,
             hash_funcs=hash_funcs,
         )
         self.max_entries = max_entries
@@ -188,7 +181,6 @@ class CachedResourceFuncInfo(CachedFuncInfo):
             max_entries=self.max_entries,
             ttl=self.ttl,
             validate=self.validate,
-            allow_widgets=self.allow_widgets,
         )
 
 
@@ -315,9 +307,6 @@ class CacheResourceAPI:
 
         experimental_allow_widgets : bool
             Allow widgets to be used in the cached function. Defaults to False.
-            Support for widgets in cached functions is currently experimental.
-            Setting this parameter to True may lead to excessive memory use since the
-            widget value is treated as an additional input parameter to the cache.
 
         hash_funcs : dict or None
             Mapping of types or fully qualified names to hash functions.
@@ -328,8 +317,10 @@ class CacheResourceAPI:
             of how this can be used.
 
         .. deprecated::
-            ``experimental_allow_widgets`` is deprecated and will be removed in
-            a later version.
+            The cached widget replay functionality was removed in 1.38. Please
+            remove the ``experimental_allow_widgets`` parameter from your
+            caching decorators. This parameter will be removed in a future
+            version.
 
         Example
         -------
@@ -426,7 +417,6 @@ class CacheResourceAPI:
                     max_entries=max_entries,
                     ttl=ttl,
                     validate=validate,
-                    allow_widgets=experimental_allow_widgets,
                     hash_funcs=hash_funcs,
                 )
             )
@@ -438,7 +428,6 @@ class CacheResourceAPI:
                 max_entries=max_entries,
                 ttl=ttl,
                 validate=validate,
-                allow_widgets=experimental_allow_widgets,
                 hash_funcs=hash_funcs,
             )
         )
@@ -459,17 +448,15 @@ class ResourceCache(Cache):
         ttl_seconds: float,
         validate: ValidateFunc | None,
         display_name: str,
-        allow_widgets: bool,
     ):
         super().__init__()
         self.key = key
         self.display_name = display_name
-        self._mem_cache: TTLCache[str, MultiCacheResults] = TTLCache(
+        self._mem_cache: TTLCache[str, CachedResult] = TTLCache(
             maxsize=max_entries, ttl=ttl_seconds, timer=cache_utils.TTLCACHE_TIMER
         )
         self._mem_cache_lock = threading.Lock()
         self.validate = validate
-        self.allow_widgets = allow_widgets
 
     @property
     def max_entries(self) -> float:
@@ -488,24 +475,11 @@ class ResourceCache(Cache):
                 # key does not exist in cache.
                 raise CacheKeyNotFoundError()
 
-            multi_results: MultiCacheResults = self._mem_cache[key]
-
-            ctx = get_script_run_ctx()
-            if not ctx:
-                # ScriptRunCtx does not exist (we're probably running in "raw" mode).
-                raise CacheKeyNotFoundError()
-
-            widget_key = multi_results.get_current_widget_key(ctx, CacheType.RESOURCE)
-            if widget_key not in multi_results.results:
-                # widget_key does not exist in cache (this combination of widgets hasn't been
-                # seen for the value_key yet).
-                raise CacheKeyNotFoundError()
-
-            result = multi_results.results[widget_key]
+            result = self._mem_cache[key]
 
             if self.validate is not None and not self.validate(result.value):
                 # Validate failed: delete the entry and raise an error.
-                del multi_results.results[widget_key]
+                del self._mem_cache[key]
                 raise CacheKeyNotFoundError()
 
             return result
@@ -513,33 +487,11 @@ class ResourceCache(Cache):
     @gather_metrics("_cache_resource_object")
     def write_result(self, key: str, value: Any, messages: list[MsgData]) -> None:
         """Write a value and associated messages to the cache."""
-        ctx = get_script_run_ctx()
-        if ctx is None:
-            return
-
         main_id = st._main.id
         sidebar_id = st.sidebar.id
-        if self.allow_widgets:
-            widgets = {
-                msg.widget_metadata.widget_id
-                for msg in messages
-                if isinstance(msg, ElementMsgData) and msg.widget_metadata is not None
-            }
-        else:
-            widgets = set()
 
         with self._mem_cache_lock:
-            try:
-                multi_results = self._mem_cache[key]
-            except KeyError:
-                multi_results = MultiCacheResults(widget_ids=widgets, results={})
-
-            multi_results.widget_ids.update(widgets)
-            widget_key = multi_results.get_current_widget_key(ctx, CacheType.RESOURCE)
-
-            result = CachedResult(value, messages, main_id, sidebar_id)
-            multi_results.results[widget_key] = result
-            self._mem_cache[key] = multi_results
+            self._mem_cache[key] = CachedResult(value, messages, main_id, sidebar_id)
 
     def _clear(self, key: str | None = None) -> None:
         with self._mem_cache_lock:

streamlit/runtime/caching/cache_utils.py

@@ -16,6 +16,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import functools
 import hashlib
 import inspect
@@ -125,12 +126,10 @@ class CachedFuncInfo:
         self,
         func: FunctionType,
         show_spinner: bool | str,
-        allow_widgets: bool,
         hash_funcs: HashFuncsDict | None,
     ):
         self.func = func
         self.show_spinner = show_spinner
-        self.allow_widgets = allow_widgets
         self.hash_funcs = hash_funcs
 
     @property
@@ -230,11 +229,9 @@ class CachedFunc:
             hash_funcs=self._info.hash_funcs,
         )
 
-        try:
+        with contextlib.suppress(CacheKeyNotFoundError):
             cached_result = cache.read_result(value_key)
             return self._handle_cache_hit(cached_result)
-        except CacheKeyNotFoundError:
-            pass
         return self._handle_cache_miss(cache, value_key, func_args, func_kwargs)
 
     def _handle_cache_hit(self, result: CachedResult) -> Any:
@@ -279,17 +276,14 @@ class CachedFunc:
             # We've acquired the lock - but another thread may have acquired it first
             # and already computed the value. So we need to test for a cache hit again,
             # before computing.
-            try:
+            with contextlib.suppress(CacheKeyNotFoundError):
                 cached_result = cache.read_result(value_key)
                 # Another thread computed the value before us. Early exit!
                 return self._handle_cache_hit(cached_result)
 
-            except CacheKeyNotFoundError:
-                pass
-
             # We acquired the lock before any other thread. Compute the value!
             with self._info.cached_message_replay_ctx.calling_cached_function(
-                self._info.func, self._info.allow_widgets
+                self._info.func
             ):
                 computed_value = self._info.func(*func_args, **func_kwargs)
 
@@ -329,8 +323,10 @@ class CachedFunc:
 
         Parameters
         ----------
+
         *args: Any
             Arguments of the cached functions.
+
         **kwargs: Any
             Keyword arguments of the cached function.
 
@@ -471,8 +467,7 @@ def _make_function_key(cache_type: CacheType, func: FunctionType) -> str:
         source_code, hasher=func_hasher, cache_type=cache_type, hash_source=func
     )
 
-    cache_key = func_hasher.hexdigest()
-    return cache_key
+    return func_hasher.hexdigest()
 
 
 def _get_positional_arg_name(func: FunctionType, arg_index: int) -> str | None: