mirror of
https://github.com/python-kasa/python-kasa.git
synced 2024-12-23 03:33:35 +00:00
Expose IOT emeter info as features (#844)
Exposes IOT emeter information using features, bases on #843 to allow defining the units. --------- Co-authored-by: Steven B <51370195+sdb9696@users.noreply.github.com>
This commit is contained in:
parent
724dad02f7
commit
1ff3162112
@ -18,7 +18,7 @@ from .iotdevice import (
|
|||||||
requires_update,
|
requires_update,
|
||||||
)
|
)
|
||||||
from .iotplug import IotPlug
|
from .iotplug import IotPlug
|
||||||
from .modules import Antitheft, Countdown, Emeter, Schedule, Time, Usage
|
from .modules import Antitheft, Countdown, Schedule, Time, Usage
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -100,7 +100,6 @@ class IotStrip(IotDevice):
|
|||||||
self.add_module("usage", Usage(self, "schedule"))
|
self.add_module("usage", Usage(self, "schedule"))
|
||||||
self.add_module("time", Time(self, "time"))
|
self.add_module("time", Time(self, "time"))
|
||||||
self.add_module("countdown", Countdown(self, "countdown"))
|
self.add_module("countdown", Countdown(self, "countdown"))
|
||||||
self.add_module("emeter", Emeter(self, "emeter"))
|
|
||||||
|
|
||||||
@property # type: ignore
|
@property # type: ignore
|
||||||
@requires_update
|
@requires_update
|
||||||
@ -217,13 +216,13 @@ class IotStrip(IotDevice):
|
|||||||
@requires_update
|
@requires_update
|
||||||
def emeter_this_month(self) -> float | None:
|
def emeter_this_month(self) -> float | None:
|
||||||
"""Return this month's energy consumption in kWh."""
|
"""Return this month's energy consumption in kWh."""
|
||||||
return sum(plug.emeter_this_month for plug in self.children)
|
return sum(v if (v := plug.emeter_this_month) else 0 for plug in self.children)
|
||||||
|
|
||||||
@property # type: ignore
|
@property # type: ignore
|
||||||
@requires_update
|
@requires_update
|
||||||
def emeter_today(self) -> float | None:
|
def emeter_today(self) -> float | None:
|
||||||
"""Return this month's energy consumption in kWh."""
|
"""Return this month's energy consumption in kWh."""
|
||||||
return sum(plug.emeter_today for plug in self.children)
|
return sum(v if (v := plug.emeter_today) else 0 for plug in self.children)
|
||||||
|
|
||||||
@property # type: ignore
|
@property # type: ignore
|
||||||
@requires_update
|
@requires_update
|
||||||
|
@ -4,13 +4,77 @@ from __future__ import annotations
|
|||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
from ... import Device
|
||||||
from ...emeterstatus import EmeterStatus
|
from ...emeterstatus import EmeterStatus
|
||||||
|
from ...feature import Feature
|
||||||
from .usage import Usage
|
from .usage import Usage
|
||||||
|
|
||||||
|
|
||||||
class Emeter(Usage):
|
class Emeter(Usage):
|
||||||
"""Emeter module."""
|
"""Emeter module."""
|
||||||
|
|
||||||
|
def __init__(self, device: Device, module: str):
|
||||||
|
super().__init__(device, module)
|
||||||
|
self._add_feature(
|
||||||
|
Feature(
|
||||||
|
device,
|
||||||
|
name="Current consumption",
|
||||||
|
attribute_getter="current_consumption",
|
||||||
|
container=self,
|
||||||
|
unit="W",
|
||||||
|
id="current_power_w", # for homeassistant backwards compat
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self._add_feature(
|
||||||
|
Feature(
|
||||||
|
device,
|
||||||
|
name="Today's consumption",
|
||||||
|
attribute_getter="emeter_today",
|
||||||
|
container=self,
|
||||||
|
unit="kWh",
|
||||||
|
id="today_energy_kwh", # for homeassistant backwards compat
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self._add_feature(
|
||||||
|
Feature(
|
||||||
|
device,
|
||||||
|
name="This month's consumption",
|
||||||
|
attribute_getter="emeter_this_month",
|
||||||
|
container=self,
|
||||||
|
unit="kWh",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self._add_feature(
|
||||||
|
Feature(
|
||||||
|
device,
|
||||||
|
name="Total consumption since reboot",
|
||||||
|
attribute_getter="emeter_total",
|
||||||
|
container=self,
|
||||||
|
unit="kWh",
|
||||||
|
id="total_energy_kwh", # for homeassistant backwards compat
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self._add_feature(
|
||||||
|
Feature(
|
||||||
|
device,
|
||||||
|
name="Voltage",
|
||||||
|
attribute_getter="voltage",
|
||||||
|
container=self,
|
||||||
|
unit="V",
|
||||||
|
id="voltage", # for homeassistant backwards compat
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self._add_feature(
|
||||||
|
Feature(
|
||||||
|
device,
|
||||||
|
name="Current",
|
||||||
|
attribute_getter="current",
|
||||||
|
container=self,
|
||||||
|
unit="A",
|
||||||
|
id="current_a", # for homeassistant backwards compat
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
@property # type: ignore
|
@property # type: ignore
|
||||||
def realtime(self) -> EmeterStatus:
|
def realtime(self) -> EmeterStatus:
|
||||||
"""Return current energy readings."""
|
"""Return current energy readings."""
|
||||||
@ -32,6 +96,26 @@ class Emeter(Usage):
|
|||||||
data = self._convert_stat_data(raw_data, entry_key="month", key=current_month)
|
data = self._convert_stat_data(raw_data, entry_key="month", key=current_month)
|
||||||
return data.get(current_month)
|
return data.get(current_month)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def current_consumption(self) -> float | None:
|
||||||
|
"""Get the current power consumption in Watt."""
|
||||||
|
return self.realtime.power
|
||||||
|
|
||||||
|
@property
|
||||||
|
def emeter_total(self) -> float | None:
|
||||||
|
"""Return total consumption since last reboot in kWh."""
|
||||||
|
return self.realtime.total
|
||||||
|
|
||||||
|
@property
|
||||||
|
def current(self) -> float | None:
|
||||||
|
"""Return the current in A."""
|
||||||
|
return self.realtime.current
|
||||||
|
|
||||||
|
@property
|
||||||
|
def voltage(self) -> float | None:
|
||||||
|
"""Get the current voltage in V."""
|
||||||
|
return self.realtime.voltage
|
||||||
|
|
||||||
async def erase_stats(self):
|
async def erase_stats(self):
|
||||||
"""Erase all stats.
|
"""Erase all stats.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user