Skip to content

Commit 72e0b22

Browse files
committed
Make id a public module
This module will be moved to `client-common` in the future, and there will be more additions, so it makes sense that it is separated from the microgrid module. In an upcoming commit we'll also add a `BaseId` class to make defining new IDs easier. Signed-off-by: Leandro Lucarella <[email protected]>
1 parent 1d4370b commit 72e0b22

17 files changed

+19
-21
lines changed

src/frequenz/client/microgrid/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
UnknownError,
6363
UnrecognizedGrpcStatus,
6464
)
65-
from ._id import ComponentId, MicrogridId, SensorId
6665
from ._lifetime import Lifetime
6766
from ._metadata import Location, Metadata
6867

@@ -77,7 +76,6 @@
7776
"Component",
7877
"ComponentCategory",
7978
"ComponentData",
80-
"ComponentId",
8179
"ComponentMetadata",
8280
"ComponentMetricId",
8381
"ComponentType",
@@ -104,7 +102,6 @@
104102
"Metadata",
105103
"MeterData",
106104
"MicrogridApiClient",
107-
"MicrogridId",
108105
"OperationAborted",
109106
"OperationCancelled",
110107
"OperationNotImplemented",
@@ -114,7 +111,6 @@
114111
"OperationUnauthenticated",
115112
"PermissionDenied",
116113
"ResourceExhausted",
117-
"SensorId",
118114
"ServiceUnavailable",
119115
"UnknownError",
120116
"UnrecognizedGrpcStatus",

src/frequenz/client/microgrid/_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
from ._connection import Connection
3838
from ._constants import RECEIVER_MAX_SIZE
3939
from ._exception import ApiClientError, ClientNotConnected
40-
from ._id import ComponentId, MicrogridId, SensorId
4140
from ._metadata import Location, Metadata
4241
from ._sensor_proto import sensor_data_samples_from_proto, sensor_from_proto
42+
from .id import ComponentId, MicrogridId, SensorId
4343
from .sensor import Sensor, SensorDataSamples, SensorMetric
4444

4545
DEFAULT_GRPC_CALL_TIMEOUT = 60.0

src/frequenz/client/microgrid/_component.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from frequenz.api.common import components_pb2
1010
from frequenz.api.microgrid import grid_pb2, inverter_pb2
1111

12-
from ._id import ComponentId
12+
from .id import ComponentId
1313

1414

1515
class ComponentType(Enum):

src/frequenz/client/microgrid/_component_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
EVChargerComponentState,
1919
InverterComponentState,
2020
)
21-
from ._id import ComponentId
21+
from .id import ComponentId
2222

2323

2424
@dataclass(frozen=True)

src/frequenz/client/microgrid/_connection.py

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

77
from dataclasses import dataclass
88

9-
from ._id import ComponentId
9+
from .id import ComponentId
1010

1111

1212
@dataclass(frozen=True)

src/frequenz/client/microgrid/_metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from timezonefinder import TimezoneFinder
1010

11-
from ._id import MicrogridId
11+
from .id import MicrogridId
1212

1313
_timezone_finder = TimezoneFinder()
1414

src/frequenz/client/microgrid/_sensor_proto.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
from frequenz.api.microgrid import common_pb2, microgrid_pb2, sensor_pb2
1212
from frequenz.client.base import conversion
1313

14-
from ._id import SensorId
1514
from ._lifetime import Lifetime
1615
from ._util import enum_from_proto
16+
from .id import SensorId
1717
from .sensor import (
1818
Sensor,
1919
SensorDataSamples,

src/frequenz/client/microgrid/sensor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
from datetime import datetime
3636
from typing import assert_never
3737

38-
from ._id import SensorId
3938
from ._lifetime import Lifetime
39+
from .id import SensorId
4040
from .metrics import AggregatedMetricValue, AggregationMethod
4141

4242

tests/test_client.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
Component,
2626
ComponentCategory,
2727
ComponentData,
28-
ComponentId,
2928
Connection,
3029
EVChargerData,
3130
Fuse,
@@ -34,9 +33,8 @@
3433
InverterType,
3534
MeterData,
3635
MicrogridApiClient,
37-
MicrogridId,
38-
SensorId,
3936
)
37+
from frequenz.client.microgrid.id import ComponentId, MicrogridId, SensorId
4038
from frequenz.client.microgrid.sensor import (
4139
Sensor,
4240
SensorDataSamples,

0 commit comments

Comments
 (0)