e-data 2.0.1.dev131__py3-none-any.whl → 2.0.1.dev132__py3-none-any.whl

{e_data-2.0.1.dev131.dist-info → e_data-2.0.1.dev132.dist-info}/METADATA

@@ -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.dist-info → e_data-2.0.1.dev132.dist-info}/RECORD

@@ -1,4 +1,4 @@
-e_data-2.0.1.dev131.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+e_data-2.0.1.dev132.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 edata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edata/cli.py,sha256=0pmlaaXPVfbxPVHMovsuK9qf8PGXl38AV3gtIsk95O4,4010
 edata/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -15,18 +15,18 @@ edata/models/bill.py,sha256=-qZ4l9f8BnPFlykFRoNYnmRe6-ELWmuNh6usks_k4X0,2674
 edata/models/data.py,sha256=O1aj0H_G92mnJjm6mYhC8fnl8ZOoatGiokRf8b7ziD8,2388
 edata/models/supply.py,sha256=qM0Q22-7PfBN93-Tu3ljAE58p5gfob0YWw-o5FccjrI,878
 edata/providers/__init__.py,sha256=5xaRKPttYM6EpVE1I_vhUAF25L9pEM_qK_5Ix6xnQe0,104
-edata/providers/datadis.py,sha256=a084ArY83ncvrMQvMSD2BY1rHlhp42dwJJkU8avmleo,20137
+edata/providers/datadis.py,sha256=CUodqOQUBIvS9OyY1YREoYnfvtYUoz3cJp1RxrNvY-M,20582
 edata/providers/redata.py,sha256=uvxO2TTtSNSfPRWHZifLjbaP7zAr6O7CZ1oRQFNbIhQ,3122
 edata/services/bill_service.py,sha256=vukgeQAN0fMjAkyI9cqPqQ4wSRvPdOaswfSR1KheIYc,14947
 edata/services/data_service.py,sha256=tgLjPPPobKSc5txbkpa8mQspcFwxA8zevlRFUC56YPQ,17238
 edata/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edata/tests/test_completion.py,sha256=-iyVt-juU3U1HqMuLUJXJthil2-n_4ddWiJq2GwnXTo,3551
-edata/tests/test_datadis_connector.py,sha256=O3mjI5uIOgFz3PzQsApcG6J2yXd8rlEtj8By-9dsDbg,9270
+edata/tests/test_datadis_connector.py,sha256=cJmQP9_yxxwIfQf9h5IJhUsS2itvkPwSeYuvem_pFzI,11332
 edata/tests/test_incremental.py,sha256=dn1LRgjBi2HuNYELPKDVdZQlS01hk4lsP9L-vyvtEHo,3479
 edata/tests/test_redata_connector.py,sha256=SBvxsma5t-qvz2drxNisNM2P1STTurqEs1TSDgwaPJ8,508
 edata/tests/test_services.py,sha256=BMw-MYXs2L_c1Sg_v4TwAZGOJnx2BoWH8U50M05-ZC8,6816
 edata/tests/test_utils.py,sha256=h6yBzT7j3eA42zbXJ-AK9lXcZkjCMf16wnob1oqGvUE,2307
-e_data-2.0.1.dev131.dist-info/METADATA,sha256=IGNLDaNDJ_S4zqVw0IIoDuIaCp4TrQqtBtKek7NNu08,48084
-e_data-2.0.1.dev131.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-e_data-2.0.1.dev131.dist-info/top_level.txt,sha256=Ez-fReWtUVTMcFuH0dzCnoKIgMBHgjLaBuba8QiKC7g,6
-e_data-2.0.1.dev131.dist-info/RECORD,,
+e_data-2.0.1.dev132.dist-info/METADATA,sha256=FdrpigzLiKDQ0UtvPOp9BNvOAPhjA9R1OqqX3qBqfG0,48084
+e_data-2.0.1.dev132.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+e_data-2.0.1.dev132.dist-info/top_level.txt,sha256=Ez-fReWtUVTMcFuH0dzCnoKIgMBHgjLaBuba8QiKC7g,6
+e_data-2.0.1.dev132.dist-info/RECORD,,

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
 

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