centralizing IO validation in PleiadesConfig._normalize_config_for_io() and making it strict

Author: alexmlongLANL

src/pleiades/utils/config.py

@@ -619,6 +619,19 @@ def to_dict(self) -> Dict[str, Any]:
         """Convert configuration to a dictionary."""
         return self.model_dump(mode="json")
 
+    @classmethod
+    def _normalize_config_for_io(cls, config_dict: Dict[str, Any]) -> Dict[str, Any]:
+        """Normalize config payload before save/load validation.
+
+        Enforces strict IO requirements so save/load behavior is consistent:
+        ``fit_routines`` must be present and non-empty.
+        """
+        normalized = dict(config_dict or {})
+        fit_routines = normalized.get("fit_routines")
+        if not fit_routines:
+            raise ValueError("fit_routines must be defined in the config file")
+        return normalized
+
     def save(self, path: Optional[Path] = None) -> Path:
         """
         Save configuration to a YAML file.
@@ -635,9 +648,11 @@ def save(self, path: Optional[Path] = None) -> Path:
         # Ensure directory exists
         path.parent.mkdir(parents=True, exist_ok=True)
 
+        normalized = self._normalize_config_for_io(self.to_dict())
+
         # Save config as YAML
         with open(path, "w") as f:
-            yaml.safe_dump(self.to_dict(), f, sort_keys=False)
+            yaml.safe_dump(normalized, f, sort_keys=False)
 
         return path
 
@@ -669,7 +684,8 @@ def load(cls, path: Optional[Path] = None) -> "PleiadesConfig":
     @classmethod
     def from_dict(cls, config_dict: Dict[str, Any]) -> "PleiadesConfig":
         """Build a configuration from a dictionary."""
-        return cls.model_validate(config_dict or {}, context={"require_fit_routines": True})
+        normalized = cls._normalize_config_for_io(config_dict)
+        return cls.model_validate(normalized, context={"require_fit_routines": True})
 
 
 class IsotopeConfig(BaseModel):

tests/unit/pleiades/utils/test_utils_config.py

@@ -232,10 +232,17 @@ def test_fit_routines_are_normalized_to_typed_models(self):
         assert config.fit_routines["fit_2"].dataset_id == "dataset_2"
 
     def test_from_dict_requires_fit_routines(self):
-        """Loading from user config should fail when fit_routines are missing."""
-        with pytest.raises(ValidationError, match="fit_routines must be defined"):
+        """Loading from user payload should fail when fit_routines are missing."""
+        with pytest.raises(ValueError, match="fit_routines must be defined"):
             PleiadesConfig.from_dict({"workspace": {"root": "/tmp/pleiades"}})
 
+    def test_save_requires_fit_routines(self, tmp_path):
+        """Saving config with empty fit_routines should fail."""
+        config = PleiadesConfig()
+        save_path = tmp_path / "config.yaml"
+        with pytest.raises(ValueError, match="fit_routines must be defined"):
+            config.save(save_path)
+
     def test_isotope_config_normalization_and_defaults(self):
         """Isotope dicts should normalize to IsotopeConfig with default library applied."""
         config = PleiadesConfig(