Merge branch 'main' into bookmark-chat

Author: schloerke

shiny/_main.py

@@ -359,6 +359,32 @@ def run_app(
 
     reload_args: ReloadArgs = {}
     if reload:
+        if shiny_bookmarks_folder_name in reload_excludes:
+            # Related: https://github.com/posit-dev/py-shiny/pull/1950
+            #
+            # Temp hack to work around uvicorn
+            # https://github.com/encode/uvicorn/pull/2602 which will incorrectly reload
+            # an app if any matching files in `RELOAD_INCLUDES_DEFAULT` (e.g. `*.png`)
+            # are uploaded within `shiny_bookmarks` (an excluded relative directory).
+            #
+            # By extending `reload_excludes` to ignore everything under the bookmarks folder, we
+            # can prevent the unexpected reload from happening for the root session. File
+            # matches are performed via `pathlib.PurePath.match`, which is a right-match and
+            # only supports `*` glob.
+            #
+            # Ignore up to five modules deep. This should cover most cases.
+            #
+            # Note: file uploads are always in the root session, so they are always
+            # stored in the root bookmark dir of `shiny_bookmarks_folder_name / *`.
+            reload_excludes = [
+                *reload_excludes,
+                str(Path(shiny_bookmarks_folder_name) / "*"),
+                str(Path(shiny_bookmarks_folder_name) / "*" / "*"),
+                str(Path(shiny_bookmarks_folder_name) / "*" / "*" / "*"),
+                str(Path(shiny_bookmarks_folder_name) / "*" / "*" / "*" / "*"),
+                str(Path(shiny_bookmarks_folder_name) / "*" / "*" / "*" / "*" / "*"),
+            ]
+
         reload_args = {
             "reload": reload,
             # Adding `reload_includes` param while `reload=False` produces an warning

shiny/api-examples/notification_show/app-core.py

@@ -14,7 +14,6 @@ def server(input: Inputs, output: Outputs, session: Session):
     @reactive.effect
     @reactive.event(input.show)
     def _():
-        nonlocal ids
         nonlocal n
         # Save the ID for removal later
         id = ui.notification_show("Message " + str(n), duration=None)
@@ -24,7 +23,6 @@ def _():
     @reactive.effect
     @reactive.event(input.remove)
     def _():
-        nonlocal ids
         if ids:
             ui.notification_remove(ids.pop())
 

shiny/api-examples/notification_show/app-express.py

@@ -11,7 +11,6 @@
 @reactive.effect
 @reactive.event(input.show)
 def _():
-    global ids
     global n
     # Save the ID for removal later
     id = ui.notification_show("Message " + str(n), duration=None)
@@ -22,6 +21,5 @@ def _():
 @reactive.effect
 @reactive.event(input.remove)
 def _():
-    global ids
     if ids:
         ui.notification_remove(ids.pop())

shiny/bookmark/_bookmark.py

@@ -610,7 +610,8 @@ async def _scoped_on_bookmark(self, root_state: BookmarkState) -> None:
         )
 
         # Make subdir for scope
-        # TODO: Barret; Is this for uploaded files?!?
+        #
+        # Folder only used by author callbacks. File uploads are handled by root session
         if root_state.dir is not None:
             scope_subpath = self._ns
             scoped_state.dir = Path(root_state.dir) / scope_subpath

tests/pytest/test_reactives.py

@@ -235,15 +235,13 @@ async def test_async_sequential():
     async def react_chain(n: int):
         @calc()
         async def r():
-            nonlocal exec_order
             exec_order.append(f"r{n}-1")
             await asyncio.sleep(0)
             exec_order.append(f"r{n}-2")
             return x() + 10
 
         @effect()
         async def _():
-            nonlocal exec_order
             exec_order.append(f"o{n}-1")
             await asyncio.sleep(0)
             exec_order.append(f"o{n}-2")
@@ -402,19 +400,16 @@ async def test_effect_priority():
 
     @effect(priority=1)
     def o1():
-        nonlocal results
         v()
         results.append(1)
 
     @effect(priority=2)
     def o2():
-        nonlocal results
         v()
         results.append(2)
 
     @effect(priority=1)
     def o3():
-        nonlocal results
         v()
         results.append(3)
 
@@ -425,7 +420,6 @@ def o3():
     # invalidate others by changing v).
     @effect(priority=2)
     def o4():
-        nonlocal results
         v()
         results.append(4)
 
@@ -453,19 +447,16 @@ async def test_async_effect_priority():
 
     @effect(priority=1)
     async def o1():
-        nonlocal results
         v()
         results.append(1)
 
     @effect(priority=2)
     async def o2():
-        nonlocal results
         v()
         results.append(2)
 
     @effect(priority=1)
     async def o3():
-        nonlocal results
         v()
         results.append(3)
 
@@ -476,7 +467,6 @@ async def o3():
     # invalidate others by changing v).
     @effect(priority=2)
     async def o4():
-        nonlocal results
         v()
         results.append(4)
 
@@ -506,7 +496,6 @@ async def test_effect_destroy():
 
     @effect()
     def o1():
-        nonlocal results
         v()
         results.append(1)
 
@@ -524,7 +513,6 @@ def o1():
 
     @effect()
     def o2():
-        nonlocal results
         v()
         results.append(1)