added s11!

python_app/models/run_config_schema.py

@@ -85,18 +85,45 @@ class RuntimeModel:
     processing_live_config_path: str = ""
 
 
+@dataclass(slots=True)
+class PreprocessAssetModel:
+    """One preprocessing asset selected for live acquisition."""
+
+    set_name: str = ""
+    bundle_path: str = ""
+
+
+@dataclass(slots=True)
+class S21PreprocessModel:
+    """Two-port S21 preprocessing assets."""
+
+    calibration: PreprocessAssetModel = field(default_factory=PreprocessAssetModel)
+    reference: PreprocessAssetModel = field(default_factory=PreprocessAssetModel)
+
+
+@dataclass(slots=True)
+class S11CalibrationModel:
+    """One-port S11 OSL calibration assets."""
+
+    open: PreprocessAssetModel = field(default_factory=PreprocessAssetModel)
+    short: PreprocessAssetModel = field(default_factory=PreprocessAssetModel)
+    load: PreprocessAssetModel = field(default_factory=PreprocessAssetModel)
+
+
+@dataclass(slots=True)
+class S11PreprocessModel:
+    """One-port S11 preprocessing assets."""
+
+    calibration: S11CalibrationModel = field(default_factory=S11CalibrationModel)
+    reference: PreprocessAssetModel = field(default_factory=PreprocessAssetModel)
+
+
 @dataclass(slots=True)
 class PreprocessModel:
     """Selected preprocessing artifacts for live acquisition."""
 
-    s21_calibration_set: str = ""
-    s21_reference_set: str = ""
-    s21_calibration_bundle_path: str = ""
-    s21_reference_bundle_path: str = ""
-    s11_open_calibration_bundle_path: str = ""
-    s11_short_calibration_bundle_path: str = ""
-    s11_load_calibration_bundle_path: str = ""
-    s11_reference_bundle_path: str = ""
+    s21: S21PreprocessModel = field(default_factory=S21PreprocessModel)
+    s11: S11PreprocessModel = field(default_factory=S11PreprocessModel)
 
 
 @dataclass(slots=True)