Merge branch 'main' into data_view_meta

* main:
  bug(output transformer): fix transformer auto-registration (#1394)
  fix: Add wait till pulse animation has started (#1393)
  bug(test-deploy): Add retries for deploy tests (#1392)
  Add busy indicator tests (#1391)
  Yield to give "synchronous" writes a chance to complete (#1388)
  chore(busy indicator): Update busy indicator css files (#1389)
  feat(cli): Add `shiny --version` (#1387)
  fix(selectize): Accept jsonifiable values in `options` dictionary (#1382)
  bug(data frame): Use `<ID>_data_view_rows` (#1386)

Author: schloerke

setup.cfg

@@ -65,6 +65,7 @@ test =
     pytest>=6.2.4
     pytest-asyncio>=0.17.2
     pytest-playwright>=0.3.0
+    playwright>=1.43.0
     pytest-xdist
     pytest-timeout
     pytest-rerunfailures

shiny/_main.py

@@ -18,14 +18,15 @@
 
 import shiny
 
-from . import _autoreload, _hostenv, _static, _utils
+from . import __version__, _autoreload, _hostenv, _static, _utils
 from ._docstring import no_example
 from ._typing_extensions import NotRequired, TypedDict
 from .express import is_express_app
 from .express._utils import escape_to_var_name
 
 
 @click.group("main")
+@click.version_option(__version__)
 def main() -> None:
     pass
 

shiny/reactive/_reactives.py

@@ -15,6 +15,7 @@
     "event",
 )
 
+import asyncio
 import functools
 import traceback
 import warnings
@@ -575,6 +576,10 @@ async def _run(self) -> None:
             try:
                 with ctx():
                     await self._fn()
+
+                    # Yield so that messages can be sent to the client if necessary.
+                    # https://github.com/posit-dev/py-shiny/issues/1381
+                    await asyncio.sleep(0)
             except SilentException:
                 # It's OK for SilentException to cause an Effect to stop running
                 pass

shiny/render/transformer/_transformer.py

@@ -266,8 +266,8 @@ def __init__(
         self._default_ui_args: tuple[object, ...] = tuple()
         self._default_ui_kwargs: dict[str, object] = dict()
 
-        # Allow for App authors to not require `@output`
-        self._auto_register()
+        # Register the value function with the parent Renderer class
+        self(value_fn)
 
     def _meta(self) -> TransformerMetadata:
         """

shiny/session/_session.py

@@ -4,6 +4,7 @@
 
 __all__ = ("Session", "Inputs", "Outputs")
 
+import asyncio
 import contextlib
 import dataclasses
 import enum
@@ -653,6 +654,12 @@ def verify_state(expected_state: ConnectionState) -> None:
                                 f"Unrecognized method {message_obj['method']}"
                             )
 
+                        # Progress messages (of the "{binding: {id: xxx}}"" variety) may
+                        # have queued up at this point; let them drain before we send
+                        # the next message.
+                        # https://github.com/posit-dev/py-shiny/issues/1381
+                        await asyncio.sleep(0)
+
                         self._request_flush()
 
                         await flush()

shiny/ui/_input_select.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from ..types import Jsonifiable
+
 __all__ = (
     "input_select",
     "input_selectize",
@@ -57,7 +59,7 @@ def input_selectize(
     multiple: bool = False,
     width: Optional[str] = None,
     remove_button: Optional[bool] = None,
-    options: Optional[dict[str, str | float | JSEval]] = None,
+    options: Optional[dict[str, Jsonifiable | JSEval]] = None,
 ) -> Tag:
     """
     Create a select list that can be used to choose a single or multiple items from a
@@ -137,7 +139,7 @@ def input_select(
     width: Optional[str] = None,
     size: Optional[str] = None,
     remove_button: Optional[bool] = None,
-    options: Optional[dict[str, str | float | JSEval]] = None,
+    options: Optional[dict[str, Jsonifiable | JSEval]] = None,
 ) -> Tag:
     """
     Create a select list that can be used to choose a single or multiple items from a

shiny/www/shared/_version.json

@@ -1,5 +1,5 @@
 {
   "note!": "This file is auto-generated by scripts/htmlDependencies.R",
   "package": "shiny",
-  "version": "Github (rstudio/shiny@3d6694040208055dc32e845ac3a93a0e68e47585)"
+  "version": "Github (rstudio/shiny@733a4e898369892f553191a4d8cf67086333a8bf)"
 }

shiny/www/shared/bootstrap/_version.json

@@ -1,6 +1,6 @@
 {
   "note!": "This file is auto-generated by scripts/htmlDependencies.R",
-  "shiny_version": "Github (rstudio/shiny@3d6694040208055dc32e845ac3a93a0e68e47585)",
+  "shiny_version": "Github (rstudio/shiny@733a4e898369892f553191a4d8cf67086333a8bf)",
   "bslib_version": "Github (rstudio/bslib@3dd55fd7249d30ecddac8f98ba8dc70aee0b3459)",
   "htmltools_version": "Github (rstudio/htmltools@487aa0bed7313d7597b6edd5810e53cab0061198)",
   "bootstrap_version": "5.3.1"

shiny/www/shared/busy-indicators/busy-indicators.css

@@ -1,11 +1,18 @@
+import pytest
 from controls import Accordion
 from playwright.sync_api import Page
-from utils.deploy_utils import create_deploys_app_url_fixture, skip_if_not_chrome
+from utils.deploy_utils import (
+    create_deploys_app_url_fixture,
+    reruns,
+    reruns_delay,
+    skip_if_not_chrome,
+)
 
 app_url = create_deploys_app_url_fixture("shiny_express_accordion")
 
 
 @skip_if_not_chrome
+@pytest.mark.flaky(reruns=reruns, reruns_delay=reruns_delay)
 def test_express_accordion(page: Page, app_url: str) -> None:
     page.goto(app_url)