Merge branch 'main' into add-bookmarking-layouts

Author: karangattu

CHANGELOG.md

@@ -11,18 +11,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * 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 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)
+
 ### Changes
 
 * Express mode's `app_opts()` requires all arguments to be keyword-only. If you are using positional arguments, you will need to update your code. (#1895)
 
 * The `.get_latest_stream_result()` method on `ui.MarkdownStream()` was deprecated in favor of the new `.latest_stream` property. Call `.result()` on the property to get the latest result, `.status` to check the status, and `.cancel()` to cancel the stream.
 
+* `MarkdownStream()` now has a default maximum width of `680px` for better readability. Also, similar to `Chat()`, it now also horizontally centers itself. (#1944)
+
+* `ui.page_navbar()` and `ui.navset_bar()` now correctly apply `theme` and additional attributes from `navbar_options` created with `ui.navbar_options()`. (#1942)
+
 ### Bug fixes
 
 * Fixed an issue where the `<main>` areas of `ui.page_sidebar()` and `ui.page_navbar()` (with a `sidebar`) were made to be a fillable containers even when `fillable=False`. (#1816)
 
 * Fixed an issue where the `.update_user_input()` method on `ui.Chat()` isn't working in shinylive.  (#1891)
 
+* Fixed an issue where `width` and `height` on `MarkdownStream()` were not working as intended. (#1944)
+
 * Fixed an issue with the `.click()` method on InputActionButton controllers in `shiny.playwright.controllers` where the method would not work as expected. (#1886)
 
 ## [1.3.0] - 2025-03-03
@@ -59,12 +68,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking changes
 
-* The navbar-related style options of `ui.page_navbar()` and `ui.navset_bar()` have been consolidated into a single `navbar_options` argument that pairs with a new `ui.navbar_options()` helper. Using the direct `position`, `bg`, `inverse`, `collapsible`, and `underline` arguments will continue to work with a deprecation message.
+* The navbar-related style options of `ui.page_navbar()` and `ui.navset_bar()` have been consolidated into a single `navbar_options` argument that pairs with a new `ui.navbar_options()` helper. Using the direct `position`, `bg`, `inverse`, `collapsible`, and `underline` arguments will continue to work with a deprecation message. (#1822)
 
   Related to this change, `ui.navset_bar()` now defaults to using `underline=True` so that it uses the same set of default `ui.navbar_options()` as the page variant. In `ui.navbar_options()`, `inverse` is replaced by `theme`, which takes values `"light"` (dark text on a **light** background), `"dark"` (light text on a **dark** background), or `"auto"` (follow page settings).
 
-* The Shiny Core component `shiny.ui.Chat()` no longer has a `.ui()` method. This method
-was never intended to be used in Shiny Core (in that case, use `shiny.ui.chat_ui()`) to create the UI element. Note that the `shiny.express.ui.Chat()` class still has a `.ui()` method. (#1840)
+* The Shiny Core component `shiny.ui.Chat()` no longer has a `.ui()` method. This method was never intended to be used in Shiny Core (in that case, use `shiny.ui.chat_ui()`) to create the UI element. Note that the `shiny.express.ui.Chat()` class still has a `.ui()` method. (#1840)
 
 ### Bug fixes
 

js/chat/chat.scss

@@ -145,7 +145,8 @@ shiny-chat-input {
 
   margin-top: calc(-1 * var(--_input-padding-top));
   position: sticky;
-  bottom: calc(-1 * var(--_input-padding-bottom));
+  bottom: calc(-1 * var(--_input-padding-bottom) + 4px);
+  // 4px: autoscroll adds 2px to height, this keeps input from wiggling when scrolling on top of chat
   padding-block: var(--_input-padding-top) var(--_input-padding-bottom);
 
   textarea {

js/markdown-stream/markdown-stream.scss

@@ -6,6 +6,10 @@
   @include highlight_styles.atom_one_dark;
 }
 
+shiny-markdown-stream {
+  display: block;
+}
+
 /*
   Styling for the code-copy button (inspired by Quarto's code-copy feature)
 */
@@ -68,7 +72,8 @@ pre:has(.code-copy-button) {
 .markdown-stream-dot {
   // The stream dot is appended with each streaming chunk update, so the pulse animation
   // only shows up when streaming pauses but isn't complete.
-  animation: markdown-stream-dot-pulse 2s infinite cubic-bezier(0.18, 0.89, 0.32, 1.28);
+  animation: markdown-stream-dot-pulse 1.75s infinite cubic-bezier(0.18, 0.89, 0.32, 1.28);
+  animation-delay: 250ms;
   display: inline-block;
   transform-origin: center;
 }

shiny/_main_create.py

@@ -223,10 +223,6 @@ def apps(self) -> list[ShinyTemplate]:
     def packages(self) -> list[ShinyTemplate]:
         return self._templates("templates/package")
 
-    @property
-    def chat_starters(self) -> list[ShinyTemplate]:
-        return self._templates("templates/chat/starters")
-
     @property
     def chat_llms(self) -> list[ShinyTemplate]:
         return self._templates("templates/chat/llms")
@@ -235,6 +231,14 @@ def chat_llms(self) -> list[ShinyTemplate]:
     def chat_enterprise(self) -> list[ShinyTemplate]:
         return self._templates("templates/chat/llm-enterprise")
 
+    @property
+    def stream_llms(self) -> list[ShinyTemplate]:
+        return self._templates("templates/markdown-stream/llms")
+
+    @property
+    def stream_enterprise(self) -> list[ShinyTemplate]:
+        return self._templates("templates/markdown-stream/llm-enterpise")
+
 
 shiny_internal_templates = ShinyInternalTemplates()
 
@@ -261,15 +265,16 @@ def use_internal_template(
 
     app_templates = shiny_internal_templates.apps
     pkg_templates = shiny_internal_templates.packages
-    chat_templates = [
-        *shiny_internal_templates.chat_starters,
+    gen_ai_templates = [
         *shiny_internal_templates.chat_llms,
         *shiny_internal_templates.chat_enterprise,
+        *shiny_internal_templates.stream_llms,
+        *shiny_internal_templates.stream_enterprise,
     ]
 
     menu_choices = [
+        Choice(title="Generative AI...", value="_gen-ai"),
         Choice(title="Custom JavaScript component...", value="_js-component"),
-        Choice(title="Chat component templates...", value="_chat"),
         Choice(
             title="Choose from the Shiny Templates website", value="_external-gallery"
         ),
@@ -279,7 +284,7 @@ def use_internal_template(
         question_state = question_choose_template(app_templates, *menu_choices)
 
     template = template_by_name(
-        [*app_templates, *pkg_templates, *chat_templates], question_state
+        [*app_templates, *pkg_templates, *gen_ai_templates], question_state
     )
 
     if template is not None:
@@ -302,8 +307,8 @@ def use_internal_template(
         sys.exit(0)
     elif question_state == "_js-component":
         use_internal_package_template(dest_dir=dest_dir, package_name=package_name)
-    elif question_state == "_chat":
-        use_internal_chat_ai_template(dest_dir=dest_dir, package_name=package_name)
+    elif question_state == "_gen-ai":
+        use_internal_gen_ai_template(dest_dir=dest_dir, package_name=package_name)
     else:
         valid_choices = [t.id for t in app_templates + pkg_templates]
         if question_state not in valid_choices:
@@ -345,18 +350,24 @@ def use_internal_package_template(
     package_template_questions(template, dest_dir=dest_dir, package_name=package_name)
 
 
-def use_internal_chat_ai_template(
+def use_internal_gen_ai_template(
     input: str | None = None,
     dest_dir: Optional[Path] = None,
     package_name: Optional[str] = None,
 ):
     if input is None:
         input = questionary.select(
-            "Which kind of chat template would you like?",
+            "Which kind of Gen AI template would you like?",
             choices=[
-                Choice(title="Chat starters...", value="_chat-starters"),
-                Choice(title="LLM powered chat...", value="_chat-llms"),
-                Choice(title="Enterprise LLM...", value="_chat-llm_enterprise"),
+                Choice(title="Chat with LLM...", value="_chat-llms"),
+                Choice(
+                    title="Chat with enterprise LLM...", value="_chat-llm_enterprise"
+                ),
+                Choice(title="Stream markdown with LLM...", value="_stream-llms"),
+                Choice(
+                    title="Stream markdown with enterprise LLM...",
+                    value="_stream-enterprise",
+                ),
                 back_choice,
                 cancel_choice,
             ],
@@ -370,29 +381,34 @@ def use_internal_chat_ai_template(
             use_internal_template(dest_dir=dest_dir, package_name=package_name)
             return
 
-        use_internal_chat_ai_template(
+        use_internal_gen_ai_template(
             input, dest_dir=dest_dir, package_name=package_name
         )
         return
 
-    if input == "_chat-starters":
-        template_choices = shiny_internal_templates.chat_starters
-    elif input == "_chat-llms":
+    if input == "_chat-llms":
         template_choices = shiny_internal_templates.chat_llms
-    else:
+    elif input == "_chat-llm_enterprise":
         template_choices = shiny_internal_templates.chat_enterprise
+    elif input == "_stream-llms":
+        template_choices = shiny_internal_templates.stream_llms
+    elif input == "_stream-enterprise":
+        template_choices = shiny_internal_templates.stream_enterprise
+    else:
+        raise ValueError(f"Invalid Gen AI template choice: {input}")
 
     choice = question_choose_template(template_choices, back_choice)
 
     if choice == "back":
-        use_internal_chat_ai_template(dest_dir=dest_dir, package_name=package_name)
+        use_internal_gen_ai_template(dest_dir=dest_dir, package_name=package_name)
         return
 
     template = template_by_name(
         [
-            *shiny_internal_templates.chat_starters,
             *shiny_internal_templates.chat_llms,
             *shiny_internal_templates.chat_enterprise,
+            *shiny_internal_templates.stream_llms,
+            *shiny_internal_templates.stream_enterprise,
         ],
         choice,
     )

shiny/templates/chat/starters/hello/_template.json renamed to shiny/api-examples/Chat/_template.json

@@ -9,8 +9,10 @@
 # Create a welcome message
 welcome = """
 Hi! This is a simple Shiny `Chat` UI. Enter a message below and I will
-simply repeat it back to you. For more examples, see this
-[folder of examples](https://github.com/posit-dev/py-shiny/tree/main/shiny/templates/chat).
+simply repeat it back to you.
+
+To learn more about chatbots and how to build them with Shiny, check out
+[the documentation](https://shiny.posit.co/py/docs/genai-chatbots.html).
 """
 
 

shiny/templates/chat/starters/hello/app-core.py renamed to shiny/api-examples/Chat/app-core.py

@@ -10,8 +10,10 @@
 # Create a welcome message
 welcome = """
 Hi! This is a simple Shiny `Chat` UI. Enter a message below and I will
-simply repeat it back to you. For more examples, see this
-[folder of examples](https://github.com/posit-dev/py-shiny/tree/main/shiny/templates/chat).
+simply repeat it back to you.
+
+To learn more about chatbots and how to build them with Shiny, check out
+[the documentation](https://shiny.posit.co/py/docs/genai-chatbots.html).
 """
 
 # Create a chat instance