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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frequenz-gridpool
-Version: 0.6.3
+Version: 0.7.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
@@ -35,7 +35,7 @@ Requires-Dist: flake8==7.3.0; extra == "dev-flake8"
 Requires-Dist: flake8-datetimez==20.10.0; 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.0; extra == "dev-flake8"
+Requires-Dist: pydoclint==0.9.1; extra == "dev-flake8"
 Requires-Dist: pydocstyle==6.3.0; extra == "dev-flake8"
 Provides-Extra: dev-formatting
 Requires-Dist: black==26.5.1; extra == "dev-formatting"
@@ -47,17 +47,17 @@ Requires-Dist: mike==2.2.0; extra == "dev-mkdocs"
 Requires-Dist: mkdocs-gen-files==0.6.1; extra == "dev-mkdocs"
 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.6; extra == "dev-mkdocs"
-Requires-Dist: mkdocstrings[python]==1.0.4; 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: frequenz-repo-config[lib]==0.18.0; extra == "dev-mkdocs"
 Provides-Extra: dev-mypy
-Requires-Dist: mypy==2.1.0; extra == "dev-mypy"
+Requires-Dist: mypy==2.3.0; extra == "dev-mypy"
 Requires-Dist: types-networkx>=3.6.1.20251220; extra == "dev-mypy"
-Requires-Dist: types-Markdown==3.10.2.20260518; 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.4.10; extra == "dev-noxfile"
+Requires-Dist: nox==2026.7.11; 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"
@@ -81,9 +81,64 @@ Dynamic: license-file
 
 ## Introduction
 
-High-level interface to grid pools for the Frequenz platform.
+High-level interface to gridpools for the Frequenz platform.
 
-TODO(cookiecutter): Improve the README file
+## Market topology configuration
+
+Market topology is stored under the `assets` namespace. A relation names at
+least two of a gridpool, microgrid and market location:
+
+```toml
+assets.microgrids.241.meta.microgrid_id = 241
+
+assets.market_locations.10208446344.id = "10208446344"
+
+assets.relations.G80M241L10208446344.gridpool_id = 80
+assets.relations.G80M241L10208446344.microgrid_id = 241
+assets.relations.G80M241L10208446344.market_location_id = "10208446344"
+assets.relations.G80M241L10208446344.delivery_area.code = "10YDE-RWENET---I"
+assets.relations.G80M241L10208446344.validity.trading.participation = "ENERGY_TRADING"
+assets.relations.G80M241L10208446344.validity.trading.start = 2026-01-01T00:00:00Z
+```
+
+A relation naming a gridpool requires a delivery area. A gridpool-free relation
+must link a microgrid and market location, and may carry a delivery area for a
+direct market-location-to-area mapping. Omitted market-location types default
+to `MALO_ID`; omitted market areas default to `101` (`EU_DE`).
+
+A delivery area is a `code` and a `code_type` that defaults to EIC, so an EIC
+area is just `delivery_area.code = "..."`. EIC codes are checked for format and
+check character, not registration with an EIC issuing office; other code types
+are taken as given. One code is bound to a single code type across a document.
+
+Validity periods are half-open: the start is inclusive, the end exclusive, and
+an omitted bound is open. Bounds and query instants must include a UTC offset.
+
+Load one or more files and query the merged document with:
+
+```python
+from datetime import datetime, timezone
+from pathlib import Path
+
+from frequenz.gridpool.config import AssetsConfig
+
+config = AssetsConfig.load_from_files(
+    [Path("topology.toml"), Path("topology-overrides.toml")]
+)
+relations = config.find_relations(
+    microgrid_id=241,
+    at=datetime(2026, 1, 15, tzinfo=timezone.utc),
+)
+```
+
+Later files override individual fields from earlier files. The projections
+`find_delivery_areas`, `find_market_locations` and `find_microgrids` accept
+filters for the other relation sides and an instant. `find_delivery_areas`
+returns each area with its code and code type; a delivery-area filter takes
+either a bare code or a full delivery area matched on its code type.
+
+Market locations are keyed by raw ID, so the same raw ID cannot be used in
+several market areas within one document.
 
 ## Supported Platforms
 
