e-data 2.0.1.dev131__tar.gz → 2.0.1.dev132__tar.gz

{e_data-2.0.1.dev131/e_data.egg-info → e_data-2.0.1.dev132}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.1.dev131
+Version: 2.0.1.dev132
 Summary: Python library for managing spanish energy data from various web providers
 Author-email: VMG <vmayorg@outlook.es>
 License:                     GNU GENERAL PUBLIC LICENSE

{e_data-2.0.1.dev131 → e_data-2.0.1.dev132/e_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.1.dev131
+Version: 2.0.1.dev132
 Summary: Python library for managing spanish energy data from various web providers
 Author-email: VMG <vmayorg@outlook.es>
 License:                     GNU GENERAL PUBLIC LICENSE

{e_data-2.0.1.dev131 → e_data-2.0.1.dev132}/edata/providers/datadis.py

@@ -403,10 +403,17 @@ class DatadisConnector:
         for i in response.get("timeCurve", []):
             if "consumptionKWh" in i:
                 if all(k in i for k in GET_CONSUMPTION_DATA_MANDATORY_FIELDS):
-                    hour = str(int(i["time"].split(":")[0]) - 1)
+                    raw_hour = int(i["time"].split(":")[0])
+                    # Datadis delivers hours 1..24 (end-of-interval). A sporadic
+                    # i-DE glitch emits an extra "00:00" row on a day already
+                    # carrying its full 24 hours, so drop it -- 01:00..24:00
+                    # already covers the day -- instead of remapping onto 23:00
+                    # and overlapping that day's 24:00 slot.
+                    if raw_hour == 0:
+                        continue
                     date_as_dt = datetime.strptime(
-                        f"{i['date']} {hour.zfill(2)}:00", "%Y/%m/%d %H:%M"
-                    )
+                        i["date"], "%Y/%m/%d"
+                    ) + timedelta(hours=raw_hour - 1)
                     if not (start_date <= date_as_dt <= end_date):
                         continue  # skip element if dt is out of range
 

{e_data-2.0.1.dev131 → e_data-2.0.1.dev132}/edata/tests/test_datadis_connector.py

@@ -56,6 +56,34 @@ CONSUMPTIONS_RESPONSE = {
     ]
 }
 
+CONSUMPTIONS_RESPONSE_WITH_ZERO_HOUR = {
+    "timeCurve": [
+        {
+            "date": "2022/10/22",
+            "time": "01:00",
+            "consumptionKWh": 0.203,
+            "surplusEnergyKWh": 0,
+            "obtainMethod": "Real",
+        },
+        {
+            "date": "2022/10/22",
+            "time": "02:00",
+            "consumptionKWh": 0.163,
+            "surplusEnergyKWh": 0,
+            "obtainMethod": "Real",
+        },
+        # Sporadic i-DE glitch: an extra "00:00" row on a day that already
+        # carries its full 24 hours. Must be dropped, not remapped to 23:00.
+        {
+            "date": "2022/10/22",
+            "time": "00:00",
+            "consumptionKWh": 0.999,
+            "surplusEnergyKWh": 0,
+            "obtainMethod": "Real",
+        },
+    ]
+}
+
 MAXIMETER_RESPONSE = {
     "maxPower": [
         {
@@ -132,6 +160,40 @@ def test_get_consumption_data(mock_token, mock_get, snapshot):
     )
 
 
+@patch("aiohttp.ClientSession.get")
+@patch.object(
+    DatadisConnector, "_async_get_token", new_callable=AsyncMock, return_value=True
+)
+def test_get_consumption_data_skips_zero_hour(mock_token, mock_get):
+    """A stray "00:00" row is dropped, not remapped, and never aborts the fetch."""
+    mock_response = MagicMock()
+    mock_response.status = 200
+    mock_response.text = AsyncMock(return_value="text")
+    mock_response.json = AsyncMock(
+        return_value=CONSUMPTIONS_RESPONSE_WITH_ZERO_HOUR
+    )
+    mock_get.return_value.__aenter__.return_value = mock_response
+    connector = DatadisConnector(MOCK_USERNAME, MOCK_PASSWORD)
+
+    # Range spans the previous day, so a remapped "00:00" -> 2022/10/21 23:00
+    # would fall inside it; its absence proves the explicit skip, not the filter.
+    result = connector.get_consumption_data(
+        "ESXXXXXXXXXXXXXXXXTEST",
+        "2",
+        datetime.datetime(2022, 10, 21, 0, 0, 0),
+        datetime.datetime(2022, 10, 22, 23, 59, 59),
+        "0",
+        5,
+    )
+
+    datetimes = [x.datetime for x in result]
+    assert datetimes == [
+        datetime.datetime(2022, 10, 22, 0, 0),
+        datetime.datetime(2022, 10, 22, 1, 0),
+    ]
+    assert datetime.datetime(2022, 10, 21, 23, 0) not in datetimes
+
+
 @patch("aiohttp.ClientSession.get")
 @patch.object(
     DatadisConnector, "_async_get_token", new_callable=AsyncMock, return_value=True

{e_data-2.0.1.dev131 → e_data-2.0.1.dev132}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "e-data"
-version = "2.0.1.dev131"
+version = "2.0.1.dev132"
 description = "Python library for managing spanish energy data from various web providers"
 readme = "README.md"
 authors = [