Switch to Quantity-specific constructors from default constructors

This is because support for default constructors for derived types is
going away in a subsequent commit.

Signed-off-by: Sahas Subramanian <[email protected]>

Author: shsms

src/frequenz/sdk/timeseries/_quantities.py

@@ -367,7 +367,9 @@ def __mul__(self, duration: timedelta) -> Energy:
         Returns:
             An energy from multiplying this power by the given duration.
         """
-        return Energy(self._base_value * duration.total_seconds() / 3600.0, exponent=0)
+        return Energy.from_watt_hours(
+            self._base_value * duration.total_seconds() / 3600.0
+        )
 
     @overload
     def __truediv__(self, other: Current) -> Voltage:
@@ -398,9 +400,9 @@ def __truediv__(self, other: Current | Voltage) -> Voltage | Current:
             TypeError: If the given value is not a current or voltage.
         """
         if isinstance(other, Current):
-            return Voltage(self._base_value / other._base_value, exponent=0)
+            return Voltage.from_volts(self._base_value / other._base_value)
         if isinstance(other, Voltage):
-            return Current(self._base_value / other._base_value, exponent=0)
+            return Current.from_amperes(self._base_value / other._base_value)
         raise TypeError(
             f"unsupported operand type(s) for /: '{type(self)}' and '{type(other)}'"
         )
@@ -464,7 +466,7 @@ def __mul__(self, voltage: Voltage) -> Power:
         Returns:
             The power.
         """
-        return Power(self._base_value * voltage._base_value, exponent=0)
+        return Power.from_watts(self._base_value * voltage._base_value)
 
 
 class Voltage(Quantity, exponent_unit_map={0: "V", -3: "mV", 3: "kV"}):
@@ -539,7 +541,7 @@ def __mul__(self, current: Current) -> Power:
         Returns:
             The calculated power.
         """
-        return Power(self._base_value * current._base_value, exponent=0)
+        return Power.from_watts(self._base_value * current._base_value)
 
 
 class Energy(
@@ -641,9 +643,7 @@ def __truediv__(self, other: timedelta | Power) -> Power | timedelta:
             TypeError: If the given value is not a power or duration.
         """
         if isinstance(other, timedelta):
-            return Power(
-                self._base_value / (other.total_seconds() / 3600.0), exponent=0
-            )
+            return Power.from_watts(self._base_value / (other.total_seconds() / 3600.0))
         if isinstance(other, Power):
             return timedelta(seconds=(self._base_value / other._base_value) * 3600.0)
         raise TypeError(

src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool.py

@@ -349,13 +349,13 @@ async def _stream_component_data(
                 timestamp=phase_1.timestamp,
                 value_p1=None
                 if phase_1.value is None
-                else Current(phase_1.value.base_value),
+                else Current.from_amperes(phase_1.value.base_value),
                 value_p2=None
                 if phase_2.value is None
-                else Current(phase_2.value.base_value),
+                else Current.from_amperes(phase_2.value.base_value),
                 value_p3=None
                 if phase_3.value is None
-                else Current(phase_3.value.base_value),
+                else Current.from_amperes(phase_3.value.base_value),
             )
 
             if (

tests/timeseries/_battery_pool/test_battery_pool.py

@@ -447,19 +447,19 @@ async def test_battery_pool_power(mocker: MockerFixture) -> None:
     production_receiver = battery_pool.production_power.new_receiver()
 
     await mockgrid.mock_data.send_bat_inverter_power([2.0, 3.0])
-    assert (await power_receiver.receive()).value == Power(5.0)
-    assert (await consumption_receiver.receive()).value == Power(5.0)
-    assert (await production_receiver.receive()).value == Power(0.0)
+    assert (await power_receiver.receive()).value == Power.from_watts(5.0)
+    assert (await consumption_receiver.receive()).value == Power.from_watts(5.0)
+    assert (await production_receiver.receive()).value == Power.from_watts(0.0)
 
     await mockgrid.mock_data.send_bat_inverter_power([-2.0, -5.0])
-    assert (await power_receiver.receive()).value == Power(-7.0)
-    assert (await consumption_receiver.receive()).value == Power(0.0)
-    assert (await production_receiver.receive()).value == Power(7.0)
+    assert (await power_receiver.receive()).value == Power.from_watts(-7.0)
+    assert (await consumption_receiver.receive()).value == Power.from_watts(0.0)
+    assert (await production_receiver.receive()).value == Power.from_watts(7.0)
 
     await mockgrid.mock_data.send_bat_inverter_power([2.0, -5.0])
-    assert (await power_receiver.receive()).value == Power(-3.0)
-    assert (await consumption_receiver.receive()).value == Power(0.0)
-    assert (await production_receiver.receive()).value == Power(3.0)
+    assert (await power_receiver.receive()).value == Power.from_watts(-3.0)
+    assert (await consumption_receiver.receive()).value == Power.from_watts(0.0)
+    assert (await production_receiver.receive()).value == Power.from_watts(3.0)
 
     await mockgrid.cleanup()
 

tests/timeseries/_formula_engine/test_formula_composition.py

@@ -120,7 +120,10 @@ async def test_formula_composition_missing_pv(self, mocker: MockerFixture) -> No
             inv_pow = await inv_calc_recv.receive()
 
             assert inv_pow == bat_pow
-            assert pv_pow.timestamp == inv_pow.timestamp and pv_pow.value == Power(0.0)
+            assert (
+                pv_pow.timestamp == inv_pow.timestamp
+                and pv_pow.value == Power.from_watts(0.0)
+            )
             count += 1
 
         await mockgrid.cleanup()
@@ -154,8 +157,9 @@ async def test_formula_composition_missing_bat(self, mocker: MockerFixture) -> N
             inv_pow = await inv_calc_recv.receive()
 
             assert inv_pow == pv_pow
-            assert bat_pow.timestamp == inv_pow.timestamp and bat_pow.value == Power(
-                0.0
+            assert (
+                bat_pow.timestamp == inv_pow.timestamp
+                and bat_pow.value == Power.from_watts(0.0)
             )
             count += 1
 

tests/timeseries/test_ev_charger_pool.py

@@ -87,14 +87,14 @@ async def test_ev_power(  # pylint: disable=too-many-locals
         consumption_receiver = ev_pool.consumption_power.new_receiver()
 
         await mockgrid.mock_data.send_evc_power([2.0, 4.0, 10.0])
-        assert (await power_receiver.receive()).value == Power(16.0)
-        assert (await production_receiver.receive()).value == Power(0.0)
-        assert (await consumption_receiver.receive()).value == Power(16.0)
+        assert (await power_receiver.receive()).value == Power.from_watts(16.0)
+        assert (await production_receiver.receive()).value == Power.from_watts(0.0)
+        assert (await consumption_receiver.receive()).value == Power.from_watts(16.0)
 
         await mockgrid.mock_data.send_evc_power([2.0, 4.0, -10.0])
-        assert (await power_receiver.receive()).value == Power(-4.0)
-        assert (await production_receiver.receive()).value == Power(4.0)
-        assert (await consumption_receiver.receive()).value == Power(0.0)
+        assert (await power_receiver.receive()).value == Power.from_watts(-4.0)
+        assert (await production_receiver.receive()).value == Power.from_watts(4.0)
+        assert (await consumption_receiver.receive()).value == Power.from_watts(0.0)
 
         await mockgrid.cleanup()
 
@@ -126,7 +126,11 @@ async def test_ev_component_data(self, mocker: MockerFixture) -> None:
             status.current.value_p1,
             status.current.value_p2,
             status.current.value_p3,
-        ) == (Current(2), Current(3), Current(5))
+        ) == (
+            Current.from_amperes(2),
+            Current.from_amperes(3),
+            Current.from_amperes(5),
+        )
         assert status.state == EVChargerState.MISSING
 
         await mockgrid.mock_data.send_evc_current([[2, 3, None]])
@@ -136,7 +140,11 @@ async def test_ev_component_data(self, mocker: MockerFixture) -> None:
             status.current.value_p1,
             status.current.value_p2,
             status.current.value_p3,
-        ) == (Current(2), Current(3), None)
+        ) == (
+            Current.from_amperes(2),
+            Current.from_amperes(3),
+            None,
+        )
         assert status.state == EVChargerState.IDLE
 
         await mockgrid.mock_data.send_evc_current([[None, None, None]])
@@ -146,7 +154,11 @@ async def test_ev_component_data(self, mocker: MockerFixture) -> None:
             status.current.value_p1,
             status.current.value_p2,
             status.current.value_p3,
-        ) == (None, None, None)
+        ) == (
+            None,
+            None,
+            None,
+        )
         assert status.state == EVChargerState.MISSING
 
         await mockgrid.mock_data.send_evc_current([[None, None, None]])
@@ -157,7 +169,11 @@ async def test_ev_component_data(self, mocker: MockerFixture) -> None:
             status.current.value_p1,
             status.current.value_p2,
             status.current.value_p3,
-        ) == (None, None, None)
+        ) == (
+            None,
+            None,
+            None,
+        )
         assert status.state == EVChargerState.MISSING
 
         await mockgrid.mock_data.send_evc_current([[4, None, None]])
@@ -167,7 +183,11 @@ async def test_ev_component_data(self, mocker: MockerFixture) -> None:
             status.current.value_p1,
             status.current.value_p2,
             status.current.value_p3,
-        ) == (Current(4), None, None)
+        ) == (
+            Current.from_amperes(4),
+            None,
+            None,
+        )
         assert status.state == EVChargerState.EV_PLUGGED
 
         await mockgrid.cleanup()

tests/timeseries/test_logical_meter.py

@@ -118,14 +118,14 @@ async def test_grid_production_consumption_power(
         grid_consumption_recv = logical_meter.grid_consumption_power.new_receiver()
 
         await mockgrid.mock_data.send_meter_power([1.0, 2.0, 3.0, 4.0])
-        assert (await grid_recv.receive()).value == Power(10.0)
-        assert (await grid_production_recv.receive()).value == Power(0.0)
-        assert (await grid_consumption_recv.receive()).value == Power(10.0)
+        assert (await grid_recv.receive()).value == Power.from_watts(10.0)
+        assert (await grid_production_recv.receive()).value == Power.from_watts(0.0)
+        assert (await grid_consumption_recv.receive()).value == Power.from_watts(10.0)
 
         await mockgrid.mock_data.send_meter_power([1.0, 2.0, -3.0, -4.0])
-        assert (await grid_recv.receive()).value == Power(-4.0)
-        assert (await grid_production_recv.receive()).value == Power(4.0)
-        assert (await grid_consumption_recv.receive()).value == Power(0.0)
+        assert (await grid_recv.receive()).value == Power.from_watts(-4.0)
+        assert (await grid_production_recv.receive()).value == Power.from_watts(4.0)
+        assert (await grid_consumption_recv.receive()).value == Power.from_watts(0.0)
 
     async def test_chp_power(self, mocker: MockerFixture) -> None:
         """Test the chp power formula."""
@@ -144,14 +144,22 @@ async def test_chp_power(self, mocker: MockerFixture) -> None:
         )
 
         await mockgrid.mock_data.send_meter_power([1.0, 2.0, 3.0, 4.0])
-        assert (await chp_power_receiver.receive()).value == Power(2.0)
-        assert (await chp_production_power_receiver.receive()).value == Power(0.0)
-        assert (await chp_consumption_power_receiver.receive()).value == Power(2.0)
+        assert (await chp_power_receiver.receive()).value == Power.from_watts(2.0)
+        assert (
+            await chp_production_power_receiver.receive()
+        ).value == Power.from_watts(0.0)
+        assert (
+            await chp_consumption_power_receiver.receive()
+        ).value == Power.from_watts(2.0)
 
         await mockgrid.mock_data.send_meter_power([-4.0, -12.0, None, 10.2])
-        assert (await chp_power_receiver.receive()).value == Power(-12.0)
-        assert (await chp_production_power_receiver.receive()).value == Power(12.0)
-        assert (await chp_consumption_power_receiver.receive()).value == Power(0.0)
+        assert (await chp_power_receiver.receive()).value == Power.from_watts(-12.0)
+        assert (
+            await chp_production_power_receiver.receive()
+        ).value == Power.from_watts(12.0)
+        assert (
+            await chp_consumption_power_receiver.receive()
+        ).value == Power.from_watts(0.0)
 
     async def test_pv_power(self, mocker: MockerFixture) -> None:
         """Test the pv power formula."""
@@ -167,9 +175,13 @@ async def test_pv_power(self, mocker: MockerFixture) -> None:
         )
 
         await mockgrid.mock_data.send_meter_power([10.0, -1.0, -2.0])
-        assert (await pv_power_receiver.receive()).value == Power(-3.0)
-        assert (await pv_production_power_receiver.receive()).value == Power(3.0)
-        assert (await pv_consumption_power_receiver.receive()).value == Power(0.0)
+        assert (await pv_power_receiver.receive()).value == Power.from_watts(-3.0)
+        assert (await pv_production_power_receiver.receive()).value == Power.from_watts(
+            3.0
+        )
+        assert (
+            await pv_consumption_power_receiver.receive()
+        ).value == Power.from_watts(0.0)
 
     async def test_consumer_power_grid_meter(self, mocker: MockerFixture) -> None:
         """Test the consumer power formula with a grid meter."""
@@ -182,7 +194,7 @@ async def test_consumer_power_grid_meter(self, mocker: MockerFixture) -> None:
         consumer_power_receiver = logical_meter.consumer_power.new_receiver()
 
         await mockgrid.mock_data.send_meter_power([20.0, 2.0, 3.0, 4.0, 5.0])
-        assert (await consumer_power_receiver.receive()).value == Power(6.0)
+        assert (await consumer_power_receiver.receive()).value == Power.from_watts(6.0)
 
     async def test_consumer_power_no_grid_meter(self, mocker: MockerFixture) -> None:
         """Test the consumer power formula without a grid meter."""
@@ -195,7 +207,7 @@ async def test_consumer_power_no_grid_meter(self, mocker: MockerFixture) -> None
         consumer_power_receiver = logical_meter.consumer_power.new_receiver()
 
         await mockgrid.mock_data.send_meter_power([20.0, 2.0, 3.0, 4.0, 5.0])
-        assert (await consumer_power_receiver.receive()).value == Power(20.0)
+        assert (await consumer_power_receiver.receive()).value == Power.from_watts(20.0)
 
     async def test_producer_power(self, mocker: MockerFixture) -> None:
         """Test the producer power formula."""
@@ -208,7 +220,7 @@ async def test_producer_power(self, mocker: MockerFixture) -> None:
         producer_power_receiver = logical_meter.producer_power.new_receiver()
 
         await mockgrid.mock_data.send_meter_power([20.0, 2.0, 3.0, 4.0, 5.0])
-        assert (await producer_power_receiver.receive()).value == Power(14.0)
+        assert (await producer_power_receiver.receive()).value == Power.from_watts(14.0)
 
     async def test_producer_power_no_chp(self, mocker: MockerFixture) -> None:
         """Test the producer power formula without a chp."""
@@ -220,7 +232,7 @@ async def test_producer_power_no_chp(self, mocker: MockerFixture) -> None:
         producer_power_receiver = logical_meter.producer_power.new_receiver()
 
         await mockgrid.mock_data.send_meter_power([20.0, 2.0, 3.0])
-        assert (await producer_power_receiver.receive()).value == Power(5.0)
+        assert (await producer_power_receiver.receive()).value == Power.from_watts(5.0)
 
     async def test_producer_power_no_pv(self, mocker: MockerFixture) -> None:
         """Test the producer power formula without pv."""
@@ -232,7 +244,7 @@ async def test_producer_power_no_pv(self, mocker: MockerFixture) -> None:
         producer_power_receiver = logical_meter.producer_power.new_receiver()
 
         await mockgrid.mock_data.send_meter_power([20.0, 2.0])
-        assert (await producer_power_receiver.receive()).value == Power(2.0)
+        assert (await producer_power_receiver.receive()).value == Power.from_watts(2.0)
 
     async def test_no_producer_power(self, mocker: MockerFixture) -> None:
         """Test the producer power formula without producers."""
@@ -243,4 +255,4 @@ async def test_no_producer_power(self, mocker: MockerFixture) -> None:
         producer_power_receiver = logical_meter.producer_power.new_receiver()
 
         await mockgrid.mock_data.send_non_existing_component_value()
-        assert (await producer_power_receiver.receive()).value == Power(0.0)
+        assert (await producer_power_receiver.receive()).value == Power.from_watts(0.0)