Hydro-Quebec-API-Wrapper 3.2.0__tar.gz → 4.1.0__tar.gz

hydro_quebec_api_wrapper-4.1.0/.devcontainer/Dockerfile

@@ -0,0 +1,11 @@
+FROM registry.gitlab.com/hydroqc/hydroqc-base-container/3.13:latest
+
+# Create devcontainer user with home directory and bash shell, install sudo, and configure passwordless sudo
+RUN useradd -m -s /bin/bash devcontainer \
+    && apt-get update && apt-get install -y sudo gnulib locales \
+    && echo "devcontainer ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/devcontainer
+
+WORKDIR /home/devcontainer
+USER devcontainer
+RUN mkdir -p /home/devcontainer/.local/bin \
+    && export PATH=$PATH:/home/devcontainer/.local/bin

hydro_quebec_api_wrapper-4.1.0/.devcontainer/devcontainer.json

@@ -0,0 +1,20 @@
+{
+    "name": "hydroqc",
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+        "ghcr.io/msclock/features/gitlab-ci-local:0": {
+            "version": "latest"
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "GitLab.gitlab-workflow"
+            ]
+        }
+    },
+    "remoteUser": "devcontainer"
+}

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/.gitlab-ci.yml

@@ -31,7 +31,7 @@ test:
   stage: test
   tags:
    - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.12@sha256:b66812346075aabc0ee6cf452d734c28589bbe97a82c179b0a95d3a95c04ad41
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.13:latest
   script:
     - tox -e pylint,flake8,pydocstyle,typing,black,deps-conflict --parallel auto
     - cat mypy-txt-report/index.txt