@@ -161,7 +216,11 @@ Redirect stdout to save the result:
 gridpool-cli generate-config <microgrid_id> > microgrid.toml
 ```
 
-You can layer existing config files with the Assets API by precedence
+This command emits only microgrid entries. Topology relations, including their
+delivery-area codes, and market-location entries from input files are not
+included in its stdout output.
+
+You can layer existing microgrid config files with the Assets API by precedence
 (`--default` < Assets API < `--override`). Values from a `--default` file are
 overridden by the API, while a `--override` file keeps its own values and the
 API only fills the gaps:
@@ -172,7 +231,8 @@ gridpool-cli generate-config <microgrid_id> \
     --override overrides.toml > microgrid.toml
 ```
 
-If no microgrid IDs are given, they are taken from the supplied files:
+If no microgrid IDs are given, they are taken from the microgrid entries in the
+supplied files:
 
 ```bash
 gridpool-cli generate-config --override existing.toml > microgrid.toml

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

@@ -6,9 +6,64 @@
 
 ## Introduction
 
-High-level interface to grid pools for the Frequenz platform.
+High-level interface to gridpools for the Frequenz platform.
 
-TODO(cookiecutter): Improve the README file
+## Market topology configuration
+
+Market topology is stored under the `assets` namespace. A relation names at
+least two of a gridpool, microgrid and market location:
+
+```toml
+assets.microgrids.241.meta.microgrid_id = 241
+
+assets.market_locations.10208446344.id = "10208446344"
+
+assets.relations.G80M241L10208446344.gridpool_id = 80
+assets.relations.G80M241L10208446344.microgrid_id = 241
+assets.relations.G80M241L10208446344.market_location_id = "10208446344"
+assets.relations.G80M241L10208446344.delivery_area.code = "10YDE-RWENET---I"
+assets.relations.G80M241L10208446344.validity.trading.participation = "ENERGY_TRADING"
+assets.relations.G80M241L10208446344.validity.trading.start = 2026-01-01T00:00:00Z
+```
+
+A relation naming a gridpool requires a delivery area. A gridpool-free relation
+must link a microgrid and market location, and may carry a delivery area for a
+direct market-location-to-area mapping. Omitted market-location types default
+to `MALO_ID`; omitted market areas default to `101` (`EU_DE`).
+
+A delivery area is a `code` and a `code_type` that defaults to EIC, so an EIC
+area is just `delivery_area.code = "..."`. EIC codes are checked for format and
+check character, not registration with an EIC issuing office; other code types
+are taken as given. One code is bound to a single code type across a document.
+
+Validity periods are half-open: the start is inclusive, the end exclusive, and
+an omitted bound is open. Bounds and query instants must include a UTC offset.
+
+Load one or more files and query the merged document with:
+
+```python
+from datetime import datetime, timezone
+from pathlib import Path
+
+from frequenz.gridpool.config import AssetsConfig
+
+config = AssetsConfig.load_from_files(
+    [Path("topology.toml"), Path("topology-overrides.toml")]
+)
+relations = config.find_relations(
+    microgrid_id=241,
+    at=datetime(2026, 1, 15, tzinfo=timezone.utc),
+)
+```
+
+Later files override individual fields from earlier files. The projections
+`find_delivery_areas`, `find_market_locations` and `find_microgrids` accept
+filters for the other relation sides and an instant. `find_delivery_areas`
+returns each area with its code and code type; a delivery-area filter takes
+either a bare code or a full delivery area matched on its code type.
+
+Market locations are keyed by raw ID, so the same raw ID cannot be used in
+several market areas within one document.
 
 ## Supported Platforms
 
@@ -86,7 +141,11 @@ Redirect stdout to save the result:
 gridpool-cli generate-config <microgrid_id> > microgrid.toml
 ```
 
-You can layer existing config files with the Assets API by precedence
+This command emits only microgrid entries. Topology relations, including their
+delivery-area codes, and market-location entries from input files are not
+included in its stdout output.
+
+You can layer existing microgrid config files with the Assets API by precedence
 (`--default` < Assets API < `--override`). Values from a `--default` file are
 overridden by the API, while a `--override` file keeps its own values and the
 API only fills the gaps:
@@ -97,7 +156,8 @@ gridpool-cli generate-config <microgrid_id> \
     --override overrides.toml > microgrid.toml
 ```
 
-If no microgrid IDs are given, they are taken from the supplied files:
+If no microgrid IDs are given, they are taken from the microgrid entries in the
+supplied files:
 
 ```bash
 gridpool-cli generate-config --override existing.toml > microgrid.toml

