Indicador de ajuste de mercado y cálculo de Indexada

aiopvpc/const.py

@@ -53,25 +53,33 @@
 ESIOS_INJECTION = "1739"
 ESIOS_MAG = "1900"  # regargo GAS
 ESIOS_OMIE = "10211"  # precio mayorista
+ESIOS_MARKET_ADJUSTMENT = "2108"  # ajuste mercado Indexada VS PVPC
+ESIOS_INDEXED = "0"  # precio indexado restando PVPC y el ajuste
 
 # unique ids for each series
 KEY_PVPC = "PVPC"
 KEY_INJECTION = "INJECTION"
 KEY_MAG = "MAG"  # regargo GAS
 KEY_OMIE = "OMIE"  # precio mayorista
+KEY_ADJUSTMENT = "ADJUSTMENT"  # ajuste mercado
+KEY_INDEXED = "INDEXED"  # precio indexada
 
-ALL_SENSORS = (KEY_PVPC, KEY_INJECTION, KEY_MAG, KEY_OMIE)
+ALL_SENSORS = (KEY_PVPC, KEY_INJECTION, KEY_MAG, KEY_OMIE, KEY_ADJUSTMENT)
 SENSOR_KEY_TO_DATAID = {
     KEY_PVPC: ESIOS_PVPC,
     KEY_INJECTION: ESIOS_INJECTION,
     KEY_MAG: ESIOS_MAG,
     KEY_OMIE: ESIOS_OMIE,
+    KEY_ADJUSTMENT: ESIOS_MARKET_ADJUSTMENT,
+    KEY_INDEXED: ESIOS_MARKET_ADJUSTMENT,
 }
 SENSOR_KEY_TO_NAME = {
     KEY_PVPC: "PVPC T. 2.0TD",
     KEY_INJECTION: "Precio de la energía excedentaria",
     KEY_MAG: "2.0TD Excedente o déficit ajuste liquidación",
     KEY_OMIE: "Precio medio horario final suma",
+    KEY_ADJUSTMENT: "Ajuste de mercado a plazo",
+    KEY_INDEXED: "Precio tarifa Indexada",
 }
 
 

aiopvpc/ha_helpers.py

@@ -2,6 +2,8 @@
 
 from aiopvpc.const import (
     ALL_SENSORS,
+    KEY_ADJUSTMENT,
+    KEY_INDEXED,
     KEY_INJECTION,
     KEY_MAG,
     KEY_OMIE,
@@ -20,6 +22,10 @@
     f"{TARIFFS[1]}_{KEY_MAG}": KEY_MAG,
     f"{TARIFFS[0]}_{KEY_OMIE}": KEY_OMIE,
     f"{TARIFFS[1]}_{KEY_OMIE}": KEY_OMIE,
+    f"{TARIFFS[0]}_{KEY_ADJUSTMENT}": KEY_ADJUSTMENT,
+    f"{TARIFFS[1]}_{KEY_ADJUSTMENT}": KEY_ADJUSTMENT,
+    f"{TARIFFS[0]}_{KEY_INDEXED}": KEY_INDEXED,
+    f"{TARIFFS[1]}_{KEY_INDEXED}": KEY_INDEXED,
 }
 
 
@@ -38,7 +44,7 @@ def get_enabled_sensor_keys(
 
 def make_sensor_unique_id(config_entry_id: str, sensor_key: str) -> str:
     """(HA) Generate unique_id for each sensor kind and config entry."""
-    assert sensor_key in ALL_SENSORS
+    assert sensor_key in ALL_SENSORS or sensor_key == KEY_INDEXED
     if sensor_key == KEY_PVPC:
         # for old compatibility
         return config_entry_id

aiopvpc/pvpc_data.py

@@ -26,6 +26,8 @@
     DEFAULT_TIMEOUT,
     EsiosApiData,
     EsiosResponse,
+    KEY_ADJUSTMENT,
+    KEY_INDEXED,
     KEY_PVPC,
     REFERENCE_TZ,
     SENSOR_KEY_TO_DATAID,
@@ -274,10 +276,24 @@ async def async_update_all(
             current_data.data_source = self._data_source
             current_data.last_update = utc_now
 
+        if (
+            KEY_PVPC in current_data.availability
+            and KEY_ADJUSTMENT in current_data.availability
+        ):
+            self._calculate_indexed(current_data)
+
         for sensor_key in current_data.sensors:
             self.process_state_and_attributes(current_data, sensor_key, now)
         return current_data
 
+    def _calculate_indexed(self, current_data: EsiosApiData):
+        pvpc = current_data.sensors[KEY_PVPC]
+        adjustment = current_data.sensors[KEY_ADJUSTMENT]
+        current_data.sensors[KEY_INDEXED] = {
+            date: pvpc[date] - adjustment[date] for date in pvpc
+        }
+        current_data.availability[KEY_INDEXED] = True
+
     async def _update_prices_series(
         self,
         sensor_key: str,