@@ -70,7 +70,7 @@ test:
   # Run on shared runners to lighten the load on the private runners
   # tags:
   # - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.12@sha256:b66812346075aabc0ee6cf452d734c28589bbe97a82c179b0a95d3a95c04ad41
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.13:latest
   script:
     - >
       OUTPUT=$(curl
@@ -257,7 +257,7 @@ private_tests_done:
   stage: private_tests_done
   tags:
     - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.12@sha256:b66812346075aabc0ee6cf452d734c28589bbe97a82c179b0a95d3a95c04ad41
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.13:latest
   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"
@@ -299,7 +299,7 @@ package:
   stage: test
   tags:
     - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.12@sha256:b66812346075aabc0ee6cf452d734c28589bbe97a82c179b0a95d3a95c04ad41
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.13:latest
   script:
     # Build a package with a version based on the commmit short sha
     - pip install --upgrade pip
@@ -329,7 +329,7 @@ promote2pypi:
   stage: pypi
   tags:
     - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.12@sha256:b66812346075aabc0ee6cf452d734c28589bbe97a82c179b0a95d3a95c04ad41
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.13:latest
   script:
     # TODO: try to pull the good package from gitlab pypi repo
     #       then change the version (promote)

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v6.0.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
@@ -16,39 +16,40 @@ repos:
   - id: check-ast
 
 - repo: https://github.com/psf/black
-  rev: 24.4.2
+  rev: 25.9.0
   hooks:
   - id: black
     language_version: python3
 
 - repo: https://github.com/PyCQA/flake8/
-  rev: 7.0.0
+  rev: 7.3.0
   hooks:
   - id: flake8
     additional_dependencies: [flake8-docstrings]
 
 - repo: https://github.com/PyCQA/isort
-  rev: 5.13.2
+  rev: 7.0.0
   hooks:
   - id: isort
     args: ["--profile", "black", "--filter-files"]
     #    additional_dependencies: [toml]
 
 - repo: https://github.com/PyCQA/doc8
-  rev: v1.1.1
+  rev: v2.0.0
   hooks:
   - id: doc8
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.10.0
+  rev: v1.18.2
   hooks:
   - id: mypy
     args: [--strict, --pretty, --show-error-codes]
     additional_dependencies:
-      - "types-pytz==2024.1.0.20240417"
-      - "types-PyYAML==6.0.12.20240311"
-      - "types-python-dateutil==2.9.0.20240316"
+      - "types-pytz==2025.2.0.20251108"
+      - "types-PyYAML==6.0.12.20250915"
+      - "types-python-dateutil==2.9.0.20251108"
       - "pytest-stub==1.1.0"
-      - "aiohttp==3.9.5"
-      - "aiocache==0.12.2"
+      - "aiohttp==3.13.2"
+      - "aiocache==0.12.3"
       - "pkce==1.0.3"
+      - "pytest-asyncio==1.2.0"

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/Hydro_Quebec_API_Wrapper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: Hydro-Quebec-API-Wrapper
-Version: 3.2.0
+Version: 4.1.0
 Summary: A wrapper library to access hydro quebec API and more
 Home-page: https://hydroqc.ca
 Author-email: Hydroqc Team <info@hydroqc.ca>
@@ -12,14 +12,15 @@ Keywords: hydroquebec,lib
 Platform: any
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10.0
+Requires-Python: >=3.13.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp==3.9.5
+Requires-Dist: aiohttp==3.13.2
 Requires-Dist: python-dateutil==2.9.0.post0
-Requires-Dist: pytz==2024.1
-Requires-Dist: aiocache==0.12.2
+Requires-Dist: pytz==2025.2
+Requires-Dist: aiocache==0.12.3
 Requires-Dist: pkce==1.0.3
+Dynamic: license-file
 
 # HydroQC - Hydro Quebec API wrapper
 

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/Hydro_Quebec_API_Wrapper.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ renovate.json5
 setup.cfg
 test_requirements.txt
 tox.ini
+.devcontainer/Dockerfile
 .devcontainer/devcontainer.json
 Hydro_Quebec_API_Wrapper.egg-info/PKG-INFO
 Hydro_Quebec_API_Wrapper.egg-info/SOURCES.txt
@@ -46,6 +47,7 @@ hydroqc/customer.py
 hydroqc/diagnostic.py
 hydroqc/error.py
 hydroqc/logger.py
+hydroqc/public_client.py
 hydroqc/py.typed
 hydroqc/timerange.py
 hydroqc/utils.py
@@ -65,6 +67,9 @@ hydroqc/hydro_api/cache.py
 hydroqc/hydro_api/client.py
 hydroqc/hydro_api/consts.py
 hydroqc/peak/__init__.py
+hydroqc/peak/basepeak.py
+hydroqc/peak/basepeakhandler.py
+hydroqc/peak/consts.py
 hydroqc/peak/cpc/__init__.py
 hydroqc/peak/cpc/consts.py
 hydroqc/peak/cpc/handler.py

hydro_quebec_api_wrapper-4.1.0/Hydro_Quebec_API_Wrapper.egg-info/requires.txt

@@ -0,0 +1,5 @@
+aiohttp==3.13.2
+python-dateutil==2.9.0.post0
+pytz==2025.2
+aiocache==0.12.3
+pkce==1.0.3

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: Hydro-Quebec-API-Wrapper
-Version: 3.2.0
+Version: 4.1.0
 Summary: A wrapper library to access hydro quebec API and more
 Home-page: https://hydroqc.ca
 Author-email: Hydroqc Team <info@hydroqc.ca>
@@ -12,14 +12,15 @@ Keywords: hydroquebec,lib
 Platform: any
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10.0
+Requires-Python: >=3.13.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp==3.9.5
+Requires-Dist: aiohttp==3.13.2
 Requires-Dist: python-dateutil==2.9.0.post0
-Requires-Dist: pytz==2024.1
-Requires-Dist: aiocache==0.12.2
+Requires-Dist: pytz==2025.2
+Requires-Dist: aiocache==0.12.3
 Requires-Dist: pkce==1.0.3
+Dynamic: license-file
 
 # HydroQC - Hydro Quebec API wrapper
 

hydro_quebec_api_wrapper-4.1.0/conflict_test_requirements.txt

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

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/hydroqc/account.py

@@ -21,6 +21,7 @@ class Account:
         self,
         applicant_id: str,
         customer_id: str,
+        *,
         account_id: str,
         contracts: list[Contract],
         hydro_client: HydroClient,

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/hydroqc/contract/common.py

@@ -27,7 +27,7 @@ P = ParamSpec("P")
 
 
 def check_period_data_present(
-    method: Callable[..., None | str | bool | float | PeriodDataTyping]
+    method: Callable[..., None | str | bool | float | PeriodDataTyping],
 ) -> Callable[..., None | str | bool | float | PeriodDataTyping]:
     """Check if contract's data are present."""
 
@@ -47,7 +47,7 @@ def check_period_data_present(
 
 
 def check_info_data_present(
-    method: Callable[..., None | str | bool | float | date]
+    method: Callable[..., None | str | bool | float | date],
 ) -> Callable[..., None | str | bool | float | date]:
     """Check if contract's data are present."""
 
@@ -67,7 +67,7 @@ def check_info_data_present(
 
 
 def check_annual_data_present(
-    method: Callable[..., None | str | bool | float | date]
+    method: Callable[..., None | str | bool | float | date],
 ) -> Callable[..., None | str | bool | float | date]:
     """Check if contract's data are present."""
 
@@ -124,6 +124,7 @@ class Contract(ABC):
         self,
         applicant_id: str,
         customer_id: str,
+        *,
         account_id: str,
         contract_id: str,
         hydro_client: HydroClient,
@@ -273,7 +274,11 @@ class Contract(ABC):
     ) -> ConsumpDailyTyping:
         """Fetch daily consumption."""
         return await self._hydro_client.get_daily_consumption(
-            self.applicant_id, self.customer_id, self.contract_id, start_date, end_date
+            self.applicant_id,
+            self.customer_id,
+            contract_id=self.contract_id,
+            start_date=start_date,
+            end_date=end_date,
         )
 
     async def get_today_daily_consumption(self) -> ConsumpDailyTyping:
@@ -313,11 +318,11 @@ class Contract(ABC):
         data_csv = await self._hydro_client.get_consumption_csv(
             self.applicant_id,
             self.customer_id,
-            self.contract_id,
-            start_date,
-            end_date,
-            "energie-jour",
-            raw_output,
+            contract_id=self.contract_id,
+            start_date=start_date,
+            end_date=end_date,
+            option="energie-jour",
+            raw_output=raw_output,
         )
         return data_csv
 
@@ -334,11 +339,11 @@ class Contract(ABC):
         data_csv = await self._hydro_client.get_consumption_csv(
             self.applicant_id,
             self.customer_id,
-            self.contract_id,
-            start_date,
-            end_date,
-            "energie-heure",
-            raw_output,
+            contract_id=self.contract_id,
+            start_date=start_date,
+            end_date=end_date,
+            option="energie-heure",
+            raw_output=raw_output,
         )
         return data_csv
 
@@ -379,7 +384,7 @@ class Contract(ABC):
     @check_period_data_present
     def cp_projected_bill(self) -> float:
         """Projected bill of the current period."""
-        return self._all_period_data[0]["montantProjetePeriode"]
+        return float(self._all_period_data[0]["montantProjetePeriode"])
 
     @property
     @check_period_data_present
@@ -453,6 +458,7 @@ class ContractFallBack(Contract):
         self,
         applicant_id: str,
         customer_id: str,
+        *,
         account_id: str,
         contract_id: str,
         hydro_client: HydroClient,
@@ -463,8 +469,8 @@ class ContractFallBack(Contract):
             self,
             applicant_id,
             customer_id,
-            account_id,
-            contract_id,
-            hydro_client,
-            log_level,
+            account_id=account_id,
+            contract_id=contract_id,
+            hydro_client=hydro_client,
+            log_level=log_level,
         )

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/hydroqc/contract/contract_d.py

@@ -17,6 +17,7 @@ class ContractD(ContractResidential):
         self,
         applicant_id: str,
         customer_id: str,
+        *,
         account_id: str,
         contract_id: str,
         hydro_client: HydroClient,
@@ -27,8 +28,8 @@ class ContractD(ContractResidential):
             self,
             applicant_id,
             customer_id,
-            account_id,
-            contract_id,
-            hydro_client,
-            log_level,
+            account_id=account_id,
+            contract_id=contract_id,
+            hydro_client=hydro_client,
+            log_level=log_level,
         )

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/hydroqc/contract/contract_d_cpc.py

