Skip to content

Commit c7a58e1

Browse files
authored
Replace the internal microgrid API client with frequenz-client-microgrid (#892)
Unfortunately we can't remove the direct dependency on `frequenz-api-microgrid` yet because some code is still using the raw protobuf structures, as there are no wrappers for them yet (neither in the internal code nor in `frequenz-client-microgrid`, which is based on the SDK code). Fixes #853.
2 parents dca29e8 + 32adac9 commit c7a58e1

File tree

78 files changed

+190
-3243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+190
-3243
lines changed

RELEASE_NOTES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
## Upgrading
88

9-
<!-- Here goes notes on how to upgrade from previous versions, including deprecations and what they should be replaced with -->
9+
- The SDK is now using the microgrid API client from [`frequenz-client-microgrid`](https://github.com/frequenz-floss/frequenz-client-microgrid-python/). You should update your code if you are using the microgrid API client directly.
1010

1111
## New Features
1212

1313
<!-- Here goes the main new features and examples or instructions on how to use them -->
1414

1515
## Bug Fixes
1616

17-
<!-- Here goes notable bug fixes that are worth a special mention or explanation -->
17+
- A bug was fixed where the grid fuse was not created properly and would end up with a `max_current` with type `float` instead of `Current`.

benchmarks/power_distribution/power_distributor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from typing import Any
1313

1414
from frequenz.channels import Broadcast
15+
from frequenz.client.microgrid import Component, ComponentCategory
1516

1617
from frequenz.sdk import microgrid
1718
from frequenz.sdk.actor import ResamplerConfig
@@ -26,7 +27,6 @@
2627
Success,
2728
)
2829
from frequenz.sdk.microgrid import connection_manager
29-
from frequenz.sdk.microgrid.component import Component, ComponentCategory
3030
from frequenz.sdk.timeseries._quantities import Power
3131

3232
HOST = "microgrid.sandbox.api.frequenz.io"

benchmarks/timeseries/benchmark_datasourcing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
from typing import Any
1818

1919
from frequenz.channels import Broadcast, Receiver, ReceiverStoppedError
20+
from frequenz.client.microgrid import ComponentMetricId
2021

2122
from frequenz.sdk import microgrid
2223
from frequenz.sdk.actor import (
2324
ChannelRegistry,
2425
ComponentMetricRequest,
2526
DataSourcingActor,
2627
)
27-
from frequenz.sdk.microgrid.component import ComponentMetricId
2828

2929
try:
3030
from tests.timeseries.mock_microgrid import MockMicrogrid

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ dependencies = [
3131
# changing the version
3232
# (plugins.mkdocstrings.handlers.python.import)
3333
"frequenz-channels == 1.0.0b2",
34+
"frequenz-client-microgrid >= 0.1.2, < 0.2.0",
3435
"google-api-python-client >= 2.71, < 3",
3536
"grpcio >= 1.54.2, < 2",
3637
"grpcio-tools >= 1.54.2, < 2",

src/frequenz/sdk/_api_client/__init__.py

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/frequenz/sdk/_api_client/api_client.py

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/frequenz/sdk/actor/_data_sourcing/_component_metric_request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from dataclasses import dataclass
77
from datetime import datetime
88

9-
from ...microgrid.component._component import ComponentMetricId
9+
from frequenz.client.microgrid import ComponentMetricId
1010

1111

1212
@dataclass

src/frequenz/sdk/actor/_data_sourcing/microgrid_api_source.py

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

1111
from frequenz.channels import Receiver, Sender
12-
13-
from ...microgrid import connection_manager
14-
from ...microgrid.component import (
12+
from frequenz.client.microgrid import (
1513
BatteryData,
1614
ComponentCategory,
1715
ComponentMetricId,
1816
EVChargerData,
1917
InverterData,
2018
MeterData,
2119
)
20+
21+
from ...microgrid import connection_manager
2222
from ...timeseries import Sample
2323
from ...timeseries._quantities import Quantity
2424
from .._channel_registry import ChannelRegistry

src/frequenz/sdk/actor/_power_managing/_power_managing_actor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
from frequenz.channels import Receiver, Sender
1414
from frequenz.channels.util import SkipMissedAndDrift, Timer, select, selected_from
15+
from frequenz.client.microgrid import ComponentCategory
1516
from typing_extensions import override
1617

17-
from ...microgrid.component import ComponentCategory
1818
from ...timeseries._base_types import SystemBounds
1919
from .._actor import Actor
2020
from .._channel_registry import ChannelRegistry

src/frequenz/sdk/actor/power_distributing/_component_managers/_battery_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
import grpc
1414
from frequenz.channels import Receiver, Sender
15+
from frequenz.client.microgrid import BatteryData, ComponentCategory, InverterData
1516
from typing_extensions import override
1617

1718
from .... import microgrid
1819
from ...._internal._channels import LatestValueCache
1920
from ...._internal._math import is_close_to_zero
2021
from ....microgrid import connection_manager
21-
from ....microgrid.component import BatteryData, ComponentCategory, InverterData
2222
from ....timeseries._quantities import Power
2323
from .._component_pool_status_tracker import ComponentPoolStatusTracker
2424
from .._component_status import BatteryStatusTracker, ComponentPoolStatus

0 commit comments

Comments
 (0)