Merge branch 'main' into datagrid-empty-column

Author: schloerke

CHANGELOG.md

@@ -9,7 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## New features
 
-* Both `ui.Chat()` and `ui.MarkdownStream()` now support arbirary Shiny UI elements inside of messages. This allows for gathering input from the user (e.g., `ui.input_select()`), displaying of rich output (e.g., `render.DataGrid()`), and more. (#1868)
+* Added support for bookmarking Shiny applications. Bookmarking allows users to save the current state of an application and return to it later. This feature is available in both Shiny Core and Shiny Express. (#1870, #1915, #1919, #1920, #1922, #1934, #1938, #1945, #1955)
+  * To enable bookmarking in Express mode, set `shiny.express.app_opts(bookmark_store=)` during the app's initial construction.
+  * To enable bookmarking in Core mode, set `shiny.App(bookmark_store=)` when constructing the `app` object.
+
+* Added a new `.enable_bookmarking(client)` method to `ui.Chat()`. This method will attach bookmark hooks to save and restore the chat's messages and client state. (#1951, #1954)
+
+* Both `ui.Chat()` and `ui.MarkdownStream()` now support the inclusion of Shiny UI elements inside of messages. This allows for gathering input from the user (e.g., `ui.input_select()`), displaying of rich output (e.g., `render.DataGrid()`), and more. (#1868)
 
 * Added a new `.message_stream_context()` method to `ui.Chat()`. This context manager is a useful alternative to `.append_message_stream()` when you want to: (1) Nest a stream within another and/or
 (2) Overwrite/replace streaming content. (#1906)

pyproject.toml

@@ -120,6 +120,7 @@ dev = [
     "langsmith<0.3",
     "openai",
     "ollama",
+    "chatlas>=0.6.1",
     "tokenizers",
     "aiohttp",
     "beautifulsoup4",
@@ -134,9 +135,6 @@ doc = [
     "griffe>=1.3.2",
 ]
 
-[tool.uv.sources]
-# https://github.com/encode/uvicorn/pull/2602
-uvicorn = { git = "https://github.com/schloerke/uvicorn", branch = "reload-exclude-abs-path" }
 
 [project.urls]
 Homepage = "https://github.com/posit-dev/py-shiny"

shiny/_app.py

@@ -30,7 +30,6 @@
 from ._error import ErrorMiddleware
 from ._shinyenv import is_pyodide
 from ._utils import guess_mime_type, is_async_callable, sort_keys_length
-from .bookmark import _global as bookmark_global_state
 from .bookmark._global import as_bookmark_dir_fn
 from .bookmark._restore_state import RestoreContext, restore_context
 from .bookmark._types import (
@@ -42,6 +41,7 @@
 from .html_dependencies import jquery_deps, require_deps, shiny_deps
 from .http_staticfiles import FileResponse, StaticFiles
 from .session._session import AppSession, Inputs, Outputs, Session, session_context
+from .types import MISSING, MISSING_TYPE
 
 T = TypeVar("T")
 
@@ -115,8 +115,8 @@ def server(input: Inputs, output: Outputs, session: Session):
     ui: RenderedHTML | Callable[[Request], Tag | TagList]
     server: Callable[[Inputs, Outputs, Session], None]
 
-    _bookmark_save_dir_fn: BookmarkSaveDirFn | None
-    _bookmark_restore_dir_fn: BookmarkRestoreDirFn | None
+    _bookmark_save_dir_fn: BookmarkSaveDirFn | None | MISSING_TYPE
+    _bookmark_restore_dir_fn: BookmarkRestoreDirFn | None | MISSING_TYPE
     _bookmark_store: BookmarkStore
 
     def __init__(
@@ -498,8 +498,8 @@ def _render_page_from_file(self, file: Path, lib_prefix: str) -> RenderedHTML:
     # ==========================================================================
 
     def _init_bookmarking(self, *, bookmark_store: BookmarkStore, ui: Any) -> None:
-        self._bookmark_save_dir_fn = bookmark_global_state.bookmark_save_dir
-        self._bookmark_restore_dir_fn = bookmark_global_state.bookmark_restore_dir
+        self._bookmark_save_dir_fn = MISSING
+        self._bookmark_restore_dir_fn = MISSING
         self._bookmark_store = bookmark_store
 
         if bookmark_store != "disable" and not callable(ui):

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

shiny/bookmark/_global.py

@@ -3,20 +3,44 @@
 from typing import overload
 
 from .._utils import wrap_async
+from ..types import MISSING_TYPE
 from ._types import (
     BookmarkDirFn,
     BookmarkDirFnAsync,
     BookmarkRestoreDirFn,
     BookmarkSaveDirFn,
 )
 
-# WARNING! This file contains global state!
+# WARNING! This file contains global default values!
+
+
 # During App initialization, the save_dir and restore_dir functions are conventionally set
 # to read-only on the App.
+# If nothing is set on the `app` object, the global default bookmark functions are found and used during every save/restore.
+_default_bookmark_save_dir_fn: BookmarkSaveDirFn | None = None
+_default_bookmark_restore_dir_fn: BookmarkRestoreDirFn | None = None
+
+
+def get_bookmark_save_dir_fn(
+    save_dir_fn: BookmarkSaveDirFn | None | MISSING_TYPE,
+) -> BookmarkSaveDirFn | None:
+    if isinstance(save_dir_fn, MISSING_TYPE):
+        # Allow for default bookmark function to be utilized after app initialization.
+        # Sometimes the app is created before hooks are registered.
+        return _default_bookmark_save_dir_fn
+    else:
+        return save_dir_fn
 
 
-bookmark_save_dir: BookmarkSaveDirFn | None = None
-bookmark_restore_dir: BookmarkRestoreDirFn | None = None
+def get_bookmark_restore_dir_fn(
+    restore_dir_fn: BookmarkRestoreDirFn | None | MISSING_TYPE,
+) -> BookmarkRestoreDirFn | None:
+    if isinstance(restore_dir_fn, MISSING_TYPE):
+        # Allow for default bookmark function to be utilized after app initialization.
+        # Sometimes the app is created before hooks are registered.
+        return _default_bookmark_restore_dir_fn
+    else:
+        return restore_dir_fn
 
 
 @overload
@@ -74,9 +98,9 @@ def restore_bookmark_dir(id: str) -> Path:
     --------
     * `~shiny.bookmark.set_global_restore_dir_fn` : Set the global bookmark restore directory function
     """
-    global bookmark_save_dir
+    global _default_bookmark_save_dir_fn
 
-    bookmark_save_dir = as_bookmark_dir_fn(fn)
+    _default_bookmark_save_dir_fn = as_bookmark_dir_fn(fn)
     return fn
 
 
@@ -118,7 +142,7 @@ def restore_bookmark_dir(id: str) -> Path:
     --------
     * `~shiny.bookmark.set_global_save_dir_fn` : Set the global bookmark save directory function.
     """
-    global bookmark_restore_dir
+    global _default_bookmark_restore_dir_fn
 
-    bookmark_restore_dir = as_bookmark_dir_fn(fn)
+    _default_bookmark_restore_dir_fn = as_bookmark_dir_fn(fn)
     return fn

shiny/bookmark/_restore_state.py

@@ -10,6 +10,7 @@
 from .._docstring import add_example
 from ..module import ResolvedId
 from ._bookmark_state import local_restore_dir
+from ._global import get_bookmark_restore_dir_fn
 from ._types import BookmarkRestoreDirFn
 from ._utils import from_json_file, from_json_str, in_shiny_server
 
@@ -189,7 +190,9 @@ async def _load_state_qs(self, query_string: str, *, app: App) -> None:
 
         id = id[0]
 
-        load_bookmark_fn: BookmarkRestoreDirFn | None = app._bookmark_restore_dir_fn
+        load_bookmark_fn: BookmarkRestoreDirFn | None = get_bookmark_restore_dir_fn(
+            app._bookmark_restore_dir_fn
+        )
 
         if load_bookmark_fn is None:
             if in_shiny_server():

shiny/bookmark/_save_state.py

@@ -7,6 +7,7 @@
 from .._utils import private_random_id
 from ..reactive import isolate
 from ._bookmark_state import local_save_dir
+from ._global import get_bookmark_save_dir_fn
 from ._types import BookmarkSaveDirFn
 from ._utils import in_shiny_server, to_json_file, to_json_str
 
@@ -66,7 +67,9 @@ async def _save_state(self, *, app: App) -> str:
         # to `self.dir`.
 
         # This will be defined by the hosting environment if it supports bookmarking.
-        save_bookmark_fn: BookmarkSaveDirFn | None = app._bookmark_save_dir_fn
+        save_bookmark_fn: BookmarkSaveDirFn | None = get_bookmark_save_dir_fn(
+            app._bookmark_save_dir_fn
+        )
 
         if save_bookmark_fn is None:
             if in_shiny_server():