Merge branch 'main' into add-kitchensink-ai-tests

Author: karangattu

CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to Shiny for Python will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [UNRELEASED]
+
+### Changes
+
+* 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.
+
+### 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)
+
 ## [1.3.0] - 2025-03-03
 
 ### New features

scripts/_pkg-sources.R

@@ -1,5 +1,5 @@
 list(
-  bslib = "rstudio/bslib@main",
+  bslib = "rstudio/bslib@fix/page-main-container-fillable",
   shiny = "rstudio/shiny@main",
   sass = "sass",
   htmltools = "rstudio/htmltools@main"

shiny/ui/_chat.py

@@ -1107,16 +1107,13 @@ def update_user_input(
             }
         )
 
-        _utils.run_coro_sync(
-            self._session.send_custom_message(
-                "shinyChatMessage",
-                {
-                    "id": self.id,
-                    "handler": "shiny-chat-update-user-input",
-                    "obj": obj,
-                },
-            )
-        )
+        msg = {
+            "id": self.id,
+            "handler": "shiny-chat-update-user-input",
+            "obj": obj,
+        }
+
+        self._session._send_message_sync({"custom": {"shinyChatMessage": msg}})
 
     def set_user_message(self, value: str):
         """

shiny/ui/_markdown_stream.py

@@ -4,6 +4,7 @@
 from htmltools import css
 
 from .. import _utils, reactive
+from .._deprecated import warn_deprecated
 from .._docstring import add_example
 from .._namespaces import resolve_id
 from .._typing_extensions import TypedDict
@@ -87,9 +88,14 @@ def __init__(
         self.on_error = on_error
 
         with session_context(self._session):
-            self._latest_stream: reactive.Value[
-                Union[reactive.ExtendedTask[[], str], None]
-            ] = reactive.Value(None)
+
+            @reactive.extended_task
+            async def _mock_task() -> str:
+                return ""
+
+            self._latest_stream: reactive.Value[reactive.ExtendedTask[[], str]] = (
+                reactive.Value(_mock_task)
+            )
 
     async def stream(
         self,
@@ -151,32 +157,46 @@ async def _handle_error():
 
         return _task
 
-    def get_latest_stream_result(self) -> Union[str, None]:
+    @property
+    def latest_stream(self):
         """
-        Reactively read the latest stream result.
+        React to changes in the latest stream.
+
+        Reactively reads for the :class:`~shiny.reactive.ExtendedTask` behind the
+        latest stream.
 
-        This method reads a reactive value containing the result of the latest
-        `.stream()`. Therefore, this method must be called in a reactive context (e.g.,
-        a render function, a :func:`~shiny.reactive.calc`, or a
-        :func:`~shiny.reactive.effect`).
+        From the return value (i.e., the extended task), you can then:
+
+        1. Reactively read for the final `.result()`.
+        2. `.cancel()` the stream.
+        3. Check the `.status()` of the stream.
 
         Returns
         -------
         :
-            The result of the latest stream (a string).
+            An extended task that represents the streaming task. The `.result()` method
+            of the task can be called in a reactive context to get the final state of the
+            stream.
 
-        Raises
-        ------
-        :
-            A silent exception if no stream has completed yet.
+        Note
+        ----
+        If no stream has yet been started when this method is called, then it returns an
+        extended task with `.status()` of `"initial"` and that it status doesn't change
+        state until a message is streamed.
         """
-        stream = self._latest_stream()
-        if stream is None:
-            from .. import req
+        return self._latest_stream()
 
-            req(False)
-        else:
-            return stream.result()
+    def get_latest_stream_result(self) -> Union[str, None]:
+        """
+        Reactively read the latest stream result.
+
+        Deprecated. Use `latest_stream.result()` instead.
+        """
+        warn_deprecated(
+            "The `.get_latest_stream_result()` method is deprecated and will be removed "
+            "in a future release. Use `.latest_stream.result()` instead. "
+        )
+        self.latest_stream.result()
 
     async def clear(self):
         """

shiny/ui/_navs.py

@@ -1365,7 +1365,9 @@ def layout(self, nav: Tag, content: Tag) -> TagList:
                 # TODO-future: This could also be applied to the non-sidebar page layout above
                 from ._page import page_main_container
 
-                tab_content = page_main_container(*contents)
+                tab_content = page_main_container(
+                    *contents, fillable=self.fillable is not False
+                )
 
             content_div = div(
                 # In the fluid case, the sidebar layout should be flush (i.e.,

shiny/ui/_page.py

@@ -134,7 +134,7 @@ def page_sidebar(
         navbar_title,
         layout_sidebar(
             sidebar,
-            page_main_container(*children),
+            page_main_container(*children, fillable=fillable),
             attrs,
             fillable=fillable,
             border=False,
@@ -149,8 +149,10 @@ def page_sidebar(
     )
 
 
-def page_main_container(*args: TagChild) -> Tag:
+def page_main_container(*args: TagChild, fillable: bool = True) -> Tag:
     main = tags.main({"class": "bslib-page-main bslib-gap-spacing"}, *args)
+    if not fillable:
+        return main
     return as_fillable_container(as_fill_item(main))
 
 

shiny/www/shared/_version.json

@@ -1,5 +1,5 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
   "package": "shiny",
-  "version": "1.10.0.9000 (rstudio/shiny@531f31b66f0d83d07341b5e88e33386e4dc10f3e)"
+  "version": "1.10.0.9000 (rstudio/shiny@f55c26af4a0493b082d2967aca6d36b90795adf1)"
 }

shiny/www/shared/bootstrap/_version.json

@@ -1,7 +1,7 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
-  "shiny_version": "1.10.0.9000 (rstudio/shiny@531f31b66f0d83d07341b5e88e33386e4dc10f3e)",
-  "bslib_version": "0.9.0.9000 (rstudio/bslib@ee34398b1d93056c302560512a090c1326aff7cf)",
+  "shiny_version": "1.10.0.9000 (rstudio/shiny@f55c26af4a0493b082d2967aca6d36b90795adf1)",
+  "bslib_version": "0.9.0.9000 (rstudio/bslib@142b19053fed81b42a4efa90c497ab2682383b86)",
   "htmltools_version": "0.5.8.9000 (rstudio/htmltools@487aa0bed7313d7597b6edd5810e53cab0061198)",
   "bootstrap_version": "5.3.1"
 }

shiny/www/shared/bootstrap/bootstrap.min.css

@@ -1,5 +1,5 @@
 {
   "note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
   "package": "bslib",
-  "version": "0.9.0.9000 (rstudio/bslib@ee34398b1d93056c302560512a090c1326aff7cf)"
+  "version": "0.9.0.9000 (rstudio/bslib@142b19053fed81b42a4efa90c497ab2682383b86)"
 }