Fix bad usage of numpy-legacy-random

Author: schloerke

examples/brownian/brownian_motion.py

@@ -5,14 +5,14 @@
 # * `brownian_motion()` is a function that generates a random walk
 # * `brownian_widget()` uses restructured plotting code given in article
 
-rs = np.random.RandomState()
+rng = np.random.default_rng()
 
 
 # https://plotly.com/python/3d-line-plots/
 def brownian_motion(T=1, N=100, mu=0.1, sigma=0.01, S0=20):
     dt = float(T) / N
     t = np.linspace(0, T, N)
-    W = rs.standard_normal(size=N)
+    W = rng.standard_normal(size=N)
     W = np.cumsum(W) * np.sqrt(dt)  # standard brownian motion
     X = (mu - 0.5 * sigma**2) * t + sigma * W
     S = S0 * np.exp(X)  # geometric brownian motion

examples/cpuinfo/fakepsutil.py

@@ -7,13 +7,13 @@ def cpu_count(logical: bool = True):
     return 8 if logical else 4
 
 
-rnd = np.random.RandomState()
-last_sample = rnd.uniform(0, 100, size=cpu_count(True))
+rng = np.random.default_rng()
+last_sample = rng.uniform(0, 100, size=cpu_count(True))
 
 
 def cpu_percent(percpu: bool = False):
     global last_sample
-    delta = rnd.normal(scale=10, size=len(last_sample))
+    delta = rng.normal(scale=10, size=len(last_sample))
     last_sample = (last_sample + delta).clip(0, 100)
     if percpu:
         return last_sample.tolist()

examples/express/accordion_app.py

@@ -17,5 +17,5 @@ def txt():
 
 @render.plot
 def histogram():
-    x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+    x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
     plt.hist(x, input.n(), density=True)

examples/express/column_wrap_app.py

@@ -12,12 +12,12 @@
 
         @render.plot
         def histogram():
-            x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+            x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
             plt.hist(x, input.n(), density=True)
 
     with ui.card():
 
         @render.plot
         def histogram2():
-            x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+            x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
             plt.hist(x, input.n(), density=True, color="red")

examples/express/nav_app.py

@@ -13,7 +13,7 @@
 
             @render.plot
             def histogram():
-                x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+                x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
                 plt.hist(x, input.n(), density=True)
 
     with ui.navset_card_underline():
@@ -24,5 +24,5 @@ def histogram():
 
             @render.plot
             def histogram2():
-                x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+                x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
                 plt.hist(x, input.n2(), density=True)

examples/express/plot_app.py

@@ -9,5 +9,5 @@
 
 @render.plot
 def histogram():
-    x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+    x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
     plt.hist(x, input.n(), density=True)

examples/express/shared_app.py

@@ -12,7 +12,7 @@
 
 @render.plot
 def histogram():
-    x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+    x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
     plt.hist(x, shared.rv(), density=True)
 
 

examples/express/sidebar_app.py

@@ -10,5 +10,5 @@
 
 @render.plot
 def histogram():
-    x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+    x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
     plt.hist(x, input.n(), density=True)

examples/static_plots/app.py

@@ -54,15 +54,14 @@
 
 
 def server(input: Inputs, output: Outputs, session: Session):
-    rnd = np.random.RandomState()
+    rng = np.random.default_rng()
 
     @reactive.calc
     def fake_data():
         n = 5000
         mean = [0, 0]
-        rng = np.random.RandomState(0)
         cov = [(input.var(), input.cov()), (input.cov(), 1 / input.var())]
-        return rng.multivariate_normal(mean, cov, n).T
+        return np.random.default_rng(seed=0).multivariate_normal(mean, cov, n).T
 
     @render.plot
     def seaborn():
@@ -100,7 +99,7 @@ def plotnine():
     @render.plot
     def pandas():
         ts = pd.Series(
-            rnd.randn(1000),
+            rng.randn(1000),
             index=pd.date_range("1/1/2000", periods=1000),
         )
         ts = ts.cumsum()

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

@@ -77,7 +77,7 @@ def make_example(id: str, label: str, title: str, desc: str, extra: Any = None):
 
 
 def server(input: Inputs, output: Outputs, session: Session):
-    rnd = np.random.RandomState()
+    rng = np.random.default_rng()
 
     @render.download()
     def download1():
