Remove @output and session from server where possible

Author: schloerke

examples/airmass/app.py

@@ -12,7 +12,7 @@
 from astropy.coordinates import AltAz, EarthLocation, SkyCoord
 from location import location_server, location_ui
 
-from shiny import App, Inputs, Outputs, Session, reactive, render, req, ui
+from shiny import App, Inputs, reactive, render, req, ui
 
 app_ui = ui.page_fixed(
     ui.tags.h3("Air mass calculator"),
@@ -57,7 +57,7 @@
 )
 
 
-def server(input: Inputs, output: Outputs, session: Session):
+def server(input: Inputs):
     loc = location_server("location")
     time_padding = datetime.timedelta(hours=1.5)
 
@@ -119,7 +119,6 @@ def df() -> Dict[str, pd.DataFrame]:
             for (altaz, obj) in zip(altaz_list, obj_names())
         }
 
-    @output
     @render.plot
     def plot():
         fig, [ax1, ax2] = plt.subplots(nrows=2)
@@ -160,12 +159,10 @@ def add_boundary(ax, xval):
 
         return fig
 
-    @output
     @render.table
     def table() -> pd.DataFrame:
         return pd.concat(df())
 
-    @output
     @render.ui
     def timeinfo():
         start_utc, end_utc = times_utc()

examples/brownian/app.py

@@ -41,7 +41,7 @@
 )
 
 
-def server(input, output, session):
+def server(input):
     # BROWNIAN MOTION ====
 
     @reactive.Calc
@@ -85,22 +85,18 @@ def update_plotly_camera():
 
     # DEBUGGING ====
 
-    @output
     @render.text
     def x_debug():
         return camera_eye()["x"]
 
-    @output
     @render.text
     def y_debug():
         return camera_eye()["y"]
 
-    @output
     @render.text
     def z_debug():
         return camera_eye()["z"]
 
-    @output
     @render.text
     def mag_debug():
         eye = camera_eye()

examples/cpuinfo/app.py

@@ -13,7 +13,7 @@
 import numpy as np
 import pandas as pd
 
-from shiny import App, Inputs, Outputs, Session, reactive, render, ui
+from shiny import App, Inputs, reactive, render, ui
 
 # The agg matplotlib backend seems to be a little more efficient than the default when
 # running on macOS, and also gives more consistent results across operating systems
@@ -108,7 +108,7 @@ def cpu_current():
     return cpu_percent(percpu=True)
 
 
-def server(input: Inputs, output: Outputs, session: Session):
+def server(input: Inputs):
     cpu_history = reactive.Value(None)
 
     @reactive.Calc
@@ -145,7 +145,6 @@ def collect_cpu_samples():
     def reset_history():
         cpu_history.set(None)
 
-    @output
     @render.plot
     def plot():
         history = cpu_history_with_hold()
@@ -205,7 +204,6 @@ def plot():
 
         return fig
 
-    @output
     @render.table
     def table():
         history = cpu_history_with_hold()

examples/dataframe/app.py

@@ -2,7 +2,7 @@
 import seaborn as sns
 from shinyswatch.theme import darkly
 
-from shiny import App, Inputs, Outputs, Session, reactive, render, req, ui
+from shiny import App, Inputs, reactive, render, req, ui
 
 
 def app_ui(req):
@@ -54,14 +54,13 @@ def light_dark_switcher(dark):
     )
 
 
-def server(input: Inputs, output: Outputs, session: Session):
+def server(input: Inputs):
     df: reactive.Value[pd.DataFrame] = reactive.Value()
 
     @reactive.Effect
     def update_df():
         return df.set(sns.load_dataset(req(input.dataset())))
 
-    @output
     @render.data_frame
     def grid():
         height = 350
@@ -91,7 +90,6 @@ def handle_edit():
         df_copy.iat[edit["row"], edit["col"]] = edit["new_value"]
         df.set(df_copy)
 
-    @output
     @render.text
     def detail():
         if (

examples/duckdb/app.py

@@ -66,7 +66,7 @@ def load_csv(con, csv_name, table_name):
 )
 
 
-def server(input, output, session):
+def server(input):
     mod_counter = reactive.Value(0)
 
     query_output_server("initial_query", con=con, remove_id="initial_query")

examples/event/app.py

@@ -1,6 +1,6 @@
 import asyncio
 
