Hydro-Quebec-API-Wrapper 3.1.1__tar.gz → 3.1.2__tar.gz

{Hydro-Quebec-API-Wrapper-3.1.1 → Hydro-Quebec-API-Wrapper-3.1.2}/.gitlab-ci.yml

@@ -31,7 +31,7 @@ test:
   stage: test
   tags:
     - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:049f7935029b57bdb18554561581fde63e454fc51be38b89214ff8dc9de35db0
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:c2f84259e74c1bbd73497ee0d5a71fb5d8f8ff68befdd90f2f5e9b282da0f709
   script:
     - pip install tox
     - tox -e pylint,flake8,pydocstyle,typing,black,deps-conflict --parallel auto
@@ -70,7 +70,7 @@ test:
   stage: private_tests
   tags:
     - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:049f7935029b57bdb18554561581fde63e454fc51be38b89214ff8dc9de35db0
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:c2f84259e74c1bbd73497ee0d5a71fb5d8f8ff68befdd90f2f5e9b282da0f709
   script:
     #- apt update && apt install -y jq unzip curl
     - >
@@ -258,7 +258,7 @@ private_tests_done:
   stage: private_tests_done
   tags:
     - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:049f7935029b57bdb18554561581fde63e454fc51be38b89214ff8dc9de35db0
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:c2f84259e74c1bbd73497ee0d5a71fb5d8f8ff68befdd90f2f5e9b282da0f709
   script:
     #- apt-get update && apt-get install --no-install-recommends -y python3.10 python3-venv python3-pip --no-install-recommends git
     - echo "Private Tests done"
@@ -301,7 +301,7 @@ package:
   stage: test
   tags:
     - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:049f7935029b57bdb18554561581fde63e454fc51be38b89214ff8dc9de35db0
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:c2f84259e74c1bbd73497ee0d5a71fb5d8f8ff68befdd90f2f5e9b282da0f709
   script:
     # Build a package with a version based on the commmit short sha
     - pip install --upgrade pip
@@ -331,7 +331,7 @@ promote2pypi:
   stage: pypi
   tags:
     - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:049f7935029b57bdb18554561581fde63e454fc51be38b89214ff8dc9de35db0
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:c2f84259e74c1bbd73497ee0d5a71fb5d8f8ff68befdd90f2f5e9b282da0f709
   script:
     # TODO: try to pull the good package from gitlab pypi repo
     #       then change the version (promote)

{Hydro-Quebec-API-Wrapper-3.1.1 → Hydro-Quebec-API-Wrapper-3.1.2}/.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
   - id: check-ast
 
 - repo: https://github.com/psf/black
-  rev: 23.10.1
+  rev: 23.12.0
   hooks:
   - id: black
     language_version: python3
@@ -28,7 +28,7 @@ repos:
     additional_dependencies: [flake8-docstrings]
 
 - repo: https://github.com/PyCQA/isort
-  rev: 5.12.0
+  rev: 5.13.2
   hooks:
   - id: isort
     args: ["--profile", "black", "--filter-files"]
@@ -40,7 +40,7 @@ repos:
   - id: doc8
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.6.1
+  rev: v1.7.1
   hooks:
   - id: mypy
     args: [--strict, --pretty, --show-error-codes]
@@ -49,5 +49,6 @@ repos:
       - "types-PyYAML==6.0.12.12"
       - "types-python-dateutil==2.8.19.14"
       - "pytest-stub==1.1.0"
-      - "aiohttp==3.8.6"
+      - "aiohttp==3.9.1"
       - "aiocache==0.12.2"
+      - "pkce==1.0.3"

{Hydro-Quebec-API-Wrapper-3.1.1 → Hydro-Quebec-API-Wrapper-3.1.2}/Hydro_Quebec_API_Wrapper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Hydro-Quebec-API-Wrapper
-Version: 3.1.1
+Version: 3.1.2
 Summary: A wrapper library to access hydro quebec API and more
 Home-page: https://hydroqc.ca
 Author-email: Hydroqc Team <info@hydroqc.ca>

{Hydro-Quebec-API-Wrapper-3.1.1 → Hydro-Quebec-API-Wrapper-3.1.2}/Hydro_Quebec_API_Wrapper.egg-info/requires.txt

@@ -1,4 +1,4 @@
-aiohttp==3.8.5
+aiohttp==3.9.1
 python-dateutil==2.8.2
 pytz==2023.3.post1
 aiocache==0.12.2

