Skip to content

Commit 7ea2653

Browse files
Change definition of QuantityT
Signed-off-by: Elzbieta Kotulska <[email protected]>
1 parent 443e83e commit 7ea2653

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

src/frequenz/sdk/timeseries/_quantities.py

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,6 @@
1111
from datetime import timedelta
1212
from typing import Any, NoReturn, Self, TypeVar, overload
1313

14-
QuantityT = TypeVar(
15-
"QuantityT",
16-
"Quantity",
17-
"Power",
18-
"Current",
19-
"Voltage",
20-
"Energy",
21-
"Frequency",
22-
"Percentage",
23-
"Temperature",
24-
)
25-
"""Type variable for representing various quantity types."""
26-
2714

2815
class Quantity:
2916
"""A quantity with a unit.
@@ -1339,3 +1326,7 @@ def as_fraction(self) -> float:
13391326
This quantity as a fraction.
13401327
"""
13411328
return self._base_value / 100
1329+
1330+
1331+
QuantityT = TypeVar("QuantityT", bound=Quantity)
1332+
"""Type variable for representing various quantity types."""

src/frequenz/sdk/timeseries/formula_engine/_formula_engine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ def __init__(
858858
TokenType,
859859
FormulaEngine[QuantityT]
860860
| FormulaEngine3Phase[QuantityT]
861-
| QuantityT
861+
| Quantity
862862
| float
863863
| str,
864864
]

src/frequenz/sdk/timeseries/formula_engine/_resampled_formula_builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def __init__( # pylint: disable=too-many-arguments
5353
self._namespace: str = namespace
5454
self._metric_id: ComponentMetricId = metric_id
5555
self._resampler_requests: list[ComponentMetricRequest] = []
56-
super().__init__(formula_name, create_method) # type: ignore[arg-type]
56+
super().__init__(formula_name, create_method)
5757

5858
def _get_resampled_receiver(
5959
self, component_id: int, metric_id: ComponentMetricId

0 commit comments

Comments
 (0)