jpawlowski/hass.tibber_prices
1
0
Fork 0
mirror of https://github.com/jpawlowski/hass.tibber_prices.git synced 2026-03-30 05:13:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactoring

Browse source
This commit is contained in:
Julian Pawlowski 2025-04-23 20:00:17 +00:00
parent c67ec09c9a
commit ed779f03f0
2 changed files with 109 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
custom_components/tibber_prices/sensor.py
View file

@ -40,6 +40,7 @@ PRICE_SENSORS = (
device_class=SensorDeviceClass.MONETARY, device_class=SensorDeviceClass.MONETARY,
native_unit_of_measurement=CURRENCY_EURO, native_unit_of_measurement=CURRENCY_EURO,
entity_registry_enabled_default=False, entity_registry_enabled_default=False,
suggested_display_precision=2,
), ),
SensorEntityDescription( SensorEntityDescription(
key="current_price", key="current_price",
@ -48,6 +49,7 @@ PRICE_SENSORS = (
icon="mdi:currency-eur", icon="mdi:currency-eur",
device_class=SensorDeviceClass.MONETARY, device_class=SensorDeviceClass.MONETARY,
native_unit_of_measurement="ct/kWh", native_unit_of_measurement="ct/kWh",
suggested_display_precision=2,
), ),
SensorEntityDescription( SensorEntityDescription(
key="next_hour_price_eur", key="next_hour_price_eur",
@ -57,6 +59,7 @@ PRICE_SENSORS = (
device_class=SensorDeviceClass.MONETARY, device_class=SensorDeviceClass.MONETARY,
native_unit_of_measurement=CURRENCY_EURO, native_unit_of_measurement=CURRENCY_EURO,
entity_registry_enabled_default=False, entity_registry_enabled_default=False,
suggested_display_precision=2,
), ),
SensorEntityDescription( SensorEntityDescription(
key="next_hour_price", key="next_hour_price",
@ -65,6 +68,7 @@ PRICE_SENSORS = (
icon="mdi:currency-eur-off", icon="mdi:currency-eur-off",
device_class=SensorDeviceClass.MONETARY, device_class=SensorDeviceClass.MONETARY,
native_unit_of_measurement="ct/kWh", native_unit_of_measurement="ct/kWh",
suggested_display_precision=2,
), ),
SensorEntityDescription( SensorEntityDescription(
key="price_level", key="price_level",
@ -84,6 +88,7 @@ STATISTICS_SENSORS = (
device_class=SensorDeviceClass.MONETARY, device_class=SensorDeviceClass.MONETARY,
native_unit_of_measurement=CURRENCY_EURO, native_unit_of_measurement=CURRENCY_EURO,
entity_registry_enabled_default=False, entity_registry_enabled_default=False,
suggested_display_precision=2,
), ),
SensorEntityDescription( SensorEntityDescription(
key="lowest_price_today", key="lowest_price_today",
@ -92,6 +97,7 @@ STATISTICS_SENSORS = (
icon="mdi:currency-eur", icon="mdi:currency-eur",
device_class=SensorDeviceClass.MONETARY, device_class=SensorDeviceClass.MONETARY,
native_unit_of_measurement="ct/kWh", native_unit_of_measurement="ct/kWh",
suggested_display_precision=2,
), ),
SensorEntityDescription( SensorEntityDescription(
key="highest_price_today_eur", key="highest_price_today_eur",
@ -101,6 +107,7 @@ STATISTICS_SENSORS = (
device_class=SensorDeviceClass.MONETARY, device_class=SensorDeviceClass.MONETARY,
native_unit_of_measurement=CURRENCY_EURO, native_unit_of_measurement=CURRENCY_EURO,
entity_registry_enabled_default=False, entity_registry_enabled_default=False,
suggested_display_precision=2,
), ),
SensorEntityDescription( SensorEntityDescription(
key="highest_price_today", key="highest_price_today",
@ -109,6 +116,7 @@ STATISTICS_SENSORS = (
icon="mdi:currency-eur", icon="mdi:currency-eur",
device_class=SensorDeviceClass.MONETARY, device_class=SensorDeviceClass.MONETARY,
native_unit_of_measurement="ct/kWh", native_unit_of_measurement="ct/kWh",
suggested_display_precision=2,
), ),
SensorEntityDescription( SensorEntityDescription(
key="average_price_today_eur", key="average_price_today_eur",
@ -118,6 +126,7 @@ STATISTICS_SENSORS = (
device_class=SensorDeviceClass.MONETARY, device_class=SensorDeviceClass.MONETARY,
native_unit_of_measurement=CURRENCY_EURO, native_unit_of_measurement=CURRENCY_EURO,
entity_registry_enabled_default=False, entity_registry_enabled_default=False,
suggested_display_precision=2,
), ),
SensorEntityDescription( SensorEntityDescription(
key="average_price_today", key="average_price_today",
@ -126,6 +135,7 @@ STATISTICS_SENSORS = (
icon="mdi:currency-eur", icon="mdi:currency-eur",
device_class=SensorDeviceClass.MONETARY, device_class=SensorDeviceClass.MONETARY,
native_unit_of_measurement="ct/kWh", native_unit_of_measurement="ct/kWh",
suggested_display_precision=2,
), ),
) )
@ -159,7 +169,7 @@ DIAGNOSTIC_SENSORS = (
SensorEntityDescription( SensorEntityDescription(
key="data_timestamp", key="data_timestamp",
translation_key="data_timestamp", translation_key="data_timestamp",
name="Last Data Update", name="Latest Data Available",
icon="mdi:clock-check", icon="mdi:clock-check",
device_class=SensorDeviceClass.TIMESTAMP, device_class=SensorDeviceClass.TIMESTAMP,
entity_category=EntityCategory.DIAGNOSTIC, entity_category=EntityCategory.DIAGNOSTIC,
@ -226,15 +236,15 @@ class TibberPricesSensor(TibberPricesEntity, SensorEntity):
"next_hour_price": lambda: self._get_hourly_price_value(hour_offset=1, in_euro=False), "next_hour_price": lambda: self._get_hourly_price_value(hour_offset=1, in_euro=False),
"next_hour_price_eur": lambda: self._get_hourly_price_value(hour_offset=1, in_euro=True), "next_hour_price_eur": lambda: self._get_hourly_price_value(hour_offset=1, in_euro=True),
# Statistics sensors # Statistics sensors
"lowest_price_today": lambda: self._get_statistics_value(stat_func=min, in_euro=False), "lowest_price_today": lambda: self._get_statistics_value(stat_func=min, in_euro=False, decimals=2),
"lowest_price_today_eur": lambda: self._get_statistics_value(stat_func=min, in_euro=True), "lowest_price_today_eur": lambda: self._get_statistics_value(stat_func=min, in_euro=True, decimals=4),
"highest_price_today": lambda: self._get_statistics_value(stat_func=max, in_euro=False), "highest_price_today": lambda: self._get_statistics_value(stat_func=max, in_euro=False, decimals=2),
"highest_price_today_eur": lambda: self._get_statistics_value(stat_func=max, in_euro=True), "highest_price_today_eur": lambda: self._get_statistics_value(stat_func=max, in_euro=True, decimals=4),
"average_price_today": lambda: self._get_statistics_value( "average_price_today": lambda: self._get_statistics_value(
stat_func=lambda prices: sum(prices) / len(prices), in_euro=False stat_func=lambda prices: sum(prices) / len(prices), in_euro=False, decimals=2
), ),
"average_price_today_eur": lambda: self._get_statistics_value( "average_price_today_eur": lambda: self._get_statistics_value(
stat_func=lambda prices: sum(prices) / len(prices), in_euro=True stat_func=lambda prices: sum(prices) / len(prices), in_euro=True, decimals=4
), ),
# Rating sensors # Rating sensors
"hourly_rating": lambda: self._get_rating_value(rating_type="hourly"), "hourly_rating": lambda: self._get_rating_value(rating_type="hourly"),
@ -266,7 +276,7 @@ class TibberPricesSensor(TibberPricesEntity, SensorEntity):
def _get_price_value(self, price: float, *, in_euro: bool) -> float: def _get_price_value(self, price: float, *, in_euro: bool) -> float:
"""Convert price based on unit.""" """Convert price based on unit."""
return price if in_euro else price * 100 return price if in_euro else round((price * 100), 2)
def _get_hourly_price_value(self, *, hour_offset: int, in_euro: bool) -> float | None: def _get_hourly_price_value(self, *, hour_offset: int, in_euro: bool) -> float | None:
"""Get price for current hour or with offset.""" """Get price for current hour or with offset."""
@ -284,7 +294,9 @@ class TibberPricesSensor(TibberPricesEntity, SensorEntity):
return None return None
def _get_statistics_value(self, *, stat_func: Callable[[list[float]], float], in_euro: bool) -> float | None: def _get_statistics_value(
self, *, stat_func: Callable[[list[float]], float], in_euro: bool, decimals: int | None = None
) -> float | None:
"""Handle statistics sensor values using the provided statistical function.""" """Handle statistics sensor values using the provided statistical function."""
if not self.coordinator.data: if not self.coordinator.data:
return None return None
@ -299,7 +311,11 @@ class TibberPricesSensor(TibberPricesEntity, SensorEntity):
return None return None
value = stat_func(prices) value = stat_func(prices)
return self._get_price_value(value, in_euro=in_euro) result = self._get_price_value(value, in_euro=in_euro)
if decimals is not None:
result = round(result, decimals)
return result
def _get_rating_value(self, *, rating_type: str) -> float | None: def _get_rating_value(self, *, rating_type: str) -> float | None:
"""Handle rating sensor values.""" """Handle rating sensor values."""

2
custom_components/tibber_prices/translations/en.json
View file

@ -68,7 +68,7 @@
"name": "Monthly Price Rating" "name": "Monthly Price Rating"
}, },
"data_timestamp": { "data_timestamp": {
"name": "Last Data Update" "name": "Last Data Available"
}, },
"tomorrow_data_available": { "tomorrow_data_available": {
"name": "Tomorrow's Data Available" "name": "Tomorrow's Data Available"