fix(investigation): allow autonomous model baseline recovery

app/mcp/scenario_service.py

@@ -29,50 +29,36 @@ def calculate_scenario(name: str, parameters: dict[str, Any], *, network: str, u
     impact_threshold = parameters.pop("impact_threshold_mg_l", 0)
     common = dict(name=network, modify_pattern_start_time=start.isoformat(),
                   modify_total_duration=duration, persist_results=False, scheme_name=None)
+    boundary = {}
+    if model_only:
+        from app.infra.db.postgresql.scada import ScadaElementMappings
+        # Model scenarios may support replay decisions without consuming mutable
+        # live SCADA in place of the task's frozen observations.
+        boundary["scada_mappings"] = ScadaElementMappings(
+            reservoirs={}, tanks={}, fixed_pumps={}, variable_pumps={},
+            pressure={}, demand={}, quality={},
+        )
     if name == "run_simulation":
         from app.services.simulation import run_online_simulation
 
         result = run_online_simulation(
-            network, start, duration, output_node_ids=nodes, output_link_ids=links,
+            network, start, duration, output_node_ids=nodes, output_link_ids=links, **boundary,
         )
     elif name == "run_burst_simulation":
-        boundary = {}
-        if model_only:
-            from app.infra.db.postgresql.scada import ScadaElementMappings
-            # Replay scenarios use current model assumptions, never mutable live
-            # SCADA readings in place of the investigation's frozen observations.
-            boundary["scada_mappings"] = ScadaElementMappings(
-                reservoirs={}, tanks={}, fixed_pumps={}, variable_pumps={},
-                pressure={}, demand={}, quality={},
-            )
         result = scenarios.burst_analysis(**common, username=username,
             burst_ID=parameters["burst_pipe_ids"], burst_size=parameters["orifice_areas_cm2"], **boundary)
     elif name == "run_contaminant_simulation":
-        boundary = {}
-        if model_only:
-            from app.infra.db.postgresql.scada import ScadaElementMappings
-            boundary["scada_mappings"] = ScadaElementMappings(
-                reservoirs={}, tanks={}, fixed_pumps={}, variable_pumps={},
-                pressure={}, demand={}, quality={},
-            )
         result = scenarios.contaminant_simulation(**common, username=username,
             source=parameters["source"], concentration=parameters["concentration"], source_pattern=parameters.get("pattern"), **boundary)
     elif name == "analyze_valve_closure":
         result = scenarios.valve_close_analysis(**common,
-            modify_valve_opening={valve: 0.0 for valve in parameters["valves"]})
+            modify_valve_opening={valve: 0.0 for valve in parameters["valves"]}, **boundary)
     elif name == "analyze_flushing":
         # The service consumes m³/h (the older REST label incorrectly says L/s).
         # Reject unsupported conversion rather than silently ignore the flow.
         from app.native.wndb.model.options import get_option
         if get_option(network).get("UNITS") not in {"LPS", "CMH"}:
             raise ValueError("Flushing currently supports LPS or CMH models only")
-        boundary = {}
-        if model_only:
-            from app.infra.db.postgresql.scada import ScadaElementMappings
-            boundary["scada_mappings"] = ScadaElementMappings(
-                reservoirs={}, tanks={}, fixed_pumps={}, variable_pumps={},
-                pressure={}, demand={}, quality={},
-            )
         result = scenarios.flushing_analysis(**common, username=username,
             drainage_node_ID=parameters["drainage_node_id"], flushing_flow=parameters["flushing_flow_m3h"],
             valve_control=flushing_valve_controls(parameters), **boundary)
@@ -87,7 +73,8 @@ def calculate_scenario(name: str, parameters: dict[str, Any], *, network: str, u
         result = scenarios.pressure_regulation(**common,
             modify_fixed_pump_pattern={key: value for key, value in controls.items() if key in mappings.fixed_pumps},
             modify_variable_pump_pattern={key: value for key, value in controls.items() if key in mappings.variable_pumps},
-            modify_tank_initial_level=parameters["tank_init_level"], scada_mappings=mappings)
+            modify_tank_initial_level=parameters["tank_init_level"],
+            scada_mappings=boundary.get("scada_mappings", mappings))
     else:
         raise ValueError("Scenario is not registered")
     if not isinstance(result, dict):