Merge pull request #9 from isaacyera/fix/update-2024.04.0

Fix errors and warnings after updating HA to version 2024.04.0
vortizhe · Jun 13, 2024 · 4ca11eb · 4ca11eb
2 parents dfa9bbb + 0c2bb5b
commit 4ca11eb
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/custom_components/ingeteam_modbus/sensor.py b/custom_components/ingeteam_modbus/sensor.py
@@ -11,20 +11,26 @@
     ATTR_MANUFACTURER,
 )
 from homeassistant.const import (
-    CONF_NAME, 
-    TEMP_CELSIUS,
-    PERCENTAGE
+    CONF_NAME,
+    PERCENTAGE,
+    UnitOfTemperature,
 )
 
 from homeassistant.components.sensor import (
-    STATE_CLASS_MEASUREMENT,
     SensorEntity,
     SensorEntityDescription,
     SensorStateClass,
     SensorDeviceClass
 )
-from homeassistant.components.integration.sensor import IntegrationSensor,ATTR_SOURCE_ID,UNIT_PREFIXES,UNIT_TIME
+from homeassistant.components.integration.sensor import (
+    IntegrationSensor, 
+    ATTR_SOURCE_ID, 
+    UNIT_PREFIXES, 
+    UNIT_TIME, 
+    _IntegrationMethod
+)
 
+from homeassistant.components.integration.const import METHOD_TRAPEZOIDAL
 
 from homeassistant.core import callback
 
@@ -170,7 +176,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
         key="C",
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=TEMP_CELSIUS,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
     ),
     "Hz": SensorEntityDescription(
         key="Hz",
@@ -194,6 +200,7 @@ def __init__(
         self,
         *
         hub,
+        integration_method = METHOD_TRAPEZOIDAL,
         name: str | None,
         source_entity: str,
         unique_id: str | None):
@@ -205,12 +212,13 @@ def __init__(
         self._round_digits = 2
         self._state: Decimal | None = None
         self._last_valid_state = Decimal | None 
-        self._method = "trapezoidal"
+        self._method = _IntegrationMethod.from_name(integration_method)
 
         self._attr_name = name if name is not None else f"{source_entity} integral"
         self._unit_template = f"{'' if unit_prefix is None else unit_prefix}{{}}"
         self._unit_of_measurement: str | None = None
         self._unit_prefix = UNIT_PREFIXES[unit_prefix]
+        self._unit_prefix_string = unit_prefix
         self._unit_time = UNIT_TIME[unit_time]
         self._unit_time_str = unit_time
         self._attr_icon = "mdi:chart-histogram"
@@ -239,7 +247,7 @@ def __init__(self, platform_name, hub, device_info, name, key, unit, icon):
         self._unit_of_measurement = unit if unit != "B" else "%"
         self._icon = icon
         self._device_info = device_info
-        self._attr_state_class = STATE_CLASS_MEASUREMENT
+        self._attr_state_class = SensorStateClass.MEASUREMENT
         self.entity_description = _DESCRIPTIONS.get(unit, DIAG_SENSOR)
 
     async def async_added_to_hass(self):