fix: multiple sensors created (#34)

Author: GuyKh

custom_components/iec/const.py

@@ -12,3 +12,5 @@
 DAILY_READINGS_DICT_NAME = "daily_readings"
 FUTURE_CONSUMPTIONS_DICT_NAME = "future_consumption"
 STATIC_KWH_TARIFF = "kwh_tariff"
+STATIC_CONTRACT = "contract_number"
+STATIC_BP_NUMBER = "bp_number"

custom_components/iec/coordinator.py

@@ -27,13 +27,12 @@
 from iec_api.models.remote_reading import ReadingResolution, RemoteReading, FutureConsumptionInfo
 
 from .const import DOMAIN, CONF_USER_ID, STATICS_DICT_NAME, STATIC_KWH_TARIFF, INVOICE_DICT_NAME, \
-    FUTURE_CONSUMPTIONS_DICT_NAME, DAILY_READINGS_DICT_NAME
+    FUTURE_CONSUMPTIONS_DICT_NAME, DAILY_READINGS_DICT_NAME, STATIC_CONTRACT, STATIC_BP_NUMBER
 
 _LOGGER = logging.getLogger(__name__)
 TIMEZONE = pytz.timezone("Asia/Jerusalem")
 
 
-
 class IecApiCoordinator(DataUpdateCoordinator[dict[int, dict]]):
     """Handle fetching IEC data, updating sensors and inserting statistics."""
 
@@ -139,9 +138,11 @@ async def _async_update_data(
                         # Sort by Date
                         daily_readings.sort(key=lambda x: x.date)
 
-
-        static_data = {}
-        static_data[STATIC_KWH_TARIFF] = await self.api.get_kwh_tariff()
+        static_data = {
+            STATIC_KWH_TARIFF: await self.api.get_kwh_tariff(),
+            STATIC_CONTRACT: self._contract_id,
+            STATIC_BP_NUMBER: self._bp_number
+        }
 
         data = {STATICS_DICT_NAME: static_data, INVOICE_DICT_NAME: last_invoice,
                 FUTURE_CONSUMPTIONS_DICT_NAME: future_consumption,

custom_components/iec/manifest.json

@@ -10,5 +10,5 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/ludeeus/iec-custom-component/issues",
   "requirements": ["iec-api==0.2.7"],
-  "version": "0.0.11"
+  "version": "0.0.12"
 }

custom_components/iec/sensor.py

@@ -21,7 +21,7 @@
 from iec_api.models.invoice import Invoice
 
 from .const import DOMAIN, ILS, STATICS_DICT_NAME, STATIC_KWH_TARIFF, FUTURE_CONSUMPTIONS_DICT_NAME, INVOICE_DICT_NAME, \
-    ILS_PER_KWH, DAILY_READINGS_DICT_NAME
+    ILS_PER_KWH, DAILY_READINGS_DICT_NAME, STATIC_CONTRACT
 from .coordinator import IecApiCoordinator
 
 _LOGGER = logging.getLogger(__name__)
@@ -69,7 +69,7 @@ def get_previous_bill_kwh_price(invoice: Invoice) -> float:
         # state_class=SensorStateClass.TOTAL,
         suggested_display_precision=2,
         # The API doesn't provide future *cost* so we can try to estimate it by the previous consumption
-        value_fn=lambda data: data[FUTURE_CONSUMPTIONS_DICT_NAME].future_consumption * get_previous_bill_kwh_price(data[INVOICE_DICT_NAME])
+        value_fn=lambda data: data[FUTURE_CONSUMPTIONS_DICT_NAME].future_consumption * data[STATICS_DICT_NAME][STATIC_KWH_TARIFF]
     ),
     IecEntityDescription(
         key="elec_today_consumption",
@@ -167,22 +167,22 @@ async def async_setup_entry(
 
     coordinator: IecApiCoordinator = hass.data[DOMAIN][entry.entry_id]
     entities: list[SensorEntity] = []
-    contracts = coordinator.data.keys()
-    for contract_id in contracts:
-        if coordinator.is_smart_meter:
-            sensors_desc: tuple[IecEntityDescription, ...] = ELEC_SENSORS + SMART_ELEC_SENSORS
-        else:
-            sensors_desc: tuple[IecEntityDescription, ...] = ELEC_SENSORS
-        # sensors_desc: tuple[IecEntityDescription, ...] = ELEC_SENSORS
-
-        for sensor_desc in sensors_desc:
-            entities.append(
-                IecSensor(
-                    coordinator,
-                    sensor_desc,
-                    contract_id
-                )
+
+    if coordinator.is_smart_meter:
+        sensors_desc: tuple[IecEntityDescription, ...] = ELEC_SENSORS + SMART_ELEC_SENSORS
+    else:
+        sensors_desc: tuple[IecEntityDescription, ...] = ELEC_SENSORS
+    # sensors_desc: tuple[IecEntityDescription, ...] = ELEC_SENSORS
+
+    contract_id = coordinator.data[STATICS_DICT_NAME][STATIC_CONTRACT]
+    for sensor_desc in sensors_desc:
+        entities.append(
+            IecSensor(
+                coordinator,
+                sensor_desc,
+                contract_id
             )
+        )
 
     for sensor_desc in STATIC_SENSORS:
         entities.append(