Merge branch 'main' into data_view_meta

* main:
  test(data frame): Verify that data frame's outputs are reset before moving forward (#1383)
  Send busy/idle at the right times (#1380)
  feat(data frame): Restore `input.<ID>_selected_rows()`. Rename `input.<ID>_data_view_indices` to `input.<ID>_data_view_rows` (#1377)

Author: schloerke

CHANGELOG.md

@@ -7,7 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
-### Breaking Changes
+### `input` key changes
+
+* Restored `@render.data_frame`'s (prematurely removed in v0.9.0) input value `input.<ID>_selected_rows()`. Please use `<ID>.input_cell_selection()["rows"]` and consider `input.<ID>_selected_rows()` deprecated. (#1345, #1377)
+
+* `@render.data_frame`'s input value `input.<ID>_data_view_indices` has been renamed to `input.<ID>_data_view_rows` for consistent naming. Please use `input.<ID>_data_view_rows` and consider `input.<ID>_data_view_indices` deprecated. (#1377)
 
 * `@render.data_frame`'s input value `input.<ID>_data_view_indices` has been renamed to `input.<ID>_data_view_rows` for consistent naming. Please use `input.<ID>_data_view_rows` and consider `input.<ID>_data_view_indices` deprecated. (#1374)
 
@@ -27,7 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Fixed an issue that prevented Shiny from serving the `font.css` file referenced in Shiny's Bootstrap CSS file. (#1342)
 
-* Removed temporary state where a data frame renderer would try to subset to selected rows that did not exist. (#1351)
+* Removed temporary state where a data frame renderer would try to subset to selected rows that did not exist. (#1351, #1377)
 
 ### Other changes
 

js/data-frame/index.tsx

@@ -346,6 +346,7 @@ const ShinyDataGrid: FC<ShinyDataGridProps<unknown>> = ({
   }, [id, columnFilters]);
   useEffect(() => {
     if (!id) return;
+
     // Already prefiltered rows!
     const shinyValue: RowModel<unknown[]> = table.getSortedRowModel();
 

setup.cfg

@@ -93,6 +93,7 @@ test =
     folium
     palmerpenguins
     faicons
+    ridgeplot
 dev =
     black>=24.0
     flake8>=6.0.0

shiny/express/_stub_session.py

@@ -119,6 +119,12 @@ async def _send_message(self, message: dict[str, object]) -> None:
     def _send_message_sync(self, message: dict[str, object]) -> None:
         return
 
+    def _increment_busy_count(self) -> None:
+        return
+
+    def _decrement_busy_count(self) -> None:
+        return
+
     def on_flush(
         self,
         fn: Callable[[], None] | Callable[[], Awaitable[None]],

shiny/reactive/_reactives.py

@@ -547,7 +547,7 @@ def on_invalidate_cb() -> None:
             def _continue() -> None:
                 ctx.add_pending_flush(self._priority)
                 if self._session:
-                    self._session._send_message_sync({"busy": "busy"})
+                    self._session._increment_busy_count()
 
             if self._suspended:
                 self._on_resume = _continue
@@ -558,7 +558,7 @@ async def on_flush_cb() -> None:
             if not self._destroyed:
                 await self._run()
             if self._session:
-                self._session._send_message_sync({"busy": "idle"})
+                self._session._decrement_busy_count()
 
         ctx.on_invalidate(on_invalidate_cb)
         ctx.on_flush(on_flush_cb)

shiny/session/_session.py

@@ -471,6 +471,12 @@ def set_message_handler(
             namespaced when used with a session proxy.
         """
 
+    @abstractmethod
+    def _increment_busy_count(self) -> None: ...
+
+    @abstractmethod
+    def _decrement_busy_count(self) -> None: ...
+
 
 # ======================================================================================
 # AppSession
@@ -493,6 +499,7 @@ def __init__(
         self.id: str = id
         self._conn: Connection = conn
         self._debug: bool = debug
+        self._busy_count: int = 0
         self._message_handlers: dict[
             str,
             tuple[Callable[..., Awaitable[Jsonifiable]], Session],
@@ -785,11 +792,11 @@ async def uploadEnd(job_id: str, input_id: str) -> None:
     async def _handle_request(
         self, request: Request, action: str, subpath: Optional[str]
     ) -> ASGIApp:
-        self._send_message_sync({"busy": "busy"})
+        self._increment_busy_count()
         try:
             return await self._handle_request_impl(request, action, subpath)
         finally:
-            self._send_message_sync({"busy": "idle"})
+            self._decrement_busy_count()
 
     async def _handle_request_impl(
         self, request: Request, action: str, subpath: Optional[str]
@@ -1011,6 +1018,16 @@ async def _flush(self) -> None:
             with session_context(self):
                 await self._flushed_callbacks.invoke()
 
+    def _increment_busy_count(self) -> None:
+        self._busy_count += 1
+        if self._busy_count == 1:
+            self._send_message_sync({"busy": "busy"})
+
+    def _decrement_busy_count(self) -> None:
+        self._busy_count -= 1
+        if self._busy_count == 0:
+            self._send_message_sync({"busy": "idle"})
+
     # ==========================================================================
     # On session ended
     # ==========================================================================
@@ -1191,6 +1208,12 @@ def _send_progress(self, type: str, message: object) -> None:
     async def send_custom_message(self, type: str, message: dict[str, object]) -> None:
         await self._parent.send_custom_message(type, message)
 
+    def _increment_busy_count(self) -> None:
+        self._parent._increment_busy_count()
+
+    def _decrement_busy_count(self) -> None:
+        self._parent._decrement_busy_count()
+
     def set_message_handler(
         self,
         name: str,

shiny/www/shared/py-shiny/data-frame/data-frame.js.map

@@ -33,7 +33,7 @@ def get_apps(path: str) -> typing.List[str]:
     return app_paths
 
 
-app_idle_wait = {"duration": 300, "timeout": 5 * 1000}
+app_idle_wait = {"duration": 300, "timeout": 30 * 1000}
 app_hard_wait: typing.Dict[str, int] = {
     "examples/brownian": 250,
     "examples/ui-func": 250,

tests/playwright/examples/example_apps.py

@@ -88,14 +88,14 @@ def summary_data():
     def _():
         print(
             "Filters:",
-            summary_data.input_column_filter(),  # pyright: ignore[reportUnknownArgumentType,reportAttributeAccessIssue]
+            summary_data.input_column_filter(),
         )
 
     @reactive.effect
     def _():
         print(
             "Sorting:",
-            summary_data.input_column_sort(),  # pyright: ignore[reportUnknownArgumentType,reportAttributeAccessIssue]
+            summary_data.input_column_sort(),
         )
 
     @reactive.effect

tests/playwright/shiny/components/data_frame/edit/app.py

@@ -12,11 +12,15 @@ def test_dataframe_organization_methods(page: Page, local_app: ShinyAppProc) ->
     input_cell_selection = OutputCode(page, "cell_selection")
     reset_df = InputActionButton(page, "reset_df")
 
+    def reset_data_frame():
+        reset_df.click()
+        input_view_rows.expect_value("(0, 1, 2)")
+        input_view_selected_true.expect_value("[]")
+        input_view_selected_false.expect_value("[ 0 50 100]")
+        input_cell_selection.expect_value("()")
+
     # assert value of unsorted table
-    input_view_rows.expect_value("(0, 1, 2)")
-    input_view_selected_true.expect_value("[]")
-    input_view_selected_false.expect_value("[ 0 50 100]")
-    input_cell_selection.expect_value("()")
+    reset_data_frame()
 
     # sort column by number descending
     data_frame.set_column_sort(col=0)
@@ -46,8 +50,7 @@ def test_dataframe_organization_methods(page: Page, local_app: ShinyAppProc) ->
     input_view_selected_false.expect_value("[100 50  0]")
     input_cell_selection.expect_value("()")
 
-    # reset dataframe
-    reset_df.click()
+    reset_data_frame()
 
     # filter using numbers
     data_frame.set_column_filter(col=0, text=["6", "7"])
@@ -56,8 +59,7 @@ def test_dataframe_organization_methods(page: Page, local_app: ShinyAppProc) ->
     input_view_selected_false.expect_value("[ 50 100]")
     input_cell_selection.expect_value("()")
 
-    # reset dataframe
-    reset_df.click()
+    reset_data_frame()
 
     # select multiple rows
     data_frame.select_rows([0, 2])
@@ -66,8 +68,7 @@ def test_dataframe_organization_methods(page: Page, local_app: ShinyAppProc) ->
     input_view_selected_false.expect_value("[  0  50 100]")
     input_cell_selection.expect_value("(0, 2)")
 
-    # reset dataframe
-    reset_df.click()
+    reset_data_frame()
 
     # select single row
     data_frame.select_rows([0])

tests/playwright/shiny/components/data_frame/html_columns_df/df_organization/test_df_organization.py

@@ -39,6 +39,12 @@ def on_ended(self, fn: Callable[[], None]) -> Callable[[], None]:
     def _send_message_sync(self, message: Dict[str, object]) -> None:
         pass
 
+    def _increment_busy_count(self) -> None:
+        pass
+
+    def _decrement_busy_count(self) -> None:
+        pass
+
     async def __aenter__(self):
         self._session_context.__enter__()