jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-22 20:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use entity class vars in Tibber (#50977)

Browse Source 
* Use entity class vars in Tibber

Signed-off-by: Daniel Hjelseth Høyer <github@dahoiv.net>

* Update homeassistant/components/tibber/sensor.py

Co-authored-by: Franck Nijhof <git@frenck.dev>

* Update homeassistant/components/tibber/sensor.py

Co-authored-by: Franck Nijhof <git@frenck.dev>

* Use entity class vars in Tibber

Signed-off-by: Daniel Hjelseth Høyer <github@dahoiv.net>

* Use entity class vars in Tibber

Signed-off-by: Daniel Hjelseth Høyer <github@dahoiv.net>

Co-authored-by: Franck Nijhof <git@frenck.dev>
This commit is contained in:
Daniel Hjelseth Høyer 2021-05-25 13:35:18 +02:00 committed by GitHub
parent be0a54edb1
commit e9c787a5eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
homeassistant/components/tibber/sensor.py
View File

@ -147,23 +147,12 @@ class TibberSensor(SensorEntity):
def __init__(self, tibber_home): def __init__(self, tibber_home):
"""Initialize the sensor.""" """Initialize the sensor."""
self._tibber_home = tibber_home self._tibber_home = tibber_home
self._state = None self._home_name = tibber_home.info["viewer"]["home"]["appNickname"]
if self._home_name is None:
self._name = tibber_home.info["viewer"]["home"]["appNickname"] self._home_name = tibber_home.info["viewer"]["home"]["address"].get(
if self._name is None:
self._name = tibber_home.info["viewer"]["home"]["address"].get(
"address1", "" "address1", ""
) )
self._model = None
@property
def model(self):
"""Return the model of the sensor."""
return None
@property
def state(self):
"""Return the state of the device."""
return self._state
@property @property
def device_id(self): def device_id(self):
@ -178,8 +167,8 @@ class TibberSensor(SensorEntity):
"name": self.name, "name": self.name,
"manufacturer": MANUFACTURER, "manufacturer": MANUFACTURER,
} }
if self.model is not None: if self._model is not None:
device_info["model"] = self.model device_info["model"] = self._model
return device_info return device_info
@ -190,14 +179,25 @@ class TibberSensorElPrice(TibberSensor):
"""Initialize the sensor.""" """Initialize the sensor."""
super().__init__(tibber_home) super().__init__(tibber_home)
self._last_updated = None self._last_updated = None
self._is_available = False
self._extra_state_attributes = {}
self._spread_load_constant = randrange(5000) self._spread_load_constant = randrange(5000)
@property self._attr_available = False
def extra_state_attributes(self): self._attr_extra_state_attributes = {
"""Return the state attributes.""" "app_nickname": None,
return self._extra_state_attributes "grid_company": None,
"estimated_annual_consumption": None,
"price_level": None,
"max_price": None,
"avg_price": None,
"min_price": None,
"off_peak_1": None,
"peak": None,
"off_peak_2": None,
}
self._attr_icon = ICON
self._attr_name = f"Electricity price {self._home_name}"
self._attr_unique_id = f"{self._tibber_home.home_id}"
self._model = "Price Sensor"
async def async_update(self): async def async_update(self):
"""Get the latest data and updates the states.""" """Get the latest data and updates the states."""
@ -206,7 +206,7 @@ class TibberSensorElPrice(TibberSensor):
not self._tibber_home.last_data_timestamp not self._tibber_home.last_data_timestamp
or (self._tibber_home.last_data_timestamp - now).total_seconds() or (self._tibber_home.last_data_timestamp - now).total_seconds()
< 5 * 3600 + self._spread_load_constant < 5 * 3600 + self._spread_load_constant
or not self._is_available or not self.available
): ):
_LOGGER.debug("Asking for new data") _LOGGER.debug("Asking for new data")
await self._fetch_data() await self._fetch_data()
@ -220,42 +220,13 @@ class TibberSensorElPrice(TibberSensor):
return return
res = self._tibber_home.current_price_data() res = self._tibber_home.current_price_data()
self._state, price_level, self._last_updated = res self._attr_state, price_level, self._last_updated = res
self._extra_state_attributes["price_level"] = price_level self._attr_extra_state_attributes["price_level"] = price_level
attrs = self._tibber_home.current_attributes() attrs = self._tibber_home.current_attributes()
self._extra_state_attributes.update(attrs) self._attr_extra_state_attributes.update(attrs)
self._is_available = self._state is not None self._attr_available = self._attr_state is not None
self._attr_unit_of_measurement = self._tibber_home.price_unit
@property
def available(self):
"""Return True if entity is available."""
return self._is_available
@property
def name(self):
"""Return the name of the sensor."""
return f"Electricity price {self._name}"
@property
def model(self):
"""Return the model of the sensor."""
return "Price Sensor"
@property
def icon(self):
"""Return the icon to use in the frontend."""
return ICON
@property
def unit_of_measurement(self):
"""Return the unit of measurement of this entity."""
return self._tibber_home.price_unit
@property
def unique_id(self):
"""Return a unique ID."""
return self.device_id
@Throttle(MIN_TIME_BETWEEN_UPDATES) @Throttle(MIN_TIME_BETWEEN_UPDATES)
async def _fetch_data(self): async def _fetch_data(self):
@ -265,11 +236,11 @@ class TibberSensorElPrice(TibberSensor):
except (asyncio.TimeoutError, aiohttp.ClientError): except (asyncio.TimeoutError, aiohttp.ClientError):
return return
data = self._tibber_home.info["viewer"]["home"] data = self._tibber_home.info["viewer"]["home"]
self._extra_state_attributes["app_nickname"] = data["appNickname"] self._attr_extra_state_attributes["app_nickname"] = data["appNickname"]
self._extra_state_attributes["grid_company"] = data["meteringPointData"][ self._attr_extra_state_attributes["grid_company"] = data["meteringPointData"][
"gridCompany" "gridCompany"
] ]
self._extra_state_attributes["estimated_annual_consumption"] = data[ self._attr_extra_state_attributes["estimated_annual_consumption"] = data[
"meteringPointData" "meteringPointData"
]["estimatedAnnualConsumption"] ]["estimatedAnnualConsumption"]
@ -277,13 +248,19 @@ class TibberSensorElPrice(TibberSensor):
class TibberSensorRT(TibberSensor): class TibberSensorRT(TibberSensor):
"""Representation of a Tibber sensor for real time consumption.""" """Representation of a Tibber sensor for real time consumption."""
_attr_should_poll = False
def __init__(self, tibber_home, sensor_name, device_class, unit, initial_state): def __init__(self, tibber_home, sensor_name, device_class, unit, initial_state):
"""Initialize the sensor.""" """Initialize the sensor."""
super().__init__(tibber_home) super().__init__(tibber_home)
self._sensor_name = sensor_name self._sensor_name = sensor_name
self._device_class = device_class self._model = "Tibber Pulse"
self._unit = unit
self._state = initial_state self._attr_device_class = device_class
self._attr_name = f"{self._sensor_name} {self._home_name}"
self._attr_state = initial_state
self._attr_unique_id = f"{self._tibber_home.home_id}_rt_{self._sensor_name}"
self._attr_unit_of_measurement = unit
async def async_added_to_hass(self): async def async_added_to_hass(self):
"""Start listen for real time data.""" """Start listen for real time data."""
@ -300,42 +277,12 @@ class TibberSensorRT(TibberSensor):
"""Return True if entity is available.""" """Return True if entity is available."""
return self._tibber_home.rt_subscription_running return self._tibber_home.rt_subscription_running
@property
def model(self):
"""Return the model of the sensor."""
return "Tibber Pulse"
@property
def name(self):
"""Return the name of the sensor."""
return f"{self._sensor_name} {self._name}"
@callback @callback
def _set_state(self, state): def _set_state(self, state):
"""Set sensor state.""" """Set sensor state."""
self._state = state self._attr_state = state
self.async_write_ha_state() self.async_write_ha_state()
@property
def should_poll(self):
"""Return the polling state."""
return False
@property
def unit_of_measurement(self):
"""Return the unit of measurement of this entity."""
return self._unit
@property
def unique_id(self):
"""Return a unique ID."""
return f"{self.device_id}_rt_{self._sensor_name}"
@property
def device_class(self):
"""Return the device class of the sensor."""
return self._device_class
class TibberRtDataHandler: class TibberRtDataHandler:
"""Handle Tibber realtime data.""" """Handle Tibber realtime data."""