frequenz_gridpool-0.7.0/RELEASE_NOTES.md

@@ -0,0 +1,119 @@
+# Frequenz Gridpool Library Release Notes
+
+## Summary
+
+<!-- Here goes a general summary of what this release is about -->
+
+## Upgrading
+
+- `MicrogridConfig.load_from_file` is replaced by `AssetsConfig.load_from_files`,
+  which loads one or more files, merged into one document, and returns the whole
+  document rather than just its microgrids:
+
+  ```python
+  configs = AssetsConfig.load_from_files(path).microgrids
+  ```
+
+  `load_configs` now returns the whole `AssetsConfig` rather than just its
+  microgrids, so the file layers' `relations` and `market_locations` survive the
+  merge; replace `load_configs(...)` with `load_configs(...).microgrids` where
+  only the microgrid map is needed. `load_from_files` layers files field by field
+  instead of replacing a complete microgrid entry; fields omitted by a later file
+  retain the value from the earlier layer and cannot be removed by omission.
+
+- `Metadata` is removed; its fields (`microgrid_id`, `name`, `gid`, coordinates,
+  times) now sit directly on `MicrogridConfig`:
+
+  ```python
+  MicrogridConfig(microgrid_id=1, name="Grid")  # was meta=Metadata(...)
+  ```
+
+  In TOML they move up one level, `assets.microgrids.1.name` rather than
+  `assets.microgrids.1.meta.name`. A file still nesting a microgrid's fields
+  under `meta` loads, lifted with a deprecation warning.
+
+- A microgrid's `delivery_area` is removed. Move its value to a relation's
+  `delivery_area.code`, and set `delivery_area.code_type` when the code is not
+  EIC. When relations are present, the legacy `gid` must be their sole
+  gridpool ID; remove it for a microgrid that participates in several gridpools.
+
+- `load_configs_from_files` is removed. Use `AssetsConfig.load_from_files`,
+  which returns the whole document rather than just its microgrids: replace
+  `load_configs_from_files(files)` with
+  `AssetsConfig.load_from_files(files).microgrids`, or use the returned
+  `AssetsConfig` directly to keep relations and market locations.
+
+- `load_configs_from_api` is now private. For an API-only load call
+  `load_configs(assets_client=..., microgrid_ids=...)` and read its `.microgrids`.
+
+- `merge_config_maps` and `merge_microgrid_configs` are removed. Layering is now
+  done on the raw tables before loading, inside `load_configs` and
+  `AssetsConfig.load_from_files`; pass all the layers to one of those instead of
+  merging loaded objects.
+
+- Relation validity bounds and `at` query instants must include a UTC offset.
+
+- The implementation modules `config.load` and `config.microgrid` are now
+  private. Import their public names from `frequenz.gridpool.config` instead.
+
+- Microgrids are now keyed by `int` microgrid ID, not `str`. This covers
+  `AssetsConfig.microgrids`, including documents returned by `load_configs`.
+  Index the mapping by integer ID:
+
+  ```python
+  configs[1]  # was configs["1"]
+  ```
+
+- The `AC_ACTIVE_POWER` deprecation warning is dropped. Use `AC_POWER_ACTIVE`
+  as the formula metric key; the old name is no longer flagged on load.
+
+
+## New Features
+
+- `AssetsConfig` gives the `assets` namespace a type, so the entities still to
+  come are added as fields rather than as more dict lookups. Microgrid IDs are
+  checked during construction. `AssetsConfig.check()` performs the topology-wide
+  checks after all layers have been merged; the file loaders call it unless
+  `AssetsConfig.load_from_files` is passed `check=False`.
+
+  File loaders ignore unknown entity tables with a warning, so a reader keeps
+  working against files that already carry newer entities.
+
+  The `assets` table may carry a `version`; on load a document is run through a
+  migration pipeline that brings older layouts up to the current format, so
+  legacy files keep working. The version tracks the assets format alone, not
+  the whole document.
+
+- Market topology is described under `assets.relations`, based on the Assets
+  API `MarketTopologyRelation`: each record links at least two of a gridpool, a
+  microgrid and a market location, filed under a
+  `G<gridpool_id>M<microgrid_id>L<market_location_id>` key derived from its own
+  sides. A relation naming a gridpool sits in a `delivery_area` that rides on
+  the relation, so a gridpool-to-microgrid relation with no market location still
+  carries one. A relation's validity lives in `validity`, each entry a half-open
+  `[start, end)` datetime period it applies over. Use-case-specific periods
+  qualify a relation; separate relations let one microgrid participate in
+  several gridpools. The config extends the API with plain periods for relations
+  that do not distinguish use cases. A gridpool-free microgrid-to-market-location
+  relation may also carry a delivery area for a direct mapping. Market locations
+  live under `assets.market_locations` as self-describing entries carrying their
+  own identifier, how to read it (`MALO_ID` by default), and the Assets API market
+  area (`EU_DE` by default). A relation's `delivery_area` is a `code` plus a
+  `code_type` that defaults to EIC, so an EIC area is just
+  `delivery_area.code = "..."`; EIC codes are check-character-validated. Raw
+  market-location IDs must be unique within a document, including across market
+  areas.
+
+  `AssetsConfig` answers the common lookups with `find_relations` and the
+  projections `find_delivery_areas`, `find_market_locations` and
+  `find_microgrids`, each filtered by the other sides and an instant.
+
+  Time-varying enterprise ownership is outside this change;
+  `MicrogridConfig.enterprise_id` remains as a scalar field.
+
+## Bug Fixes
+
+- Layering config files no longer resets a field a later file leaves unset back
+  to its default. The raw tables are merged before they are loaded.
+
+<!-- Here goes notable bug fixes that are worth a special mention or explanation -->

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

