Merge branch 'main' into decouple-select-selectize

Author: schloerke

CHANGELOG.md

@@ -7,9 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
-### Changes
+### New features
+
+### Improvements
+
+* `selectize`, `remove_button`, and `options` parameters of `ui.input_select()` have been deprecated; use `ui.input_selectize()` instead. (Thanks, @ErdaradunGaztea!) (#1947) 
+
+* Improved the styling and readability of markdown tables rendered by `ui.Chat()` and `ui.MarkdownStream()`. (#1973)
+
+### Bug fixes
 
-* `selectize`, `remove_button`, and `options` parameters of `ui.input_select()` have been deprecated; use `ui.input_selectize()` instead. (#1947) 
 
 ## [1.4.0] - 2025-04-08
 

js/markdown-stream/markdown-stream.ts

@@ -45,28 +45,38 @@ const SVG_DOT = createSVGIcon(
   `<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" class="${SVG_DOT_CLASS}" style="margin-left:.25em;margin-top:-.25em"><circle cx="6" cy="6" r="6"/></svg>`
 );
 
-// For rendering chat output, we use typical Markdown behavior of passing through raw
-// HTML (albeit sanitizing afterwards).
-//
-// For echoing chat input, we escape HTML. This is not for security reasons but just
-// because it's confusing if the user is using tag-like syntax to demarcate parts of
-// their prompt for other reasons (like <User>/<Assistant> for providing examples to the
-// chat model), and those tags simply vanish.
-const rendererEscapeHTML = new Renderer();
-rendererEscapeHTML.html = (html: string) =>
+// 'markdown' renderer (for assistant messages)
+const markdownRenderer = new Renderer();
+
+// Add some basic Bootstrap styling to markdown tables
+markdownRenderer.table = (header: string, body: string) => {
+  return `<table class="table table-striped table-bordered">
+      <thead>${header}</thead>
+      <tbody>${body}</tbody>
+    </table>`;
+};
+
+// 'semi-markdown' renderer (for user messages)
+const semiMarkdownRenderer = new Renderer();
+
+// Escape HTML, not for security reasons, but just because it's confusing if the user is
+// using tag-like syntax to demarcate parts of their prompt for other reasons (like
+// <User>/<Assistant> for providing examples to the model), and those tags vanish.
+semiMarkdownRenderer.html = (html: string) =>
   html
     .replaceAll("&", "&amp;")
     .replaceAll("<", "&lt;")
     .replaceAll(">", "&gt;")
     .replaceAll('"', "&quot;")
     .replaceAll("'", "&#039;");
-const markedEscapeOpts = { renderer: rendererEscapeHTML };
 
 function contentToHTML(content: string, content_type: ContentType) {
   if (content_type === "markdown") {
-    return unsafeHTML(sanitizeHTML(parse(content) as string));
+    const html = parse(content, { renderer: markdownRenderer });
+    return unsafeHTML(sanitizeHTML(html as string));
   } else if (content_type === "semi-markdown") {
-    return unsafeHTML(sanitizeHTML(parse(content, markedEscapeOpts) as string));
+    const html = parse(content, { renderer: semiMarkdownRenderer });
+    return unsafeHTML(sanitizeHTML(html as string));
   } else if (content_type === "html") {
     return unsafeHTML(sanitizeHTML(content));
   } else if (content_type === "text") {

pyproject.toml

@@ -100,7 +100,7 @@ dev = [
     "isort>=5.10.1",
     "libsass>=0.23.0",
     "brand_yml>=0.1.0",
-    "pyright>=1.1.398",
+    "pyright==1.1.398",
     "pre-commit>=2.15.0",
     "wheel",
     "matplotlib",

shiny/api-examples/Module/app-core.py

@@ -9,7 +9,7 @@ def counter_ui(label: str = "Increment counter") -> ui.TagChild:
     return ui.card(
         ui.h2("This is " + label),
         ui.input_action_button(id="button", label=label),
-        ui.output_text_verbatim(id="out"),
+        ui.output_text(id="out"),
     )
 
 

shiny/api-examples/Module/app-express.py

@@ -0,0 +1,30 @@
+from shiny import reactive
+from shiny.express import module, render, ui
+
+
+# ============================================================
+# Counter module
+# ============================================================
+@module
+def counter(input, output, session, label, starting_value: int = 0):
+    count = reactive.value(starting_value)
+    with ui.card():
+        ui.h2(f"This is {label}")
+        ui.input_action_button("button", f"{label}")
+
+        @render.text
+        def out():
+            return f"Click count is {count()}"
+
+    @reactive.effect
+    @reactive.event(input.button)
+    def _():
+        count.set(count() + 1)
+
+
+# =============================================================================
+# App that uses module
+# =============================================================================
+counter("counter1", "Counter 1", starting_value=0)
+ui.hr()
+counter("counter2", "Counter 2", starting_value=0)

shiny/api-examples/express_module/app-express.py

@@ -15,7 +15,7 @@
 __all__ = ("module",)
 
 
-@add_example(ex_dir="../api-examples/express_module")
+@add_example(ex_dir="../api-examples/Module")
 def module(
     fn: Callable[Concatenate[Inputs, Outputs, Session, P], R],
 ) -> Callable[Concatenate[Id, P], R]:

shiny/express/_module.py

@@ -4,7 +4,7 @@
 
 from typing import TYPE_CHECKING, Callable, TypeVar
 
-from ._docstring import no_example
+from ._docstring import add_example
 from ._namespaces import (
     Id,
     ResolvedId,
@@ -24,25 +24,87 @@
 _: Id  # type: ignore
 
 
-@no_example()
+@add_example(ex_dir="api-examples/Module")
 def ui(fn: Callable[P, R]) -> Callable[Concatenate[str, P], R]:
+    """
+    Decorator for defining a Shiny module UI function.
+
+    This decorator allows you to write the UI portion of a Shiny module.
+    When your decorated `ui` function is called with an `id`,
+    the UI elements defined within will automatically be namespaced using that `id`.
+    This enables reuse of UI components and consistent input/output handling
+    when paired with a :func:`shiny.module.server` function.
+
+    Parameters
+    ----------
+    fn
+        A function that returns a Shiny UI element or layout (e.g., a `ui.panel_*` component).
+        This function should **not** accept an `id` parameter itself; the decorator injects it.
+
+    Returns
+    -------
+    :
+        A function that takes a `str` `id` as its first argument, followed by any additional
+        parameters accepted by `fn`. When called, it returns UI elements with input/output
+        IDs automatically namespaced using the provided module `id`.
+
+    See Also
+    --------
+    * Shiny Modules documentation: <https://shiny.posit.co/py/docs/modules.html>
+    * :func:`shiny.module.server`
+    """
+
     def wrapper(id: Id, *args: P.args, **kwargs: P.kwargs) -> R:
         with namespace_context(id):
             return fn(*args, **kwargs)
 
     return wrapper
 
 
-@no_example()
+@add_example(ex_dir="api-examples/Module")
 def server(
     fn: Callable[Concatenate[Inputs, Outputs, Session, P], R],
 ) -> Callable[Concatenate[str, P], R]:
+    """
+    Decorator for defining a Shiny module server function.
+
+    This decorator is used to encapsulate the server logic for a Shiny module.
+    It automatically creates a namespaced child `Session` using the provided module `id`,
+    and passes the appropriate `input`, `output`, and `session` objects to your server function.
+
+    This ensures that the server logic is scoped correctly for each module instance and
+    allows for reuse of logic across multiple instances of the same module.
+
+    Parameters
+    ----------
+    fn
+        A server function that takes `input`, `output`, and `session` as its first
+        three arguments, followed by any additional arguments defined by the user.
+
+    Returns
+    -------
+    :
+        A function that takes a module `id` (as a string) as its first argument,
+        followed by any arguments expected by `fn`. When called, it will register
+        the module's server logic in a namespaced context.
+
+    See Also
+    --------
+    * Shiny Modules documentation: <https://shiny.posit.co/py/docs/modules.html>
+    * :func:`shiny.module.ui`
+    """
     from .session import require_active_session, session_context
 
     def wrapper(id: Id, *args: P.args, **kwargs: P.kwargs) -> R:
         sess = require_active_session(None)
         child_sess = sess.make_scope(id)
         with session_context(child_sess):
-            return fn(child_sess.input, child_sess.output, child_sess, *args, **kwargs)
+            return fn(
+                child_sess.input,
+                child_sess.output,
+                child_sess,
+                *args,
+                **kwargs,
+            )
 
     return wrapper