python-esios 2.4.0__py3-none-any.whl → 2.4.2__py3-none-any.whl

esios/.agents/skills/esios/SKILL.md

@@ -60,8 +60,8 @@ print(sheet.frequency)    # "hourly" or "hourly-quarterly"
 
 | ID | Name | Description | Geos |
 |----|------|-------------|------|
-| 600 | Precio mercado spot | OMIE spot market price | ES, PT, FR, DE, BE, NL |
-| 1001 | Precio mercado diario | Day-ahead market price | ES |
+| 600 | Precio mercado SPOT Diario | OMIE spot / day-ahead market price | ES, PT, FR, DE, BE, NL |
+| 1001 | PVPC T. 2.0TD | Término de facturación de energía activa del PVPC (voluntary price for small consumers) | Península, Canarias, Baleares, Ceuta, Melilla |
 | 10033 | Demanda real | Real-time electricity demand | ES |
 | 10034 | Generación eólica | Real-time wind generation | ES |
 | 10035 | Generación solar FV | Real-time solar PV generation | ES |

esios/processing/i90.py

@@ -33,6 +33,43 @@ def _any_value_greater_than_30(series: np.ndarray) -> bool:
     return any(v > 30 for v in series if isinstance(v, (int, float, np.integer, np.floating)) and not np.isnan(v))
 
 
+# Labels that REE uses for the cells sitting between the index columns and the
+# per-period value columns of an I90 sheet. Match is exact (case-insensitive,
+# trimmed). The count of these cells per sheet has varied across REE format
+# revisions — historically 2 ("Hora" / "Cuarto de Hora del dia" + "Total");
+# from Oct 2025 the MTU 15-min transition dropped "Total" on several sheets,
+# leaving 1. Counting them dynamically keeps the parser resilient to either.
+_SEPARATOR_LABELS = frozenset({
+    "cuarto de hora del dia",
+    "hora del dia",
+    "hora",
+    "total",
+    "indicadores",
+})
+
+
+def _count_header_separators(row: np.ndarray, idx_col_start: int) -> int:
+    """Count separator cells immediately preceding the time-value block.
+
+    Walks ``row`` backwards from ``idx_col_start - 1``, incrementing on each
+    cell whose text matches a known separator label and stopping at the first
+    non-matching cell or NaN. A NaN cell signals the start of the index-column
+    placeholder zone in double-header layouts (where index labels live on the
+    other header row, leaving the date row blank under each index position).
+    """
+    n = 0
+    for i in range(idx_col_start - 1, -1, -1):
+        cell = row[i]
+        if cell is None or (isinstance(cell, float) and np.isnan(cell)):
+            break
+        text = str(cell).strip().lower()
+        if text in _SEPARATOR_LABELS:
+            n += 1
+            continue
+        break
+    return n
+
+
 class I90Book:
     """Represents an I90DIA workbook (XLS) with lazy sheet preprocessing.
 
@@ -163,18 +200,29 @@ class I90Sheet:
         arr[arr == ""] = np.nan
         return arr
 
-    def _normalize_datetime_columns(self, columns: np.ndarray) -> np.ndarray:
+    def _normalize_datetime_columns(
+        self, columns: np.ndarray, n_measures: int = 1
+    ) -> np.ndarray:
         """Normalize time column headers to integer period indices.
 
-        Handles four column formats found in I90 files:
+        Handles five column formats found in I90 files:
 
         1. Sequential integers: 1–24 (hourly) or 1–96 (quarterly)
         2. H-Q format: "1-1", "1-2", "1-3", "1-4", "2-1", …
-        3. NaN-filler format: [1, NaN, NaN, NaN, 2, …]
+        3. NaN-filler format: [1, NaN, NaN, NaN, 2, …] — one period number per
+           hour, three NaN fillers for the remaining quarters (single measure).
         4. Range format (DST days): "00-01", "01-02", "02-03a", "02-03b", …
            where the first number is the start hour and a/b suffix marks
            the repeated hour on fall-back days. Detected by the first
            column starting with "0" (e.g. "00-01").