@@ -100,8 +100,8 @@ def download2():
         """
 
         print(input.num_points())
-        x = rnd.uniform(size=input.num_points())
-        y = rnd.uniform(size=input.num_points())
+        x = rng.uniform(size=input.num_points())
+        y = rng.uniform(size=input.num_points())
         plt.figure()
         plt.scatter(x, y)
         plt.title(input.title())
@@ -110,7 +110,7 @@ def download2():
             yield buf.getvalue()
 
     @render.download(
-        filename=lambda: f"新型-{date.today().isoformat()}-{rnd.randint(100, 999)}.csv"
+        filename=lambda: f"新型-{date.today().isoformat()}-{rng.randint(100, 999)}.csv"
     )
     async def download3():
         await asyncio.sleep(0.25)

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

@@ -8,7 +8,7 @@
 
 from shiny.express import render, ui
 
-rnd = np.random.RandomState()
+rng = np.random.default_rng()
 
 ui.page_opts(title="Various download examples")
 
@@ -43,8 +43,8 @@ def download2():
             """
 
             print(input.num_points())
-            x = rnd.uniform(size=input.num_points())
-            y = rnd.uniform(size=input.num_points())
+            x = rng.uniform(size=input.num_points())
+            y = rng.uniform(size=input.num_points())
             plt.figure()
             plt.scatter(x, y)
             plt.title(input.title())
@@ -59,7 +59,7 @@ def download2():
 
         @render.download(
             label="Download filename",
-            filename=lambda: f"新型-{date.today().isoformat()}-{rnd.randint(100, 999)}.csv",
+            filename=lambda: f"新型-{date.today().isoformat()}-{rng.randint(100, 999)}.csv",
         )
         async def download3():
             await asyncio.sleep(0.25)

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

@@ -16,7 +16,7 @@ def server(input: Inputs, output: Outputs, session: Session):
     # (not when the slider is changed)
     @reactive.event(input.go, ignore_none=False)
     def plot():
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(input.n())
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(input.n())
         fig, ax = plt.subplots()
         ax.hist(x, bins=30, density=True)
         return fig

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

@@ -13,7 +13,7 @@
 # (not when the slider is changed)
 @reactive.event(input.go, ignore_none=False)
 def plot():
-    x = 100 + 15 * np.random.RandomState(seed=19680801).randn(input.n())
+    x = 100 + 15 * np.random.default_rng(seed=19680801).randn(input.n())
     fig, ax = plt.subplots()
     ax.hist(x, bins=30, density=True)
     return fig

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

@@ -16,7 +16,7 @@ def server(input: Inputs, output: Outputs, session: Session):
     # the slider is changed
     @reactive.event(input.go, ignore_none=False)
     def plot():
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(input.n())
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(input.n())
         fig, ax = plt.subplots()
         ax.hist(x, bins=30, density=True)
         return fig

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

@@ -13,7 +13,7 @@
 # the slider is changed
 @reactive.event(input.go, ignore_none=False)
 def plot():
-    x = 100 + 15 * np.random.RandomState(seed=19680801).randn(input.n())
+    x = 100 + 15 * np.random.default_rng(seed=19680801).randn(input.n())
     fig, ax = plt.subplots()
     ax.hist(x, bins=30, density=True)
     return fig

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

@@ -45,7 +45,7 @@ def _():
 
     @render.plot(alt="A histogram")
     def plot() -> object:
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
         fig, ax = plt.subplots()
         ax.hist(x, input.n(), density=True)

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

@@ -13,7 +13,7 @@
 
         @render.plot(alt="A histogram")
         def plot() -> object:
-            x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+            x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
             fig, ax = plt.subplots()
             ax.hist(x, input.n(), density=True)

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

@@ -12,7 +12,7 @@
 def server(input: Inputs, output: Outputs, session: Session):
     @render.plot
     def distPlot():
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
         fig, ax = plt.subplots()
         ax.hist(x, input.obs(), density=True)

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

@@ -8,7 +8,7 @@
 
 @render.plot
 def distPlot():
-    x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+    x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
     fig, ax = plt.subplots()
     ax.hist(x, input.obs(), density=True)

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

@@ -18,7 +18,7 @@ def plot():
 
         # ...but don't take a reactive dependency on the slider
         with reactive.isolate():
-            x = 100 + 15 * np.random.RandomState(19680801).randn(input.n())
+            x = 100 + 15 * np.random.default_rng(seed=19680801).randn(input.n())
 
         fig, ax = plt.subplots()
         ax.hist(x, bins=30, density=True)

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

