Merge branch 'main' into data_view_meta

schloerke · schloerke · commit 86b5e42b4e30 · 2024-05-20T15:16:09.000-04:00
* 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)
diff --git a/setup.cfg b/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
diff --git a/shiny/_main.py b/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
 
diff --git a/shiny/reactive/_reactives.py b/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
diff --git a/shiny/render/transformer/_transformer.py b/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:
         """
diff --git a/shiny/session/_session.py b/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()
diff --git a/shiny/ui/_input_select.py b/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
diff --git a/shiny/www/shared/_version.json b/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)"
 }
diff --git a/shiny/www/shared/bootstrap/_version.json b/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"
diff --git a/shiny/www/shared/busy-indicators/busy-indicators.css b/shiny/www/shared/busy-indicators/busy-indicators.css
diff --git a/tests/playwright/deploys/express-accordion/test_deploys_express_accordion.py b/tests/playwright/deploys/express-accordion/test_deploys_express_accordion.py
@@ -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)
 
diff --git a/tests/playwright/deploys/express-dataframe/test_deploys_express_dataframe.py b/tests/playwright/deploys/express-dataframe/test_deploys_express_dataframe.py
@@ -1,11 +1,18 @@
+import pytest
 from controls import OutputDataFrame
 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-dataframe")
 
 
 @skip_if_not_chrome
+@pytest.mark.flaky(reruns=reruns, reruns_delay=reruns_delay)
 def test_express_dataframe_deploys(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
diff --git a/tests/playwright/deploys/express-folium/test_deploys_express_folium.py b/tests/playwright/deploys/express-folium/test_deploys_express_folium.py
@@ -1,10 +1,17 @@
+import pytest
 from playwright.sync_api import Page, expect
-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-folium")
 
 
 @skip_if_not_chrome
+@pytest.mark.flaky(reruns=reruns, reruns_delay=reruns_delay)
 def test_folium_map(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
diff --git a/tests/playwright/deploys/express-page_default/test_deploys_express_page_default.py b/tests/playwright/deploys/express-page_default/test_deploys_express_page_default.py
@@ -1,13 +1,20 @@
+import pytest
 from controls import LayoutNavsetTab
 from playwright.sync_api import Page, expect
-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,
+)
 
 TIMEOUT = 2 * 60 * 1000
 
 app_url = create_deploys_app_url_fixture("shiny_express_page_default")
 
 
 @skip_if_not_chrome
+@pytest.mark.flaky(reruns=reruns, reruns_delay=reruns_delay)
 def test_page_default(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
diff --git a/tests/playwright/deploys/express-page_fillable/test_deploys_express_page_fillable.py b/tests/playwright/deploys/express-page_fillable/test_deploys_express_page_fillable.py
@@ -1,11 +1,18 @@
+import pytest
 from controls import Card, OutputTextVerbatim
 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("express_page_fillable")
 
 
 @skip_if_not_chrome
+@pytest.mark.flaky(reruns=reruns, reruns_delay=reruns_delay)
 def test_express_page_fillable(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
diff --git a/tests/playwright/deploys/express-page_fluid/test_deploys_express_page_fluid.py b/tests/playwright/deploys/express-page_fluid/test_deploys_express_page_fluid.py
@@ -1,11 +1,18 @@
+import pytest
 from controls import Card, OutputTextVerbatim
 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("express_page_fluid")
 
 
 @skip_if_not_chrome
+@pytest.mark.flaky(reruns=reruns, reruns_delay=reruns_delay)
 def test_express_page_fluid(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
diff --git a/tests/playwright/deploys/express-page_sidebar/test_deploys_express_page_sidebar.py b/tests/playwright/deploys/express-page_sidebar/test_deploys_express_page_sidebar.py
@@ -1,11 +1,18 @@
+import pytest
 from controls import OutputTextVerbatim, Sidebar
 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("express_page_sidebar")
 
 
 @skip_if_not_chrome
+@pytest.mark.flaky(reruns=reruns, reruns_delay=reruns_delay)
 def test_express_page_sidebar(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
diff --git a/tests/playwright/deploys/plotly/test_plotly_app.py b/tests/playwright/deploys/plotly/test_plotly_app.py
@@ -1,11 +1,18 @@
+import pytest
 from playwright.sync_api import Page, expect
-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,
+)
 
 TIMEOUT = 2 * 60 * 1000
 app_url = create_deploys_app_url_fixture("example_deploy_app_A")
 
 
 @skip_if_not_chrome
+@pytest.mark.flaky(reruns=reruns, reruns_delay=reruns_delay)
 def test_deploys(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
diff --git a/tests/playwright/deploys/shiny-client-console-error/test_shiny_client_error.py b/tests/playwright/deploys/shiny-client-console-error/test_shiny_client_error.py
@@ -1,10 +1,17 @@
+import pytest
 from playwright.sync_api import Page, expect
-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_client_console_error")
 
 
 @skip_if_not_chrome
+@pytest.mark.flaky(reruns=reruns, reruns_delay=reruns_delay)
 def test_shiny_client_console_error(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
diff --git a/tests/playwright/shiny/components/busy_indicators/app.py b/tests/playwright/shiny/components/busy_indicators/app.py
@@ -0,0 +1,85 @@
+# pyright:basic
+import time
+
+import numpy as np
+import seaborn as sns
+
+from shiny import App, module, reactive, render, ui
+
+
+# -- Reusable card module --
+@module.ui
+def card_ui(spinner_type, spinner_color, spinner_size):
+    return ui.card(
+        ui.busy_indicators.options(
+            spinner_type=spinner_type,
+            spinner_color=spinner_color,
+            spinner_size=spinner_size,
+        ),
+        ui.card_header("Spinner: " + spinner_type),
+        ui.output_plot("plot"),
+    )
+
+
+@module.server
+def card_server(input, output, session, rerender):
+    @render.plot
+    def plot():
+        rerender()
+        time.sleep(0.5)
+        sns.lineplot(x=np.arange(100), y=np.random.randn(100))
+
+
+# -- Main app --
+app_ui = ui.page_fillable(
+    ui.busy_indicators.options(
+        pulse_background="linear-gradient(45deg, blue, red)",
+        pulse_height="100px",
+        pulse_speed="4s",
+    ),
+    # ui.busy_indicators.use(spinners=False, pulse=True),
+    ui.input_radio_buttons(
+        "busy_indicator_type",
+        "Choose the indicator type",
+        ["spinners", "pulse"],
+        inline=True,
+    ),
+    ui.input_task_button("rerender", "Re-render"),
+    ui.output_text_verbatim("counter", placeholder=True),
+    ui.layout_columns(
+        card_ui("ring", "ring", "red", "10px"),
+        card_ui("bars", "bars", "green", "20px"),
+        card_ui("dots", "dots", "blue", "30px"),
+        card_ui("pulse", "pulse", "olive", "50px"),
+        col_widths=6,
+    ),
+    ui.output_ui("indicator_types_ui"),
+)
+
+
+def server(input, output, session):
+
+    @reactive.calc
+    @reactive.event(input.rerender, ignore_none=False)
+    def rerender():
+        return input.rerender()
+
+    card_server("ring", rerender=rerender)
+    card_server("bars", rerender=rerender)
+    card_server("dots", rerender=rerender)
+    card_server("pulse", rerender=rerender)
+
+    @render.ui
+    def indicator_types_ui():
+        selected_busy_indicator_type = input.busy_indicator_type()
+        return ui.busy_indicators.use(
+            spinners=(selected_busy_indicator_type == "spinners"),
+            pulse=(selected_busy_indicator_type != "spinners"),
+        )
+
+    @render.text
+    def counter():
+        return str(rerender())
+
+
+app = App(app_ui, server)
diff --git a/tests/playwright/shiny/components/busy_indicators/test_busy_indicators.py b/tests/playwright/shiny/components/busy_indicators/test_busy_indicators.py
diff --git a/tests/playwright/shiny/deprecated/output_transformer/test_output_transformer_example.py b/tests/playwright/shiny/deprecated/output_transformer/test_output_transformer_example.py
diff --git a/tests/playwright/shiny/server/output_transformer/test_output_transformer_async.py b/tests/playwright/shiny/server/output_transformer/test_output_transformer_async.py
diff --git a/tests/playwright/utils/deploy_utils.py b/tests/playwright/utils/deploy_utils.py
diff --git a/tests/pytest/mocktime.py b/tests/pytest/mocktime.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"note!": "This file is auto-generated by scripts/htmlDependencies.R",`
`3`	`3`	`"package": "shiny",`
`4`		`- "version": "Github (rstudio/shiny@3d6694040208055dc32e845ac3a93a0e68e47585)"`
	`4`	`+ "version": "Github (rstudio/shiny@733a4e898369892f553191a4d8cf67086333a8bf)"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"note!": "This file is auto-generated by scripts/htmlDependencies.R",`
`3`		`- "shiny_version": "Github (rstudio/shiny@3d6694040208055dc32e845ac3a93a0e68e47585)",`
	`3`	`+ "shiny_version": "Github (rstudio/shiny@733a4e898369892f553191a4d8cf67086333a8bf)",`
`4`	`4`	`"bslib_version": "Github (rstudio/bslib@3dd55fd7249d30ecddac8f98ba8dc70aee0b3459)",`
`5`	`5`	`"htmltools_version": "Github (rstudio/htmltools@487aa0bed7313d7597b6edd5810e53cab0061198)",`
`6`	`6`	`"bootstrap_version": "5.3.1"`