+        5. Multi-measure format: [1, NaN, 2, NaN, …] — each period number labels
+           a block of `n_measures` sub-columns (e.g. MW + €/MWh paired per
+           quarter-hour in offer sheets), the NaN fillers being the extra
+           measures. The period number is on every n_measures-th column.
+
+        `n_measures` is the count of distinct measure sub-columns per period
+        (1 for single-measure sheets). It disambiguates format 3 from format 5,
+        which share the same NaN-filler shape but mean opposite things.
         """
         if any(pd.isna(columns)):
             self._n_columns_totals = 3
@@ -203,6 +251,10 @@ class I90Sheet:
             )
             return ((hours - 1) * 4 + quarters).values
 
+        # Multi-measure format: each period number labels a block of n_measures sub-columns (e.g. MW + €/MWh). The ffilled value already IS the period index and the duplication is the measures — keep it so every measure of a period shares one datetime (paired), instead of spreading them across sequential slots.
+        if n_measures > 1:
+            return hours.values
+
         # NaN-filler quarterly format: after ffill the same hour number repeats
         # four times (quarters share the hour label).  Assign sequential indices.
         if hours.duplicated().any():
@@ -220,8 +272,18 @@ class I90Sheet:
         if idx_col_start == -1:
             return pd.DataFrame()
 
-        columns_date = self._normalize_datetime_columns(columns_prior[idx_col_start:])
         columns_variable = columns[idx_col_start:]
+        # Distinct measure labels per period (e.g. {MW, €/MWh} -> 2). Disambiguates the NaN-filler time header (single measure, expand to sequential quarters) from the multi-measure paired layout (keep the period index so measures pair).
+        measure_labels = pd.Series(columns_variable).dropna()
+        n_measures = int(measure_labels.nunique()) if len(measure_labels) else 1
+        columns_date = self._normalize_datetime_columns(
+            columns_prior[idx_col_start:], n_measures=n_measures
+        )
+        # _normalize_datetime_columns sets _n_columns_totals from the time-block
+        # content (NaN-filler vs sequential). Override with a header-label count
+        # so the index slice survives REE format revisions that add or drop a
+        # "Total" column without touching the time-axis encoding.
+        self._n_columns_totals = _count_header_separators(columns_prior, idx_col_start)
         columns_index = columns[: idx_col_start - self._n_columns_totals]
 
         return columns, columns_index, columns_date, columns_variable
@@ -230,6 +292,7 @@ class I90Sheet:
         self, idx_col_start: int, columns: np.ndarray
     ) -> tuple[np.ndarray, np.ndarray, np.ndarray, None]:
         columns_date = self._normalize_datetime_columns(columns[idx_col_start:])
+        self._n_columns_totals = _count_header_separators(columns, idx_col_start)
         columns_index = columns[: idx_col_start - self._n_columns_totals]
         return columns, columns_index, columns_date, None
 

{python_esios-2.4.0.dist-info → python_esios-2.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-esios
-Version: 2.4.0
+Version: 2.4.2
 Summary: A Python wrapper for the ESIOS API (Spanish electricity market)
 Project-URL: Homepage, https://github.com/datons/python-esios
 Project-URL: Repository, https://github.com/datons/python-esios
@@ -85,7 +85,7 @@ from esios import ESIOSClient
 client = ESIOSClient()
 
 # Get indicator data as DataFrame
-handle = client.indicators.get(600)  # PVPC price
+handle = client.indicators.get(600)  # Day-ahead spot price (OMIE)
 df = handle.historical("2025-01-01", "2025-01-31")
 
 # Search indicators
@@ -99,8 +99,8 @@ client.archives.download(1, start="2025-01-01", end="2025-01-31", output_dir="./
 
 | ID | Name | Description |
 |----|------|-------------|
-| 600 | PVPC | Voluntary price for small consumers |
-| 1001 | Day-ahead price | OMIE spot market price |
+| 600 | Day-ahead price | OMIE spot market price |
+| 1001 | PVPC | Voluntary price for small consumers (2.0TD) |
 | 10033 | Demand | Real-time electricity demand |
 | 10034 | Wind generation | Real-time wind generation |
 | 10035 | Solar PV generation | Real-time solar generation |

{python_esios-2.4.0.dist-info → python_esios-2.4.2.dist-info}/RECORD

@@ -5,7 +5,7 @@ esios/catalog.py,sha256=xWwMx5I32m34npjAXHh-Ua4e_0pfG89yxUC_Vy9VlAA,16811
 esios/client.py,sha256=rLgdyPFII6CC_TJwgkHaScJ7nBUpt85N94mujKAn0d0,5825
 esios/constants.py,sha256=yfxSNG37i4dkpa7x0CBvXTroyddn5jhNTuWGDhAq3-0,1074
 esios/exceptions.py,sha256=AiWLdRDWj50JEsld9CvVBsfLnZZKFmW62_bZmZ7Z_eA,899
-esios/.agents/skills/esios/SKILL.md,sha256=_5wCzMMB8FHWcAPeMA5vGklZFEGBEvU5wBOryNIogzM,6252
+esios/.agents/skills/esios/SKILL.md,sha256=D1wXiKyk7HoFw6CapccoORrtMXUpS2BuAVEChLu3AJE,6375
 esios/cli/__init__.py,sha256=9gd5ZDIH1-yNP_xcd60ethOFXm9w6un0CJ9CX0Qvb2A,256
 esios/cli/app.py,sha256=j1d8QWtKTTsWozSqqQitTkzzRjBE6OXY0ZZWYdS19wE,1524
 esios/cli/archives.py,sha256=Re9ZMauTiJlHdmiE7F3ZlV2wfaEyShS0C7Z4M2X4Ra8,7715
@@ -32,10 +32,10 @@ esios/models/indicator.py,sha256=u1AJyEA3YeOqQFjV08_lzyMaofuCiMoLPjvosls9gfE,111
 esios/models/offer_indicator.py,sha256=nA80Y7Yp0utDaDOdZ-ObcWTsAdhvuXlfJjJBpdVQ7Lo,758
 esios/processing/__init__.py,sha256=1kLt_gO_wDhXM1BbY0zTyfAYo-CjYKW1ljgRRDZ7USM,278
 esios/processing/dataframes.py,sha256=OitzBvAerssGP2VXNC-sSO48XsHdIB2nKTUgByN5eYQ,2524
-esios/processing/i90.py,sha256=fI8DfY8CD2kF1_ZrAzuEDxN0m7Vh3CV3dIn32lxKffA,11687
+esios/processing/i90.py,sha256=oo7CWKiHvCJjRIifr-hdXsqEH4JfFoFzY-LWVfw-brE,15107
 esios/processing/zip.py,sha256=12LbFHJTdX_h3JG-clEgQ4Haj-kw0UjfopGLlCRXfGM,1913
-python_esios-2.4.0.dist-info/METADATA,sha256=STVMDUwpgk6ZOx79KXOMPwn-t1aIvhB8MdsBmQtfdkk,3169
-python_esios-2.4.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-python_esios-2.4.0.dist-info/entry_points.txt,sha256=7ngseyIyvJ4buTHFL9htaZ4tTFHpG4zzJNkc8B5Jr8U,40
-python_esios-2.4.0.dist-info/licenses/LICENSE,sha256=LorLs1-VeBW70Wo9fLAtLJN7nNd6Poy0xzvqdWVqFlE,35128
-python_esios-2.4.0.dist-info/RECORD,,
+python_esios-2.4.2.dist-info/METADATA,sha256=KeSOrUKqPGOOx0LfWfovkaAahwtMFEAReh_C96OKyJo,3194
+python_esios-2.4.2.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+python_esios-2.4.2.dist-info/entry_points.txt,sha256=7ngseyIyvJ4buTHFL9htaZ4tTFHpG4zzJNkc8B5Jr8U,40
+python_esios-2.4.2.dist-info/licenses/LICENSE,sha256=LorLs1-VeBW70Wo9fLAtLJN7nNd6Poy0xzvqdWVqFlE,35128
+python_esios-2.4.2.dist-info/RECORD,,

{python_esios-2.4.0.dist-info → python_esios-2.4.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.30.1
 Root-Is-Purelib: true
 Tag: py3-none-any