@@ -15,7 +15,7 @@ def plot():
 
     # ...but don't take a reactive dependency on the slider
     with reactive.isolate():
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(input.n())
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(input.n())
 
     fig, ax = plt.subplots()
     ax.hist(x, bins=30, density=True)

shiny/api-examples/layout_columns/model_plots.py

@@ -3,12 +3,12 @@
 
 from shiny import ui
 
-rnd = np.random.RandomState()
+rng = np.random.default_rng()
 
 
 def plot_loss_over_time():
     epochs = np.arange(1, 101)
-    loss = 1000 / np.sqrt(epochs) + rnd.rand(100) * 25
+    loss = 1000 / np.sqrt(epochs) + rng.uniform(size=100) * 25
 
     fig = plt.figure(figsize=(10, 6))
     plt.plot(epochs, loss)
@@ -19,7 +19,7 @@ def plot_loss_over_time():
 
 def plot_accuracy_over_time():
     epochs = np.arange(1, 101)
-    accuracy = np.sqrt(epochs) / 12 + rnd.rand(100) * 0.15
+    accuracy = np.sqrt(epochs) / 12 + rng.uniform(size=100) * 0.15
     accuracy = [np.min([np.max(accuracy[:i]), 1]) for i in range(1, 101)]
 
     fig = plt.figure(figsize=(10, 6))
@@ -31,7 +31,7 @@ def plot_accuracy_over_time():
 
 def plot_feature_importance():
     features = ["Product Category", "Price", "Brand", "Rating", "Number of Reviews"]
-    importance = rnd.rand(5)
+    importance = rng.uniform(size=5)
 
     fig = plt.figure(figsize=(10, 6))
     plt.barh(features, importance)

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

@@ -16,7 +16,7 @@
 def server(input: Inputs, output: Outputs, session: Session):
     @render.plot(alt="A histogram")
     def plot() -> object:
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
         fig, ax = plt.subplots()
         ax.hist(x, input.n(), density=True)

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

@@ -9,7 +9,7 @@
 
     @render.plot(alt="A histogram")
     def plot() -> object:
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
         fig, ax = plt.subplots()
         ax.hist(x, input.n(), density=True)

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

@@ -14,7 +14,7 @@
 def server(input: Inputs, output: Outputs, session: Session):
     @render.plot
     def p():
-        x_rand = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+        x_rand = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
         fig, ax = plt.subplots()
         ax.hist(x_rand, int(input.n()), density=True)
         return fig

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

@@ -8,7 +8,7 @@
 
 @render.plot
 def p():
-    x_rand = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+    x_rand = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
     fig, ax = plt.subplots()
     ax.hist(x_rand, int(input.n()), density=True)
     return fig

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

@@ -18,7 +18,7 @@
 def server(input: Inputs, output: Outputs, session: Session):
     @render.plot(alt="A histogram")
     def plot() -> object:
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
         fig, ax = plt.subplots()
         ax.hist(x, input.n(), density=True)

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

@@ -12,7 +12,7 @@
 
     @render.plot(alt="A histogram")
     def plot() -> object:
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
         fig, ax = plt.subplots()
         ax.hist(x, input.n(), density=True)

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

@@ -16,7 +16,7 @@
 def server(input: Inputs, output: Outputs, session: Session):
     @render.plot(alt="A histogram")
     def plot() -> object:
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
         fig, ax = plt.subplots()
         ax.hist(x, input.n(), density=True)

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

@@ -12,7 +12,7 @@
 
     @render.plot(alt="A histogram")
     def plot() -> object:
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
         fig, ax = plt.subplots()
         ax.hist(x, input.n(), density=True)

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

@@ -16,7 +16,7 @@
 def server(input: Inputs, output: Outputs, session: Session):
     @render.plot(alt="A histogram")
     def plot() -> object:
-        x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+        x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
         fig, ax = plt.subplots()
         ax.hist(x, input.n(), density=True)

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

@@ -9,7 +9,7 @@
 
 @render.plot(alt="A histogram")
 def plot() -> object:
-    x = 100 + 15 * np.random.RandomState(seed=19680801).randn(437)
+    x = 100 + 15 * np.random.default_rng(seed=19680801).randn(437)
 
     fig, ax = plt.subplots()
     ax.hist(x, input.n(), density=True)