Skip to content

Commit 3a2f7cd

Browse files
committed
Rename PvInverterSolarInverter
This is to make the component types compatible with the microgrid client. Signed-off-by: Sahas Subramanian <[email protected]>
1 parent 2085eff commit 3a2f7cd

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

src/frequenz/client/assets/electrical_component/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
HybridInverter,
3737
Inverter,
3838
InverterType,
39-
PvInverter,
39+
SolarInverter,
4040
UnrecognizedInverter,
4141
UnspecifiedInverter,
4242
)
@@ -81,7 +81,7 @@
8181
"HybridInverter",
8282
"Inverter",
8383
"InverterType",
84-
"PvInverter",
84+
"SolarInverter",
8585
"UnrecognizedInverter",
8686
"UnspecifiedInverter",
8787
"Meter",

src/frequenz/client/assets/electrical_component/_electrical_component_proto.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
BatteryInverter,
4848
HybridInverter,
4949
InverterType,
50-
PvInverter,
50+
SolarInverter,
5151
UnrecognizedInverter,
5252
UnspecifiedInverter,
5353
)
@@ -320,12 +320,15 @@ def electrical_component_from_proto_with_issues(
320320
inverter_enum_to_class: dict[
321321
InverterType,
322322
type[
323-
UnspecifiedInverter | BatteryInverter | PvInverter | HybridInverter
323+
UnspecifiedInverter
324+
| BatteryInverter
325+
| SolarInverter
326+
| HybridInverter
324327
],
325328
] = {
326329
InverterType.UNSPECIFIED: UnspecifiedInverter,
327330
InverterType.BATTERY: BatteryInverter,
328-
InverterType.PV: PvInverter,
331+
InverterType.SOLAR: SolarInverter,
329332
InverterType.HYBRID: HybridInverter,
330333
}
331334
inverter_type = enum_proto.enum_from_proto(
@@ -335,7 +338,7 @@ def electrical_component_from_proto_with_issues(
335338
case (
336339
InverterType.UNSPECIFIED
337340
| InverterType.BATTERY
338-
| InverterType.PV
341+
| InverterType.SOLAR
339342
| InverterType.HYBRID
340343
):
341344
if inverter_type is InverterType.UNSPECIFIED:

src/frequenz/client/assets/electrical_component/_inverter.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class InverterType(enum.Enum):
2525
BATTERY = electrical_components_pb2.INVERTER_TYPE_BATTERY
2626
"""The inverter is a battery inverter."""
2727

28-
PV = electrical_components_pb2.INVERTER_TYPE_PV
28+
SOLAR = electrical_components_pb2.INVERTER_TYPE_PV
2929
"""The inverter is a solar inverter."""
3030

3131
HYBRID = electrical_components_pb2.INVERTER_TYPE_HYBRID
@@ -106,10 +106,10 @@ class BatteryInverter(Inverter):
106106

107107

108108
@dataclasses.dataclass(frozen=True, kw_only=True)
109-
class PvInverter(Inverter):
110-
"""A PV inverter."""
109+
class SolarInverter(Inverter):
110+
"""A Solar inverter."""
111111

112-
type: Literal[InverterType.PV] = InverterType.PV
112+
type: Literal[InverterType.SOLAR] = InverterType.SOLAR
113113
"""The type of this inverter.
114114
115115
Note:
@@ -150,7 +150,7 @@ class UnrecognizedInverter(Inverter):
150150
InverterTypes: TypeAlias = (
151151
UnspecifiedInverter
152152
| BatteryInverter
153-
| PvInverter
153+
| SolarInverter
154154
| HybridInverter
155155
| UnrecognizedInverter
156156
)

0 commit comments

Comments
 (0)