Define reactive dependencies in 1 place

projectmesa · Mar 6, 2024 · 10f2d57 · 10f2d57
1 parent c6b0530
commit 10f2d57
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/mesa/experimental/jupyter_viz.py b/mesa/experimental/jupyter_viz.py
@@ -17,7 +17,7 @@
 # TODO: Turn this function into a Solara component once the current_step.value
 # dependency is passed to measure()
 def Card(
-    model, measures, agent_portrayal, space_drawer, current_step, color, layout_type
+    model, measures, agent_portrayal, space_drawer, dependencies, color, layout_type
 ):
     with rv.Card(
         style_=f"background-color: {color}; width: 100%; height: 100%"
@@ -27,11 +27,11 @@ def Card(
             if space_drawer == "default":
                 # draw with the default implementation
                 components_matplotlib.SpaceMatplotlib(
-                    model, agent_portrayal, dependencies=[current_step.value]
+                    model, agent_portrayal, dependencies=dependencies
                 )
             elif space_drawer == "altair":
                 components_altair.SpaceAltair(
-                    model, agent_portrayal, dependencies=[current_step.value]
+                    model, agent_portrayal, dependencies=dependencies
                 )
             elif space_drawer:
                 # if specified, draw agent space with an alternate renderer
@@ -44,7 +44,7 @@ def Card(
                 measure(model)
             else:
                 components_matplotlib.PlotMatplotlib(
-                    model, measure, dependencies=[current_step.value]
+                    model, measure, dependencies=dependencies
                 )
     return main
 
@@ -115,6 +115,8 @@ def do_reseed():
         reactive_seed.value = model.random.random()
 
     # jupyter
+    dependencies = [current_step.value, reactive_seed.value]
+
     def render_in_jupyter():
         with solara.GridFixed(columns=2):
             UserInputs(user_params, on_change=handle_change_model_params)
@@ -126,11 +128,11 @@ def render_in_jupyter():
             if space_drawer == "default":
                 # draw with the default implementation
                 components_matplotlib.SpaceMatplotlib(
-                    model, agent_portrayal, dependencies=[current_step.value]
+                    model, agent_portrayal, dependencies=dependencies
                 )
             elif space_drawer == "altair":
                 components_altair.SpaceAltair(
-                    model, agent_portrayal, dependencies=[current_step.value]
+                    model, agent_portrayal, dependencies=dependencies
                 )
             elif space_drawer:
                 # if specified, draw agent space with an alternate renderer
@@ -144,7 +146,7 @@ def render_in_jupyter():
                     measure(model)
                 else:
                     components_matplotlib.PlotMatplotlib(
-                        model, measure, dependencies=[current_step.value]
+                        model, measure, dependencies=dependencies
                     )
 
     def render_in_browser():
@@ -178,7 +180,7 @@ def render_in_browser():
                 measures,
                 agent_portrayal,
                 space_drawer,
-                current_step,
+                dependencies,
                 color="white",
                 layout_type=layout_types[i],
             )