@@ -17,6 +17,7 @@ class ContractDCPC(ContractD):
         self,
         applicant_id: str,
         customer_id: str,
+        *,
         account_id: str,
         contract_id: str,
         hydro_client: HydroClient,
@@ -27,18 +28,18 @@ class ContractDCPC(ContractD):
             self,
             applicant_id,
             customer_id,
-            account_id,
-            contract_id,
-            hydro_client,
-            log_level,
+            account_id=account_id,
+            contract_id=contract_id,
+            hydro_client=hydro_client,
+            log_level=log_level,
         )
         wch_logger = self._logger.getChild("wch")
         self._wch: CPCPeakHandler = CPCPeakHandler(
             self.applicant_id,
             self.customer_id,
-            self.contract_id,
-            hydro_client,
-            wch_logger,
+            contract_id=self.contract_id,
+            hydro_client=hydro_client,
+            logger=wch_logger,
         )
 
     @property

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/hydroqc/contract/contract_dpc.py

@@ -11,7 +11,7 @@ from hydroqc.types import DPCDataTyping
 
 
 def check_dpc_data_present(
-    method: Callable[..., None | str | bool | float | date]
+    method: Callable[..., None | str | bool | float | date],
 ) -> Callable[..., None | str | bool | float | date]:
     """Check if contractDPC's data are present."""
 
