Merge branch 'add-config-obj' into add-config-obj-replace-schemas

docs/hooks/generate_readable_schema.py

@@ -20,9 +20,7 @@
 TEMPDIR = tempfile.TemporaryDirectory()
 
 SCHEMAS = {
-    "config_schema": config_schema.CalliopeConfig().model_json_schema(
-        replace_refs=True
-    ),
+    "config_schema": config_schema.CalliopeConfig().model_no_ref_schema(),
     "model_schema": schema.MODEL_SCHEMA,
     "math_schema": schema.MATH_SCHEMA,
     "data_table_schema": schema.DATA_TABLE_SCHEMA,

src/calliope/attrdict.py

@@ -329,7 +329,7 @@ def as_dict_flat(self):
             d[k] = self.get_key(k)
         return d
 
-    def as_yaml_str(self) -> str:
+    def to_yaml(self, path: str | None = None) -> str:
         """Return a serialised YAML string."""
         result = self.copy()
         yaml_ = ruamel_yaml.YAML()
@@ -357,7 +357,11 @@ def as_yaml_str(self) -> str:
 
         stream = io.StringIO()
         yaml_.dump(result, stream)
-        return stream.getvalue()
+        yaml_str = stream.getvalue()
+        if path:
+            with open(path, "w") as f:
+                f.write(yaml_str)
+        return yaml_str
 
     def save_yaml(self, path: str) -> None:
         """Save AttrDict as a yaml file.

src/calliope/model.py

@@ -343,7 +343,8 @@ def solve(self, force: bool = False, warmstart: bool = False, **kwargs) -> None:
             to_drop = []
 
         solve_config = self.config.update({"solve": kwargs}).solve
-        mode = self.config.build.mode
+        # FIXME: find a way to avoid overcomplicated passing of settings between modes
+        mode = self.config.update(self.config.applied_keyword_overrides).build.mode
         self._model_data.attrs["timestamp_solve_start"] = log_time(
             LOGGER,
             self._timings,

src/calliope/schemas/config_schema.py

@@ -63,19 +63,15 @@ def update(self, update_dict: dict, deep: bool = False) -> Self:
         self._kwargs = update_dict
         return updated
 
-    def model_json_schema(self, replace_refs=False) -> AttrDict:
-        """Generate an AttrDict with the schema of this class.
-
-        Args:
-            replace_refs (bool, optional): If True, replace $ref/$def for better readability. Defaults to False.
+    def model_no_ref_schema(self) -> AttrDict:
+        """Generate an AttrDict with the schema replacing $ref/$def for better readability.
 
         Returns:
             AttrDict: class schema.
         """
         schema_dict = AttrDict(super().model_json_schema())
-        if replace_refs:
-            schema_dict = AttrDict(jsonref.replace_refs(schema_dict))
-            schema_dict.del_key("$defs")
+        schema_dict = AttrDict(jsonref.replace_refs(schema_dict))
+        schema_dict.del_key("$defs")
         return schema_dict
 
     @property