Michal
/
SWS-12500-custom-component
mirror of https://github.com/schizza/SWS-12500-custom-component
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve data validation and error logging in utils.py

ecowitt_support
SchiZzA 2026-01-18 21:48:24 +01:00
parent 234840e115
commit a3dc3d0d53
No known key found for this signature in database
1 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
custom_components/sws12500/utils.py
View File

@ -2,7 +2,8 @@
import logging import logging
import math import math
from typing import cast from multiprocessing import Value
from typing import Any, cast
import numpy as np import numpy as np
from py_typecheck import checked from py_typecheck import checked
@ -218,6 +219,19 @@ def celsius_to_fahrenheit(celsius: float) -> float:
return celsius * 9.0 / 5.0 + 32 return celsius * 9.0 / 5.0 + 32
def _to_float(val: Any) -> float | None:
"""Convert int or string to float."""
if not val:
return None
try:
v = float(val)
except (TypeError, ValueError):
return None
else:
return v
def heat_index( def heat_index(
data: dict[str, int | float | str], convert: bool = False data: dict[str, int | float | str], convert: bool = False
) -> float | None: ) -> float | None:
@ -226,12 +240,18 @@ def heat_index(
data: dict with temperature and humidity data: dict with temperature and humidity
convert: bool, convert recieved data from Celsius to Fahrenheit convert: bool, convert recieved data from Celsius to Fahrenheit
""" """
if (temp := checked(data.get(OUTSIDE_TEMP), float)) is None: if (temp := _to_float(data.get(OUTSIDE_TEMP))) is None:
_LOGGER.error("We are missing OUTSIDE TEMP, cannot calculate heat index.") _LOGGER.error(
"We are missing/invalid OUTSIDE TEMP (%s), cannot calculate wind chill index.",
temp,
)
return None return None
if (rh := checked(data.get(OUTSIDE_HUMIDITY), float)) is None: if (rh := _to_float(data.get(OUTSIDE_HUMIDITY))) is None:
_LOGGER.error("We are missing OUTSIDE HUMIDITY, cannot calculate heat index.") _LOGGER.error(
"We are missing/invalid OUTSIDE HUMIDITY (%s), cannot calculate wind chill index.",
rh,
)
return None return None
adjustment = None adjustment = None
@ -271,11 +291,21 @@ def chill_index(
data: dict with temperature and wind speed data: dict with temperature and wind speed
convert: bool, convert recieved data from Celsius to Fahrenheit convert: bool, convert recieved data from Celsius to Fahrenheit
""" """
if (temp := checked(data.get(OUTSIDE_TEMP), float)) is None: temp = _to_float(data.get(OUTSIDE_TEMP))
_LOGGER.error("We are missing OUTSIDE TEMP, cannot calculate wind chill index.") wind = _to_float(data.get(WIND_SPEED))
if temp is None:
_LOGGER.error(
"We are missing/invalid OUTSIDE TEMP (%s), cannot calculate wind chill index.",
temp,
)
return None return None
if (wind := checked(data.get(WIND_SPEED), float)) is None:
_LOGGER.error("We are missing WIND SPEED, cannot calculate wind chill index.") if wind is None:
_LOGGER.error(
"We are missing/invalid WIND SPEED (%s), cannot calculate wind chill index.",
wind,
)
return None return None
if convert: if convert: