feat: add independent input fields for both species (except mortality, which is mirrored) and update config accordingly

dashboard/app.py

@@ -251,8 +251,49 @@ This version is smoother and may yield slightly different results than the discr
                 with gr.Tab("Biomass Table"):
                     biomass_debug_table = gr.Dataframe(label="Biomass Table (inputs & outputs per year)")
             # --- End tabbed tables ---
-            def update_declining_increment(y1, y2, y3, y4, y5):
+            # --- Adjustable Model Inputs ---
+            sp = config["species"][0]  # Only first species for now
+            with gr.Accordion("Adjust Model Inputs", open=True):
+                with gr.Row():
+                    planting_density = gr.Number(value=sp['planting_density'], label=f"{sp['name']} Planting Density (trees/ha)")
+                    r0_dbh = gr.Number(value=sp['declining_increment']['dbh']['r0'], label=f"{sp['name']} r0 (DBH, cm/yr)")
+                    tm_dbh = gr.Number(value=sp['declining_increment']['dbh']['T_m'], label=f"{sp['name']} Tm (DBH, yrs)")
+                    r0_height = gr.Number(value=sp['declining_increment']['height']['r0'], label=f"{sp['name']} r0 (Height, m/yr)")
+                    tm_height = gr.Number(value=sp['declining_increment']['height']['T_m'], label=f"{sp['name']} Tm (Height, yrs)")
+                with gr.Row():
+                    mort_1 = gr.Number(value=sp['mortality_rates']['year_1'], label="Year 1 Mortality (%)")
+                    mort_2 = gr.Number(value=sp['mortality_rates']['year_2'], label="Year 2 Mortality (%)")
+                    mort_3 = gr.Number(value=sp['mortality_rates']['year_3'], label="Year 3 Mortality (%)")
+                    mort_4 = gr.Number(value=sp['mortality_rates']['year_4'], label="Year 4 Mortality (%)")
+                    mort_5 = gr.Number(value=sp['mortality_rates']['year_5'], label="Year 5 Mortality (%)")
+                    mort_sub = gr.Number(value=sp['mortality_rates']['subsequent'], label="Subsequent Years Mortality (%)")
+                with gr.Row():
+                    project_duration = gr.Number(value=config['project']['duration_years'], label="Project Duration (years)")
+                    buffer_pct = gr.Number(value=config['carbon']['buffer_percentage'], label="Buffer %")
+                    soil_carbon = gr.Number(value=config['carbon']['soil_carbon_per_ha_per_year'], label="Soil Carbon per ha per year (tCO2)")
+            # Remove hardcoded key model inputs from Markdown section
+            # Update the update_declining_increment callback to use these new inputs
+            def update_declining_increment(y1, y2, y3, y4, y5,
+                                           planting_density, r0_dbh, tm_dbh, r0_height, tm_height,
+                                           mort_1, mort_2, mort_3, mort_4, mort_5, mort_sub,
+                                           project_duration, buffer_pct, soil_carbon):
                 config = update_planting_schedule(MODEL_CONFIGS["Declining Increment"], [y1, y2, y3, y4, y5])
+                # Update species_A params
+                config['species'][0]['planting_density'] = planting_density
+                config['species'][0]['declining_increment']['dbh']['r0'] = r0_dbh
+                config['species'][0]['declining_increment']['dbh']['T_m'] = tm_dbh
+                config['species'][0]['declining_increment']['height']['r0'] = r0_height
+                config['species'][0]['declining_increment']['height']['T_m'] = tm_height
+                config['species'][0]['mortality_rates']['year_1'] = mort_1
+                config['species'][0]['mortality_rates']['year_2'] = mort_2
+                config['species'][0]['mortality_rates']['year_3'] = mort_3
+                config['species'][0]['mortality_rates']['year_4'] = mort_4
+                config['species'][0]['mortality_rates']['year_5'] = mort_5
+                config['species'][0]['mortality_rates']['subsequent'] = mort_sub
+                # Update project/carbon params
+                config['project']['duration_years'] = project_duration
+                config['carbon']['buffer_percentage'] = buffer_pct
+                config['carbon']['soil_carbon_per_ha_per_year'] = soil_carbon
                 with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as tmp:
                     yaml.dump(config, tmp)
                     tmp_path = tmp.name
@@ -268,6 +309,16 @@ This version is smoother and may yield slightly different results than the discr
                 for col in species_results_fmt.columns:
                     if species_results_fmt[col].dtype in [float, int]:
                         species_results_fmt[col] = species_results_fmt[col].apply(lambda x: f"{x:,.2f}" if isinstance(x, float) else f"{x:,}")
+                # --- Ensure all DataFrames are native types ---
+                results_fmt = to_native(results_fmt)
+                species_results_fmt = to_native(species_results_fmt)
+                survival_table = to_native(survival_table)
+                biomass_debug_df = to_native(biomass_debug_df)
+                # --- Ensure all other values are native types ---
+                if hasattr(summary, 'item'):
+                    summary = summary.item()
+                if hasattr(key_metrics_md, 'item'):
+                    key_metrics_md = key_metrics_md.item()
                 # Key metrics for summary card
                 total_area = sum(config["project"]["planting_schedule"].values())
                 final_buffer = results["buffer_carbon"].iloc[-1]
@@ -277,11 +328,14 @@ This version is smoother and may yield slightly different results than the discr
                 return (plots[0], plots[1], plots[2], growth_fig, summary, results_fmt, species_results_fmt, survival_table, biomass_debug_df, key_metrics_md)
             update_btn.click(
                 update_declining_increment,
-                inputs=[year_1, year_2, year_3, year_4, year_5],
+                inputs=[year_1, year_2, year_3, year_4, year_5,
+                        planting_density, r0_dbh, tm_dbh, r0_height, tm_height,
+                        mort_1, mort_2, mort_3, mort_4, mort_5, mort_sub,
+                        project_duration, buffer_pct, soil_carbon],
                 outputs=[carbon_plot, biomass_plot, annual_plot, growth_plot, summary_box, results_box, species_box, survival_box, biomass_debug_table, key_metrics]
             )
             # Show initial results
-            c, b, a, g, summary, r, s, surv, biomass_debug_df, key_metrics_md = update_declining_increment(2500, 2500, 0, 0, 0)
+            c, b, a, g, summary, r, s, surv, biomass_debug_df, key_metrics_md = update_declining_increment(2500, 2500, 0, 0, 0, 2500, 2500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
             carbon_plot.value = c
             biomass_plot.value = b
             annual_plot.value = a