Skip to content

Commit 7a7e410

Browse files
authored
Merge v0.18.x into v0.x.x (#209)
The v0.18.x branch is good enough to make a release, so we want to merge it to v0.x.x to make it clear it is the default main branch now. Fixes #55.
2 parents 9c34449 + ce3dac6 commit 7a7e410

File tree

128 files changed

+11282
-4505
lines changed

Some content is hidden

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

128 files changed

+11282
-4505
lines changed

RELEASE_NOTES.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
## Summary
44

5-
<!-- Here goes a general summary of what this release is about -->
5+
This release is a major breaking change, as we jump to the API specification version 0.17.x, which introduces big and fundamental breaking changes. This also starts using the `v1` namespace in `frequenz-api-common`, which also introduces major breaking changes. It would be very hard to detail all the API changes here, please refer to the [Microgrid API releases](https://github.com/frequenz-floss/frequenz-api-microgrid/releases) and [Common API releases](https://github.com/frequenz-floss/frequenz-api-common/releases).
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+
- `MicrogridApiClient`:
10+
11+
* The client now follows the v0.17 API names, so most methods changed names and signatures.
1012

1113
## New Features
1214

pyproject.toml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,14 @@ classifiers = [
3636
]
3737
requires-python = ">= 3.11, < 4"
3838
dependencies = [
39-
"frequenz-api-microgrid >= 0.15.5, < 0.16.0",
40-
"frequenz-channels >= 1.0.0-rc1, < 2.0.0",
41-
"frequenz-client-base >= 0.8.0, < 0.12.0",
42-
"frequenz-client-common >= 0.3.2, < 0.4.0",
43-
"grpcio >= 1.63.0, < 2",
44-
"protobuf >= 5.26.1, < 7",
39+
"frequenz-api-common >= 0.8.0, < 1.0.0",
40+
"frequenz-api-microgrid >= 0.18.0, < 0.19.0",
41+
"frequenz-channels >= 1.6.1, < 2.0.0",
42+
"frequenz-client-base >= 0.10.0, < 0.12.0",
43+
"frequenz-client-common >= 0.3.6, < 0.4.0",
44+
"frequenz-core >= 1.3.0, < 2.0.0",
45+
"grpcio >= 1.72.1, < 2",
46+
"protobuf >= 6.31.1, < 7",
4547
"typing-extensions >= 4.13.0, < 5",
4648
]
4749
dynamic = ["version"]
@@ -129,6 +131,10 @@ check-yield-types = false
129131
arg-type-hints-in-docstring = false
130132
arg-type-hints-in-signature = true
131133
allow-init-docstring = true
134+
per-file-ignores = [
135+
# Ignore the max-line-length (E501) because enum values are just too long
136+
"src/frequenz/client/microgrid/metrics/_metric.py:E501",
137+
]
132138

133139
[tool.pylint.similarities]
134140
ignore-comments = ['yes']

src/frequenz/client/microgrid/__init__.py

Lines changed: 15 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,13 @@
77
"""
88

99

10-
from ._client import MicrogridApiClient
11-
from ._component import (
12-
Component,
13-
ComponentCategory,
14-
ComponentMetadata,
15-
ComponentMetricId,
16-
ComponentType,
17-
Fuse,
18-
GridMetadata,
19-
InverterType,
10+
from ._client import (
11+
DEFAULT_CHANNEL_OPTIONS,
12+
DEFAULT_GRPC_CALL_TIMEOUT,
13+
MicrogridApiClient,
14+
Validity,
2015
)
21-
from ._component_data import (
22-
BatteryData,
23-
ComponentData,
24-
EVChargerData,
25-
InverterData,
26-
MeterData,
27-
)
28-
from ._component_error import (
29-
BatteryError,
30-
BatteryErrorCode,
31-
ErrorLevel,
32-
InverterError,
33-
InverterErrorCode,
34-
)
35-
from ._component_states import (
36-
BatteryComponentState,
37-
BatteryRelayState,
38-
EVChargerCableState,
39-
EVChargerComponentState,
40-
InverterComponentState,
41-
)
42-
from ._connection import Connection
16+
from ._delivery_area import DeliveryArea, EnergyMarketCodeType
4317
from ._exception import (
4418
ApiClientError,
4519
ClientNotConnected,
@@ -63,45 +37,27 @@
6337
UnrecognizedGrpcStatus,
6438
)
6539
from ._lifetime import Lifetime
66-
from ._metadata import Location, Metadata
40+
from ._location import Location
41+
from ._microgrid_info import MicrogridInfo, MicrogridStatus
6742

6843
__all__ = [
6944
"ApiClientError",
70-
"BatteryComponentState",
71-
"BatteryData",
72-
"BatteryError",
73-
"BatteryErrorCode",
74-
"BatteryRelayState",
7545
"ClientNotConnected",
76-
"Component",
77-
"ComponentCategory",
78-
"ComponentData",
79-
"ComponentMetadata",
80-
"ComponentMetricId",
81-
"ComponentType",
82-
"Connection",
46+
"DEFAULT_CHANNEL_OPTIONS",
47+
"DEFAULT_GRPC_CALL_TIMEOUT",
8348
"DataLoss",
84-
"EVChargerCableState",
85-
"EVChargerComponentState",
86-
"EVChargerData",
49+
"DeliveryArea",
50+
"EnergyMarketCodeType",
8751
"EntityAlreadyExists",
8852
"EntityNotFound",
89-
"ErrorLevel",
90-
"Fuse",
91-
"GridMetadata",
9253
"GrpcError",
9354
"InternalError",
9455
"InvalidArgument",
95-
"InverterComponentState",
96-
"InverterData",
97-
"InverterError",
98-
"InverterErrorCode",
99-
"InverterType",
10056
"Lifetime",
10157
"Location",
102-
"Metadata",
103-
"MeterData",
10458
"MicrogridApiClient",
59+
"MicrogridInfo",
60+
"MicrogridStatus",
10561
"OperationAborted",
10662
"OperationCancelled",
10763
"OperationNotImplemented",
@@ -114,4 +70,5 @@
11470
"ServiceUnavailable",
11571
"UnknownError",
11672
"UnrecognizedGrpcStatus",
73+
"Validity",
11774
]

0 commit comments

Comments
 (0)