Rename ui_toolkit to ui and import it from the top-level (#63)

Author: cpsievert

examples/bind_event/app.py

@@ -1,9 +1,8 @@
 import asyncio
-import shiny.ui_toolkit as st
 from shiny import *
 from htmltools import tags
 
-ui = st.page_fluid(
+app_ui = ui.page_fluid(
     tags.p(
         """
       The first time you click the button, you should see a 1 appear below the button,
@@ -12,16 +11,16 @@
       print the number of clicks in the console twice.
       """
     ),
-    st.navs_tab_card(
-        st.nav(
+    ui.navs_tab_card(
+        ui.nav(
             "Sync",
-            st.input_action_button("btn", "Click me"),
-            st.output_ui("btn_value"),
+            ui.input_action_button("btn", "Click me"),
+            ui.output_ui("btn_value"),
         ),
-        st.nav(
+        ui.nav(
             "Async",
-            st.input_action_button("btn_async", "Click me"),
-            st.output_ui("btn_async_value"),
+            ui.input_action_button("btn_async", "Click me"),
+            ui.output_ui("btn_async_value"),
         ),
     ),
 )
@@ -80,4 +79,4 @@ async def btn_async_value():
         return str(val)
 
 
-app = App(ui, server, debug=True)
+app = App(app_ui, server, debug=True)

examples/download/app.py

@@ -1,24 +1,18 @@
-# To run this app:
-#   python3 app.py
-
-# Then point web browser to:
-#   http://localhost:8000/
 import asyncio
 import os
 import io
 from datetime import date
 from typing import Any
 
-import shiny.ui_toolkit as st
 from shiny import *
-from htmltools import *
+from htmltools import div, p
 
 import matplotlib.pyplot as plt
 import numpy as np
 
 
 def make_example(id: str, label: str, title: str, desc: str, extra: Any = None):
-    return st.column(
+    return ui.column(
         4,
         div(
             {"class": "card mb-4"},
@@ -27,50 +21,50 @@ def make_example(id: str, label: str, title: str, desc: str, extra: Any = None):
                 {"class": "card-body"},
                 p(desc, class_="card-text text-muted"),
                 extra,
-                st.download_button(id, label, class_="btn-primary"),
+                ui.download_button(id, label, class_="btn-primary"),
             ),
         ),
     )
 
 
-ui = st.page_fluid(
-    st.row(
+app_ui = ui.page_fluid(
+    ui.row(
         make_example(
             "download1",
             label="Download CSV",
             title="Simple case",
             desc="Downloads a pre-existing file, using its existing name on disk.",
         ),
     ),
-    st.row(
+    ui.row(
         make_example(
             "download2",
             label="Download plot",
             title="Dynamic data generation",
             desc="Downloads a PNG that's generated on the fly.",
             extra=[
-                st.input_text("title", "Plot title", "Random scatter plot"),
-                st.input_slider("num_points", "Number of data points", 1, 100, 50),
+                ui.input_text("title", "Plot title", "Random scatter plot"),
+                ui.input_slider("num_points", "Number of data points", 1, 100, 50),
             ],
         ),
     ),
-    st.row(
+    ui.row(
         make_example(
             "download3",
             "Download",
             "Dynamic filename",
             "Demonstrates that filenames can be generated on the fly (and use Unicode characters!).",
         ),
     ),
-    st.row(
+    ui.row(
         make_example(
             "download4",
             "Download",
             "Failed downloads",
             "Throws an error in the download handler, download should not succeed.",
         ),
     ),
-    st.row(
+    ui.row(
         make_example(
             "download5",
             "Download",
@@ -126,4 +120,4 @@ async def _():
         raise Exception("This error was caused intentionally")
 
 
-app = App(ui, server)
+app = App(app_ui, server)

examples/dynamic_ui/app.py

@@ -1,27 +1,20 @@
-# To run this app:
-#   python3 app.py
-
-# Then point web browser to:
-#   http://localhost:8000/
-
-import shiny.ui_toolkit as st
 from shiny import *
-from htmltools import *
+from htmltools import tags
 
 # For plot rendering
 import numpy as np
 import matplotlib.pyplot as plt
 
-ui = st.page_fluid(
-    st.layout_sidebar(
-        st.panel_sidebar(
-            st.h2("Dynamic UI"),
-            st.output_ui("ui"),
-            st.input_action_button("btn", "Trigger insert/remove ui"),
+app_ui = ui.page_fluid(
+    ui.layout_sidebar(
+        ui.panel_sidebar(
+            ui.h2("Dynamic UI"),
+            ui.output_ui("ui"),
+            ui.input_action_button("btn", "Trigger insert/remove ui"),
         ),
-        st.panel_main(
-            st.output_text_verbatim("txt"),
-            st.output_plot("plot"),
+        ui.panel_main(
+            ui.output_text_verbatim("txt"),
+            ui.output_plot("plot"),
         ),
     ),
 )
@@ -50,10 +43,10 @@ def plot():
         ax.hist(x, input.n(), density=True)
         return fig
 
-    @output()
+    @output(name="ui")
     @render_ui()
-    def ui():
-        return st.input_slider(
+    def _():
+        return ui.input_slider(
             "This slider is rendered via @render_ui()", "N", 0, 100, 20
         )
 
@@ -66,4 +59,4 @@ def _():
             ui_remove("#thanks")
 
 
-app = App(ui, server)
+app = App(app_ui, server)