Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@

## Upgrading

<!-- Here goes notes on how to upgrade from previous versions, including deprecations and what they should be replaced with -->
- 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.

## New Features

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

## Bug Fixes

<!-- Here goes notable bug fixes that are worth a special mention or explanation -->
- 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`.
2 changes: 1 addition & 1 deletion benchmarks/power_distribution/power_distributor.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from typing import Any

from frequenz.channels import Broadcast
from frequenz.client.microgrid import Component, ComponentCategory

from frequenz.sdk import microgrid
from frequenz.sdk.actor import ResamplerConfig
Expand All @@ -26,7 +27,6 @@
Success,
)
from frequenz.sdk.microgrid import connection_manager
from frequenz.sdk.microgrid.component import Component, ComponentCategory
from frequenz.sdk.timeseries._quantities import Power

HOST = "microgrid.sandbox.api.frequenz.io"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/timeseries/benchmark_datasourcing.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
from typing import Any

from frequenz.channels import Broadcast, Receiver, ReceiverStoppedError
from frequenz.client.microgrid import ComponentMetricId

from frequenz.sdk import microgrid
from frequenz.sdk.actor import (
ChannelRegistry,
ComponentMetricRequest,
DataSourcingActor,
)
from frequenz.sdk.microgrid.component import ComponentMetricId

try:
from tests.timeseries.mock_microgrid import MockMicrogrid
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ dependencies = [
# changing the version
# (plugins.mkdocstrings.handlers.python.import)
"frequenz-channels == 1.0.0b2",
"frequenz-client-microgrid >= 0.1.2, < 0.2.0",
"google-api-python-client >= 2.71, < 3",
"grpcio >= 1.54.2, < 2",
"grpcio-tools >= 1.54.2, < 2",
Expand Down
8 changes: 0 additions & 8 deletions src/frequenz/sdk/_api_client/__init__.py

This file was deleted.

50 changes: 0 additions & 50 deletions src/frequenz/sdk/_api_client/api_client.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from dataclasses import dataclass
from datetime import datetime

from ...microgrid.component._component import ComponentMetricId
from frequenz.client.microgrid import ComponentMetricId


@dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
from typing import Any

from frequenz.channels import Receiver, Sender

from ...microgrid import connection_manager
from ...microgrid.component import (
from frequenz.client.microgrid import (
BatteryData,
ComponentCategory,
ComponentMetricId,
EVChargerData,
InverterData,
MeterData,
)

from ...microgrid import connection_manager
from ...timeseries import Sample
from ...timeseries._quantities import Quantity
from .._channel_registry import ChannelRegistry
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

from frequenz.channels import Receiver, Sender
from frequenz.channels.util import SkipMissedAndDrift, Timer, select, selected_from
from frequenz.client.microgrid import ComponentCategory
from typing_extensions import override

from ...microgrid.component import ComponentCategory
from ...timeseries._base_types import SystemBounds
from .._actor import Actor
from .._channel_registry import ChannelRegistry
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

import grpc
from frequenz.channels import Receiver, Sender
from frequenz.client.microgrid import BatteryData, ComponentCategory, InverterData
from typing_extensions import override

from .... import microgrid
from ...._internal._channels import LatestValueCache
from ...._internal._math import is_close_to_zero
from ....microgrid import connection_manager
from ....microgrid.component import BatteryData, ComponentCategory, InverterData
from ....timeseries._quantities import Power
from .._component_pool_status_tracker import ComponentPoolStatusTracker
from .._component_status import BatteryStatusTracker, ComponentPoolStatus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
# pylint: enable=no-name-in-module
from frequenz.channels import Receiver, Sender
from frequenz.channels.util import Timer, select, selected_from
from typing_extensions import override

from ....microgrid import connection_manager
from ....microgrid.component import (
from frequenz.client.microgrid import (
BatteryData,
ComponentCategory,
ComponentData,
InverterData,
)
from typing_extensions import override

from ....microgrid import connection_manager
from ..._background_service import BackgroundService
from ._blocking_status import BlockingStatus
from ._component_status import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
from dataclasses import dataclass
from typing import NamedTuple, Sequence

from frequenz.client.microgrid import BatteryData, InverterData

from ...._internal._math import is_close_to_zero
from ....microgrid.component import BatteryData, InverterData
from ..result import PowerBounds

_logger = logging.getLogger(__name__)
Expand Down
5 changes: 1 addition & 4 deletions src/frequenz/sdk/microgrid/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
""" # noqa: D205, D400

from ..actor import ResamplerConfig
from . import _data_pipeline, client, component, connection_manager, metadata
from . import _data_pipeline, connection_manager
from ._data_pipeline import (
battery_pool,
consumer,
Expand All @@ -149,15 +149,12 @@ async def initialize(host: str, port: int, resampler_config: ResamplerConfig) ->

__all__ = [
"initialize",
"client",
"component",
"consumer",
"battery_pool",
"ev_charger_pool",
"grid",
"frequency",
"logical_meter",
"metadata",
"producer",
"voltage",
]
2 changes: 1 addition & 1 deletion src/frequenz/sdk/microgrid/_power_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# pylint seems to think this is a cyclic import, but it is not.
#
# pylint: disable=cyclic-import
from .component import ComponentCategory
from frequenz.client.microgrid import ComponentCategory

# A number of imports had to be done inside functions where they are used, to break
# import cycles.
Expand Down
20 changes: 0 additions & 20 deletions src/frequenz/sdk/microgrid/client/__init__.py

This file was deleted.

Loading