@@ -3,8 +3,8 @@
 
 [build-system]
 requires = [
-  "setuptools == 82.0.1",
-  "setuptools_scm[toml] == 10.2.0",
+  "setuptools == 83.0.0",
+  "setuptools_scm[toml] == 10.2.1",
   "frequenz-repo-config[lib] == 0.18.0",
 ]
 build-backend = "setuptools.build_meta"
@@ -56,7 +56,7 @@ dev-flake8 = [
   "flake8-datetimez == 20.10.0",
   "flake8-docstrings == 1.7.0",
   "flake8-pyproject == 1.2.4",  # For reading the flake8 config from pyproject.toml
-  "pydoclint == 0.9.0",
+  "pydoclint == 0.9.1",
   "pydocstyle == 6.3.0",
 ]
 dev-formatting = ["black == 26.5.1", "isort == 8.0.1"]
@@ -67,20 +67,20 @@ dev-mkdocs = [
   "mkdocs-gen-files == 0.6.1",
   "mkdocs-literate-nav == 0.6.3",
   "mkdocs-macros-plugin == 1.5.0",
-  "mkdocs-material == 9.7.6",
-  "mkdocstrings[python] == 1.0.4",
+  "mkdocs-material == 9.7.7",
+  "mkdocstrings[python] == 1.0.6",
   "mkdocstrings-python == 2.0.5",
   "frequenz-repo-config[lib] == 0.18.0",
 ]
 dev-mypy = [
-  "mypy == 2.1.0",
+  "mypy == 2.3.0",
   "types-networkx>=3.6.1.20251220",
-  "types-Markdown == 3.10.2.20260518",
+  "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.4.10",
+  "nox == 2026.7.11",
   "frequenz-repo-config[lib] == 0.18.0",
 ]
 dev-pylint = [
@@ -148,6 +148,7 @@ min-similarity-lines = 40
 disable = [
   "too-few-public-methods",
   "too-many-return-statements",
+  "too-many-arguments",
   # disabled because it conflicts with isort
   "wrong-import-order",
   "ungrouped-imports",

{frequenz_gridpool-0.6.3 → frequenz_gridpool-0.7.0}/src/frequenz/gridpool/__init__.py

@@ -6,25 +6,9 @@
 from frequenz.microgrid_component_graph import ComponentGraphConfig, FormulaOverrides
 
 from ._graph_generator import ComponentGraphGenerator
-from .config import (
-    Metadata,
-    MicrogridConfig,
-    load_configs,
-    load_configs_from_api,
-    load_configs_from_files,
-    merge_config_maps,
-    merge_microgrid_configs,
-)
 
 __all__ = [
     "ComponentGraphConfig",
     "ComponentGraphGenerator",
     "FormulaOverrides",
-    "Metadata",
-    "MicrogridConfig",
-    "load_configs",
-    "load_configs_from_api",
-    "load_configs_from_files",
-    "merge_config_maps",
-    "merge_microgrid_configs",
 ]

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

@@ -11,15 +11,11 @@ import asyncclick as click
 from frequenz.client.assets import AssetsApiClient
 from frequenz.client.common.microgrid import MicrogridId
 
-from frequenz.gridpool import (
-    ComponentGraphConfig,
-    ComponentGraphGenerator,
-    MicrogridConfig,
-    load_configs,
-)
+from frequenz.gridpool import ComponentGraphConfig, ComponentGraphGenerator
 from frequenz.gridpool.cli._dump_config import dump_map
 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
 
 
 @click.group()
@@ -207,29 +203,33 @@ async def generate_config(
     ids = list(dict.fromkeys(microgrid_ids)) or None
     if inplace and ids is None:
         assert default_file is not None
-        ids = sorted(int(mid) for mid in MicrogridConfig.load_from_file(default_file))
+        ids = sorted(AssetsConfig.load_from_files(default_file).microgrids)
 
     async with AssetsApiClient(url, auth_key=key, sign_secret=secret) as client:
         if inplace:
             # default_file is the patch target here, not a merge input.
-            configs = await load_configs(
-                assets_client=client,
-                override_files=override_file,
-                microgrid_ids=ids,
-                component_graph_config=_graph_config(
-                    prefer_meters_in_component_formulas
-                ),
-            )
+            configs = (
+                await load_configs(
+                    assets_client=client,
+                    override_files=override_file,
+                    microgrid_ids=ids,
+                    component_graph_config=_graph_config(
+                        prefer_meters_in_component_formulas
+                    ),
+                )
+            ).microgrids
         else:
-            configs = await load_configs(
-                default_files=default_file,
-                assets_client=client,
-                override_files=override_file,
-                microgrid_ids=ids,
-                component_graph_config=_graph_config(
-                    prefer_meters_in_component_formulas
-                ),
-            )
+            configs = (
+                await load_configs(
+                    default_files=default_file,
+                    assets_client=client,
+                    override_files=override_file,
+                    microgrid_ids=ids,
+                    component_graph_config=_graph_config(
+                        prefer_meters_in_component_formulas
+                    ),
+                )
+            ).microgrids
 
     if not configs:
         raise click.ClickException("No microgrids could be loaded; nothing to write.")

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

@@ -5,11 +5,11 @@
 
 Renders a `{microgrid_id: MicrogridConfig}` mapping as dotted-key TOML, e.g.:
 
-    115.meta.microgrid_id = 115
-    115.meta.name = "Demo Grid"
-    115.meta.latitude = 52.52
+    115.microgrid_id = 115
+    115.name = "Demo Grid"
+    115.latitude = 52.52
 
-This is the inverse of `load_configs_from_files`. Value rendering (quoting,
+This is the inverse of `AssetsConfig.load_from_files`. Value rendering (quoting,
 escaping, key-quoting, list/number/datetime formatting) is delegated to
 `tomlkit`; only the flattening to dotted keys and the dropping of empty/`None`
 fields are done here, since TOML has no null and `tomlkit` rejects it.
@@ -20,7 +20,7 @@ from typing import Any
 import tomlkit
 from tomlkit.items import Integer, Trivia
 
-from frequenz.gridpool import MicrogridConfig
+from frequenz.gridpool.config import MicrogridConfig
 
 
 def _is_empty(value: Any) -> bool:
@@ -71,11 +71,11 @@ def _iter_leaves(
     return leaves
 
 
-def dump_map(configs: dict[str, MicrogridConfig]) -> str:
+def dump_map(configs: dict[int, MicrogridConfig]) -> str:
     """Serialize a mapping of microgrid configs to dotted-key TOML.
 
     Args:
-        configs: Mapping from microgrid ID (as string) to `MicrogridConfig`.
+        configs: Mapping from microgrid ID to `MicrogridConfig`.
 
     Returns:
         The TOML representation as a string, with one blank line between
@@ -83,10 +83,10 @@ def dump_map(configs: dict[str, MicrogridConfig]) -> str:
     """
     schema = MicrogridConfig.Schema()
     doc = tomlkit.document()
-    for mid in sorted(configs, key=int):
+    for mid in sorted(configs):
         dumped = schema.dump(configs[mid])
         assert isinstance(dumped, dict)
-        leaves = _iter_leaves([mid], dumped)
+        leaves = _iter_leaves([str(mid)], dumped)
         if not leaves:
             continue
         if doc.body:

{frequenz_gridpool-0.6.3 → frequenz_gridpool-0.7.0}/src/frequenz/gridpool/cli/_patch_config.py

@@ -15,17 +15,17 @@ from typing import Any
 import tomlkit
 from tomlkit import TOMLDocument
 
-from frequenz.gridpool import MicrogridConfig
+from frequenz.gridpool.config import MicrogridConfig
 
 from ._dump_config import _format_value, _iter_leaves
 
 
-def patch_file(path: Path, configs: dict[str, MicrogridConfig]) -> str:
+def patch_file(path: Path, configs: dict[int, MicrogridConfig]) -> str:
     """Patch the TOML file at `path` with any leaves missing from `configs`.
 
     Args:
         path: Path to the existing TOML file to patch.
-        configs: Mapping from microgrid ID (as string) to `MicrogridConfig`.
+        configs: Mapping from microgrid ID to `MicrogridConfig`.
 
     Returns:
         The patched TOML text; the caller is responsible for writing it back.
@@ -33,12 +33,12 @@ def patch_file(path: Path, configs: dict[str, MicrogridConfig]) -> str:
     return patch_text(path.read_text(), configs)
 
 
-def patch_text(original: str, configs: dict[str, MicrogridConfig]) -> str:
+def patch_text(original: str, configs: dict[int, MicrogridConfig]) -> str:
     """Patch dotted-key TOML text with any leaves missing from `configs`.
 
     Args:
         original: The existing TOML text to patch.
-        configs: Mapping from microgrid ID (as string) to `MicrogridConfig`.
+        configs: Mapping from microgrid ID to `MicrogridConfig`.
 
     Returns:
         The patched TOML text.
@@ -51,7 +51,8 @@ def patch_text(original: str, configs: dict[str, MicrogridConfig]) -> str:
     # into the rendered text instead.
     orphans: dict[str, list[tuple[list[str], Any]]] = {}
 
-    for mid, cfg in configs.items():
+    for microgrid_id, cfg in configs.items():
+        mid = str(microgrid_id)
         dumped = schema.dump(cfg)
         assert isinstance(dumped, dict)
         leaves = _iter_leaves([], dumped)

{frequenz_gridpool-0.6.3 → frequenz_gridpool-0.7.0}/src/frequenz/gridpool/config/__init__.py

@@ -1,42 +1,42 @@
 # License: MIT
 # Copyright © 2025 Frequenz Energy-as-a-Service GmbH
 
-"""Microgrid configuration data model and loading."""
+"""Asset configuration data models and loading."""
 
 from frequenz.microgrid_component_graph import ComponentGraphConfig, FormulaOverrides
 
-from .load import (
-    load_configs,
-    load_configs_from_api,
-    load_configs_from_files,
-)
-from .microgrid import (
+from ._assets import AssetsConfig
+from ._load import load_configs
+from ._microgrid import (
     BatteryConfig,
     ComponentCategory,
     ComponentType,
     ComponentTypeConfig,
-    Metadata,
     MicrogridConfig,
     PVConfig,
     WindConfig,
-    merge_config_maps,
-    merge_microgrid_configs,
+)
+from ._topology import (
+    DeliveryAreaConfig,
+    MarketLocationConfig,
+    RelationConfig,
+    ValidityConfig,
 )
 
 __all__ = [
+    "AssetsConfig",
     "BatteryConfig",
     "ComponentCategory",
     "ComponentGraphConfig",
     "ComponentType",
     "ComponentTypeConfig",
+    "DeliveryAreaConfig",
     "FormulaOverrides",
-    "Metadata",
+    "MarketLocationConfig",
     "MicrogridConfig",
     "PVConfig",
+    "RelationConfig",
+    "ValidityConfig",
     "WindConfig",
     "load_configs",
-    "load_configs_from_api",
-    "load_configs_from_files",
-    "merge_config_maps",
-    "merge_microgrid_configs",
 ]