streamlit-nightly 1.36.1.dev20240722__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/runtime/scriptrunner/magic.py

@@ -15,6 +15,7 @@
 from __future__ import annotations
 
 import ast
+import sys
 from typing import Any, Final
 
 from streamlit import config
@@ -46,10 +47,12 @@ def add_magic(code: str, script_path: str) -> Any:
 
     file_ends_in_semicolon = _does_file_end_in_semicolon(tree, code)
 
-    return _modify_ast_subtree(
+    _modify_ast_subtree(
         tree, is_root=True, file_ends_in_semicolon=file_ends_in_semicolon
     )
 
+    return tree
+
 
 def _modify_ast_subtree(
     tree: Any,
@@ -65,19 +68,25 @@ def _modify_ast_subtree(
         node_type = type(node)
 
         # Recursively parses the content of the statements
-        # `with`, `for` and `while`, as well as function definitions.
+        # `with` as well as function definitions.
         # Also covers their async counterparts
         if (
             node_type is ast.FunctionDef
             or node_type is ast.With
-            or node_type is ast.For
-            or node_type is ast.While
             or node_type is ast.AsyncFunctionDef
             or node_type is ast.AsyncWith
-            or node_type is ast.AsyncFor
         ):
             _modify_ast_subtree(node)
 
+        # Recursively parses the content of the statements
+        # `for` and `while`.
+        # Also covers their async counterparts
+        elif (
+            node_type is ast.For or node_type is ast.While or node_type is ast.AsyncFor
+        ):
+            _modify_ast_subtree(node)
+            _modify_ast_subtree(node, "orelse")
+
         # Recursively parses methods in a class.
         elif node_type is ast.ClassDef:
             for inner_node in node.body:
@@ -86,12 +95,14 @@ def _modify_ast_subtree(
 
         # Recursively parses the contents of try statements,
         # all their handlers (except and else) and the finally body
-        elif node_type is ast.Try:
-            for j, inner_node in enumerate(node.handlers):
-                node.handlers[j] = _modify_ast_subtree(inner_node)
-            finally_node = _modify_ast_subtree(node, body_attr="finalbody")
-            node.finalbody = finally_node.finalbody
+        elif node_type is ast.Try or (
+            sys.version_info >= (3, 11) and node_type is ast.TryStar
+        ):
             _modify_ast_subtree(node)
+            _modify_ast_subtree(node, body_attr="finalbody")
+            _modify_ast_subtree(node, body_attr="orelse")
+            for handler_node in node.handlers:
+                _modify_ast_subtree(handler_node)
 
         # Recursively parses if blocks, as well as their else/elif blocks
         # (else/elif are both mapped to orelse)
@@ -100,6 +111,10 @@ def _modify_ast_subtree(
             _modify_ast_subtree(node)
             _modify_ast_subtree(node, "orelse")
 
+        elif sys.version_info >= (3, 10) and node_type is ast.Match:
+            for case_node in node.cases:
+                _modify_ast_subtree(case_node)
+
         # Convert standalone expression nodes to st.write
         elif node_type is ast.Expr:
             value = _get_st_write_from_expr(
@@ -119,8 +134,6 @@ def _modify_ast_subtree(
 
     ast.fix_missing_locations(tree)
 
-    return tree
-
 
 def _insert_import_statement(tree: Any) -> None:
     """Insert Streamlit import statement at the top(ish) of the tree."""

streamlit/static/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.29bca1b5.css",
-    "main.js": "./static/js/main.35bc5645.js",
+    "main.js": "./static/js/main.94c2fada.js",
     "static/js/9336.3e046ad7.chunk.js": "./static/js/9336.3e046ad7.chunk.js",
     "static/js/9330.2b4c99e0.chunk.js": "./static/js/9330.2b4c99e0.chunk.js",
     "static/js/2736.7d516fcc.chunk.js": "./static/js/2736.7d516fcc.chunk.js",
@@ -152,6 +152,6 @@
   },
   "entrypoints": [
     "static/css/main.29bca1b5.css",
-    "static/js/main.35bc5645.js"
+    "static/js/main.94c2fada.js"
   ]
 }

streamlit/static/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><link rel="shortcut icon" href="./favicon.png"/><link rel="preload" href="./static/media/SourceSansPro-Regular.0d69e5ff5e92ac64a0c9.woff2" as="font" type="font/woff2" crossorigin><link rel="preload" href="./static/media/SourceSansPro-SemiBold.abed79cd0df1827e18cf.woff2" as="font" type="font/woff2" crossorigin><link rel="preload" href="./static/media/SourceSansPro-Bold.118dea98980e20a81ced.woff2" as="font" type="font/woff2" crossorigin><title>Streamlit</title><script>window.prerenderReady=!1</script><script defer="defer" src="./static/js/main.35bc5645.js"></script><link href="./static/css/main.29bca1b5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><link rel="shortcut icon" href="./favicon.png"/><link rel="preload" href="./static/media/SourceSansPro-Regular.0d69e5ff5e92ac64a0c9.woff2" as="font" type="font/woff2" crossorigin><link rel="preload" href="./static/media/SourceSansPro-SemiBold.abed79cd0df1827e18cf.woff2" as="font" type="font/woff2" crossorigin><link rel="preload" href="./static/media/SourceSansPro-Bold.118dea98980e20a81ced.woff2" as="font" type="font/woff2" crossorigin><title>Streamlit</title><script>window.prerenderReady=!1</script><script defer="defer" src="./static/js/main.94c2fada.js"></script><link href="./static/css/main.29bca1b5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>