Merge branch 'main' into pop_over

* main:
  feat(Session): Make Session on_flush() and on_flushed() accept async functions (#693)
  Make data frame selection return row numbers, not pandas index value (#677)
  chore(api)!: Rename `ui.navset_pill_card` -> `ui.navset_card_pill` and `ui.navset_tab_card` -> `ui.navset_card_tab` (#681)
  Consolidate all testing into `tests/` folder (#683)
  Fix pyright error (#678)
  Make model score app work on Connect/Shinyapps.io (#657)
  Suppress type check for read_csv
  Synchonize input_file examples
  More realistic file import example (#582)
  Make flaky dataframe test have larger timeout (#675)
  Wrap bare value box value in `p` tag (#668)

Author: schloerke

CHANGELOG.md

@@ -8,22 +8,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
-### Experimental breaking changes
-
-* `shiny.experimental.ui.sidebar_toggle()` has been renamed to `shiny.experimental.ui.toggle_sidebar()` (#680).
-* `shiny.experimental.ui.tooltip_toggle()` has been renamed to `shiny.experimental.ui.toggle_tooltip()` (#680).
-* `shiny.experimental.ui.tooltip_update()` has been renamed to `shiny.experimental.ui.update_tooltip()` (#680).
-
-
 ### New features
 
 * Added `shiny.render.renderer_components` decorator to help create new output renderers (#621).
 * Added `shiny.experimental.ui.popover()`, `update_popover()`, and `toggle_popover()` for easy creation (and server-side updating) of [Bootstrap popovers](https://getbootstrap.com/docs/5.2/components/popovers/). Popovers are similar to tooltips, but are more persistent, and should primarily be used with button-like UI elements (e.g. `input_action_button()` or icons) (#680).
 * Added `shiny.experimental.ui.toggle_switch()` (#680).
 * Added CSS classes to UI input methods (#680) .
+* `Session` objects can now accept an asynchronous (or synchronous) function for `.on_flush(fn=)`, `.on_flushed(fn=)`, and `.on_ended(fn=)` (#686).
+
+### API changes
+
+* Renamed `shiny.ui.navset_pill_card` to `shiny.ui.navset_card_pill`. `shiny.ui.navset_pill_card` will throw a deprecated warning (#492).
+* Renamed `shiny.ui.navset_tab_card` to `shiny.ui.navset_card_tab`. `shiny.ui.navset_tab_card` will throw a deprecated warning (#492).
+
+#### Experimental API changes
+
+* Renamed `shiny.experimental.ui.navset_pill_card` to `shiny.experimental.ui.navset_card_pill` (#492).
+* Renamed `shiny.experimental.ui.navset_tab_card` to `shiny.experimental.ui.navset_card_tab` (#492).
+* Renamed `shiny.experimental.ui.sidebar_toggle()` to `shiny.experimental.ui.toggle_sidebar()` (#680).
+* Renamed `shiny.experimental.ui.tooltip_toggle()` to `shiny.experimental.ui.toggle_tooltip()` (#680).
+* Renamed `shiny.experimental.ui.tooltip_update()` to `shiny.experimental.ui.update_tooltip()` (#680).
+
 
 ### Bug fixes
 
+* Fixed #646: Wrap bare value box value in `<p />` tags. (#668)
+* Fixed #676: The `render.data_frame` selection feature was underdocumented and buggy (sometimes returning `None` as a row identifier if the pandas data frame's index had gaps in it). With this release, the selection is consistently a tuple of the 0-based row numbers of the selected rows--or `None` if no rows are selected. (#677)
+
 ### Other changes
 
 

Makefile

@@ -77,11 +77,11 @@ check: ## check code quality with black and isort
 	isort --check-only --diff .
 
 test: ## run tests quickly with the default Python
-	python3 tests/asyncio_prevent.py
-	pytest tests
+	python3 tests/pytest/asyncio_prevent.py
+	pytest
 
 # Default `FILE` to `e2e` if not specified
-FILE:=e2e
+FILE:=tests/e2e
 
 e2e: ## end-to-end tests with playwright
 	playwright install --with-deps

docs/_quartodoc.yml

@@ -77,9 +77,9 @@ quartodoc:
         - ui.nav_spacer
         - ui.nav_menu
         - ui.navset_tab
-        - ui.navset_tab_card
+        - ui.navset_card_tab
         - ui.navset_pill
-        - ui.navset_pill_card
+        - ui.navset_card_pill
         - ui.navset_pill_list
         - ui.navset_hidden
     - title: UI panels
@@ -247,8 +247,8 @@ quartodoc:
             - experimental.ui.layout_sidebar
             - experimental.ui.page_navbar
             - experimental.ui.navset_bar
-            - experimental.ui.navset_tab_card
-            - experimental.ui.navset_pill_card
+            - experimental.ui.navset_card_tab
+            - experimental.ui.navset_card_pill
             - experimental.ui.toggle_sidebar
             - experimental.ui.toggle_switch
             - experimental.ui.panel_main

e2e/experimental/value_box/test_valuebox.py

@@ -11,7 +11,7 @@
       print the number of clicks in the console twice.
       """
     ),
-    ui.navset_tab_card(
+    ui.navset_card_tab(
         ui.nav(
             "Sync",
             ui.input_action_button("btn", "Click me"),

examples/event/app.py

@@ -55,4 +55,16 @@ async def update_db(position):
 
 def begin():
     position = init_db()
-    asyncio.create_task(update_db(position))
+
+    # After initializing the database, we need to start a non-blocking task to update it
+    # every second or so. If an event loop is already running, we can use an asyncio
+    # task. (This is the case when running via `shiny run` and shinylive.) Otherwise, we
+    # need to launch a background thread and run an asyncio event loop there. (This is
+    # the case when running via shinyapps.io or Posit Connect.)
+
+    if asyncio.get_event_loop().is_running():
+        asyncio.create_task(update_db(position))
+    else:
+        from threading import Thread
+
+        Thread(target=lambda: asyncio.run(update_db(position)), daemon=True).start()

examples/model-score/scoredata.py

@@ -58,12 +58,8 @@ interface ShinyDataGridProps<TIndex> {
 
 const ShinyDataGrid: FC<ShinyDataGridProps<unknown>> = (props) => {
   const { id, data, bgcolor } = props;
-  const { columns, index, type_hints, data: rowData } = data;
+  const { columns, type_hints, data: rowData } = data;
   const { width, height, filters: withFilters } = data.options;
-  const keyToIndex: Record<string, unknown> = {};
-  index.forEach((value) => {
-    keyToIndex[value + ""] = value;
-  });
 
   const containerRef = useRef<HTMLDivElement>(null);
   const theadRef = useRef<HTMLTableSectionElement>(null);
@@ -192,7 +188,8 @@ const ShinyDataGrid: FC<ShinyDataGridProps<unknown>> = (props) => {
           rowSelection
             .keys()
             .toList()
-            .map((key) => keyToIndex[key])
+            .map((key) => parseInt(key))
+            .sort()
         );
       }
     }

js/dataframe/index.tsx

@@ -20,7 +20,7 @@ export interface DataGridOptions {
 
 export interface PandasData<TIndex> {
   columns: ReadonlyArray<string>;
-  index: ReadonlyArray<TIndex>;
+  // index: ReadonlyArray<TIndex>;
   data: unknown[][];
   type_hints?: ReadonlyArray<TypeHint>;
   options: DataGridOptions;

js/dataframe/types.ts

@@ -1,6 +1,6 @@
 [pytest]
 asyncio_mode=strict
-testpaths=tests
+testpaths=tests/pytest/
 addopts = --strict-markers --durations=6 --durations-min=5.0 --browser webkit --browser firefox --browser chromium --numprocesses auto
 markers =
     examples: Suite of tests to validate that examples do not produce errors (deselect with '-m "not examples"')

pytest.ini

@@ -63,8 +63,10 @@ def summary_data():
 
     @reactive.Calc
     def filtered_df():
+        # input.summary_data_selected_rows() is a tuple, so we must convert it to list,
+        # as that's what Pandas requires for indexing.
         selected_idx = list(req(input.summary_data_selected_rows()))
-        countries = summary_df["country"][selected_idx]
+        countries = summary_df.iloc[selected_idx]["country"]
         # Filter data for selected countries
         return df[df["country"].isin(countries)]
 

shiny/api-examples/data_frame/app.py

@@ -1,31 +1,56 @@
 import pandas as pd
 
-from shiny import App, Inputs, Outputs, Session, render, ui
+from shiny import App, Inputs, Outputs, Session, reactive, render, ui
 from shiny.types import FileInfo
 
 app_ui = ui.page_fluid(
-    ui.layout_sidebar(
-        ui.panel_sidebar(
-            ui.input_file("file1", "Choose CSV File", accept=[".csv"], multiple=False),
-            ui.input_checkbox("header", "Header", True),
-            width=5,
-        ),
-        ui.panel_main(
-            ui.output_ui("contents"),
-        ),
+    ui.input_file("file1", "Choose CSV File", accept=[".csv"], multiple=False),
+    ui.input_checkbox_group(
+        "stats",
+        "Summary Stats",
+        choices=["Row Count", "Column Count", "Column Names"],
+        selected=["Row Count", "Column Count", "Column Names"],
     ),
+    ui.output_table("summary"),
 )
 
 
 def server(input: Inputs, output: Outputs, session: Session):
+    @reactive.Calc
+    def parsed_file():
+        file: list[FileInfo] | None = input.file1()
+        if file is None:
+            return pd.DataFrame()
+        return pd.read_csv(  # pyright: ignore[reportUnknownMemberType]
+            file[0]["datapath"]
+        )
+
     @output
-    @render.ui
-    def contents():
-        if input.file1() is None:
-            return "Please upload a csv file"
-        f: list[FileInfo] = input.file1()
-        df = pd.read_csv(f[0]["datapath"], header=0 if input.header() else None)
-        return ui.HTML(df.to_html(classes="table table-striped"))
+    @render.table
+    def summary():
+        df = parsed_file()
+
+        if df.empty:
+            return pd.DataFrame()
+
+        # Get the row count, column count, and column names of the DataFrame
+        row_count = df.shape[0]
+        column_count = df.shape[1]
+        names = df.columns.tolist()
+        column_names = ", ".join(str(name) for name in names)
+
+        # Create a new DataFrame to display the information
+        info_df = pd.DataFrame(
+            {
+                "Row Count": [row_count],
+                "Column Count": [column_count],
+                "Column Names": [column_names],
+            }
+        )
+
+        # input.stats() is a list of strings; subset the columns based on the selected
+        # checkboxes
+        return info_df.loc[:, input.stats()]
 
 
 app = App(app_ui, server)

shiny/api-examples/input_file/app.py

@@ -53,10 +53,10 @@ def nav_controls(prefix: str) -> List[NavSetArg]:
         ui.navset_tab(*nav_controls("navset_tab()")),
         ui.h4("navset_pill()"),
         ui.navset_pill(*nav_controls("navset_pill()")),
-        ui.h4("navset_tab_card()"),
-        ui.navset_tab_card(*nav_controls("navset_tab_card()")),
-        ui.h4("navset_pill_card()"),
-        ui.navset_pill_card(*nav_controls("navset_pill_card()")),
+        ui.h4("navset_card_tab()"),
+        ui.navset_card_tab(*nav_controls("navset_card_tab()")),
+        ui.h4("navset_card_pill()"),
+        ui.navset_card_pill(*nav_controls("navset_card_pill()")),
         ui.h4("navset_pill_list()"),
         ui.navset_pill_list(*nav_controls("navset_pill_list()")),
     )

shiny/api-examples/nav/app.py

@@ -6,7 +6,7 @@
             ui.input_slider("controller", "Controller", min=1, max=3, value=1)
         ),
         ui.panel_main(
-            ui.navset_tab_card(
+            ui.navset_card_tab(
                 ui.nav("Panel 1", "Panel 1 content", value="panel1"),
                 ui.nav("Panel 2", "Panel 2 content", value="panel2"),
                 ui.nav("Panel 3", "Panel 3 content", value="panel3"),

shiny/api-examples/update_navs/app.py

@@ -51,14 +51,14 @@ def nav_items(prefix: str) -> list[NavSetArg]:
         ),
         footer=ui.div(
             {"style": "width:80%; margin: 0 auto"},
-            ui.h4("navset_tab_card()"),
-            x.ui.navset_tab_card(
-                *nav_items("navset_tab_card()"),
+            ui.h4("navset_card_tab()"),
+            x.ui.navset_card_tab(
+                *nav_items("navset_card_tab()"),
                 sidebar=my_sidebar,
             ),
-            ui.h4("navset_pill_card()"),
-            x.ui.navset_pill_card(
-                *nav_items("navset_pill_card()"),
+            ui.h4("navset_card_pill()"),
+            x.ui.navset_card_pill(
+                *nav_items("navset_card_pill()"),
                 sidebar=my_sidebar,
             ),
             # Do not include `navset_bar()` in example. Ok for testing only

shiny/experimental/e2e/navbar/app.py

@@ -35,7 +35,7 @@
 from ._input_switch import toggle_switch
 from ._input_text import input_text_area
 from ._layout import layout_column_wrap
-from ._navs import navset_bar, navset_pill_card, navset_tab_card
+from ._navs import navset_bar, navset_card_pill, navset_card_tab
 from ._output import output_image, output_plot, output_ui
 from ._page import page_fillable, page_navbar, page_sidebar
 from ._sidebar import (
@@ -72,8 +72,8 @@
     "page_navbar",
     # Navs
     "navset_bar",
-    "navset_tab_card",
-    "navset_pill_card",
+    "navset_card_tab",
+    "navset_card_pill",
     # Card
     "CardItem",
     "ImgContainer",

shiny/experimental/ui/__init__.py

@@ -2,8 +2,8 @@
 
 __all__ = (
     "navset_bar",
-    "navset_tab_card",
-    "navset_pill_card",
+    "navset_card_tab",
+    "navset_card_pill",
 )
 
 import copy
@@ -194,7 +194,7 @@ def navset_card_body(content: Tag, sidebar: Optional[Sidebar] = None) -> CardIte
         return CardItem(content)
 
 
-def navset_tab_card(
+def navset_card_tab(
     *args: NavSetArg,
     id: Optional[str] = None,
     selected: Optional[str] = None,
@@ -229,7 +229,7 @@ def navset_tab_card(
     * ~shiny.experimental.ui.navset_bar
     * ~shiny.ui.navset_tab
     * ~shiny.ui.navset_pill
-    * ~shiny.experimental.ui.navset_pill_card
+    * ~shiny.experimental.ui.navset_card_pill
     * ~shiny.ui.navset_hidden
 
     Example
@@ -249,7 +249,7 @@ def navset_tab_card(
     )
 
 
-def navset_pill_card(
+def navset_card_pill(
     *args: NavSetArg,
     id: Optional[str] = None,
     selected: Optional[str] = None,
@@ -287,7 +287,7 @@ def navset_pill_card(
     * ~shiny.experimental.ui.navset_bar
     * ~shiny.ui.navset_tab
     * ~shiny.ui.navset_pill
-    * ~shiny.experimental.ui.navset_tab_card
+    * ~shiny.experimental.ui.navset_card_tab
     * ~shiny.ui.navset_hidden
 
     Example
@@ -533,8 +533,8 @@ def navset_bar(
     * ~shiny.ui.nav_spacer
     * ~shiny.ui.navset_tab
     * ~shiny.ui.navset_pill
-    * ~shiny.experimental.ui.navset_tab_card
-    * ~shiny.experimental.ui.navset_pill_card
+    * ~shiny.experimental.ui.navset_card_tab
+    * ~shiny.experimental.ui.navset_card_pill
     * ~shiny.ui.navset_hidden
 
     Example