{Hydro-Quebec-API-Wrapper-3.1.1 → Hydro-Quebec-API-Wrapper-3.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Hydro-Quebec-API-Wrapper
-Version: 3.1.1
+Version: 3.1.2
 Summary: A wrapper library to access hydro quebec API and more
 Home-page: https://hydroqc.ca
 Author-email: Hydroqc Team <info@hydroqc.ca>

Hydro-Quebec-API-Wrapper-3.1.2/conflict_test_requirements.txt

@@ -0,0 +1 @@
+mqtt-hass-base==4.2.5

{Hydro-Quebec-API-Wrapper-3.1.1 → Hydro-Quebec-API-Wrapper-3.1.2}/examples/hydro.py

@@ -1,9 +1,11 @@
 #!/usr/bin/env python
 import asyncio
 import os
+from datetime import date
 
 from hydroqc.webuser import WebUser
 
+
 USERNAME = os.getenv("hydroQcUsername")
 PASSWORD = os.getenv("hydroQcPassword")
 
@@ -32,28 +34,28 @@ async def async_func():
     print(data)
 
     # Can still access events but probably unnecessary
-    await contract.winter_credit.refresh_data()
-    data = contract.winter_credit.next_anchor
+    await contract.peak_handler.refresh_data()
+    data = contract.peak_handler.next_anchor
     print(data)
-    data = contract.winter_credit.next_peak
+    data = contract.peak_handler.next_peak
     print(data)
-    data = contract.winter_credit.next_peak_is_critical
+    data = contract.peak_handler.next_peak_is_critical
     print(data)
-    data = contract.winter_credit.cumulated_credit
+    data = contract.peak_handler.cumulated_credit
     print(data)
 
     # Need to call refresh_data before accessing attributes
-    await contract.winter_credit.refresh_data()
-    wc = contract.winter_credit.__dict__
+    await contract.peak_handler.refresh_data()
+    wc = contract.peak_handler.__dict__
     for k in wc.keys():
         if not k.startswith("value_"):
             continue
         else:
             print(k + " : " + str(wc[k]))
     # Still accessible through the data property
-    data = contract.winter_credit.raw_data
+    data = contract.peak_handler.raw_data
     print(data)
-    data = await contract.get_hourly_consumption("2022-01-20")
+    data = await contract.get_hourly_consumption(date.fromisoformat("2022-01-20"))
     print(data)
     data = await contract.get_today_hourly_consumption()
     print(data)
@@ -63,7 +65,7 @@ async def async_func():
     print(data)
     data = await contract.get_annual_consumption()
     print(data)
-    data = await contract.get_daily_consumption("2022-01-10", "2022-01-20")
+    data = await contract.get_daily_consumption(date.fromisoformat("2022-01-10"), date.fromisoformat("2022-01-20"))
     print(data)
 
 

{Hydro-Quebec-API-Wrapper-3.1.1 → Hydro-Quebec-API-Wrapper-3.1.2}/setup.cfg

@@ -3,7 +3,7 @@ url = https://hydroqc.ca
 
 [options]
 install_requires = 
-	aiohttp==3.8.5
+	aiohttp==3.9.1
 	python-dateutil==2.8.2
 	pytz==2023.3.post1
 	aiocache==0.12.2

{Hydro-Quebec-API-Wrapper-3.1.1 → Hydro-Quebec-API-Wrapper-3.1.2}/test_requirements.txt

@@ -1,14 +1,14 @@
 flake8==6.1.0
 pydocstyle==6.3.0
 parameterized==0.9.0
-pylint==3.0.2
+pylint==3.0.3
 pytest==7.4.3
 pytest-cov==4.1.0
-pytest-asyncio==0.21.1
-black==23.10.1
-mypy==1.6.1
+pytest-asyncio==0.23.2
+black==23.12.0
+mypy==1.7.1
 types-pytz==2023.3.1.1
 types-PyYAML==6.0.12.12
 types-python-dateutil==2.8.19.14
-pyright==1.1.334
+pyright==1.1.341
 lxml==4.9.3

{Hydro-Quebec-API-Wrapper-3.1.1 → Hydro-Quebec-API-Wrapper-3.1.2}/tests/subtest_common.py

@@ -15,7 +15,7 @@ from hydroqc.contract.common import (
 )
 from hydroqc.contract.contract_dpc import check_dpc_data_present
 from hydroqc.customer import Customer
-from hydroqc.error import HydroQcError
+from hydroqc.error import HydroQcError, HydroQcHTTPError
 from hydroqc.peak.cpc.handler import CPCPeakHandler
 from hydroqc.webuser import WebUser
 
@@ -255,12 +255,35 @@ class SubTestCommon:
     @pytest.mark.asyncio
     async def test_hourly_consumption(self, contract: Contract) -> None:
         """Test hourly consumption stats."""
-        today_hourly_consumption = await contract.get_today_hourly_consumption()
-        assert today_hourly_consumption.get("success") is True
-        assert today_hourly_consumption.get("results", {}).get("dateJour") in (
-            today_str,
-            yesterday_str,
-        )
+        try:
+            today_hourly_consumption = await contract.get_today_hourly_consumption()
+            assert today_hourly_consumption.get("success") is True
+            assert today_hourly_consumption.get("results", {}).get("dateJour") in (
+                today_str,
+                yesterday_str,
+            )
+        except HydroQcHTTPError as exp:
+            # Failing at the end of the period
+            # So we are check if it's the case
+            # If not, it's an actual issue
+            await contract.get_periods_info()
+            if (
+                isinstance(contract.cp_current_day, int)
+                and isinstance(contract.cp_duration, int)
+                and (
+                    contract.cp_current_day < 2
+                    or contract.cp_duration - contract.cp_current_day < 2
+                )
+            ):
+                # end of period or new period detected
+                assert (
+                    True
+                ), "End of period or new period detected: no hourly consumption"
+            else:
+                assert (
+                    False
+                ), "NO End of period or new period detected: error in no hourly consumption"
+                raise exp
 
     @pytest.mark.asyncio
     async def test_total_hourly_consumption(self, contract: Contract) -> None:
@@ -338,12 +361,23 @@ class SubTestCommon:
     @pytest.mark.asyncio
     async def test_latest_period(self, contract: Contract) -> None:
         """Test latest_period."""
-        assert (
-            contract.cp_current_day is None
-        ), "Method get_period_info is already called but it should not"
-        assert (
-            not contract.latest_period_info
-        ), "Method get_period_info is already called but it should not"
+        if (
+            isinstance(contract.cp_current_day, int)
+            and isinstance(contract.cp_duration, int)
+            and (
+                contract.cp_current_day < 2
+                or contract.cp_duration - contract.cp_current_day < 2
+            )
+        ):
+            assert contract.cp_current_day is not None
+            assert contract.latest_period_info
+        else:
+            assert (
+                contract.cp_current_day is None
+            ), "Method get_period_info is already called but it should not"
+            assert (
+                not contract.latest_period_info
+            ), "Method get_period_info is already called but it should not"
 
     @typing.no_type_check
     @pytest.mark.asyncio

{Hydro-Quebec-API-Wrapper-3.1.1 → Hydro-Quebec-API-Wrapper-3.1.2}/tests/subtest_contract_dt.py

@@ -1,4 +1,6 @@
 """Contract DT tests module."""
+from types import NoneType
+
 import pytest
 
 from hydroqc.contract import ContractDT
@@ -16,35 +18,51 @@ class SubTestContractDT:
         assert contract.rate == "DT"
         assert contract.rate_option == ""
 
-        assert (
-            isinstance(contract.cp_current_bill, float)
-            and contract.cp_current_bill >= 0
-        )
-        assert (
-            isinstance(contract.cp_projected_bill, float)
-            and contract.cp_projected_bill >= 0
-        )
-        assert (
-            isinstance(contract.cp_daily_bill_mean, float)
-            and contract.cp_daily_bill_mean >= 0
-        )
-        assert (
-            isinstance(contract.cp_projected_total_consumption, int)
-            and contract.cp_projected_total_consumption >= 0
-        )
-        assert (
-            isinstance(contract.cp_kwh_cost_mean, float)
-            and contract.cp_kwh_cost_mean >= 0
-        )
+        if (
+            isinstance(contract.cp_current_day, int)
+            and isinstance(contract.cp_duration, int)
+            and (
+                contract.cp_current_day < 2
+                or contract.cp_duration - contract.cp_current_day < 2
+            )
+        ):
+            assert isinstance(contract.cp_current_bill, (float, NoneType))
+            assert isinstance(contract.cp_projected_bill, (float, NoneType))
+            assert isinstance(contract.cp_daily_bill_mean, (float, NoneType))
+            assert isinstance(contract.cp_projected_total_consumption, (int, NoneType))
+            assert isinstance(contract.cp_kwh_cost_mean, (float, NoneType))
+            assert isinstance(contract.cp_lower_price_consumption, (int, NoneType))
+            assert isinstance(contract.cp_higher_price_consumption, (int, NoneType))
+        else:
+            assert (
+                isinstance(contract.cp_current_bill, float)
+                and contract.cp_current_bill >= 0
+            )
+            assert (
+                isinstance(contract.cp_projected_bill, float)
+                and contract.cp_projected_bill >= 0
+            )
+            assert (
+                isinstance(contract.cp_daily_bill_mean, float)
+                and contract.cp_daily_bill_mean >= 0
+            )
+            assert (
+                isinstance(contract.cp_projected_total_consumption, int)
+                and contract.cp_projected_total_consumption >= 0
+            )
+            assert (
+                isinstance(contract.cp_kwh_cost_mean, float)
+                and contract.cp_kwh_cost_mean >= 0
+            )
 
-        assert (
-            isinstance(contract.cp_lower_price_consumption, int)
-            and contract.cp_lower_price_consumption >= 0
-        )
-        assert (
-            isinstance(contract.cp_higher_price_consumption, int)
-            and contract.cp_higher_price_consumption >= 0
-        )
+            assert (
+                isinstance(contract.cp_lower_price_consumption, int)
+                and contract.cp_lower_price_consumption >= 0
+            )
+            assert (
+                isinstance(contract.cp_higher_price_consumption, int)
+                and contract.cp_higher_price_consumption >= 0
+            )
 
         assert isinstance(contract.amount_saved_vs_base_rate, float)
 

Hydro-Quebec-API-Wrapper-3.1.1/conflict_test_requirements.txt

@@ -1 +0,0 @@
-mqtt-hass-base==4.2.3