Skip to content

Commit ffa29cf

Browse files
committed
Switch to reporting API v1alpha10
This includes the major update to common API v1alpha8. Signed-off-by: cwasicki <[email protected]>
1 parent 3221ce2 commit ffa29cf

File tree

3 files changed

+22
-20
lines changed

3 files changed

+22
-20
lines changed

src/frequenz/client/reporting/_client.py

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,44 @@
88
from typing import cast
99

1010
# pylint: disable=no-name-in-module
11-
from frequenz.api.common.v1.microgrid.microgrid_pb2 import (
12-
MicrogridComponentIDs as PBMicrogridComponentIDs,
11+
from frequenz.api.common.v1alpha8.microgrid.microgrid_pb2 import (
12+
MicrogridElectricalComponentIDs as PBMicrogridComponentIDs,
1313
)
14-
from frequenz.api.common.v1.microgrid.microgrid_pb2 import (
14+
from frequenz.api.common.v1alpha8.microgrid.microgrid_pb2 import (
1515
MicrogridSensorIDs as PBMicrogridSensorIDs,
1616
)
17-
from frequenz.api.reporting.v1.reporting_pb2 import (
17+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
1818
AggregationConfig as PBAggregationConfig,
1919
)
20-
from frequenz.api.reporting.v1.reporting_pb2 import FilterOption as PBFilterOption
21-
from frequenz.api.reporting.v1.reporting_pb2 import (
20+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
21+
FilterOption as PBFilterOption,
22+
)
23+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
2224
MetricConnections as PBMetricConnections,
2325
)
24-
from frequenz.api.reporting.v1.reporting_pb2 import (
26+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
2527
ReceiveAggregatedMicrogridComponentsDataStreamRequest as PBAggregatedStreamRequest,
2628
)
27-
from frequenz.api.reporting.v1.reporting_pb2 import (
29+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
2830
ReceiveAggregatedMicrogridComponentsDataStreamResponse as PBAggregatedStreamResponse,
2931
)
30-
from frequenz.api.reporting.v1.reporting_pb2 import (
32+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
3133
ReceiveMicrogridComponentsDataStreamRequest as PBReceiveMicrogridComponentsDataStreamRequest,
3234
)
33-
from frequenz.api.reporting.v1.reporting_pb2 import (
35+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
3436
ReceiveMicrogridComponentsDataStreamResponse as PBReceiveMicrogridComponentsDataStreamResponse,
3537
)
36-
from frequenz.api.reporting.v1.reporting_pb2 import (
38+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
3739
ReceiveMicrogridSensorsDataStreamRequest as PBReceiveMicrogridSensorsDataStreamRequest,
3840
)
39-
from frequenz.api.reporting.v1.reporting_pb2 import (
41+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
4042
ReceiveMicrogridSensorsDataStreamResponse as PBReceiveMicrogridSensorsDataStreamResponse,
4143
)
42-
from frequenz.api.reporting.v1.reporting_pb2 import (
44+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
4345
ResamplingOptions as PBResamplingOptions,
4446
)
45-
from frequenz.api.reporting.v1.reporting_pb2 import TimeFilter as PBTimeFilter
46-
from frequenz.api.reporting.v1.reporting_pb2_grpc import ReportingStub
47+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import TimeFilter as PBTimeFilter
48+
from frequenz.api.reporting.v1alpha10.reporting_pb2_grpc import ReportingStub
4749
from frequenz.channels import Receiver
4850
from frequenz.client.base.channel import ChannelOptions
4951
from frequenz.client.base.client import BaseApiClient
@@ -250,7 +252,7 @@ def _receive_microgrid_components_data_batch(
250252
or not self._components_data_streams[stream_key].is_running
251253
):
252254
microgrid_components_pb = [
253-
PBMicrogridComponentIDs(microgrid_id=mid, component_ids=cids)
255+
PBMicrogridComponentIDs(microgrid_id=mid, electrical_component_ids=cids)
254256
for mid, cids in microgrid_components
255257
]
256258

src/frequenz/client/reporting/_types.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
from typing import Any, NamedTuple
1010

1111
# pylint: disable=no-name-in-module
12-
from frequenz.api.reporting.v1.reporting_pb2 import (
12+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
1313
ReceiveAggregatedMicrogridComponentsDataStreamResponse as PBAggregatedStreamResponse,
1414
)
15-
from frequenz.api.reporting.v1.reporting_pb2 import (
15+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
1616
ReceiveMicrogridComponentsDataStreamResponse as PBReceiveMicrogridComponentsDataStreamResponse,
1717
)
18-
from frequenz.api.reporting.v1.reporting_pb2 import (
18+
from frequenz.api.reporting.v1alpha10.reporting_pb2 import (
1919
ReceiveMicrogridSensorsDataStreamResponse as PBReceiveMicrogridSensorsDataStreamResponse,
2020
)
2121

tests/test_client_reporting.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from unittest.mock import MagicMock, patch
66

77
import pytest
8-
from frequenz.api.reporting.v1.reporting_pb2_grpc import ReportingStub
8+
from frequenz.api.reporting.v1alpha10.reporting_pb2_grpc import ReportingStub
99
from frequenz.client.base.channel import ChannelOptions
1010
from frequenz.client.base.client import BaseApiClient
1111

0 commit comments

Comments
 (0)