fix: Avoid Estimation for Private Producers (#142)

* fix: Avoid Estimation for Private Producers

* fix

* Fix

* Update manifest and default behavior

Author: GuyKh

custom_components/iec/coordinator.py

@@ -285,6 +285,7 @@ async def _async_update_data(
             daily_readings: dict[str, list[RemoteReading] | None] | None = {}
 
             is_smart_meter = contracts.get(contract_id).smart_meter
+            is_private_producer = contracts.get(contract_id).from_private_producer
             attributes_to_add = {CONTRACT_ID_ATTR_NAME: str(contract_id),
                                  IS_SMART_METER_ATTR_NAME: is_smart_meter,
                                  METER_ID_ATTR_NAME: None}
@@ -373,33 +374,34 @@ async def _async_update_data(
                             else:
                                 _LOGGER.debug("Failed fetching FutureConsumption, data in IEC API is corrupted")
 
-                    devices_by_id: Devices = await self._get_devices_by_device_id(device.device_number)
-                    last_meter_read = int(devices_by_id.counter_devices[0].last_mr)
-                    last_meter_read_date = devices_by_id.counter_devices[0].last_mr_date
-                    phase_count = devices_by_id.counter_devices[0].connection_size.phase
-                    connection_size = (devices_by_id.counter_devices[0].
-                                       connection_size.representative_connection_size)
-
-                    distribution_tariff = await self._get_distribution_tariff(phase_count)
-                    delivery_tariff = await self._get_delivery_tariff(phase_count)
-                    power_size = await self._get_power_size(connection_size)
-
-                    estimated_bill, fixed_price, consumption_price, total_days, delivery_price, distribution_price, \
-                    total_kva_price, estimated_kwh_consumption = (
-                            self._calculate_estimated_bill(device.device_number, future_consumption,
-                                                        last_meter_read, last_meter_read_date,
-                                                        kwh_tariff, kva_tariff, distribution_tariff,
-                                                        delivery_tariff, power_size, last_invoice))
-
-                    estimated_bill_dict = {
-                        TOTAL_EST_BILL_ATTR_NAME: estimated_bill,
-                        EST_BILL_DAYS_ATTR_NAME: total_days,
-                        EST_BILL_CONSUMPTION_PRICE_ATTR_NAME: consumption_price,
-                        EST_BILL_DELIVERY_PRICE_ATTR_NAME: delivery_price,
-                        EST_BILL_DISTRIBUTION_PRICE_ATTR_NAME: distribution_price,
-                        EST_BILL_TOTAL_KVA_PRICE_ATTR_NAME: total_kva_price,
-                        EST_BILL_KWH_CONSUMPTION_ATTR_NAME: estimated_kwh_consumption
-                    }
+                    if not is_private_producer:
+                        devices_by_id: Devices = await self._get_devices_by_device_id(device.device_number)
+                        last_meter_read = int(devices_by_id.counter_devices[0].last_mr)
+                        last_meter_read_date = devices_by_id.counter_devices[0].last_mr_date
+                        phase_count = devices_by_id.counter_devices[0].connection_size.phase
+                        connection_size = (devices_by_id.counter_devices[0].
+                                        connection_size.representative_connection_size)
+
+                        distribution_tariff = await self._get_distribution_tariff(phase_count)
+                        delivery_tariff = await self._get_delivery_tariff(phase_count)
+                        power_size = await self._get_power_size(connection_size)
+
+                        estimated_bill, fixed_price, consumption_price, total_days, delivery_price, distribution_price, \
+                        total_kva_price, estimated_kwh_consumption = (
+                                self._calculate_estimated_bill(device.device_number, future_consumption,
+                                                            last_meter_read, last_meter_read_date,
+                                                            kwh_tariff, kva_tariff, distribution_tariff,
+                                                            delivery_tariff, power_size, last_invoice))
+
+                        estimated_bill_dict = {
+                            TOTAL_EST_BILL_ATTR_NAME: estimated_bill,
+                            EST_BILL_DAYS_ATTR_NAME: total_days,
+                            EST_BILL_CONSUMPTION_PRICE_ATTR_NAME: consumption_price,
+                            EST_BILL_DELIVERY_PRICE_ATTR_NAME: delivery_price,
+                            EST_BILL_DISTRIBUTION_PRICE_ATTR_NAME: distribution_price,
+                            EST_BILL_TOTAL_KVA_PRICE_ATTR_NAME: total_kva_price,
+                            EST_BILL_KWH_CONSUMPTION_ATTR_NAME: estimated_kwh_consumption
+                        }
 
             data[str(contract_id)] = {CONTRACT_DICT_NAME: contracts.get(contract_id),
                                       INVOICE_DICT_NAME: last_invoice,

custom_components/iec/manifest.json

@@ -11,5 +11,5 @@
   "issue_tracker": "https://github.com/guykh/iec-custom-component/issues",
   "loggers": ["iec_api"],
   "requirements": ["iec-api==0.3.1"],
-  "version": "0.0.29"
+  "version": "0.0.30"
 }

custom_components/iec/sensor.py

@@ -96,8 +96,7 @@ def _get_reading_by_date(readings: list[RemoteReading] | None, desired_date: dat
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         # state_class=SensorStateClass.TOTAL,
         suggested_display_precision=3,
-        value_fn=lambda data:
-        (data[ESTIMATED_BILL_DICT_NAME][EST_BILL_KWH_CONSUMPTION_ATTR_NAME] or 0)
+        value_fn=lambda data: (data[ESTIMATED_BILL_DICT_NAME][EST_BILL_KWH_CONSUMPTION_ATTR_NAME] if data[ESTIMATED_BILL_DICT_NAME] else 0)
         if (data[ESTIMATED_BILL_DICT_NAME]
             and data[ESTIMATED_BILL_DICT_NAME][EST_BILL_KWH_CONSUMPTION_ATTR_NAME]) else None
     ),
@@ -108,7 +107,7 @@ def _get_reading_by_date(readings: list[RemoteReading] | None, desired_date: dat
         # 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[ESTIMATED_BILL_DICT_NAME][TOTAL_EST_BILL_ATTR_NAME] or 0),
+        value_fn=lambda data: (data[ESTIMATED_BILL_DICT_NAME][TOTAL_EST_BILL_ATTR_NAME]) if data[ESTIMATED_BILL_DICT_NAME] else 0,
         custom_attrs_fn=lambda data: {
             EST_BILL_DAYS_ATTR_NAME: data[ESTIMATED_BILL_DICT_NAME][EST_BILL_DAYS_ATTR_NAME],
             EST_BILL_CONSUMPTION_PRICE_ATTR_NAME: data[ESTIMATED_BILL_DICT_NAME][EST_BILL_CONSUMPTION_PRICE_ATTR_NAME],
@@ -304,9 +303,11 @@ def __init__(
             attributes.update(attributes_to_add)
 
         if self.entity_description.custom_attrs_fn:
-            attributes.update(self.entity_description.custom_attrs_fn(
+            custom_attr = self.entity_description.custom_attrs_fn(
                 self.coordinator.data.get(str(int(self.contract_id)))
-            ))
+            )
+            if custom_attr:
+                attributes.update(custom_attr)
 
         if is_multi_contract:
             attributes["is_multi_contract"] = is_multi_contract