Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved Error Handling & Correct Units #54

Merged
merged 2 commits into from
Nov 7, 2021
Merged

Improved Error Handling & Correct Units #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6a649b
Improve error handling
ColinRobbins Oct 26, 2021
a923b9c
Fix units for standing charge
ColinRobbins Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 17 additions & 14 deletions custom_components/hildebrandglow_dcc/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ def __init__(self, glow: Glow, resource: Dict[str, Any], config: ConfigEntry):
self.resource = resource
self.config = config
self.meter = None
self.data_error_logged = False

@property
def unique_id(self) -> str:
Expand Down Expand Up @@ -171,8 +172,11 @@ def state(self) -> Optional[str]:
return round(res, 2)
return round(res, 3)
except (KeyError, IndexError, TypeError) as _error:
_LOGGER.error("Lookup Error - data (%s): (%s)",
_error, self._state)
if self.data_error_logged:
return None
self.data_error_logged = True
_LOGGER.error("Glow API data error (%s): (%s)",
self.name, _error)
return None
return None

Expand Down Expand Up @@ -268,12 +272,11 @@ def state(self) -> Optional[str]:
return standing

except (KeyError, IndexError, TypeError) as _error:
if plan is None:
_LOGGER.error("Lookup Error - plan (%s): (%s)",
_error, self._state)
else:
_LOGGER.error(
"Lookup Error - standing (%s): (%s)", _error, plan)
if self.data_error_logged:
return None
self.data_error_logged = True
_LOGGER.error("Glow API data error (%s): (%s)",
self.name, _error)
return None

return None
Expand All @@ -286,7 +289,7 @@ def device_class(self) -> str:
@property
def unit_of_measurement(self) -> Optional[str]:
"""Return the unit of measurement."""
return "GBP/kWh"
return "GBP"

async def async_update(self) -> None:
"""Fetch new state data for the sensor.
Expand Down Expand Up @@ -345,11 +348,11 @@ def state(self) -> Optional[str]:
return round(rate, 4)

except (KeyError, IndexError, TypeError) as _error:
if plan is None:
_LOGGER.error("Key Error - plan (%s): (%s)",
_error, self._state)
else:
_LOGGER.error("Key Error - rate (%s): (%s)", _error, plan)
if self.data_error_logged:
return None
self.data_error_logged = True
_LOGGER.error("Glow API data error (%s): (%s)",
self.name, _error)
return None

return None
Expand Down