Apply gentl trigger defaults when saving

Add with_save_defaults helpers to CameraSettings and MultiCameraSettings and use them when serializing ApplicationSettings so gentl "trigger" defaults are applied to saved configs. Remove duplicated camera-default helper logic from DLCLiveMainWindow and simplify _current_config to rely on model methods. Add unit tests to verify gentl trigger defaults are included for top-level and multi-camera cases.

Author: C-Achard

dlclivegui/config.py

@@ -190,6 +190,25 @@ def set_trigger_settings(self, trigger: CameraTriggerSettings, backend: str | No
             self.properties[str(key).lower()] = ns
         ns["trigger"] = trigger.to_properties()
 
+    def with_save_defaults(self) -> CameraSettings:
+        out = self.model_copy(deep=True)
+
+        backend = (out.backend or "").lower()
+        if backend != "gentl":
+            return out
+
+        if not isinstance(out.properties, dict):
+            out.properties = {}
+
+        ns = out.properties.setdefault("gentl", {})
+        if not isinstance(ns, dict):
+            ns = {}
+            out.properties["gentl"] = ns
+
+        ns.setdefault("trigger", CameraTriggerSettings().to_properties())
+
+        return out
+
 
 class CameraTriggerSettings(BaseModel):
     """
@@ -302,12 +321,19 @@ def from_dict(cls, data: dict[str, Any]) -> MultiCameraSettings:
         return cls(cameras=cameras, max_cameras=max_cameras, tile_layout=tile_layout)
 
     def to_dict(self) -> dict[str, Any]:
+        out = self.with_save_defaults()
         return {
-            "cameras": [cam.model_dump() for cam in self.cameras],
-            "max_cameras": self.max_cameras,
-            "tile_layout": self.tile_layout,
+            "cameras": [cam.model_dump() for cam in out.cameras],
+            "max_cameras": out.max_cameras,
+            "tile_layout": out.tile_layout,
         }
 
+    def with_save_defaults(self) -> MultiCameraSettings:
+        """Return a copy with save defaults applied to all cameras."""
+        out = self.model_copy(deep=True)
+        out.cameras = [cam.with_save_defaults() for cam in out.cameras]
+        return out
+
 
 class DynamicCropModel(BaseModel):
     enabled: bool = False
@@ -473,10 +499,18 @@ def from_dict(cls, data: dict[str, Any]) -> ApplicationSettings:
         )
 
     def to_dict(self) -> dict[str, Any]:
+        multi_camera = self.multi_camera.with_save_defaults()
+        active_cameras = multi_camera.get_active_cameras()
+
+        if active_cameras:
+            camera = active_cameras[0].model_copy(deep=True)
+        else:
+            camera = self.camera.with_save_defaults()
+
         return {
             "version": self.version,
-            "camera": self.camera.model_dump(),
-            "multi_camera": self.multi_camera.to_dict(),
+            "camera": camera.model_dump(),
+            "multi_camera": multi_camera.to_dict(),
             "dlc": self.dlc.model_dump(),
             "recording": self.recording.model_dump(),
             "bbox": self.bbox.model_dump(),

dlclivegui/gui/main_window.py

@@ -56,7 +56,6 @@
     ApplicationSettings,
     BoundingBoxSettings,
     CameraSettings,
-    CameraTriggerSettings,
     DLCProcessorSettings,
     MultiCameraSettings,
     RecordingSettings,
@@ -855,39 +854,12 @@ def _apply_config(self, config: ApplicationSettings) -> None:
         # Update recording path preview
         self._update_recording_path_preview()
 
-    def _with_camera_trigger_defaults_for_save(self, cam: CameraSettings) -> CameraSettings:
-        out = cam.model_copy(deep=True)
-
-        backend = (out.backend or "").lower()
-        if backend != "gentl":
-            return out
-
-        if not isinstance(out.properties, dict):
-            out.properties = {}
-
-        ns = out.properties.setdefault("gentl", {})
-        if not isinstance(ns, dict):
-            ns = {}
-            out.properties["gentl"] = ns
-
-        ns.setdefault("trigger", CameraTriggerSettings().model_dump(exclude_none=True))
-
-        return out
-
-    def _with_camera_defaults_for_save(self, settings: MultiCameraSettings) -> MultiCameraSettings:
-        out = settings.model_copy(deep=True)
-
-        out.cameras = [self._with_camera_trigger_defaults_for_save(cam) for cam in out.cameras]
-
-        return out
-
     def _current_config(self, *, allow_empty_model_path=False) -> ApplicationSettings:
-        # Get the first camera from multi-camera config for backward compatibility
-        multi_camera = self._with_camera_defaults_for_save(self._config.multi_camera)
+        multi_camera = self._config.multi_camera
         camera = (
             multi_camera.cameras[0].model_copy(deep=True)
             if multi_camera.cameras
-            else self._with_camera_trigger_defaults_for_save(self._config.camera)
+            else self._config.camera.model_copy(deep=True)
         )
 
         return ApplicationSettings(

tests/test_config.py

@@ -0,0 +1,36 @@
+import pytest
+
+from dlclivegui.config import ApplicationSettings, CameraSettings, MultiCameraSettings
+
+
+@pytest.mark.unit
+def test_save_applies_gentl_trigger_defaults_to_top_level_camera():
+    cam = CameraSettings(
+        backend="gentl",
+        properties={"gentl": {}},
+    )
+
+    settings = ApplicationSettings(
+        camera=cam,
+        multi_camera=MultiCameraSettings(cameras=[cam]),
+    )
+
+    data = settings.to_dict()
+
+    assert "trigger" in data["camera"]["properties"]["gentl"]
+
+
+@pytest.mark.unit
+def test_save_applies_gentl_trigger_defaults_to_multi_camera():
+    cam = CameraSettings(
+        backend="gentl",
+        properties={"gentl": {}},
+    )
+
+    settings = ApplicationSettings(
+        multi_camera=MultiCameraSettings(cameras=[cam]),
+    )
+
+    data = settings.to_dict()
+
+    assert "trigger" in data["multi_camera"]["cameras"][0]["properties"]["gentl"]