Use new metrics package from common client

This package is compatible with `v1alpha8` of the common API v0.8.

Signed-off-by: cwasicki <[email protected]>

Author: cwasicki

src/frequenz/client/reporting/_client.py

@@ -49,7 +49,7 @@
 from frequenz.client.base.client import BaseApiClient
 from frequenz.client.base.exception import ClientNotConnected
 from frequenz.client.base.streaming import GrpcStreamBroadcaster
-from frequenz.client.common.metric import Metric
+from frequenz.client.common.metrics import Metric
 from google.protobuf.timestamp_pb2 import Timestamp as PBTimestamp
 
 from ._batch_unroll_receiver import BatchUnrollReceiver
@@ -294,7 +294,7 @@ def dt2ts(dt: datetime) -> PBTimestamp:
             )
 
             metric_conns_pb = [
-                PBMetricConnections(metric=metric.to_proto(), connections=[])
+                PBMetricConnections(metric=metric.value, connections=[])
                 for metric in metrics
             ]
 
@@ -477,7 +477,7 @@ def dt2ts(dt: datetime) -> PBTimestamp:
 
             metric_conns_pb = [
                 PBMetricConnections(
-                    metric=metric.to_proto(),
+                    metric=metric.value,
                     connections=[],
                 )
                 for metric in metrics
@@ -556,7 +556,7 @@ def receive_aggregated_data(
 
             aggregation_config = PBAggregationConfig(
                 microgrid_id=microgrid_id,
-                metric=metric.to_proto(),
+                metric=metric.value,
                 aggregation_formula=aggregation_formula,
             )
 

src/frequenz/client/reporting/_types.py

@@ -20,7 +20,7 @@
 )
 
 # pylint: enable=no-name-in-module
-from frequenz.client.common.metric import Metric
+from frequenz.client.common.metrics import Metric
 
 
 class MetricSample(NamedTuple):
@@ -92,8 +92,8 @@ def __iter__(self) -> Iterator[MetricSample]:
         for item in items:
             cid = getattr(item, self.id_attr)
             for sample in getattr(item, "metric_samples", []):
-                ts = sample.sampled_at.ToDatetime().replace(tzinfo=timezone.utc)
-                met = Metric.from_proto(sample.metric).name
+                ts = sample.sample_time.ToDatetime().replace(tzinfo=timezone.utc)
+                met = Metric(sample.metric).name
 
                 # Handle simple_metric
                 if sample.value.HasField("simple_metric"):
@@ -126,8 +126,8 @@ def __iter__(self) -> Iterator[MetricSample]:
                                 ts, mid, cid, f"{met}_bound_{i}_upper", bound.upper
                             )
 
-            for state in getattr(item, "states", []):
-                ts = state.sampled_at.ToDatetime().replace(tzinfo=timezone.utc)
+            for state in getattr(item, "state_snapshots", []):
+                ts = state.origin_time.ToDatetime().replace(tzinfo=timezone.utc)
                 for category, category_items in {
                     "state": getattr(state, "states", []),
                     "warning": getattr(state, "warnings", []),
@@ -150,7 +150,10 @@ def __init__(self, data_pb: PBReceiveMicrogridComponentsDataStreamResponse):
             data_pb: The underlying protobuf message.
         """
         super().__init__(
-            data_pb, id_attr="component_id", items_attr="components", has_bounds=True
+            data_pb,
+            id_attr="electrical_component_id",
+            items_attr="components",
+            has_bounds=True,
         )
 
 

src/frequenz/client/reporting/cli/__main__.py

@@ -8,7 +8,7 @@
 from datetime import datetime, timedelta
 from typing import AsyncIterator
 
-from frequenz.client.common.metric import Metric
+from frequenz.client.common.metrics import Metric
 
 from frequenz.client.reporting import ReportingApiClient
 from frequenz.client.reporting._types import MetricSample