Merge branch 'main' into shiny-create-bugs

* main:
  Use dynamic version of py-shiny for deploy tests (#970)
  Add underscores to hide some imports (#978)
  Add rsconnect json files(shinyapps.io tests) and folium tests (#928)
  Express' `value_box()` no longer includes named positional args (#966)
  Include `tooltip()` and `popover()` in express (#949)

Author: schloerke

.github/workflows/pytest.yaml

@@ -119,7 +119,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Run example app tests
+      - name: Run tests for deploys
         env:
           DEPLOY_CONNECT_SERVER_URL: "https://rsc.radixu.com/"
           DEPLOY_CONNECT_SERVER_API_KEY: "${{ secrets.DEPLOY_CONNECT_SERVER_API_KEY }}"

.gitignore

@@ -113,3 +113,4 @@ docs/source/reference/
 
 # Developer scratch area
 _dev/
+tests/playwright/deploys/apps/*/requirements.txt

setup.cfg

@@ -83,6 +83,7 @@ test =
     missingno
     rsconnect-python
     scikit-learn
+    folium
 
 dev =
     black>=23.1.0

shiny/api-examples/render_display/app.py

@@ -0,0 +1,19 @@
+import datetime
+
+from shiny import render, ui
+from shiny.express import input, layout
+
+with layout.card(id="card"):
+    ui.input_slider("val", "slider", 0, 100, 50)
+    "Text outside of render display call"
+    ui.tags.br()
+    f"Rendered time: {str(datetime.datetime.now())}"
+
+    @render.display
+    def render_display():
+        "Text inside of render display call"
+        ui.tags.br()
+        "Dynamic slider value: "
+        input.val()
+        ui.tags.br()
+        f"Display's rendered time: {str(datetime.datetime.now())}"

shiny/express/__init__.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
-from ..session import Inputs, Outputs, Session
+# Import these with underscore names so they won't show in autocomplete from the Python
+# console.
+from ..session import Inputs as _Inputs, Outputs as _Outputs, Session as _Session
 from ..session import _utils as _session_utils
-from . import app, ui
+from . import ui
 from ._is_express import is_express_app
 from ._output import output_args, suspend_display
 from ._run import wrap_express_app
@@ -16,15 +18,14 @@
     "output_args",
     "suspend_display",
     "wrap_express_app",
-    "app",
     "ui",
     "display_body",
 )
 
 # Add types to help type checkers
-input: Inputs
-output: Outputs
-session: Session
+input: _Inputs
+output: _Outputs
+session: _Session
 
 
 # Note that users should use `from shiny.express import input` instead of `from shiny
@@ -50,8 +51,8 @@ def __init__(self):
 
         from .._namespaces import Root
 
-        self.input = Inputs({})
-        self.output = Outputs(cast(Session, self), Root, {}, {})
+        self.input = _Inputs({})
+        self.output = _Outputs(cast(_Session, self), Root, {}, {})
 
     # This is needed so that Outputs don't throw an error.
     def _is_hidden(self, name: str) -> bool:
@@ -61,15 +62,15 @@ def _is_hidden(self, name: str) -> bool:
 _current_mock_session: _MockSession | None = None
 
 
-def _get_current_session_or_mock() -> Session:
+def _get_current_session_or_mock() -> _Session:
     from typing import cast
 
     session = _session_utils.get_current_session()
     if session is None:
         global _current_mock_session
         if _current_mock_session is None:
             _current_mock_session = _MockSession()
-        return cast(Session, _current_mock_session)
+        return cast(_Session, _current_mock_session)
 
     else:
         return session

shiny/express/ui/__init__.py

@@ -133,6 +133,8 @@
     panel_conditional,
     panel_fixed,
     panel_absolute,
+    tooltip,
+    popover,
 )
 
 from ._page import (
@@ -269,6 +271,8 @@
     "panel_conditional",
     "panel_fixed",
     "panel_absolute",
+    "popover",
+    "tooltip",
     # Imports from ._page
     "page_opts",
 )
@@ -294,11 +298,9 @@
         "panel_main",  # Deprecated
         "panel_sidebar",  # Deprecated
         "panel_title",
-        "popover",
         "showcase_bottom",
         "showcase_left_center",
         "showcase_top_right",
-        "tooltip",
     ),
     # Items from shiny.express.ui that don't have a counterpart in shiny.ui
     "shiny.express.ui": ("page_opts",),

shiny/express/ui/_cm_components.py

@@ -1115,8 +1115,6 @@ def nav_menu(
 # Value boxes
 # ======================================================================================
 def value_box(
-    title: TagChild,
-    value: TagChild,
     *,
     showcase: Optional[TagChild] = None,
     showcase_layout: ui._valuebox.SHOWCASE_LAYOUTS_STR
@@ -1134,16 +1132,14 @@ def value_box(
 
     This function wraps :func:`~shiny.ui.value_box`.
 
-    An opinionated (:func:`~shiny.ui.card`-powered) box, designed for
-    displaying a `value` and `title`. Optionally, a `showcase` can provide for context
-    for what the `value` represents (for example, it could hold an icon, or even a
+    An opinionated (:func:`~shiny.ui.card`-powered) box, designed for displaying a title
+    (the 1st child), value (the 2nd child), and other explanation text (other children,
+    if any). Optionally, a `showcase` can provide for context for what the `value`
+    represents (for example, it could hold an icon, or even a
     :func:`~shiny.ui.output_plot`).
 
     Parameters
     ----------
-    title,value
-        A string, number, or :class:`~htmltools.Tag` child to display as
-        the title or value of the value box. The `title` appears above the `value`.
     showcase
         A :class:`~htmltools.Tag` child to showcase (e.g., an icon, a
         :func:`~shiny.ui.output_plot`, etc).
@@ -1184,7 +1180,6 @@ def value_box(
     """
     return RecallContextManager(
         ui.value_box,
-        args=(title, value),
         kwargs=dict(
             showcase=showcase,
             showcase_layout=showcase_layout,
@@ -1400,3 +1395,90 @@ def panel_absolute(
             **kwargs,
         ),
     )
+
+
+# ======================================================================================
+# Tooltips and popovers
+# ======================================================================================
+
+
+def tooltip(
+    *,
+    id: Optional[str] = None,
+    placement: Literal["auto", "top", "right", "bottom", "left"] = "auto",
+    options: Optional[dict[str, object]] = None,
+    **kwargs: TagAttrValue,
+) -> RecallContextManager[Tag]:
+    """
+    Context manager for a tooltip
+
+    This function wraps :func:`~shiny.ui.tooltip`.
+
+    Display additional information when focusing (or hovering over) a UI element.
+
+    Parameters
+    ----------
+    id
+        A character string. Required to reactively respond to the visibility of the
+        tooltip (via the `input[id]` value) and/or update the visibility/contents of the
+        tooltip.
+    placement
+        The placement of the tooltip relative to its trigger.
+    options
+        A list of additional [Bootstrap
+        options](https://getbootstrap.com/docs/5.3/components/tooltips/#options).
+    """
+
+    return RecallContextManager(
+        ui.tooltip,
+        kwargs=dict(
+            id=id,
+            placement=placement,
+            options=options,
+            **kwargs,
+        ),
+    )
+
+
+def popover(
+    *,
+    title: Optional[TagChild] = None,
+    id: Optional[str] = None,
+    placement: Literal["auto", "top", "right", "bottom", "left"] = "auto",
+    options: Optional[dict[str, object]] = None,
+    **kwargs: TagAttrValue,
+) -> RecallContextManager[Tag]:
+    """
+    Context manager for a popover
+
+    This function wraps :func:`~shiny.ui.popover`.
+
+    Display additional information when clicking on a UI element (typically a
+    button).
+
+    Parameters
+    ----------
+    title
+        A title to display in the popover. Can be a character string or UI elements
+        (i.e., tags).
+    id
+        A character string. Required to reactively respond to the visibility of the
+        popover (via the `input[id]` value) and/or update the visibility/contents of the
+        popover.
+    placement
+        The placement of the popover relative to its trigger.
+    options
+        A list of additional [Bootstrap
+        options](https://getbootstrap.com/docs/5.3/components/popovers/#options).
+    """
+
+    return RecallContextManager(
+        ui.popover,
+        kwargs=dict(
+            title=title,
+            id=id,
+            placement=placement,
+            options=options,
+            **kwargs,
+        ),
+    )

tests/playwright/deploys/apps/plotly_app/requirements.txt renamed to tests/playwright/deploys/apps/plotly_app/app_requirements.txt

@@ -1,5 +1,4 @@
 pandas
 plotly
-git+https://github.com/posit-dev/py-shiny.git#egg=shiny
 git+https://github.com/posit-dev/py-htmltools.git#egg=htmltools
 git+https://github.com/posit-dev/py-shinywidgets.git#egg=shinywidgets

tests/playwright/deploys/apps/plotly_app/rsconnect-python/plotly_app.json

@@ -1,12 +1,11 @@
 {
-    "https://rsc.radixu.com/": {
-        "server_url": "https://rsc.radixu.com/",
-        "filename": "/Users/karangathani/Documents/GitHub/py-shiny/tests/playwright/deploys/apps/plotly_app",
-        "app_url": "https://rsc.radixu.com/content/fc82dde5-c4ba-4748-971b-aacc09613faa/",
-        "app_id": "fc82dde5-c4ba-4748-971b-aacc09613faa",
-        "app_guid": "fc82dde5-c4ba-4748-971b-aacc09613faa",
+    "https://api.shinyapps.io": {
+        "server_url": "https://api.shinyapps.io",
+        "app_url": "https://testing-apps.shinyapps.io/example_deploy_app_a1/",
+        "app_id": 10800241,
+        "app_guid": null,
         "title": "example_deploy_app_A",
         "app_mode": "python-shiny",
         "app_store_version": 1
     }
-}
+}

tests/playwright/deploys/apps/shiny-express-page-fluid/requirements.txt renamed to tests/playwright/deploys/apps/shiny-express-accordion/app_requirements.txt

@@ -1,2 +1 @@
-git+https://github.com/posit-dev/py-shiny.git#egg=shiny
 git+https://github.com/posit-dev/py-htmltools.git#egg=htmltools