Rework radar system

python_app/workflows/radar_config_variants.py

@@ -7,8 +7,7 @@ import json
 import logging
 from pathlib import Path
 
-from python_app.models.run_config_model import RunConfigModel
-from python_app.storage.npz_store import radar_key_from_config
+from python_app.models.run_config_schema import RunConfigModel
 
 logger = logging.getLogger(__name__)
 
@@ -25,7 +24,6 @@ _RADAR_SWEEP_KEYS = (
 class RadarConfigVariant:
     """One capture-ready radar sweep variant loaded from JSON."""
 
-    source_path: Path
     display_name: str
     config: RunConfigModel
     radar_key: str
@@ -147,19 +145,8 @@ def _load_radar_config_variant(path: Path, *, base_config: RunConfigModel) -> Ra
     config_payload["radar"]["sweep"].update(sweep_payload)
     config = RunConfigModel.from_dict(config_payload)
 
-    radar_key = radar_key_from_config(
-        model_name=config.radar.model,
-        serial=config.radar.serial,
-        sweep_start_hz=config.radar.sweep.start_hz,
-        sweep_stop_hz=config.radar.sweep.stop_hz,
-        sweep_points=config.radar.sweep.points,
-        ifbw_hz=config.radar.sweep.if_bandwidth_hz,
-        power_dbm=config.radar.sweep.power_dbm,
-        extra_serials=config.radar_key_extra_parts() or None,
-    )
     return RadarConfigVariant(
-        source_path=path,
         display_name=path.stem,
         config=config,
-        radar_key=radar_key,
+        radar_key=config.radar_key(),
     )