Skip to content

Commit 8d9e735

Browse files
Use frequenz-quantities library (frequenz-floss#1087)
Remove current quantities definition
2 parents 0a7c72e + 7ada5cf commit 8d9e735

File tree

87 files changed

+123
-2405
lines changed

Some content is hidden

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

87 files changed

+123
-2405
lines changed

RELEASE_NOTES.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
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+
- Replace `Quantity` and its sub-classes (`Power`, `Current`, etc.) in the `frequenz.sdk.timeseries` module with the external
10+
[`frequenz-quantities`](https://pypi.org/project/frequenz-quantities/) package. Please add the new library as a dependency
11+
and adapt your imports if you are using these types.
12+
- The `QuantityT` has been moved to the `frequenz.sdk.timeseries._base_types` module.
13+
- The `QuantityT` doesn't include itself (`QuantityT`) anymore.
1014

1115
## New Features
1216

benchmarks/power_distribution/power_distributor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
from frequenz.channels import Broadcast
1515
from frequenz.client.microgrid import Component, ComponentCategory
16+
from frequenz.quantities import Power
1617

1718
from frequenz.sdk import microgrid
1819
from frequenz.sdk.actor import ResamplerConfig
@@ -27,7 +28,6 @@
2728
Result,
2829
Success,
2930
)
30-
from frequenz.sdk.timeseries._quantities import Power
3131

3232
HOST = "microgrid.sandbox.api.frequenz.io"
3333
PORT = 62060

benchmarks/timeseries/periodic_feature_extractor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
import numpy as np
2222
from frequenz.channels import Broadcast
23+
from frequenz.quantities import Quantity
2324
from numpy.random import default_rng
2425
from numpy.typing import NDArray
2526

2627
from frequenz.sdk.timeseries import MovingWindow, PeriodicFeatureExtractor, Sample
27-
from frequenz.sdk.timeseries._quantities import Quantity
2828

2929

3030
@contextlib.asynccontextmanager

benchmarks/timeseries/resampling.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
from datetime import datetime, timedelta, timezone
88
from timeit import timeit
99

10+
from frequenz.quantities import Quantity
11+
1012
from frequenz.sdk.timeseries import Sample
11-
from frequenz.sdk.timeseries._quantities import Quantity
1213
from frequenz.sdk.timeseries._resampling import (
1314
ResamplerConfig,
1415
SourceProperties,

benchmarks/timeseries/ringbuffer_memusage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from datetime import datetime, timedelta, timezone
1010

1111
import numpy as np
12+
from frequenz.quantities import Quantity
1213

1314
from frequenz.sdk.timeseries import Sample
14-
from frequenz.sdk.timeseries._quantities import Quantity
1515
from frequenz.sdk.timeseries._ringbuffer import OrderedRingBuffer
1616

1717
FIVE_MINUTES = timedelta(minutes=5)

benchmarks/timeseries/ringbuffer_serialization.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
from typing import Any
1212

1313
import numpy as np
14+
from frequenz.quantities import Quantity
1415

1516
import frequenz.sdk.timeseries._ringbuffer as rb
1617
from frequenz.sdk.timeseries import Sample
17-
from frequenz.sdk.timeseries._quantities import Quantity
1818

1919
FILE_NAME = "ringbuffer.pkl"
2020
FIVE_MINUTES = timedelta(minutes=5)

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ dependencies = [
3131
# (plugins.mkdocstrings.handlers.python.import)
3232
"frequenz-client-microgrid >= 0.5.1, < 0.6.0",
3333
"frequenz-channels >= 1.2.0, < 2.0.0",
34+
"frequenz-quantities == 1.0.0rc1",
3435
"networkx >= 2.8, < 4",
3536
"numpy >= 1.26.4, < 2",
3637
"typing_extensions >= 4.6.1, < 5",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
InverterData,
1818
MeterData,
1919
)
20+
from frequenz.quantities import Quantity
2021

2122
from ..._internal._asyncio import run_forever
2223
from ..._internal._channels import ChannelRegistry
2324
from ...microgrid import connection_manager
2425
from ...timeseries import Sample
25-
from ...timeseries._quantities import Quantity
2626
from ._component_metric_request import ComponentMetricRequest
2727

2828
_logger = logging.getLogger(__name__)

src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
InverterData,
1919
OperationOutOfRange,
2020
)
21+
from frequenz.quantities import Power
2122
from typing_extensions import override
2223

2324
from ...._internal._math import is_close_to_zero
24-
from ....timeseries._quantities import Power
2525
from ... import connection_manager
2626
from .._component_pool_status_tracker import ComponentPoolStatusTracker
2727
from .._component_status import BatteryStatusTracker, ComponentPoolStatus

src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_config.py

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

10-
from .....timeseries import Current
10+
from frequenz.quantities import Current
1111

1212

1313
@dataclass(frozen=True)

0 commit comments

Comments
 (0)