From 06688410f0301a82bd32577d522558b910d8f46a Mon Sep 17 00:00:00 2001 From: Flora Date: Wed, 9 Jul 2025 16:27:32 +0200 Subject: [PATCH] Renaming to allow for api-reporting update Signed-off-by: Flora --- RELEASE_NOTES.md | 2 +- pyproject.toml | 6 +++--- src/frequenz/client/reporting/_client.py | 12 ++++++------ src/frequenz/client/reporting/_types.py | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 27bd3d5..4d2f0d1 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -6,7 +6,7 @@ ## Upgrading - +* Update to frequenz-api-reporting v0.8.0 ## New Features diff --git a/pyproject.toml b/pyproject.toml index e627d76..47ec208 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,10 +28,10 @@ requires-python = ">= 3.11, < 4" dependencies = [ "typing_extensions >= 4.6.1, < 5", "grpc-stubs == 1.53.0.6", - "frequenz-api-reporting >= 0.7.0, < 0.8", + "frequenz-api-reporting >= 0.8.0, < 0.9", "frequenz-client-common >= 0.3.0, < 0.4", - "grpcio >=1.70.0, < 2", - "protobuf >= 5.29.3, < 7", + "grpcio >=1.72.1, < 2", + "protobuf >=6.31.1, < 7", "frequenz-client-base >= 0.11.0, < 0.12.0", ] dynamic = ["version"] diff --git a/src/frequenz/client/reporting/_client.py b/src/frequenz/client/reporting/_client.py index f5e0f1f..c0398b5 100644 --- a/src/frequenz/client/reporting/_client.py +++ b/src/frequenz/client/reporting/_client.py @@ -260,8 +260,8 @@ def dt2ts(dt: datetime) -> PBTimestamp: return ts time_filter = PBTimeFilter( - start=dt2ts(start_time) if start_time else None, - end=dt2ts(end_time) if end_time else None, + start_time=dt2ts(start_time) if start_time else None, + end_time=dt2ts(end_time) if end_time else None, ) incl_states = ( @@ -450,8 +450,8 @@ def dt2ts(dt: datetime) -> PBTimestamp: return ts time_filter = PBTimeFilter( - start=dt2ts(start_time) if start_time else None, - end=dt2ts(end_time) if end_time else None, + start_time=dt2ts(start_time) if start_time else None, + end_time=dt2ts(end_time) if end_time else None, ) incl_states = ( @@ -566,8 +566,8 @@ def dt2ts(dt: datetime) -> PBTimestamp: return ts time_filter = PBTimeFilter( - start=dt2ts(start_time) if start_time else None, - end=dt2ts(end_time) if end_time else None, + start_time=dt2ts(start_time) if start_time else None, + end_time=dt2ts(end_time) if end_time else None, ) stream_filter = PBAggregatedStreamRequest.AggregationStreamFilter( diff --git a/src/frequenz/client/reporting/_types.py b/src/frequenz/client/reporting/_types.py index ed06026..78ccab4 100644 --- a/src/frequenz/client/reporting/_types.py +++ b/src/frequenz/client/reporting/_types.py @@ -92,7 +92,7 @@ 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) + ts = sample.sample_time.ToDatetime().replace(tzinfo=timezone.utc) met = Metric.from_proto(sample.metric).name # Handle simple_metric @@ -127,7 +127,7 @@ def __iter__(self) -> Iterator[MetricSample]: ) for state in getattr(item, "states", []): - ts = state.sampled_at.ToDatetime().replace(tzinfo=timezone.utc) + ts = state.sample_time.ToDatetime().replace(tzinfo=timezone.utc) for category, category_items in { "state": getattr(state, "states", []), "warning": getattr(state, "warnings", []), @@ -177,7 +177,7 @@ class AggregatedMetric: def sample(self) -> MetricSample: """Return the aggregated metric sample.""" return MetricSample( - timestamp=self._data_pb.sample.sampled_at.ToDatetime().replace( + timestamp=self._data_pb.sample.sample_time.ToDatetime().replace( tzinfo=timezone.utc ), microgrid_id=self._data_pb.aggregation_config.microgrid_id,