frequenz-gridpool 0.7.0__tar.gz → 0.8.0__tar.gz

{frequenz_gridpool-0.7.0/src/frequenz_gridpool.egg-info → frequenz_gridpool-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frequenz-gridpool
-Version: 0.7.0
+Version: 0.8.0
 Summary: High-level interface to grid pools for the Frequenz platform.
 Author-email: Frequenz Energy-as-a-Service GmbH <floss@frequenz.com>
 License-Expression: MIT
@@ -19,6 +19,7 @@ Classifier: Typing :: Typed
 Requires-Python: <4,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: marshmallow<5,>=3.18.0
 Requires-Dist: marshmallow-dataclass<9,>=8.7.1
 Requires-Dist: typing-extensions<5,>=4.14.1
 Requires-Dist: frequenz-microgrid-component-graph<0.6,>=0.5.0
@@ -32,7 +33,7 @@ Requires-Dist: matplotlib<4,>=3.7.0; extra == "render-graph"
 Requires-Dist: networkx<4,>=3.0; extra == "render-graph"
 Provides-Extra: dev-flake8
 Requires-Dist: flake8==7.3.0; extra == "dev-flake8"
-Requires-Dist: flake8-datetimez==20.10.0; extra == "dev-flake8"
+Requires-Dist: flake8-datetimez==26.8.1; extra == "dev-flake8"
 Requires-Dist: flake8-docstrings==1.7.0; extra == "dev-flake8"
 Requires-Dist: flake8-pyproject==1.2.4; extra == "dev-flake8"
 Requires-Dist: pydoclint==0.9.1; extra == "dev-flake8"
@@ -41,7 +42,7 @@ Provides-Extra: dev-formatting
 Requires-Dist: black==26.5.1; extra == "dev-formatting"
 Requires-Dist: isort==8.0.1; extra == "dev-formatting"
 Provides-Extra: dev-mkdocs
-Requires-Dist: Markdown==3.10.2; extra == "dev-mkdocs"
+Requires-Dist: Markdown==3.10.3; extra == "dev-mkdocs"
 Requires-Dist: black==26.5.1; extra == "dev-mkdocs"
 Requires-Dist: mike==2.2.0; extra == "dev-mkdocs"
 Requires-Dist: mkdocs-gen-files==0.6.1; extra == "dev-mkdocs"
@@ -49,21 +50,21 @@ Requires-Dist: mkdocs-literate-nav==0.6.3; extra == "dev-mkdocs"
 Requires-Dist: mkdocs-macros-plugin==1.5.0; extra == "dev-mkdocs"
 Requires-Dist: mkdocs-material==9.7.7; extra == "dev-mkdocs"
 Requires-Dist: mkdocstrings[python]==1.0.6; extra == "dev-mkdocs"
-Requires-Dist: mkdocstrings-python==2.0.5; extra == "dev-mkdocs"
+Requires-Dist: mkdocstrings-python==2.0.7; extra == "dev-mkdocs"
 Requires-Dist: frequenz-repo-config[lib]==0.18.0; extra == "dev-mkdocs"
 Provides-Extra: dev-mypy
-Requires-Dist: mypy==2.3.0; extra == "dev-mypy"
+Requires-Dist: mypy==2.3.1; extra == "dev-mypy"
 Requires-Dist: types-networkx>=3.6.1.20251220; extra == "dev-mypy"
 Requires-Dist: types-Markdown==3.10.2.20260712; extra == "dev-mypy"
 Requires-Dist: frequenz-gridpool[dev-mkdocs,dev-noxfile,dev-pytest]; extra == "dev-mypy"
 Provides-Extra: dev-noxfile
-Requires-Dist: nox==2026.7.11; extra == "dev-noxfile"
+Requires-Dist: nox==2026.8.17; extra == "dev-noxfile"
 Requires-Dist: frequenz-repo-config[lib]==0.18.0; extra == "dev-noxfile"
 Provides-Extra: dev-pylint
 Requires-Dist: frequenz-gridpool[dev-mkdocs,dev-noxfile,dev-pytest]; extra == "dev-pylint"
 Provides-Extra: dev-pytest
 Requires-Dist: pytest==9.1.1; extra == "dev-pytest"
-Requires-Dist: pylint==4.0.6; extra == "dev-pytest"
+Requires-Dist: pylint==4.0.7; extra == "dev-pytest"
 Requires-Dist: frequenz-repo-config[extra-lint-examples]==0.18.0; extra == "dev-pytest"
 Requires-Dist: pytest-mock==3.15.1; extra == "dev-pytest"
 Requires-Dist: pytest-asyncio==1.4.0; extra == "dev-pytest"
@@ -150,7 +151,7 @@ The following platforms are officially supported (tested):
 
 ## CLI
 
-This package ships the `gridpool-cli` command with three subcommands.
+This package ships the `gridpool-cli` command with five subcommands.
 
 ### Setup
 
@@ -162,6 +163,9 @@ export ASSETS_API_AUTH_KEY="..."
 export ASSETS_API_SIGN_SECRET="..."
 ```
 
+`FREQUENZ_API_KEY` and `FREQUENZ_API_SECRET` are accepted as fallbacks for
+`ASSETS_API_AUTH_KEY` and `ASSETS_API_SIGN_SECRET`.
+
 ### Print component formulas
 
 ```bash
@@ -246,6 +250,28 @@ gridpool-cli generate-config <microgrid_id> \
     --prefer-meters-in-component-formulas > microgrid.toml
 ```
 
+### Validate config files
+
+Check config files offline, without contacting the Assets API, and exit
+non-zero on the first error, to gate config-repo CI:
+
+```bash
+gridpool-cli validate microgrid.toml [more.toml ...]
+```
+
+Each file is validated on its own first, so every record names its own key and
+required fields; the files are then validated merged, for the cross-record
+checks.
+
+### Look up a gridpool's enterprise
+
+Print the enterprise ID that owns a gridpool, read from the config files
+(merged as one stack); exits non-zero if the gridpool is not declared:
+
+```bash
+gridpool-cli find-enterprise <gridpool_id> config.toml [more.toml ...]
+```
+
 ## Contributing
 
 If you want to know how to build this project and contribute to it, please

{frequenz_gridpool-0.7.0 → frequenz_gridpool-0.8.0}/README.md

@@ -75,7 +75,7 @@ The following platforms are officially supported (tested):
 
 ## CLI
 
-This package ships the `gridpool-cli` command with three subcommands.
+This package ships the `gridpool-cli` command with five subcommands.
 
 ### Setup
 
@@ -87,6 +87,9 @@ export ASSETS_API_AUTH_KEY="..."
 export ASSETS_API_SIGN_SECRET="..."
 ```
 
+`FREQUENZ_API_KEY` and `FREQUENZ_API_SECRET` are accepted as fallbacks for
+`ASSETS_API_AUTH_KEY` and `ASSETS_API_SIGN_SECRET`.
+
 ### Print component formulas
 
 ```bash
@@ -171,6 +174,28 @@ gridpool-cli generate-config <microgrid_id> \
     --prefer-meters-in-component-formulas > microgrid.toml
 ```
 
+### Validate config files
+
+Check config files offline, without contacting the Assets API, and exit
+non-zero on the first error, to gate config-repo CI:
+
+```bash
+gridpool-cli validate microgrid.toml [more.toml ...]
+```
+
+Each file is validated on its own first, so every record names its own key and
+required fields; the files are then validated merged, for the cross-record
+checks.
+
+### Look up a gridpool's enterprise
+
+Print the enterprise ID that owns a gridpool, read from the config files
+(merged as one stack); exits non-zero if the gridpool is not declared:
+
+```bash
+gridpool-cli find-enterprise <gridpool_id> config.toml [more.toml ...]
+```
+
 ## Contributing
 
 If you want to know how to build this project and contribute to it, please

frequenz_gridpool-0.8.0/RELEASE_NOTES.md

@@ -0,0 +1,57 @@
+# Frequenz Gridpool Library Release Notes
+
+## Summary
+
+This release rounds out `gridpool-cli` for the `assets` config layout and adds
+gridpool enterprise ownership to the config model. The CLI can now generate,
+validate, patch, and query merged config files.
+
+## Upgrading
+
+- The legacy config layouts are no longer migrated on load: top-level microgrid
+  IDs and `meta`-nested microgrid fields are gone. A file with no `assets` table
+  now loads as empty and contributes nothing to a merge, rather than having its
+  top-level keys read as microgrid IDs. This lets a mixed list of files (some
+  carrying an `[app]` table for their own config, some an `assets` table) be
+  passed to `AssetsConfig.load_from_files` / `load_configs`, which reads only the
+  `assets`-bearing ones. Rebuild any legacy-layout files with `generate-config`.
+
+- `generate-config` now writes the `assets.microgrids` layout and stamps
+  `assets.version`, instead of the legacy layout. Regenerate configs to get the
+  current format; generated files then load back without a migration.
+
+- `generate-config --inplace` refuses legacy-layout files (top-level or
+  `meta`-nested), which it would duplicate rather than edit. Rebuild those from
+  scratch.
+
+## New Features
+
+- `gridpool-cli validate <files>` checks config files offline and exits
+  non-zero on the first error, to gate config-repo CI. Each file must be valid
+  on its own, so a record names its own key and required fields; the files are
+  then checked merged, for the cross-record checks.
+
+- `gridpool-cli` accepts `FREQUENZ_API_KEY` and `FREQUENZ_API_SECRET` as a
+  fallback pair for `ASSETS_API_AUTH_KEY` and `ASSETS_API_SIGN_SECRET`.
+
+- Gridpools are described under `assets.gridpools`, each entry naming the
+  enterprise that owns the gridpool. `AssetsConfig.find_enterprise(gridpool_id)`
+  returns the configured owner.
+  `gridpool-cli find-enterprise <gridpool_id> <files>` prints it from the config.
+  `AssetsConfig.check` enforces the one-enterprise-per-gridpool invariant: a
+  gridpool's microgrids may not disagree on it, and a declared enterprise must
+  match the inferred one.
+
+- A config derived from the Assets API now carries each microgrid's
+  `enterprise_id`.
+
+- `generate-config --inplace` refreshes managed values while preserving
+  formatting; `--fill-missing` only adds absent values. Generated patches are
+  validated before writing.
+
+## Bug Fixes
+
+- Config files with validity periods now load under marshmallow 3, not only
+  marshmallow 4. `tomllib` yields native `datetime` objects, which marshmallow
+  3's `DateTime` field rejected. `marshmallow` is now a direct dependency so the
+  minimum-version test exercises this path.

{frequenz_gridpool-0.7.0 → frequenz_gridpool-0.8.0}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [build-system]
 requires = [
-  "setuptools == 83.0.0",
+  "setuptools == 84.0.0",
   "setuptools_scm[toml] == 10.2.1",
   "frequenz-repo-config[lib] == 0.18.0",
 ]
@@ -26,6 +26,10 @@ classifiers = [
 ]
 requires-python = ">= 3.11, < 4"
 dependencies = [
+  # Used transitively via marshmallow-dataclass (every config schema is a
+  # `marshmallow.Schema`); declared directly so `pytest_min` pins its lower
+  # bound and the minimum-version path is actually tested.
+  "marshmallow >= 3.18.0, < 5",
   "marshmallow-dataclass >= 8.7.1, < 9",
   "typing-extensions >= 4.14.1, < 5",
   "frequenz-microgrid-component-graph >= 0.5.0, < 0.6",
@@ -53,7 +57,7 @@ render-graph = [
 
 dev-flake8 = [
   "flake8 == 7.3.0",
-  "flake8-datetimez == 20.10.0",
+  "flake8-datetimez == 26.8.1",
   "flake8-docstrings == 1.7.0",
   "flake8-pyproject == 1.2.4",  # For reading the flake8 config from pyproject.toml
   "pydoclint == 0.9.1",
@@ -61,7 +65,7 @@ dev-flake8 = [
 ]
 dev-formatting = ["black == 26.5.1", "isort == 8.0.1"]
 dev-mkdocs = [
-  "Markdown == 3.10.2",
+  "Markdown == 3.10.3",
   "black == 26.5.1",
   "mike == 2.2.0",
   "mkdocs-gen-files == 0.6.1",
@@ -69,18 +73,18 @@ dev-mkdocs = [
   "mkdocs-macros-plugin == 1.5.0",
   "mkdocs-material == 9.7.7",
   "mkdocstrings[python] == 1.0.6",
-  "mkdocstrings-python == 2.0.5",
+  "mkdocstrings-python == 2.0.7",
   "frequenz-repo-config[lib] == 0.18.0",
 ]
 dev-mypy = [
-  "mypy == 2.3.0",
+  "mypy == 2.3.1",
   "types-networkx>=3.6.1.20251220",
   "types-Markdown == 3.10.2.20260712",
   # For checking the noxfile, docs/ script, and tests
   "frequenz-gridpool[dev-mkdocs,dev-noxfile,dev-pytest]",
 ]
 dev-noxfile = [
-  "nox == 2026.7.11",
+  "nox == 2026.8.17",
   "frequenz-repo-config[lib] == 0.18.0",
 ]
 dev-pylint = [
@@ -90,7 +94,7 @@ dev-pylint = [
 ]
 dev-pytest = [
   "pytest == 9.1.1",
-  "pylint == 4.0.6",       # We need this to check for the examples
+  "pylint == 4.0.7",       # We need this to check for the examples
   "frequenz-repo-config[extra-lint-examples] == 0.18.0",
   "pytest-mock == 3.15.1",
   "pytest-asyncio == 1.4.0",

{frequenz_gridpool-0.7.0 → frequenz_gridpool-0.8.0}/src/frequenz/gridpool/cli/__main__.py

@@ -5,11 +5,13 @@
 
 import os
 import tempfile
+import tomllib
 from pathlib import Path
 
 import asyncclick as click
 from frequenz.client.assets import AssetsApiClient
 from frequenz.client.common.microgrid import MicrogridId
+from marshmallow import ValidationError
 
 from frequenz.gridpool import ComponentGraphConfig, ComponentGraphGenerator
 from frequenz.gridpool.cli._dump_config import dump_map
@@ -17,12 +19,37 @@ from frequenz.gridpool.cli._patch_config import patch_file
 from frequenz.gridpool.cli._render_graph import ComponentGraphRenderer, RenderOptions
 from frequenz.gridpool.config import AssetsConfig, load_configs
 
+_LOAD_ERRORS = (ValueError, TypeError, tomllib.TOMLDecodeError, ValidationError)
+"""Exceptions raised when a config file fails to load or validate."""
+
 
 @click.group()
 async def cli() -> None:
     """CLI tool for gridpool functionality."""
 
 
+def _assets_credentials() -> tuple[str, str, str]:
+    """Resolve Assets API URL, auth key and sign secret from the environment.
+
+    `FREQUENZ_API_KEY` and `FREQUENZ_API_SECRET` are accepted as a fallback pair
+    for `ASSETS_API_AUTH_KEY` and `ASSETS_API_SIGN_SECRET`. The key and secret
+    are taken as a whole from one source, never mixed across the two.
+    """
+    url = os.environ.get("ASSETS_API_URL")
+    key = os.environ.get("ASSETS_API_AUTH_KEY")
+    secret = os.environ.get("ASSETS_API_SIGN_SECRET")
+    if not key and not secret:
+        key = os.environ.get("FREQUENZ_API_KEY")
+        secret = os.environ.get("FREQUENZ_API_SECRET")
+    if not url or not key or not secret:
+        raise click.ClickException(
+            "ASSETS_API_URL and auth credentials must be set: "
+            "ASSETS_API_AUTH_KEY (or FREQUENZ_API_KEY) and "
+            "ASSETS_API_SIGN_SECRET (or FREQUENZ_API_SECRET)."
+        )
+    return url, key, secret
+
+
 def _graph_config(prefer_meters: bool) -> ComponentGraphConfig | None:
     """Build the graph config for `--prefer-meters-in-component-formulas`.
 
@@ -55,13 +82,7 @@ async def print_formulas(
     prefer_meters_in_component_formulas: bool,
 ) -> None:
     """Fetch and print component graph formulas for a microgrid."""
-    url = os.environ.get("ASSETS_API_URL")
-    key = os.environ.get("ASSETS_API_AUTH_KEY")
-    secret = os.environ.get("ASSETS_API_SIGN_SECRET")
-    if not url or not key or not secret:
-        raise click.ClickException(
-            "ASSETS_API_URL, ASSETS_API_AUTH_KEY, ASSETS_API_SIGN_SECRET must be set."
-        )
+    url, key, secret = _assets_credentials()
 
     async with AssetsApiClient(
         url,
@@ -90,6 +111,70 @@ async def print_formulas(
             )
 
 
+@cli.command()
+@click.argument(
+    "config_files",
+    nargs=-1,
+    required=True,
+    type=click.Path(exists=True, dir_okay=False, path_type=Path),
+)
+async def validate(config_files: tuple[Path, ...]) -> None:
+    """Validate each config file on its own, then the merged stack.
+
+    Each file must stand alone: every record names its own key and required
+    fields. The merged stack then adds the cross-record checks. Exits non-zero
+    on the first error, to gate CI.
+    """
+    for config_file in config_files:
+        try:
+            AssetsConfig.load_from_files([config_file])
+        except _LOAD_ERRORS as exc:
+            raise click.ClickException(f"{config_file}: {exc}") from exc
+
+    try:
+        config = AssetsConfig.load_from_files(list(config_files))
+    except _LOAD_ERRORS as exc:
+        raise click.ClickException(str(exc)) from exc
+
+    click.echo(
+        f"OK: {len(config_files)} file(s), {len(config.microgrids)} microgrid(s), "
+        f"{len(config.relations)} relation(s), "
+        f"{len(config.market_locations)} market location(s).",
+        err=True,
+    )
+
+
+@cli.command("find-enterprise")
+@click.argument("gridpool_id", type=int)
+@click.argument(
+    "config_files",
+    nargs=-1,
+    required=True,
+    type=click.Path(exists=True, dir_okay=False, path_type=Path),
+)
+async def find_enterprise(gridpool_id: int, config_files: tuple[Path, ...]) -> None:
+    """Print the enterprise ID owning GRIDPOOL_ID, read from the config files.
+
+    The files are read as one merged stack. The owner is taken from the
+    `gridpools` entry without validating the full document. Exits non-zero if
+    the gridpool is not configured.
+    """
+    try:
+        # The declared `gridpools` entry is the source of truth for ownership,
+        # so read it even from a document whole-document validation would reject.
+        config = AssetsConfig.load_from_files(list(config_files), check=False)
+        enterprise_id = config.find_enterprise(gridpool_id)
+    except _LOAD_ERRORS as exc:
+        raise click.ClickException(str(exc)) from exc
+
+    if enterprise_id is None:
+        raise click.ClickException(
+            f"Could not determine the enterprise for gridpool {gridpool_id} "
+            "from the given config(s)."
+        )
+    click.echo(enterprise_id)
+
+
 @cli.command("render-graph")
 @click.argument("microgrid_id", type=int)
 @click.option(
@@ -107,13 +192,7 @@ async def print_formulas(
 )
 async def render_graph(microgrid_id: int, output: str, show: bool) -> None:
     """Render and save a component graph visualization for a microgrid."""
-    url = os.environ.get("ASSETS_API_URL")
-    key = os.environ.get("ASSETS_API_AUTH_KEY")
-    secret = os.environ.get("ASSETS_API_SIGN_SECRET")
-    if not url or not key or not secret:
-        raise click.ClickException(
-            "ASSETS_API_URL, ASSETS_API_AUTH_KEY, ASSETS_API_SIGN_SECRET must be set."
-        )
+    url, key, secret = _assets_credentials()
 
     try:
         async with AssetsApiClient(
@@ -151,9 +230,16 @@ async def render_graph(microgrid_id: int, output: str, show: bool) -> None:
     "--inplace",
     is_flag=True,
     default=False,
-    help="Patch --default in place instead of printing to stdout. Preserves "
-    "existing comments, ordering and formatting in that file; only fills in "
-    "values it is missing. Requires --default.",
+    help="Patch --default in place instead of printing to stdout, refreshing "
+    "the managed values while keeping its comments, ordering and formatting. "
+    "Requires --default.",
+)
+@click.option(
+    "--fill-missing",
+    is_flag=True,
+    default=False,
+    help="With --inplace, only add values --default is missing, leaving the "
+    "values already in it untouched.",
 )
 @click.option(
     "--prefer-meters-in-component-formulas",
@@ -162,11 +248,13 @@ async def render_graph(microgrid_id: int, output: str, show: bool) -> None:
     help="Read the meter before the component in the per-category formulas. "
     "This is the order used before component graph v0.5.0.",
 )
-async def generate_config(
+async def generate_config(  # pylint: disable=too-many-locals
     microgrid_ids: tuple[int, ...],
+    *,
     default_file: Path | None,
     override_file: Path | None,
     inplace: bool,
+    fill_missing: bool,
     prefer_meters_in_component_formulas: bool,
 ) -> None:
     """Generate microgrid config from the Assets API as TOML.
@@ -184,21 +272,17 @@ async def generate_config(
     component graph v0.5.0.
 
     With `--inplace`, `--default` is patched directly instead: candidate values
-    come from the Assets API (with `--override` layered on top), and only
-    leaves `--default` is missing are added, preserving its existing comments,
-    field order and formatting. If no microgrid IDs are given, every microgrid
-    already in `--default` is processed.
+    come from the Assets API (with `--override` layered on top) and refresh the
+    managed values, keeping the file's comments, field order and formatting.
+    With `--fill-missing`, only values `--default` lacks are added. If no
+    microgrid IDs are given, every microgrid already in `--default` is processed.
     """
     if inplace and default_file is None:
         raise click.ClickException("--inplace requires --default.")
+    if fill_missing and not inplace:
+        raise click.ClickException("--fill-missing requires --inplace.")
 
-    url = os.environ.get("ASSETS_API_URL")
-    key = os.environ.get("ASSETS_API_AUTH_KEY")
-    secret = os.environ.get("ASSETS_API_SIGN_SECRET")
-    if not url or not key or not secret:
-        raise click.ClickException(
-            "ASSETS_API_URL, ASSETS_API_AUTH_KEY, ASSETS_API_SIGN_SECRET must be set."
-        )
+    url, key, secret = _assets_credentials()
 
     ids = list(dict.fromkeys(microgrid_ids)) or None
     if inplace and ids is None:
@@ -236,13 +320,25 @@ async def generate_config(
 
     if inplace:
         assert default_file is not None
-        patched = patch_file(default_file, configs)
+        try:
+            patched = patch_file(default_file, configs, fill_missing=fill_missing)
+        except ValueError as exc:
+            raise click.ClickException(str(exc)) from exc
         fd, tmp_name = tempfile.mkstemp(
             dir=default_file.parent, prefix=f".{default_file.name}."
         )
         try:
             with os.fdopen(fd, "w") as tmp_file:
                 tmp_file.write(patched)
+            # Guard against a patch that corrupts the file (e.g. bad splicing)
+            # before it overwrites the user's config.
+            try:
+                AssetsConfig.load_from_files(Path(tmp_name))
+            except _LOAD_ERRORS as exc:
+                raise click.ClickException(
+                    f"Refusing to write {default_file}: the patched result is "
+                    f"invalid: {exc}"
+                ) from exc
             os.replace(tmp_name, default_file)
         except BaseException:
             os.remove(tmp_name)

{frequenz_gridpool-0.7.0 → frequenz_gridpool-0.8.0}/src/frequenz/gridpool/cli/_dump_config.py

@@ -5,9 +5,11 @@
 
 Renders a `{microgrid_id: MicrogridConfig}` mapping as dotted-key TOML, e.g.:
 
-    115.microgrid_id = 115
-    115.name = "Demo Grid"
-    115.latitude = 52.52
+    assets.version = 1
+
+    assets.microgrids.115.microgrid_id = 115
+    assets.microgrids.115.name = "Demo Grid"
+    assets.microgrids.115.latitude = 52.52
 
 This is the inverse of `AssetsConfig.load_from_files`. Value rendering (quoting,
 escaping, key-quoting, list/number/datetime formatting) is delegated to
@@ -15,12 +17,16 @@ escaping, key-quoting, list/number/datetime formatting) is delegated to
 fields are done here, since TOML has no null and `tomlkit` rejects it.
 """
 
+from dataclasses import asdict
 from typing import Any
 
 import tomlkit
 from tomlkit.items import Integer, Trivia
 
 from frequenz.gridpool.config import MicrogridConfig
+from frequenz.gridpool.config._migrations import _CURRENT_VERSION
+
+_MICROGRID_PREFIX = ["assets", "microgrids"]
 
 
 def _is_empty(value: Any) -> bool:
@@ -81,16 +87,13 @@ def dump_map(configs: dict[int, MicrogridConfig]) -> str:
         The TOML representation as a string, with one blank line between
         microgrids and entries sorted by numeric microgrid ID.
     """
-    schema = MicrogridConfig.Schema()
     doc = tomlkit.document()
+    doc.append(tomlkit.key(["assets", "version"]), _CURRENT_VERSION)
     for mid in sorted(configs):
-        dumped = schema.dump(configs[mid])
-        assert isinstance(dumped, dict)
-        leaves = _iter_leaves([str(mid)], dumped)
+        leaves = _iter_leaves([*_MICROGRID_PREFIX, str(mid)], asdict(configs[mid]))
         if not leaves:
             continue
-        if doc.body:
-            doc.add(tomlkit.nl())
+        doc.add(tomlkit.nl())
         for path, value in leaves:
             doc.append(tomlkit.key(path), _format_value(value))
     return tomlkit.dumps(doc)