Refactor SpaceRenderer API to separate setup and draw methods

mesa/examples/advanced/epstein_civil_violence/app.py

@@ -64,8 +64,11 @@ def post_process(ax):
 )
 
 epstein_model = EpsteinCivilViolence()
-renderer = SpaceRenderer(epstein_model, backend="matplotlib")
-renderer.draw_agents(citizen_cop_portrayal)
+renderer = SpaceRenderer(epstein_model, backend="matplotlib").setup_agents(
+    citizen_cop_portrayal
+)
+# Specifically, avoid drawing the grid to hide the grid lines.
+renderer.draw_agents()
 renderer.post_process = post_process
 
 page = SolaraViz(

mesa/examples/advanced/pd_grid/app.py

@@ -45,7 +45,11 @@ def pd_agent_portrayal(agent):
 # Initialize model
 initial_model = PdGrid()
 # Create grid and agent visualization component using Altair
-renderer = SpaceRenderer(initial_model, backend="altair").render(pd_agent_portrayal)
+renderer = (
+    SpaceRenderer(initial_model, backend="altair")
+    .setup_agents(pd_agent_portrayal)
+    .render()
+)
 
 # Create visualization with all components
 page = SolaraViz(

mesa/examples/advanced/sugarscape_g1mt/app.py

@@ -57,11 +57,16 @@ def post_process(chart):
 # Here, the renderer uses the Altair backend, while the plot components
 # use the Matplotlib backend.
 # Both can be mixed and matched to enhance the visuals of your model.
-renderer = SpaceRenderer(model, backend="altair").render(
-    agent_portrayal=agent_portrayal,
-    propertylayer_portrayal=propertylayer_portrayal,
-    post_process=post_process,
+renderer = (
+    SpaceRenderer(model, backend="altair")
+    .setup_agents(agent_portrayal)
+    .setup_propertylayer(propertylayer_portrayal)
 )
+# Specifically, avoid drawing the grid to hide the grid lines.
+renderer.draw_agents()
+renderer.draw_propertylayer()
+
+renderer.post_process = post_process
 
 # Note: It is advised to switch the pages after pausing the model
 # on the Solara dashboard.

mesa/examples/advanced/wolf_sheep/app.py

@@ -84,9 +84,9 @@ def post_process_lines(ax):
 renderer = SpaceRenderer(
     model,
     backend="matplotlib",
-)
-renderer.draw_agents(wolf_sheep_portrayal)
+).setup_agents(wolf_sheep_portrayal)
 renderer.post_process = post_process_space
+renderer.draw_agents()
 
 page = SolaraViz(
     model,

mesa/examples/basic/boid_flockers/app.py

@@ -70,10 +70,14 @@ def boid_draw(agent):
 model = BoidFlockers()
 
 # Quickest way to visualize grid along with agents or property layers.
-renderer = SpaceRenderer(
-    model,
-    backend="matplotlib",
-).render(agent_portrayal=boid_draw)
+renderer = (
+    SpaceRenderer(
+        model,
+        backend="matplotlib",
+    )
+    .setup_agents(boid_draw)
+    .render()
+)
 
 page = SolaraViz(
     model,

mesa/examples/basic/boltzmann_wealth_model/app.py

@@ -60,10 +60,15 @@ def post_process(chart):
 # It builds the visualization in layers, first drawing the grid structure,
 # and then drawing the agents on top. It uses a specified backend
 # (like "altair" or "matplotlib") for creating the plots.
-renderer = SpaceRenderer(model, backend="altair")
-# Can customize the grid appearance.
-renderer.draw_structure(grid_color="black", grid_dash=[6, 2], grid_opacity=0.3)
-renderer.draw_agents(agent_portrayal=agent_portrayal, cmap="viridis", vmin=0, vmax=10)
+
+renderer = (
+    SpaceRenderer(model, backend="altair")
+    .setup_structure(  # To customize the grid appearance.
+        grid_color="black", grid_dash=[6, 2], grid_opacity=0.3
+    )
+    .setup_agents(agent_portrayal, cmap="viridis", vmin=0, vmax=10)
+)
+renderer.render()
 
 # The post_process function is used to modify the Altair chart after it has been created.
 # It can be used to add legends, colorbars, or other visual elements.

mesa/examples/basic/conways_game_of_life/app.py

@@ -55,10 +55,10 @@ def post_process(ax):
 # Create initial model instance
 model1 = ConwaysGameOfLife()
 
-renderer = SpaceRenderer(model1, backend="matplotlib")
+renderer = SpaceRenderer(model1, backend="matplotlib").setup_agents(agent_portrayal)
 # In this case the renderer only draws the agents because we just want to observe
 # the state of the agents, not the structure of the grid.
-renderer.draw_agents(agent_portrayal=agent_portrayal)
+renderer.draw_agents()
 renderer.post_process = post_process
 
 # Create the SolaraViz page. This will automatically create a server and display the

mesa/examples/basic/schelling/app.py

@@ -73,12 +73,11 @@ def agent_portrayal(agent):
 
 # Note: Models with images as markers are very performance intensive.
 model1 = Schelling()
-renderer = SpaceRenderer(model1, backend="matplotlib")
+renderer = SpaceRenderer(model1, backend="matplotlib").setup_agents(agent_portrayal)
 # Here we use renderer.render() to render the agents and grid in one go.
 # This function always renders the grid and then renders the agents or
-# property layers on top of it if specified. It also supports passing the
-# post_process function to fine-tune the plot after rendering in itself.
-renderer.render(agent_portrayal=agent_portrayal)
+# property layers on top of it if specified.
+renderer.render()
 
 HappyPlot = make_plot_component({"happy": "tab:green"})
 

mesa/examples/basic/virus_on_network/app.py

@@ -109,12 +109,16 @@ def post_process_lineplot(chart):
 
 
 model1 = VirusOnNetwork()
-renderer = SpaceRenderer(model1, backend="altair")
-renderer.draw_structure(
-    node_kwargs={"color": "black", "filled": False, "strokeWidth": 5},
-    edge_kwargs={"strokeDash": [6, 1]},
-)  # Do this to draw the underlying network and customize it
-renderer.draw_agents(agent_portrayal)
+renderer = (
+    SpaceRenderer(model1, backend="altair")
+    .setup_structure(  # Do this to draw the underlying network and customize it
+        node_kwargs={"color": "black", "filled": False, "strokeWidth": 5},
+        edge_kwargs={"strokeDash": [6, 1]},
+    )
+    .setup_agents(agent_portrayal)
+)
+
+renderer.render()
 
 # Plot components can also be in altair and support post_process
 StatePlot = make_plot_component(

mesa/visualization/solara_viz.py

@@ -269,19 +269,12 @@ def SpaceRendererComponent(
         for artist in itertools.chain.from_iterable(all_artists):
             artist.remove()
 
-        # Draw the space structure if specified
         if renderer.space_mesh:
-            renderer.draw_structure(**renderer.space_kwargs)
-
-        # Draw agents if specified
+            renderer.draw_structure()
         if renderer.agent_mesh:
-            renderer.draw_agents(
-                agent_portrayal=renderer.agent_portrayal, **renderer.agent_kwargs
-            )
-
-        # Draw property layers if specified
+            renderer.draw_agents()
         if renderer.propertylayer_mesh:
-            renderer.draw_propertylayer(renderer.propertylayer_portrayal)
+            renderer.draw_propertylayer()
 
         # Update the fig every time frame
         if dependencies:
@@ -306,15 +299,11 @@ def SpaceRendererComponent(
         propertylayer = renderer.propertylayer_mesh or None
 
         if renderer.space_mesh:
-            structure = renderer.draw_structure(**renderer.space_kwargs)
+            structure = renderer.draw_structure()
         if renderer.agent_mesh:
-            agents = renderer.draw_agents(
-                renderer.agent_portrayal, **renderer.agent_kwargs
-            )
+            agents = renderer.draw_agents()
         if renderer.propertylayer_mesh:
-            propertylayer = renderer.draw_propertylayer(
-                renderer.propertylayer_portrayal
-            )
+            propertylayer = renderer.draw_propertylayer()
 
         spatial_charts_list = [
             chart for chart in [structure, propertylayer, agents] if chart