Skip to content

Commit b1c4300

Browse files
committed
Remove assets level from micrgrid config
This was introduced as an additional nesting level. It doesn't seem to be necessary and is not reflected in the current config files anyway, so we remove it. Signed-off-by: cwasicki <[email protected]>
1 parent 87a97cc commit b1c4300

File tree

1 file changed

+11
-21
lines changed

1 file changed

+11
-21
lines changed

src/frequenz/data/microgrid/config.py

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -160,20 +160,6 @@ class BatteryConfig:
160160
"""Capacity of the battery in Wh."""
161161

162162

163-
@dataclass(frozen=True)
164-
class AssetsConfig:
165-
"""Configuration of the assets in a microgrid."""
166-
167-
pv: dict[str, PVConfig] | None = None
168-
"""Configuration of the PV system."""
169-
170-
wind: dict[str, WindConfig] | None = None
171-
"""Configuration of the wind turbines."""
172-
173-
battery: dict[str, BatteryConfig] | None = None
174-
"""Configuration of the batteries."""
175-
176-
177163
# pylint: disable=too-many-instance-attributes
178164
@dataclass(frozen=True)
179165
class Metadata:
@@ -211,8 +197,14 @@ class MicrogridConfig:
211197
meta: Metadata | None = None
212198
"""Metadata of the microgrid."""
213199

214-
assets: AssetsConfig | None = None
215-
"""Configuration of the assets in the microgrid."""
200+
pv: dict[str, PVConfig] | None = None
201+
"""Configuration of the PV system."""
202+
203+
wind: dict[str, WindConfig] | None = None
204+
"""Configuration of the wind turbines."""
205+
206+
battery: dict[str, BatteryConfig] | None = None
207+
"""Configuration of the batteries."""
216208

217209
ctype: dict[str, ComponentTypeConfig] = field(default_factory=dict)
218210
"""Mapping of component category types to ac power component config."""
@@ -225,11 +217,9 @@ def __init__(self, config_dict: dict[str, Any]) -> None:
225217
"""
226218
self.meta = Metadata(**(config_dict.get("meta") or {}))
227219

228-
self.assets = AssetsConfig(
229-
pv=config_dict.get("pv") or {},
230-
wind=config_dict.get("wind") or {},
231-
battery=config_dict.get("battery") or {},
232-
)
220+
self.pv = config_dict.get("pv") or {}
221+
self.wind = config_dict.get("wind") or {}
222+
self.battery = config_dict.get("battery") or {}
233223

234224
self.ctype = {
235225
ctype: ComponentTypeConfig(component_type=cast(ComponentType, ctype), **cfg)

0 commit comments

Comments
 (0)