streamlit-nightly 1.36.1.dev20240723__py2.py3-none-any.whl → 1.36.1.dev20240724__py2.py3-none-any.whl

streamlit/runtime/caching/cache_utils.py

@@ -157,21 +157,25 @@ def make_cached_func_wrapper(info: CachedFuncInfo) -> Callable[..., Any]:
     some or all of the wrapper's cached values.
     """
     cached_func = CachedFunc(info)
+    return functools.update_wrapper(cached_func, info.func)
 
-    # We'd like to simply return `cached_func`, which is already a Callable.
-    # But using `functools.update_wrapper` on the CachedFunc instance
-    # itself results in errors when our caching decorators are used to decorate
-    # member functions. (See https://github.com/streamlit/streamlit/issues/6109)
 
-    @functools.wraps(info.func)
-    def wrapper(*args, **kwargs):
-        return cached_func(*args, **kwargs)
+class BoundCachedFunc:
+    """A wrapper around a CachedFunc that binds it to a specific instance in case of
+    decorated function is a class method."""
 
-    # Give our wrapper its `clear` function.
-    # (This results in a spurious mypy error that we suppress.)
-    wrapper.clear = cached_func.clear  # type: ignore
+    def __init__(self, cached_func: CachedFunc, instance: Any):
+        self._cached_func = cached_func
+        self._instance = instance
 
-    return wrapper
+    def __call__(self, *args, **kwargs) -> Any:
+        return self._cached_func(self._instance, *args, **kwargs)
+
+    def __repr__(self):
+        return f"<BoundCachedFunc: {self._cached_func._info.func} of {self._instance}>"
+
+    def clear(self, *args, **kwargs):
+        self._cached_func.clear(self._instance, *args, **kwargs)
 
 
 class CachedFunc:
@@ -179,6 +183,16 @@ class CachedFunc:
         self._info = info
         self._function_key = _make_function_key(info.cache_type, info.func)
 
+    def __repr__(self):
+        return f"<CachedFunc: {self._info.func}>"
+
+    def __get__(self, instance, owner=None):
+        """CachedFunc implements descriptor protocol to support cache methods."""
+        if instance is None:
+            return self
+
+        return functools.update_wrapper(BoundCachedFunc(self, instance), self)
+
     def __call__(self, *args, **kwargs) -> Any:
         """The wrapper. We'll only call our underlying function on a cache miss."""
 

{streamlit_nightly-1.36.1.dev20240723.dist-info → streamlit_nightly-1.36.1.dev20240724.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: streamlit-nightly
-Version: 1.36.1.dev20240723
+Version: 1.36.1.dev20240724
 Summary: A faster way to build and share data apps
 Home-page: https://streamlit.io
 Author: Snowflake Inc

{streamlit_nightly-1.36.1.dev20240723.dist-info → streamlit_nightly-1.36.1.dev20240724.dist-info}/RECORD

@@ -319,7 +319,7 @@ streamlit/runtime/caching/cache_data_api.py,sha256=dodSmj-Zpp2GnfFFBNyP6YgkTHdLy
 streamlit/runtime/caching/cache_errors.py,sha256=0yMPp7XhePilU91rIYu_XEuKnv6qeixW5a_YirpHWS8,4760
 streamlit/runtime/caching/cache_resource_api.py,sha256=dD4wYxwggVegL4iLZWZShZn6X8TDNLmU8CShpsFX8s8,20975
 streamlit/runtime/caching/cache_type.py,sha256=P21JWouFWU0qXQyHbM3y3A1pLZud90ALGeO4bQ5Pvew,1131
-streamlit/runtime/caching/cache_utils.py,sha256=kzA83MTakvm4PlS4gvYTJ-oBwkQRAzIryMadjnLDgB0,18255
+streamlit/runtime/caching/cache_utils.py,sha256=a36_4CWezuCR4okG7CHOaVWszImKmZq8XVre8IZMfsY,18673
 streamlit/runtime/caching/cached_message_replay.py,sha256=20lsH6isxIr6Mpixywj-_I6ltFDD_NX4MnmWia4LRVA,17973
 streamlit/runtime/caching/hashing.py,sha256=05cvu9x_KV2pQp8pisH_mTIL0pqbBhobf3HZWVpNT6w,18988
 streamlit/runtime/caching/legacy_cache_api.py,sha256=Jw1JoQeYN-A7Fjn7KJmq8dy0oFuBX6WtUXNqO0KsSdg,6033
@@ -536,9 +536,9 @@ streamlit/web/server/server_util.py,sha256=C3M971XFoEXTMufQLwHbZdtZOE30nWx-2WiXm
 streamlit/web/server/stats_request_handler.py,sha256=47nQHe4ETsO9QS9FAEUF8rZigU_k5eACJZw4-jc8U6c,3684
 streamlit/web/server/upload_file_request_handler.py,sha256=ftyKpARrUjOpRcFETIXuoTyOG_mo-ToOw5NI0y_W4lE,5003
 streamlit/web/server/websocket_headers.py,sha256=xkmLm7-WyXyQM8fW-NuURBnD_rmQaiO3oBlu6woF71w,2207
-streamlit_nightly-1.36.1.dev20240723.data/scripts/streamlit.cmd,sha256=ZEYM3vBJSp-k7vwSJ3ba5NzEk9-qHdSeLvGYAAe1mMw,676
-streamlit_nightly-1.36.1.dev20240723.dist-info/METADATA,sha256=-gC1d0_abFV2HpPt34kkSldwxEjl4Fbo9DUNjniS5v4,8531
-streamlit_nightly-1.36.1.dev20240723.dist-info/WHEEL,sha256=ANi2y8tYx-p70pj7MSdqQMJNFJEUgAOyfPpHzqz0w84,109
-streamlit_nightly-1.36.1.dev20240723.dist-info/entry_points.txt,sha256=uNJ4DwGNXEhOK0USwSNanjkYyR-Bk7eYQbJFDrWyOgY,53
-streamlit_nightly-1.36.1.dev20240723.dist-info/top_level.txt,sha256=V3FhKbm7G2LnR0s4SytavrjIPNIhvcsAGXfYHAwtQzw,10
-streamlit_nightly-1.36.1.dev20240723.dist-info/RECORD,,
+streamlit_nightly-1.36.1.dev20240724.data/scripts/streamlit.cmd,sha256=ZEYM3vBJSp-k7vwSJ3ba5NzEk9-qHdSeLvGYAAe1mMw,676
+streamlit_nightly-1.36.1.dev20240724.dist-info/METADATA,sha256=OmqrsMmpEZrL0eJw7nFhsViweOFH2ep4eqLYJFvIt9I,8531
+streamlit_nightly-1.36.1.dev20240724.dist-info/WHEEL,sha256=ANi2y8tYx-p70pj7MSdqQMJNFJEUgAOyfPpHzqz0w84,109
+streamlit_nightly-1.36.1.dev20240724.dist-info/entry_points.txt,sha256=uNJ4DwGNXEhOK0USwSNanjkYyR-Bk7eYQbJFDrWyOgY,53
+streamlit_nightly-1.36.1.dev20240724.dist-info/top_level.txt,sha256=V3FhKbm7G2LnR0s4SytavrjIPNIhvcsAGXfYHAwtQzw,10
+streamlit_nightly-1.36.1.dev20240724.dist-info/RECORD,,