Fetch component_type from component metadata

The component type is now part of `Metadata`.  This commit also adds a
test for non-NONE inverter types.

Signed-off-by: Sahas Subramanian <[email protected]>

Author: shsms

src/frequenz/sdk/microgrid/component/_component.py

@@ -31,15 +31,15 @@ class InverterType(ComponentType):
 
 def _component_type_from_protobuf(
     component_category: components_pb.ComponentCategory.ValueType,
-    component_type: inverter_pb.Type.ValueType,
+    component_metadata: inverter_pb.Metadata,
 ) -> Optional[ComponentType]:
     """Convert a protobuf InverterType message to Component enum.
 
     For internal-only use by the `microgrid` package.
 
     Args:
         component_category: category the type belongs to.
-        component_type: protobuf enum to convert.
+        component_metadata: protobuf metadata to fetch type from.
 
     Returns:
         Enum value corresponding to the protobuf message.
@@ -51,10 +51,14 @@ def _component_type_from_protobuf(
         component_category
         == components_pb.ComponentCategory.COMPONENT_CATEGORY_INVERTER
     ):
-        if not any(t.value == component_type for t in InverterType):
+        # mypy 1.4.1 crashes at this line, maybe it doesn't like the name of the "type"
+        # attribute in this context.  Hence the "# type: ignore".
+        if not any(
+            t.value == component_metadata.type for t in InverterType  # type: ignore
+        ):
             return None
 
-        return InverterType(component_type)
+        return InverterType(component_metadata.type)
 
     return None
 

tests/microgrid/test_client.py

@@ -126,6 +126,25 @@ async def test_components(self) -> None:
                 Component(107, ComponentCategory.EV_CHARGER),
             }
 
+            servicer.set_components(
+                [
+                    (9, components_pb.ComponentCategory.COMPONENT_CATEGORY_METER),
+                    (666, components_pb.ComponentCategory.COMPONENT_CATEGORY_SENSOR),
+                    (999, components_pb.ComponentCategory.COMPONENT_CATEGORY_BATTERY),
+                ]
+            )
+            servicer.add_component(
+                99,
+                components_pb.ComponentCategory.COMPONENT_CATEGORY_INVERTER,
+                components_pb.InverterType.INVERTER_TYPE_BATTERY,
+            )
+
+            assert set(await microgrid.components()) == {
+                Component(9, ComponentCategory.METER),
+                Component(99, ComponentCategory.INVERTER, InverterType.BATTERY),
+                Component(999, ComponentCategory.BATTERY),
+            }
+
         finally:
             assert await server.graceful_shutdown()