@@ -45,6 +45,7 @@ class ContractDPC(ContractResidential):
         self,
         applicant_id: str,
         customer_id: str,
+        *,
         account_id: str,
         contract_id: str,
         hydro_client: HydroClient,
@@ -55,18 +56,18 @@ class ContractDPC(ContractResidential):
             self,
             applicant_id,
             customer_id,
-            account_id,
-            contract_id,
-            hydro_client,
-            log_level,
+            account_id=account_id,
+            contract_id=contract_id,
+            hydro_client=hydro_client,
+            log_level=log_level,
         )
         peaks_logger = self._logger.getChild("peaks")
         self._peakh: DPCPeakHandler = DPCPeakHandler(
             self.applicant_id,
             self.customer_id,
-            self.contract_id,
-            hydro_client,
-            peaks_logger,
+            contract_id=self.contract_id,
+            hydro_client=hydro_client,
+            logger=peaks_logger,
         )
 
     @property

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/hydroqc/contract/contract_dt.py

@@ -18,6 +18,7 @@ class ContractDT(ContractResidential):
         self,
         applicant_id: str,
         customer_id: str,
+        *,
         account_id: str,
         contract_id: str,
         hydro_client: HydroClient,
@@ -28,10 +29,10 @@ class ContractDT(ContractResidential):
             self,
             applicant_id,
             customer_id,
-            account_id,
-            contract_id,
-            hydro_client,
-            log_level,
+            account_id=account_id,
+            contract_id=contract_id,
+            hydro_client=hydro_client,
+            log_level=log_level,
         )
 
     @property

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/hydroqc/contract/contract_m.py

@@ -21,6 +21,7 @@ class ContractM(Contract):
         self,
         applicant_id: str,
         customer_id: str,
+        *,
         account_id: str,
         contract_id: str,
         hydro_client: HydroClient,
@@ -31,10 +32,10 @@ class ContractM(Contract):
             self,
             applicant_id,
             customer_id,