-from shiny import App, Inputs, Outputs, Session, reactive, render, ui
+from shiny import App, Inputs, reactive, render, ui
 
 app_ui = ui.page_fluid(
     ui.tags.p(
@@ -26,7 +26,7 @@
 )
 
 
-def server(input: Inputs, output: Outputs, session: Session):
+def server(input: Inputs):
     @reactive.Effect
     @reactive.event(input.btn)
     def _():
@@ -66,7 +66,6 @@ async def _():
         val = await btn_async_r()
         print("async @calc() event:   ", str(val))
 
-    @output
     @render.ui
     @reactive.event(btn_async_r)
     async def btn_async_value():

examples/global_pyplot/app.py

@@ -1,6 +1,6 @@
 import matplotlib.pyplot as plt
 
-from shiny import App, Inputs, Outputs, Session, render, ui
+from shiny import App, Inputs, render, ui
 
 app_ui = ui.page_fluid(
     ui.input_checkbox("render", "Render", value=True),
@@ -18,14 +18,12 @@
 )
 
 
-def server(input: Inputs, output: Outputs, session: Session):
-    @output
+def server(input: Inputs):
     @render.plot
     def mpl():
         if input.render():
             plt.hist([1, 1, 2, 3, 5])
 
-    @output
     @render.plot
     async def mpl_bad():
         if input.render():

examples/headers/app.py

@@ -9,7 +9,6 @@
 
 
 def server(input: Inputs, output: Outputs, session: Session):
-    @output
     @render.text
     def headers():
         s = ""
@@ -18,7 +17,6 @@ def headers():
 
         return s
 
-    @output
     @render.text
     def user_groups():
         return f"session.user: {session.user}\nsession.groups: {session.groups}"

examples/inputs-update/app.py

@@ -1,6 +1,6 @@
 from datetime import date
 
-from shiny import App, Inputs, Outputs, Session, reactive, ui
+from shiny import App, Inputs, reactive, ui
 
 app_ui = ui.page_fluid(
     ui.panel_title("Changing the values of inputs from the server"),
@@ -87,7 +87,7 @@
 )
 
 
-def server(input: Inputs, output: Outputs, session: Session):
+def server(input: Inputs):
     @reactive.Effect
     def _():
         # We'll use these multiple times, so use short var names for

examples/load_balance/app.py

@@ -30,7 +30,6 @@
 
 
 def server(input: Inputs, output: Outputs, session: Session):
-    @output
     @render.ui
     def out():
         # Register a dynamic route for the client to try to connect to.

examples/model-score/app.py

@@ -9,7 +9,7 @@
 from plotly_streaming import render_plotly_streaming
 from shinywidgets import output_widget
 
-from shiny import App, Inputs, Outputs, Session, reactive, render, ui
+from shiny import App, Inputs, reactive, render, ui
 
 THRESHOLD_MID = 0.85
 THRESHOLD_MID_COLOR = "rgb(0, 137, 26)"
@@ -133,7 +133,7 @@ def app_ui(req):
     )
 
 
-def server(input: Inputs, output: Outputs, session: Session):
+def server(input: Inputs):
     @reactive.Calc
     def recent_df():
         """
@@ -178,7 +178,6 @@ def filtered_df():
     def filtered_model_names():
         return filtered_df()["model"].unique()
 
-    @output
     @render.ui
     def value_boxes():
         data = filtered_df()
@@ -208,7 +207,6 @@ def value_boxes():
             fixed_width=True,
         )
 
-    @output
     @render_plotly_streaming(recreate_key=filtered_model_names, update="data")
     def plot_timeseries():
         """
@@ -249,7 +247,6 @@ def plot_timeseries():
 
         return fig
 
-    @output
     @render_plotly_streaming(recreate_key=filtered_model_names, update="data")
     def plot_dist():
         fig = px.histogram(

examples/moduleapp/app.py

@@ -62,11 +62,10 @@ def dynamic_counter():
 )
 
 
-def server(input: Inputs, output: Outputs, session: Session):
+def server(input: Inputs):
     counter_server("counter1")
     counter_wrapper_server("counter2_wrapper", "Counter 2")
 
-    @output()
     @render.ui()
     def counter3_ui():
         counter_server("counter3")

examples/penguins/app.py

@@ -8,8 +8,7 @@
 import seaborn as sns
 from colors import bg_palette, palette
 
-import shiny.experimental as x
-from shiny import App, Inputs, Outputs, Session, reactive, render, req, ui
+from shiny import App, Inputs, reactive, render, req, ui
 
 sns.set_theme()
 
@@ -48,7 +47,7 @@
 )
 
 
-def server(input: Inputs, output: Outputs, session: Session):
+def server(input: Inputs):
     @reactive.Calc
     def filtered_df() -> pd.DataFrame:
         """Returns a Pandas data frame that includes only the desired rows"""
@@ -59,7 +58,6 @@ def filtered_df() -> pd.DataFrame:
         # Filter the rows so we only include the desired species
         return df[df["Species"].isin(input.species())]
 
-    @output
     @render.plot
     def scatter():
         """Generates a plot for Shiny to display to the user"""
@@ -77,13 +75,12 @@ def scatter():
             legend=False,
         )
 
-    @output
     @render.ui
     def value_boxes():
         df = filtered_df()
 
         def penguin_value_box(title: str, count: int, bgcol: str, showcase_img: str):
-            return x.ui.value_box(
+            return ui.value_box(
                 title,
                 count,
                 {"class": "pt-1 pb-0"},
@@ -120,7 +117,7 @@ def penguin_value_box(title: str, count: int, bgcol: str, showcase_img: str):
             if name in input.species()
         ]
 
-        return ui.layout_column_wrap(1 / len(value_boxes), *value_boxes)
+        return ui.layout_column_wrap(*value_boxes, width=1 / len(value_boxes))
 
 
 app = App(

examples/req/app.py

@@ -1,4 +1,4 @@
-from shiny import App, Inputs, Outputs, Session, reactive, render, req, ui
+from shiny import App, Inputs, reactive, render, req, ui
 from shiny.types import SafeException
 
 app_ui = ui.page_fluid(
@@ -15,18 +15,16 @@
 )
 
 
-def server(input: Inputs, output: Outputs, session: Session):
+def server(input: Inputs):
     @reactive.Calc
     def safe_click():
         req(input.safe())
         return input.safe()
 
-    @output
     @render.ui
     def safe():
         raise SafeException(f"You've clicked {str(safe_click())} times")
 
-    @output
     @render.ui
     def unsafe():
         req(input.unsafe())
@@ -38,7 +36,6 @@ def _():
         print("unsafe clicks:", input.unsafe())
         # raise Exception("Observer exception: this should cause a crash")
 
-    @output
     @render.ui
     def txt_out():
         req(input.txt(), cancel_output=True)