-            account_id,
-            contract_id,
-            hydro_client,
-            log_level,
+            account_id=account_id,
+            contract_id=contract_id,
+            hydro_client=hydro_client,
+            log_level=log_level,
         )
 
     async def get_power_demand_per_15min(
@@ -47,11 +48,11 @@ class ContractM(Contract):
         data_csv = await self._hydro_client.get_consumption_csv(
             self.applicant_id,
             self.customer_id,
-            self.contract_id,
-            start_date,
-            end_date,
-            "puissance-min",
-            raw_output,
+            contract_id=self.contract_id,
+            start_date=start_date,
+            end_date=end_date,
+            option="puissance-min",
+            raw_output=raw_output,
         )
         return data_csv
 
@@ -65,10 +66,10 @@ class ContractM(Contract):
         data_csv = await self._hydro_client.get_consumption_csv(
             self.applicant_id,
             self.customer_id,
-            self.contract_id,
-            start_date,
-            end_date,
-            "puissance-jour",
-            raw_output,
+            contract_id=self.contract_id,
+            start_date=start_date,
+            end_date=end_date,
+            option="puissance-jour",
+            raw_output=raw_output,
         )
         return data_csv

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/hydroqc/contract/contract_m_gdp.py

@@ -16,6 +16,7 @@ class ContractMGDP(ContractM):
         self,
         applicant_id: str,
         customer_id: str,
+        *,
         account_id: str,
         contract_id: str,
         hydro_client: HydroClient,
@@ -26,8 +27,8 @@ class ContractMGDP(ContractM):
             self,
             applicant_id,
             customer_id,
-            account_id,
-            contract_id,
-            hydro_client,
-            log_level,
+            account_id=account_id,
+            contract_id=contract_id,
+            hydro_client=hydro_client,
+            log_level=log_level,
         )

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/hydroqc/contract/contract_residential.py

@@ -18,6 +18,7 @@ class ContractResidential(Contract):
         self,
         applicant_id: str,
         customer_id: str,
+        *,
         account_id: str,
         contract_id: str,
         hydro_client: HydroClient,
@@ -28,10 +29,10 @@ class ContractResidential(Contract):
             self,
             applicant_id,
             customer_id,
-            account_id,
-            contract_id,
-            hydro_client,
-            log_level,
+            account_id=account_id,
+            contract_id=contract_id,
+            hydro_client=hydro_client,
+            log_level=log_level,
         )
 
     async def get_daily_energy(
@@ -44,10 +45,10 @@ class ContractResidential(Contract):
         data_csv = await self._hydro_client.get_consumption_csv(
             self.applicant_id,
             self.customer_id,
-            self.contract_id,
-            start_date,
-            end_date,
-            "energie-jour",
-            raw_output,
+            contract_id=self.contract_id,
+            start_date=start_date,
+            end_date=end_date,
+            option="energie-jour",
+            raw_output=raw_output,
         )
         return data_csv

{hydro_quebec_api_wrapper-3.2.0 → hydro_quebec_api_wrapper-4.1.0}/hydroqc/customer.py

@@ -19,6 +19,7 @@ class Customer:
         self,
         applicant_id: str,
         customer_id: str,
+        *,
         customer_names: list[str],
         hydro_client: HydroClient,
         log_level: str | None = None,
@@ -71,10 +72,10 @@ class Customer:
                 account = Account(
                     self.applicant_id,
                     self.customer_id,
-                    account_id,
-                    [],
-                    self._hydro_client,
-                    self._log_level,
+                    account_id=account_id,
+                    contracts=[],
+                    hydro_client=self._hydro_client,
+                    log_level=self._log_level,
                 )
                 self.accounts.append(account)
             else:
@@ -103,10 +104,10 @@ class Customer:
                     contract = getattr(contractModule, contract_class_name)(
                         self.applicant_id,
                         self.customer_id,
-                        account_id,
-                        contract_id,
-                        self._hydro_client,
-                        self._log_level,
+                        account_id=account_id,
+                        contract_id=contract_id,
+                        hydro_client=self._hydro_client,
+                        log_level=self._log_level,
                     )
                     account.contracts.append(contract)
                 else: