Hydro-Quebec-API-Wrapper 4.0.0__py3-none-any.whl → 4.2.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {Hydro_Quebec_API_Wrapper-4.0.0.dist-info → hydro_quebec_api_wrapper-4.2.0.dist-info}/METADATA +6 -5
- hydro_quebec_api_wrapper-4.2.0.dist-info/RECORD +53 -0
- {Hydro_Quebec_API_Wrapper-4.0.0.dist-info → hydro_quebec_api_wrapper-4.2.0.dist-info}/WHEEL +1 -1
- hydroqc/account.py +1 -0
- hydroqc/contract/common.py +25 -19
- hydroqc/contract/contract_d.py +5 -4
- hydroqc/contract/contract_d_cpc.py +8 -7
- hydroqc/contract/contract_dpc.py +71 -22
- hydroqc/contract/contract_dt.py +5 -4
- hydroqc/contract/contract_m.py +15 -14
- hydroqc/contract/contract_m_gdp.py +5 -4
- hydroqc/contract/contract_residential.py +10 -9
- hydroqc/customer.py +9 -8
- hydroqc/hydro_api/client.py +34 -6
- hydroqc/hydro_api/consts.py +2 -2
- hydroqc/peak/basepeakhandler.py +1 -0
- hydroqc/peak/cpc/consts.py +5 -3
- hydroqc/peak/cpc/handler.py +4 -3
- hydroqc/peak/cpc/peak.py +22 -5
- hydroqc/peak/dpc/consts.py +1 -3
- hydroqc/peak/dpc/handler.py +4 -3
- hydroqc/public_client.py +11 -2
- hydroqc/types/__init__.py +2 -2
- hydroqc/types/common.py +6 -6
- hydroqc/types/consump.py +0 -17
- hydroqc/types/dpc.py +27 -10
- hydroqc/types/dt.py +12 -2
- hydroqc/webuser.py +5 -4
- Hydro_Quebec_API_Wrapper-4.0.0.dist-info/RECORD +0 -53
- {Hydro_Quebec_API_Wrapper-4.0.0.dist-info → hydro_quebec_api_wrapper-4.2.0.dist-info}/entry_points.txt +0 -0
- {Hydro_Quebec_API_Wrapper-4.0.0.dist-info → hydro_quebec_api_wrapper-4.2.0.dist-info/licenses}/LICENSE +0 -0
- {Hydro_Quebec_API_Wrapper-4.0.0.dist-info → hydro_quebec_api_wrapper-4.2.0.dist-info}/top_level.txt +0 -0
{Hydro_Quebec_API_Wrapper-4.0.0.dist-info → hydro_quebec_api_wrapper-4.2.0.dist-info}/METADATA
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: Hydro-Quebec-API-Wrapper
|
|
3
|
-
Version: 4.
|
|
3
|
+
Version: 4.2.0
|
|
4
4
|
Summary: A wrapper library to access hydro quebec API and more
|
|
5
5
|
Home-page: https://hydroqc.ca
|
|
6
6
|
Author-email: Hydroqc Team <info@hydroqc.ca>
|
|
@@ -12,14 +12,15 @@ Keywords: hydroquebec,lib
|
|
|
12
12
|
Platform: any
|
|
13
13
|
Classifier: Programming Language :: Python :: 3
|
|
14
14
|
Classifier: Operating System :: OS Independent
|
|
15
|
-
Requires-Python: >=3.
|
|
15
|
+
Requires-Python: >=3.13.0
|
|
16
16
|
Description-Content-Type: text/markdown
|
|
17
17
|
License-File: LICENSE
|
|
18
|
-
Requires-Dist: aiohttp==3.
|
|
18
|
+
Requires-Dist: aiohttp==3.13.2
|
|
19
19
|
Requires-Dist: python-dateutil==2.9.0.post0
|
|
20
|
-
Requires-Dist: pytz==
|
|
20
|
+
Requires-Dist: pytz==2025.2
|
|
21
21
|
Requires-Dist: aiocache==0.12.3
|
|
22
22
|
Requires-Dist: pkce==1.0.3
|
|
23
|
+
Dynamic: license-file
|
|
23
24
|
|
|
24
25
|
# HydroQC - Hydro Quebec API wrapper
|
|
25
26
|
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
hydro_quebec_api_wrapper-4.2.0.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
|
|
2
|
+
hydroqc/__init__.py,sha256=sFhCh7-LWoISCQuAtdrLQOmj2x5wjHBGbAAPg4SN6Pc,40
|
|
3
|
+
hydroqc/account.py,sha256=84PO2npB_VG8cEzGIbmXj9sD1whG8qynkiGd-yEYddM,3375
|
|
4
|
+
hydroqc/consts.py,sha256=a9dWq5i6t5VedYosUbP8zIuG2q5TPw4ruT0jOaC8Yo8,209
|
|
5
|
+
hydroqc/customer.py,sha256=Z3zq1p6ZwCXsxMnE8R6RmrGOCTxUFualMuu9MPRwQLI,6267
|
|
6
|
+
hydroqc/diagnostic.py,sha256=eVY3HfMcLCjTbKWo9xdaw14ygju4qUIKy9pxcQstoRc,17322
|
|
7
|
+
hydroqc/error.py,sha256=2HzWBak_RpuhfIrLhnfgNuY3FhUwwNyo1BLUDH6U0CI,598
|
|
8
|
+
hydroqc/logger.py,sha256=Fez6CqjBBxd841U3avtnrT3E43Vyy-v1e7hqwUmf9bg,1256
|
|
9
|
+
hydroqc/public_client.py,sha256=pUXA9rkgA8b4wIA3EMsd8FAC-swp-IRa4S-VK0v60SQ,3065
|
|
10
|
+
hydroqc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
11
|
+
hydroqc/timerange.py,sha256=MXR9yau72m4UZBSmN1qB0jMs0x4_jEZYnwtaUnGq-MQ,1137
|
|
12
|
+
hydroqc/utils.py,sha256=sxA5qkOA-Ui5jgEYItFQIeQdBsS_5z8J3xn8YxKZMow,232
|
|
13
|
+
hydroqc/webuser.py,sha256=MqlZNLLpuLGxHfRKyyVj-2SbDeWq7ERFZAnvvvzqVbo,4578
|
|
14
|
+
hydroqc/contract/__init__.py,sha256=uqxjOgyhpKFd-n_umxdaW5FB_DkJJaettWnEFC0nRYc,548
|
|
15
|
+
hydroqc/contract/common.py,sha256=xVw9z_Yjqp95SGCPNAfJVABvgp_C-KM51VTBEU9wjeM,15705
|
|
16
|
+
hydroqc/contract/contract_d.py,sha256=6jPYTCjFq8zonfbXPrEujDVz58n5RUEuq54VCGqph6o,856
|
|
17
|
+
hydroqc/contract/contract_d_cpc.py,sha256=-Y2S4MkzAfsbf_L2jCKfU7OD-nbzgoEpyT3SWh0U0tQ,1418
|
|
18
|
+
hydroqc/contract/contract_dpc.py,sha256=EF60N9Xl5K4XXPHAV6KtTK5SYVtQD8pKUzn_wATjKXg,7165
|
|
19
|
+
hydroqc/contract/contract_dt.py,sha256=TSKf2oh-MlG8A42xVUCCyf7oezlWTFoyATF9xlQn2JE,1687
|
|
20
|
+
hydroqc/contract/contract_m.py,sha256=2hSSb9Tw2eZu7PV1XicfTFKLCRiffq72NfOYiVz8QMk,2108
|
|
21
|
+
hydroqc/contract/contract_m_gdp.py,sha256=y8seZHmjkkul0TZ5Epxuxc4g0JVbs9o8KjL_y1gIldU,801
|
|
22
|
+
hydroqc/contract/contract_residential.py,sha256=v88mWvJsJP7FsY5cHmr0ZYYT_S-6xtSk1zvhTJ9UM4g,1456
|
|
23
|
+
hydroqc/contract/outage.py,sha256=K5XX0enSKMVpL-JCkWsykuKUw-5_GcSJLzcSR1SqQDk,3979
|
|
24
|
+
hydroqc/hydro_api/__init__.py,sha256=bIIjTkhQcXG7kn4cQr_Q6tFSKGjAx-AXLjMMlRCjclY,32
|
|
25
|
+
hydroqc/hydro_api/cache.py,sha256=mC3UO246V5zJ1p89nUb5EzQon_4tQGUgFMZKy4YY8I8,912
|
|
26
|
+
hydroqc/hydro_api/client.py,sha256=8yKiAFE3-gdiXGZSuw11Cydpa8rX_39LAWr51yvtsvQ,36706
|
|
27
|
+
hydroqc/hydro_api/consts.py,sha256=XDNOjZVpC-Z7rsOL4GDgfexb7m8zc7HiafiKGiFvoUI,4607
|
|
28
|
+
hydroqc/peak/__init__.py,sha256=ye2KbWXhJEHZnBDaFylWioy3W-mzJw_lDplsJNAapNs,19
|
|
29
|
+
hydroqc/peak/basepeak.py,sha256=DMXjZXyNRHWnuhB0Vp3ZINGhNQngG7AU15cDLajmC7M,1954
|
|
30
|
+
hydroqc/peak/basepeakhandler.py,sha256=XVemlzDd2IeriDdvunvTxV7qwH1qEJcc0zm5-C716Ts,9184
|
|
31
|
+
hydroqc/peak/consts.py,sha256=2gUTZcDzu6Dia5g5w7-IG0JFt-9YdVopYcbHXjW3EK8,67
|
|
32
|
+
hydroqc/peak/cpc/__init__.py,sha256=sez6LQOUqDu6YVIpJexq9wYv3wef3I4TeCxwHhO9bBU,18
|
|
33
|
+
hydroqc/peak/cpc/consts.py,sha256=5PBf56YhsTMsZDkW0E_syN_byCVwLqS4ZFGG0_CWpsM,637
|
|
34
|
+
hydroqc/peak/cpc/handler.py,sha256=PEn4TTBu7-PTchNUmy3UxW7JVZ3QpFfKj06JHeJQn6M,12432
|
|
35
|
+
hydroqc/peak/cpc/peak.py,sha256=ptECO7_VSvT4fgOYSSqS_5kYPMHPHfgVjZr9M9MIKv4,4957
|
|
36
|
+
hydroqc/peak/dpc/__init__.py,sha256=H99D93OC4quEag-lQZ3BEF2mr5Qiu3DtvdKjBsiSRBg,18
|
|
37
|
+
hydroqc/peak/dpc/consts.py,sha256=FpnNUa29DgIzqqgtzues9TucEiMRwQq-HWeLzu3lUtY,464
|
|
38
|
+
hydroqc/peak/dpc/handler.py,sha256=fx0Rnum2Zz8vGsJENKsrWuFflzHp2NjH3dMPaHf-ulE,3408
|
|
39
|
+
hydroqc/peak/dpc/peak.py,sha256=clb1j6LaBndPo0qPlOxumGuUGYB4-_ob_s8UQa-m49o,1313
|
|
40
|
+
hydroqc/types/__init__.py,sha256=INBHElvUfZTZV3w9ywyLa-d7GfpXy096FApAGkKOYwI,1502
|
|
41
|
+
hydroqc/types/account.py,sha256=yXwqjU3lBG7cGt8RF0cyvNSxtBCaIoWgmtvsLisvQTY,3696
|
|
42
|
+
hydroqc/types/common.py,sha256=s1DA48svkJGsNaNUVcpEhoYLjiUOpfQI8WQ5xN6Yfco,1365
|
|
43
|
+
hydroqc/types/consump.py,sha256=uCQ5ZHs_Qts5iLe9Q14tDZKby4iTxBd1QewUMkr3B8I,5594
|
|
44
|
+
hydroqc/types/contract.py,sha256=OTi8c5CEces3vwwQLbPzo1jB7sgwOweS1imFPnJMML0,1657
|
|
45
|
+
hydroqc/types/cpc.py,sha256=ghmtBTT1FKuqVodJJ0kCtUbYNTLCOrngxgcrzjJYvok,2116
|
|
46
|
+
hydroqc/types/dpc.py,sha256=OgJr7xbJZ1N2qPOY8JvNfruI7zqxnL47nJE2D7cb50s,1822
|
|
47
|
+
hydroqc/types/dt.py,sha256=8Ypeo3JP9uaoJ_PUZJiPOJ8L0fkGXmEUU5tqoeV1fMY,564
|
|
48
|
+
hydroqc/types/outage.py,sha256=XTsNyu8mmxUx44XWvOOUHKSoijp-lgbXwQroiqm9S0o,3932
|
|
49
|
+
hydro_quebec_api_wrapper-4.2.0.dist-info/METADATA,sha256=33dDyFhsA5rjlC1e26nGMkNb4YMaVTGcLGWMkW0MQD0,7948
|
|
50
|
+
hydro_quebec_api_wrapper-4.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
51
|
+
hydro_quebec_api_wrapper-4.2.0.dist-info/entry_points.txt,sha256=G2YKkCH9rFt2dXbFyHINBp4bmqY2HTEIaf7F1CwbC_k,57
|
|
52
|
+
hydro_quebec_api_wrapper-4.2.0.dist-info/top_level.txt,sha256=YAcYLnu5YYkbxt1psUoBfo_opl-lAZKq0A7B3IN_P6M,8
|
|
53
|
+
hydro_quebec_api_wrapper-4.2.0.dist-info/RECORD,,
|
hydroqc/account.py
CHANGED
hydroqc/contract/common.py
CHANGED
|
@@ -27,7 +27,7 @@ P = ParamSpec("P")
|
|
|
27
27
|
|
|
28
28
|
|
|
29
29
|
def check_period_data_present(
|
|
30
|
-
method: Callable[..., None | str | bool | float | PeriodDataTyping]
|
|
30
|
+
method: Callable[..., None | str | bool | float | PeriodDataTyping],
|
|
31
31
|
) -> Callable[..., None | str | bool | float | PeriodDataTyping]:
|
|
32
32
|
"""Check if contract's data are present."""
|
|
33
33
|
|
|
@@ -47,7 +47,7 @@ def check_period_data_present(
|
|
|
47
47
|
|
|
48
48
|
|
|
49
49
|
def check_info_data_present(
|
|
50
|
-
method: Callable[..., None | str | bool | float | date]
|
|
50
|
+
method: Callable[..., None | str | bool | float | date],
|
|
51
51
|
) -> Callable[..., None | str | bool | float | date]:
|
|
52
52
|
"""Check if contract's data are present."""
|
|
53
53
|
|
|
@@ -67,7 +67,7 @@ def check_info_data_present(
|
|
|
67
67
|
|
|
68
68
|
|
|
69
69
|
def check_annual_data_present(
|
|
70
|
-
method: Callable[..., None | str | bool | float | date]
|
|
70
|
+
method: Callable[..., None | str | bool | float | date],
|
|
71
71
|
) -> Callable[..., None | str | bool | float | date]:
|
|
72
72
|
"""Check if contract's data are present."""
|
|
73
73
|
|
|
@@ -124,6 +124,7 @@ class Contract(ABC):
|
|
|
124
124
|
self,
|
|
125
125
|
applicant_id: str,
|
|
126
126
|
customer_id: str,
|
|
127
|
+
*,
|
|
127
128
|
account_id: str,
|
|
128
129
|
contract_id: str,
|
|
129
130
|
hydro_client: HydroClient,
|
|
@@ -273,7 +274,11 @@ class Contract(ABC):
|
|
|
273
274
|
) -> ConsumpDailyTyping:
|
|
274
275
|
"""Fetch daily consumption."""
|
|
275
276
|
return await self._hydro_client.get_daily_consumption(
|
|
276
|
-
self.applicant_id,
|
|
277
|
+
self.applicant_id,
|
|
278
|
+
self.customer_id,
|
|
279
|
+
contract_id=self.contract_id,
|
|
280
|
+
start_date=start_date,
|
|
281
|
+
end_date=end_date,
|
|
277
282
|
)
|
|
278
283
|
|
|
279
284
|
async def get_today_daily_consumption(self) -> ConsumpDailyTyping:
|
|
@@ -313,11 +318,11 @@ class Contract(ABC):
|
|
|
313
318
|
data_csv = await self._hydro_client.get_consumption_csv(
|
|
314
319
|
self.applicant_id,
|
|
315
320
|
self.customer_id,
|
|
316
|
-
self.contract_id,
|
|
317
|
-
start_date,
|
|
318
|
-
end_date,
|
|
319
|
-
"energie-jour",
|
|
320
|
-
raw_output,
|
|
321
|
+
contract_id=self.contract_id,
|
|
322
|
+
start_date=start_date,
|
|
323
|
+
end_date=end_date,
|
|
324
|
+
option="energie-jour",
|
|
325
|
+
raw_output=raw_output,
|
|
321
326
|
)
|
|
322
327
|
return data_csv
|
|
323
328
|
|
|
@@ -334,11 +339,11 @@ class Contract(ABC):
|
|
|
334
339
|
data_csv = await self._hydro_client.get_consumption_csv(
|
|
335
340
|
self.applicant_id,
|
|
336
341
|
self.customer_id,
|
|
337
|
-
self.contract_id,
|
|
338
|
-
start_date,
|
|
339
|
-
end_date,
|
|
340
|
-
"energie-heure",
|
|
341
|
-
raw_output,
|
|
342
|
+
contract_id=self.contract_id,
|
|
343
|
+
start_date=start_date,
|
|
344
|
+
end_date=end_date,
|
|
345
|
+
option="energie-heure",
|
|
346
|
+
raw_output=raw_output,
|
|
342
347
|
)
|
|
343
348
|
return data_csv
|
|
344
349
|
|
|
@@ -379,7 +384,7 @@ class Contract(ABC):
|
|
|
379
384
|
@check_period_data_present
|
|
380
385
|
def cp_projected_bill(self) -> float:
|
|
381
386
|
"""Projected bill of the current period."""
|
|
382
|
-
return self._all_period_data[0]["montantProjetePeriode"]
|
|
387
|
+
return float(self._all_period_data[0]["montantProjetePeriode"])
|
|
383
388
|
|
|
384
389
|
@property
|
|
385
390
|
@check_period_data_present
|
|
@@ -453,6 +458,7 @@ class ContractFallBack(Contract):
|
|
|
453
458
|
self,
|
|
454
459
|
applicant_id: str,
|
|
455
460
|
customer_id: str,
|
|
461
|
+
*,
|
|
456
462
|
account_id: str,
|
|
457
463
|
contract_id: str,
|
|
458
464
|
hydro_client: HydroClient,
|
|
@@ -463,8 +469,8 @@ class ContractFallBack(Contract):
|
|
|
463
469
|
self,
|
|
464
470
|
applicant_id,
|
|
465
471
|
customer_id,
|
|
466
|
-
account_id,
|
|
467
|
-
contract_id,
|
|
468
|
-
hydro_client,
|
|
469
|
-
log_level,
|
|
472
|
+
account_id=account_id,
|
|
473
|
+
contract_id=contract_id,
|
|
474
|
+
hydro_client=hydro_client,
|
|
475
|
+
log_level=log_level,
|
|
470
476
|
)
|
hydroqc/contract/contract_d.py
CHANGED
|
@@ -17,6 +17,7 @@ class ContractD(ContractResidential):
|
|
|
17
17
|
self,
|
|
18
18
|
applicant_id: str,
|
|
19
19
|
customer_id: str,
|
|
20
|
+
*,
|
|
20
21
|
account_id: str,
|
|
21
22
|
contract_id: str,
|
|
22
23
|
hydro_client: HydroClient,
|
|
@@ -27,8 +28,8 @@ class ContractD(ContractResidential):
|
|
|
27
28
|
self,
|
|
28
29
|
applicant_id,
|
|
29
30
|
customer_id,
|
|
30
|
-
account_id,
|
|
31
|
-
contract_id,
|
|
32
|
-
hydro_client,
|
|
33
|
-
log_level,
|
|
31
|
+
account_id=account_id,
|
|
32
|
+
contract_id=contract_id,
|
|
33
|
+
hydro_client=hydro_client,
|
|
34
|
+
log_level=log_level,
|
|
34
35
|
)
|
|
@@ -17,6 +17,7 @@ class ContractDCPC(ContractD):
|
|
|
17
17
|
self,
|
|
18
18
|
applicant_id: str,
|
|
19
19
|
customer_id: str,
|
|
20
|
+
*,
|
|
20
21
|
account_id: str,
|
|
21
22
|
contract_id: str,
|
|
22
23
|
hydro_client: HydroClient,
|
|
@@ -27,18 +28,18 @@ class ContractDCPC(ContractD):
|
|
|
27
28
|
self,
|
|
28
29
|
applicant_id,
|
|
29
30
|
customer_id,
|
|
30
|
-
account_id,
|
|
31
|
-
contract_id,
|
|
32
|
-
hydro_client,
|
|
33
|
-
log_level,
|
|
31
|
+
account_id=account_id,
|
|
32
|
+
contract_id=contract_id,
|
|
33
|
+
hydro_client=hydro_client,
|
|
34
|
+
log_level=log_level,
|
|
34
35
|
)
|
|
35
36
|
wch_logger = self._logger.getChild("wch")
|
|
36
37
|
self._wch: CPCPeakHandler = CPCPeakHandler(
|
|
37
38
|
self.applicant_id,
|
|
38
39
|
self.customer_id,
|
|
39
|
-
self.contract_id,
|
|
40
|
-
hydro_client,
|
|
41
|
-
wch_logger,
|
|
40
|
+
contract_id=self.contract_id,
|
|
41
|
+
hydro_client=hydro_client,
|
|
42
|
+
logger=wch_logger,
|
|
42
43
|
)
|
|
43
44
|
|
|
44
45
|
@property
|
hydroqc/contract/contract_dpc.py
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"""Hydroquebec contract module."""
|
|
2
2
|
|
|
3
3
|
from collections.abc import Callable
|
|
4
|
-
from datetime import date
|
|
4
|
+
from datetime import date, datetime
|
|
5
|
+
from enum import Enum
|
|
5
6
|
|
|
6
7
|
from hydroqc.contract.common import check_period_data_present
|
|
7
8
|
from hydroqc.contract.contract_residential import ContractResidential
|
|
@@ -10,8 +11,15 @@ from hydroqc.peak.dpc.handler import DPCPeakHandler
|
|
|
10
11
|
from hydroqc.types import DPCDataTyping
|
|
11
12
|
|
|
12
13
|
|
|
14
|
+
class WinterState(str, Enum):
|
|
15
|
+
"""Winter period state."""
|
|
16
|
+
|
|
17
|
+
CURRENT = "C" # Current/Active (within winter period)
|
|
18
|
+
FINISHED = "F" # Finished (past winter period)
|
|
19
|
+
|
|
20
|
+
|
|
13
21
|
def check_dpc_data_present(
|
|
14
|
-
method: Callable[..., None | str | bool | float | date]
|
|
22
|
+
method: Callable[..., None | str | bool | float | date],
|
|
15
23
|
) -> Callable[..., None | str | bool | float | date]:
|
|
16
24
|
"""Check if contractDPC's data are present."""
|
|
17
25
|
|
|
@@ -26,6 +34,20 @@ def check_dpc_data_present(
|
|
|
26
34
|
"Maybe you did a rate change recently. "
|
|
27
35
|
"This message should disappear at the beginning of the next bill period."
|
|
28
36
|
)
|
|
37
|
+
return None
|
|
38
|
+
|
|
39
|
+
# Check if winter period data is available
|
|
40
|
+
if (
|
|
41
|
+
"periodesHiver" not in contract._dpc_data
|
|
42
|
+
or not contract._dpc_data.get("periodesHiver")
|
|
43
|
+
or len(contract._dpc_data["periodesHiver"]) == 0
|
|
44
|
+
):
|
|
45
|
+
contract._logger.info(
|
|
46
|
+
"DPC data is empty or incomplete. "
|
|
47
|
+
"This may occur outside the winter period or during a rate transition."
|
|
48
|
+
)
|
|
49
|
+
return None
|
|
50
|
+
|
|
29
51
|
return method(contract)
|
|
30
52
|
|
|
31
53
|
return wrapper
|
|
@@ -45,6 +67,7 @@ class ContractDPC(ContractResidential):
|
|
|
45
67
|
self,
|
|
46
68
|
applicant_id: str,
|
|
47
69
|
customer_id: str,
|
|
70
|
+
*,
|
|
48
71
|
account_id: str,
|
|
49
72
|
contract_id: str,
|
|
50
73
|
hydro_client: HydroClient,
|
|
@@ -55,18 +78,18 @@ class ContractDPC(ContractResidential):
|
|
|
55
78
|
self,
|
|
56
79
|
applicant_id,
|
|
57
80
|
customer_id,
|
|
58
|
-
account_id,
|
|
59
|
-
contract_id,
|
|
60
|
-
hydro_client,
|
|
61
|
-
log_level,
|
|
81
|
+
account_id=account_id,
|
|
82
|
+
contract_id=contract_id,
|
|
83
|
+
hydro_client=hydro_client,
|
|
84
|
+
log_level=log_level,
|
|
62
85
|
)
|
|
63
86
|
peaks_logger = self._logger.getChild("peaks")
|
|
64
87
|
self._peakh: DPCPeakHandler = DPCPeakHandler(
|
|
65
88
|
self.applicant_id,
|
|
66
89
|
self.customer_id,
|
|
67
|
-
self.contract_id,
|
|
68
|
-
hydro_client,
|
|
69
|
-
peaks_logger,
|
|
90
|
+
contract_id=self.contract_id,
|
|
91
|
+
hydro_client=hydro_client,
|
|
92
|
+
logger=peaks_logger,
|
|
70
93
|
)
|
|
71
94
|
|
|
72
95
|
@property
|
|
@@ -85,6 +108,13 @@ class ContractDPC(ContractResidential):
|
|
|
85
108
|
)
|
|
86
109
|
return self._dpc_data
|
|
87
110
|
|
|
111
|
+
def _get_dpc_field(self, field_name: str) -> str | float | int:
|
|
112
|
+
"""Get DPC field from periodesHiver data."""
|
|
113
|
+
winter_period = self._dpc_data["periodesHiver"][0]
|
|
114
|
+
if field_name in winter_period:
|
|
115
|
+
return winter_period[field_name] # type: ignore
|
|
116
|
+
raise KeyError(f"Field {field_name} not found in DPC data")
|
|
117
|
+
|
|
88
118
|
@property
|
|
89
119
|
@check_period_data_present
|
|
90
120
|
def cp_lower_price_consumption(self) -> float:
|
|
@@ -110,44 +140,63 @@ class ContractDPC(ContractResidential):
|
|
|
110
140
|
@check_dpc_data_present
|
|
111
141
|
def last_update_date(self) -> date:
|
|
112
142
|
"""DPC data last update."""
|
|
113
|
-
|
|
143
|
+
date_str = str(self._get_dpc_field("dateMaj"))
|
|
144
|
+
# Handle ISO format with timezone
|
|
145
|
+
if "T" in date_str:
|
|
146
|
+
return date.fromisoformat(date_str.split("T", maxsplit=1)[0])
|
|
147
|
+
return date.fromisoformat(date_str)
|
|
114
148
|
|
|
115
149
|
@property
|
|
116
150
|
@check_dpc_data_present
|
|
117
151
|
def critical_called_hours(self) -> int:
|
|
118
152
|
"""Get number of critical hours."""
|
|
119
|
-
return int(self.
|
|
153
|
+
return int(self._get_dpc_field("hrsCritiquesAppelees"))
|
|
120
154
|
|
|
121
155
|
@property
|
|
122
156
|
@check_dpc_data_present
|
|
123
157
|
def max_critical_called_hours(self) -> int:
|
|
124
158
|
"""Get max number of critical hours."""
|
|
125
|
-
return int(self.
|
|
159
|
+
return int(self._get_dpc_field("hrsCritiquesAppeleesMax"))
|
|
126
160
|
|
|
127
161
|
@property
|
|
128
162
|
@check_dpc_data_present
|
|
129
163
|
def amount_saved_vs_base_rate(self) -> float:
|
|
130
164
|
"""Amount saved or not versus the base rate."""
|
|
131
|
-
return self.
|
|
165
|
+
return float(self._get_dpc_field("montantEconPerteVSTarifBase"))
|
|
132
166
|
|
|
133
167
|
@property
|
|
134
168
|
@check_dpc_data_present
|
|
135
169
|
def winter_total_days(self) -> int:
|
|
136
|
-
"""Get number of winter days."""
|
|
137
|
-
|
|
170
|
+
"""Get number of winter days (calculated from period dates)."""
|
|
171
|
+
winter = self._dpc_data["periodesHiver"][0]
|
|
172
|
+
start = datetime.fromisoformat(winter["dateDebut"].replace("Z", "+00:00"))
|
|
173
|
+
end = datetime.fromisoformat(winter["dateFin"].replace("Z", "+00:00"))
|
|
174
|
+
return (end - start).days
|
|
138
175
|
|
|
139
176
|
@property
|
|
140
177
|
@check_dpc_data_present
|
|
141
178
|
def winter_total_days_last_update(self) -> int:
|
|
142
|
-
"""Get number of days since winter starts."""
|
|
143
|
-
|
|
179
|
+
"""Get number of days since winter starts (calculated from dates)."""
|
|
180
|
+
winter = self._dpc_data["periodesHiver"][0]
|
|
181
|
+
start = datetime.fromisoformat(winter["dateDebut"].replace("Z", "+00:00"))
|
|
182
|
+
update = datetime.fromisoformat(winter["dateMaj"].replace("Z", "+00:00"))
|
|
183
|
+
return (update - start).days
|
|
144
184
|
|
|
145
185
|
@property
|
|
146
186
|
@check_dpc_data_present
|
|
147
|
-
def winter_state(self) ->
|
|
148
|
-
"""Get winter state.
|
|
187
|
+
def winter_state(self) -> WinterState:
|
|
188
|
+
"""Get winter state (computed from dates).
|
|
149
189
|
|
|
150
|
-
|
|
151
|
-
|
|
190
|
+
Returns:
|
|
191
|
+
WinterState.CURRENT: Within winter period
|
|
192
|
+
WinterState.FINISHED: Past winter period
|
|
152
193
|
"""
|
|
153
|
-
|
|
194
|
+
winter = self._dpc_data["periodesHiver"][0]
|
|
195
|
+
now = datetime.now(
|
|
196
|
+
datetime.fromisoformat(winter["dateDebut"].replace("Z", "+00:00")).tzinfo
|
|
197
|
+
)
|
|
198
|
+
start = datetime.fromisoformat(winter["dateDebut"].replace("Z", "+00:00"))
|
|
199
|
+
end = datetime.fromisoformat(winter["dateFin"].replace("Z", "+00:00"))
|
|
200
|
+
if start <= now <= end:
|
|
201
|
+
return WinterState.CURRENT
|
|
202
|
+
return WinterState.FINISHED
|
hydroqc/contract/contract_dt.py
CHANGED
|
@@ -18,6 +18,7 @@ class ContractDT(ContractResidential):
|
|
|
18
18
|
self,
|
|
19
19
|
applicant_id: str,
|
|
20
20
|
customer_id: str,
|
|
21
|
+
*,
|
|
21
22
|
account_id: str,
|
|
22
23
|
contract_id: str,
|
|
23
24
|
hydro_client: HydroClient,
|
|
@@ -28,10 +29,10 @@ class ContractDT(ContractResidential):
|
|
|
28
29
|
self,
|
|
29
30
|
applicant_id,
|
|
30
31
|
customer_id,
|
|
31
|
-
account_id,
|
|
32
|
-
contract_id,
|
|
33
|
-
hydro_client,
|
|
34
|
-
log_level,
|
|
32
|
+
account_id=account_id,
|
|
33
|
+
contract_id=contract_id,
|
|
34
|
+
hydro_client=hydro_client,
|
|
35
|
+
log_level=log_level,
|
|
35
36
|
)
|
|
36
37
|
|
|
37
38
|
@property
|
hydroqc/contract/contract_m.py
CHANGED
|
@@ -21,6 +21,7 @@ class ContractM(Contract):
|
|
|
21
21
|
self,
|
|
22
22
|
applicant_id: str,
|
|
23
23
|
customer_id: str,
|
|
24
|
+
*,
|
|
24
25
|
account_id: str,
|
|
25
26
|
contract_id: str,
|
|
26
27
|
hydro_client: HydroClient,
|
|
@@ -31,10 +32,10 @@ class ContractM(Contract):
|
|
|
31
32
|
self,
|
|
32
33
|
applicant_id,
|
|
33
34
|
customer_id,
|
|
34
|
-
account_id,
|
|
35
|
-
contract_id,
|
|
36
|
-
hydro_client,
|
|
37
|
-
log_level,
|
|
35
|
+
account_id=account_id,
|
|
36
|
+
contract_id=contract_id,
|
|
37
|
+
hydro_client=hydro_client,
|
|
38
|
+
log_level=log_level,
|
|
38
39
|
)
|
|
39
40
|
|
|
40
41
|
async def get_power_demand_per_15min(
|
|
@@ -47,11 +48,11 @@ class ContractM(Contract):
|
|
|
47
48
|
data_csv = await self._hydro_client.get_consumption_csv(
|
|
48
49
|
self.applicant_id,
|
|
49
50
|
self.customer_id,
|
|
50
|
-
self.contract_id,
|
|
51
|
-
start_date,
|
|
52
|
-
end_date,
|
|
53
|
-
"puissance-min",
|
|
54
|
-
raw_output,
|
|
51
|
+
contract_id=self.contract_id,
|
|
52
|
+
start_date=start_date,
|
|
53
|
+
end_date=end_date,
|
|
54
|
+
option="puissance-min",
|
|
55
|
+
raw_output=raw_output,
|
|
55
56
|
)
|
|
56
57
|
return data_csv
|
|
57
58
|
|
|
@@ -65,10 +66,10 @@ class ContractM(Contract):
|
|
|
65
66
|
data_csv = await self._hydro_client.get_consumption_csv(
|
|
66
67
|
self.applicant_id,
|
|
67
68
|
self.customer_id,
|
|
68
|
-
self.contract_id,
|
|
69
|
-
start_date,
|
|
70
|
-
end_date,
|
|
71
|
-
"puissance-jour",
|
|
72
|
-
raw_output,
|
|
69
|
+
contract_id=self.contract_id,
|
|
70
|
+
start_date=start_date,
|
|
71
|
+
end_date=end_date,
|
|
72
|
+
option="puissance-jour",
|
|
73
|
+
raw_output=raw_output,
|
|
73
74
|
)
|
|
74
75
|
return data_csv
|
|
@@ -16,6 +16,7 @@ class ContractMGDP(ContractM):
|
|
|
16
16
|
self,
|
|
17
17
|
applicant_id: str,
|
|
18
18
|
customer_id: str,
|
|
19
|
+
*,
|
|
19
20
|
account_id: str,
|
|
20
21
|
contract_id: str,
|
|
21
22
|
hydro_client: HydroClient,
|
|
@@ -26,8 +27,8 @@ class ContractMGDP(ContractM):
|
|
|
26
27
|
self,
|
|
27
28
|
applicant_id,
|
|
28
29
|
customer_id,
|
|
29
|
-
account_id,
|
|
30
|
-
contract_id,
|
|
31
|
-
hydro_client,
|
|
32
|
-
log_level,
|
|
30
|
+
account_id=account_id,
|
|
31
|
+
contract_id=contract_id,
|
|
32
|
+
hydro_client=hydro_client,
|
|
33
|
+
log_level=log_level,
|
|
33
34
|
)
|
|
@@ -18,6 +18,7 @@ class ContractResidential(Contract):
|
|
|
18
18
|
self,
|
|
19
19
|
applicant_id: str,
|
|
20
20
|
customer_id: str,
|
|
21
|
+
*,
|
|
21
22
|
account_id: str,
|
|
22
23
|
contract_id: str,
|
|
23
24
|
hydro_client: HydroClient,
|
|
@@ -28,10 +29,10 @@ class ContractResidential(Contract):
|
|
|
28
29
|
self,
|
|
29
30
|
applicant_id,
|
|
30
31
|
customer_id,
|
|
31
|
-
account_id,
|
|
32
|
-
contract_id,
|
|
33
|
-
hydro_client,
|
|
34
|
-
log_level,
|
|
32
|
+
account_id=account_id,
|
|
33
|
+
contract_id=contract_id,
|
|
34
|
+
hydro_client=hydro_client,
|
|
35
|
+
log_level=log_level,
|
|
35
36
|
)
|
|
36
37
|
|
|
37
38
|
async def get_daily_energy(
|
|
@@ -44,10 +45,10 @@ class ContractResidential(Contract):
|
|
|
44
45
|
data_csv = await self._hydro_client.get_consumption_csv(
|
|
45
46
|
self.applicant_id,
|
|
46
47
|
self.customer_id,
|
|
47
|
-
self.contract_id,
|
|
48
|
-
start_date,
|
|
49
|
-
end_date,
|
|
50
|
-
"energie-jour",
|
|
51
|
-
raw_output,
|
|
48
|
+
contract_id=self.contract_id,
|
|
49
|
+
start_date=start_date,
|
|
50
|
+
end_date=end_date,
|
|
51
|
+
option="energie-jour",
|
|
52
|
+
raw_output=raw_output,
|
|
52
53
|
)
|
|
53
54
|
return data_csv
|
hydroqc/customer.py
CHANGED
|
@@ -19,6 +19,7 @@ class Customer:
|
|
|
19
19
|
self,
|
|
20
20
|
applicant_id: str,
|
|
21
21
|
customer_id: str,
|
|
22
|
+
*,
|
|
22
23
|
customer_names: list[str],
|
|
23
24
|
hydro_client: HydroClient,
|
|
24
25
|
log_level: str | None = None,
|
|
@@ -71,10 +72,10 @@ class Customer:
|
|
|
71
72
|
account = Account(
|
|
72
73
|
self.applicant_id,
|
|
73
74
|
self.customer_id,
|
|
74
|
-
account_id,
|
|
75
|
-
[],
|
|
76
|
-
self._hydro_client,
|
|
77
|
-
self._log_level,
|
|
75
|
+
account_id=account_id,
|
|
76
|
+
contracts=[],
|
|
77
|
+
hydro_client=self._hydro_client,
|
|
78
|
+
log_level=self._log_level,
|
|
78
79
|
)
|
|
79
80
|
self.accounts.append(account)
|
|
80
81
|
else:
|
|
@@ -103,10 +104,10 @@ class Customer:
|
|
|
103
104
|
contract = getattr(contractModule, contract_class_name)(
|
|
104
105
|
self.applicant_id,
|
|
105
106
|
self.customer_id,
|
|
106
|
-
account_id,
|
|
107
|
-
contract_id,
|
|
108
|
-
self._hydro_client,
|
|
109
|
-
self._log_level,
|
|
107
|
+
account_id=account_id,
|
|
108
|
+
contract_id=contract_id,
|
|
109
|
+
hydro_client=self._hydro_client,
|
|
110
|
+
log_level=self._log_level,
|
|
110
111
|
)
|
|
111
112
|
account.contracts.append(contract)
|
|
112
113
|
else:
|
hydroqc/hydro_api/client.py
CHANGED
|
@@ -85,6 +85,7 @@ class HydroClient:
|
|
|
85
85
|
self,
|
|
86
86
|
username: str,
|
|
87
87
|
password: str,
|
|
88
|
+
*,
|
|
88
89
|
timeout: int = REQUESTS_TIMEOUT,
|
|
89
90
|
verify_ssl: bool = True,
|
|
90
91
|
session: aiohttp.ClientSession | None = None,
|
|
@@ -146,12 +147,14 @@ class HydroClient:
|
|
|
146
147
|
self,
|
|
147
148
|
url: str,
|
|
148
149
|
method: str,
|
|
150
|
+
*,
|
|
149
151
|
params: dict[str, Any] | None = None,
|
|
150
152
|
data: str | dict[str, Any] | None = None,
|
|
151
153
|
headers: dict[str, str] | None = None,
|
|
152
154
|
verify_ssl: bool | None = None,
|
|
153
155
|
status: int | None = 200,
|
|
154
156
|
url_encoded: bool = False,
|
|
157
|
+
allow_redirects: bool | None = None,
|
|
155
158
|
) -> aiohttp.ClientResponse:
|
|
156
159
|
"""Make an HTTP request."""
|
|
157
160
|
if params is None:
|
|
@@ -192,11 +195,16 @@ class HydroClient:
|
|
|
192
195
|
self._logger.debug("HTTP query %s to %s", url, method)
|
|
193
196
|
|
|
194
197
|
url_url = yarl.URL(url, encoded=url_encoded)
|
|
198
|
+
# Since aiohttp 3.13 redirect handling for some endpoints (notably Azure B2C flows)
|
|
199
|
+
# appears to differ (initial authorize endpoint may now return a 302 first),
|
|
200
|
+
# we allow callers to opt-in to following redirects. Default keeps previous behavior.
|
|
201
|
+
if allow_redirects is None:
|
|
202
|
+
allow_redirects = False
|
|
195
203
|
raw_res: aiohttp.ClientResponse = await getattr(self._session, method)(
|
|
196
204
|
url_url,
|
|
197
205
|
params=params,
|
|
198
206
|
data=data,
|
|
199
|
-
allow_redirects=
|
|
207
|
+
allow_redirects=allow_redirects,
|
|
200
208
|
ssl=ssl_context,
|
|
201
209
|
headers=headers,
|
|
202
210
|
)
|
|
@@ -251,7 +259,11 @@ class HydroClient:
|
|
|
251
259
|
async def _get_httpsession(self) -> None:
|
|
252
260
|
"""Set http session."""
|
|
253
261
|
if not hasattr(self, "_cookie_jar"):
|
|
254
|
-
|
|
262
|
+
# aiohttp 3.12+ changed cookie quoting behavior for shared/default-scope cookies.
|
|
263
|
+
# Azure B2C endpoints used in the login flow can be sensitive to quoted cookies.
|
|
264
|
+
# Disable quoting to preserve legacy behavior and improve compatibility.
|
|
265
|
+
# Also allow 'unsafe' cookies as some endpoints may not strictly adhere to RFCs.
|
|
266
|
+
self._cookie_jar = aiohttp.CookieJar(quote_cookie=False, unsafe=True)
|
|
255
267
|
if self._session is None:
|
|
256
268
|
self._logger.debug("Creating new http session")
|
|
257
269
|
self._session = aiohttp.ClientSession(
|
|
@@ -310,6 +322,12 @@ class HydroClient:
|
|
|
310
322
|
|
|
311
323
|
# Get http session
|
|
312
324
|
await self._get_httpsession()
|
|
325
|
+
# Ensure a clean slate for authentication cookies (csrf, TransId, etc.)
|
|
326
|
+
# Some Azure B2C flows reject reused cookies leading to 400 on SelfAsserted.
|
|
327
|
+
try:
|
|
328
|
+
self._cookie_jar.clear()
|
|
329
|
+
except AttributeError: # pragma: no cover - defensive
|
|
330
|
+
self._logger.debug("Failed to clear cookie jar before login", exc_info=True)
|
|
313
331
|
|
|
314
332
|
url = f"{AUTHORIZE_URL}"
|
|
315
333
|
headers = {
|
|
@@ -327,7 +345,11 @@ class HydroClient:
|
|
|
327
345
|
"mobile": "false",
|
|
328
346
|
}
|
|
329
347
|
|
|
330
|
-
|
|
348
|
+
# Allow redirects for initial authorize call
|
|
349
|
+
# (Azure B2C sometimes issues a 302 before final HTML)
|
|
350
|
+
res = await self.http_request(
|
|
351
|
+
url, "get", headers=headers, params=params, allow_redirects=True
|
|
352
|
+
)
|
|
331
353
|
|
|
332
354
|
html_data = await res.text()
|
|
333
355
|
|
|
@@ -758,6 +780,7 @@ class HydroClient:
|
|
|
758
780
|
self,
|
|
759
781
|
applicant_id: str,
|
|
760
782
|
customer_id: str,
|
|
783
|
+
*,
|
|
761
784
|
contract_id: str,
|
|
762
785
|
start_date: date,
|
|
763
786
|
end_date: date,
|
|
@@ -839,12 +862,16 @@ class HydroClient:
|
|
|
839
862
|
) -> DPCDataTyping:
|
|
840
863
|
"""Fetch FlexD data of the current year.
|
|
841
864
|
|
|
842
|
-
API URL: https://cl
|
|
843
|
-
|
|
865
|
+
API URL: https://services-cl.solutions.hydroquebec.com/wsapi/web/prive/api/
|
|
866
|
+
v3_0/tarificationDynamique/tarifPointeCritique
|
|
844
867
|
|
|
845
868
|
"""
|
|
846
869
|
await self._select_contract(applicant_id, customer_id, contract_id)
|
|
847
|
-
|
|
870
|
+
headers = await self._get_customer_http_headers(applicant_id, customer_id)
|
|
871
|
+
params = {"noContrat": contract_id}
|
|
872
|
+
api_call_response = await self.http_request(
|
|
873
|
+
FLEXD_DATA_URL, "get", params=params, headers=headers
|
|
874
|
+
)
|
|
848
875
|
# We can not use res.json() because the response header are not application/json
|
|
849
876
|
data: DPCDataTyping = self._load_json(await api_call_response.text())
|
|
850
877
|
return data
|
|
@@ -873,6 +900,7 @@ class HydroClient:
|
|
|
873
900
|
self,
|
|
874
901
|
applicant_id: str,
|
|
875
902
|
customer_id: str,
|
|
903
|
+
*,
|
|
876
904
|
contract_id: str,
|
|
877
905
|
start_date: date,
|
|
878
906
|
end_date: date,
|
hydroqc/hydro_api/consts.py
CHANGED
|
@@ -57,8 +57,8 @@ OPEN_DATA_PEAK_URL = (
|
|
|
57
57
|
RELATION_URL = f"{HOST_SERVICES}/wsapi/web/prive/api/v1_0/relations"
|
|
58
58
|
|
|
59
59
|
FLEXD_DATA_URL = (
|
|
60
|
-
f"{HOST_SERVICES}/
|
|
61
|
-
"
|
|
60
|
+
f"{HOST_SERVICES}/wsapi/web/prive/api/v3_0/"
|
|
61
|
+
"tarificationDynamique/tarifPointeCritique"
|
|
62
62
|
)
|
|
63
63
|
FLEXD_PEAK_URL = f"{HOST_SERVICES}/conso/portraitweb/api/v3_0/conso"
|
|
64
64
|
CONSO_CSV_URL = (
|
hydroqc/peak/basepeakhandler.py
CHANGED
hydroqc/peak/cpc/consts.py
CHANGED
|
@@ -3,12 +3,14 @@
|
|
|
3
3
|
# from typing import Literal
|
|
4
4
|
import datetime
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
DEFAULT_MORNING_ANCHOR_START_OFFSET = 5
|
|
7
|
+
DEFAULT_MORNING_ANCHOR_DURATION = 3
|
|
8
|
+
DEFAULT_EVENING_ANCHOR_START_OFFSET = 4
|
|
9
|
+
DEFAULT_EVENING_ANCHOR_DURATION = 2
|
|
8
10
|
DEFAULT_EVENT_REFRESH_SECONDS = 300
|
|
9
11
|
DEFAULT_PRE_HEAT_DURATION = 180
|
|
10
12
|
DEFAULT_MORNING_PEAK_START = datetime.time(6, 0, 0)
|
|
11
|
-
DEFAULT_MORNING_PEAK_END = datetime.time(
|
|
13
|
+
DEFAULT_MORNING_PEAK_END = datetime.time(10, 0, 0)
|
|
12
14
|
DEFAULT_EVENING_PEAK_START = datetime.time(16, 0, 0)
|
|
13
15
|
DEFAULT_EVENING_PEAK_END = datetime.time(20, 0, 0)
|
|
14
16
|
# MORNING_EVENING: tuple[Literal["morning"], Literal["evening"]] = ("morning", "evening")
|
hydroqc/peak/cpc/handler.py
CHANGED
|
@@ -60,6 +60,7 @@ class CPCPeakHandler(BasePeakHandler[Peak]):
|
|
|
60
60
|
self,
|
|
61
61
|
applicant_id: str,
|
|
62
62
|
customer_id: str,
|
|
63
|
+
*,
|
|
63
64
|
contract_id: str,
|
|
64
65
|
hydro_client: HydroClient,
|
|
65
66
|
logger: logging.Logger,
|
|
@@ -68,9 +69,9 @@ class CPCPeakHandler(BasePeakHandler[Peak]):
|
|
|
68
69
|
super().__init__(
|
|
69
70
|
applicant_id,
|
|
70
71
|
customer_id,
|
|
71
|
-
contract_id,
|
|
72
|
-
hydro_client,
|
|
73
|
-
logger,
|
|
72
|
+
contract_id=contract_id,
|
|
73
|
+
hydro_client=hydro_client,
|
|
74
|
+
logger=logger,
|
|
74
75
|
)
|
|
75
76
|
|
|
76
77
|
self._raw_data: CPCDataTyping = {}
|
hydroqc/peak/cpc/peak.py
CHANGED
|
@@ -4,7 +4,14 @@ import datetime
|
|
|
4
4
|
|
|
5
5
|
from hydroqc.peak.basepeak import BasePeak
|
|
6
6
|
from hydroqc.peak.consts import DEFAULT_PRE_HEAT_DURATION
|
|
7
|
-
from hydroqc.peak.cpc.consts import
|
|
7
|
+
from hydroqc.peak.cpc.consts import (
|
|
8
|
+
DEFAULT_MORNING_ANCHOR_DURATION,
|
|
9
|
+
DEFAULT_MORNING_ANCHOR_START_OFFSET,
|
|
10
|
+
DEFAULT_EVENING_ANCHOR_DURATION,
|
|
11
|
+
DEFAULT_EVENING_ANCHOR_START_OFFSET,
|
|
12
|
+
DEFAULT_MORNING_PEAK_START,
|
|
13
|
+
DEFAULT_MORNING_PEAK_END,
|
|
14
|
+
)
|
|
8
15
|
from hydroqc.timerange import TimeRange
|
|
9
16
|
from hydroqc.types import CriticalPeakDataTyping
|
|
10
17
|
|
|
@@ -71,15 +78,25 @@ class Peak(BasePeak):
|
|
|
71
78
|
self._is_critical = True
|
|
72
79
|
self._raw_stats = stats
|
|
73
80
|
|
|
81
|
+
def is_morning_peak(self) -> bool:
|
|
82
|
+
"""Determine if this peak is a morning peak based on its start time."""
|
|
83
|
+
peak_time = self.start_date.time()
|
|
84
|
+
return DEFAULT_MORNING_PEAK_START <= peak_time <= DEFAULT_MORNING_PEAK_END
|
|
85
|
+
|
|
74
86
|
@property
|
|
75
87
|
def anchor(self) -> Anchor:
|
|
76
88
|
"""Get the anchor period of the peak."""
|
|
89
|
+
if self.is_morning_peak():
|
|
90
|
+
anchor_start_offset = DEFAULT_MORNING_ANCHOR_START_OFFSET
|
|
91
|
+
anchor_duration = DEFAULT_MORNING_ANCHOR_DURATION
|
|
92
|
+
else:
|
|
93
|
+
anchor_start_offset = DEFAULT_EVENING_ANCHOR_START_OFFSET
|
|
94
|
+
anchor_duration = DEFAULT_EVENING_ANCHOR_DURATION
|
|
95
|
+
|
|
77
96
|
anchor_start_date = self.start_date - datetime.timedelta(
|
|
78
|
-
hours=
|
|
79
|
-
)
|
|
80
|
-
anchor_end_date = anchor_start_date + datetime.timedelta(
|
|
81
|
-
hours=DEFAULT_ANCHOR_DURATION
|
|
97
|
+
hours=anchor_start_offset
|
|
82
98
|
)
|
|
99
|
+
anchor_end_date = anchor_start_date + datetime.timedelta(hours=anchor_duration)
|
|
83
100
|
return Anchor(anchor_start_date, anchor_end_date, self.is_critical)
|
|
84
101
|
|
|
85
102
|
@property
|
hydroqc/peak/dpc/consts.py
CHANGED
|
@@ -3,11 +3,9 @@
|
|
|
3
3
|
# from typing import Literal
|
|
4
4
|
import datetime
|
|
5
5
|
|
|
6
|
-
DEFAULT_ANCHOR_START_OFFSET = 5
|
|
7
|
-
DEFAULT_ANCHOR_DURATION = 3
|
|
8
6
|
DEFAULT_EVENT_REFRESH_SECONDS = 300
|
|
9
7
|
DEFAULT_MORNING_PEAK_START = datetime.time(6, 0, 0)
|
|
10
|
-
DEFAULT_MORNING_PEAK_END = datetime.time(
|
|
8
|
+
DEFAULT_MORNING_PEAK_END = datetime.time(10, 0, 0)
|
|
11
9
|
DEFAULT_EVENING_PEAK_START = datetime.time(16, 0, 0)
|
|
12
10
|
DEFAULT_EVENING_PEAK_END = datetime.time(20, 0, 0)
|
|
13
11
|
# MORNING_EVENING: tuple[Literal["morning"], Literal["evening"]] = ("morning", "evening")
|
hydroqc/peak/dpc/handler.py
CHANGED
|
@@ -23,6 +23,7 @@ class DPCPeakHandler(BasePeakHandler[Peak]):
|
|
|
23
23
|
self,
|
|
24
24
|
applicant_id: str,
|
|
25
25
|
customer_id: str,
|
|
26
|
+
*,
|
|
26
27
|
contract_id: str,
|
|
27
28
|
hydro_client: HydroClient,
|
|
28
29
|
logger: logging.Logger,
|
|
@@ -31,9 +32,9 @@ class DPCPeakHandler(BasePeakHandler[Peak]):
|
|
|
31
32
|
super().__init__(
|
|
32
33
|
applicant_id,
|
|
33
34
|
customer_id,
|
|
34
|
-
contract_id,
|
|
35
|
-
hydro_client,
|
|
36
|
-
logger,
|
|
35
|
+
contract_id=contract_id,
|
|
36
|
+
hydro_client=hydro_client,
|
|
37
|
+
logger=logger,
|
|
37
38
|
)
|
|
38
39
|
|
|
39
40
|
self._raw_data: list[DPCPeakDataTyping] = []
|
hydroqc/public_client.py
CHANGED
|
@@ -17,6 +17,7 @@ class PublicClient:
|
|
|
17
17
|
self,
|
|
18
18
|
rate_code: str | None = None,
|
|
19
19
|
rate_option_code: str | None = None,
|
|
20
|
+
*,
|
|
20
21
|
verify_ssl: bool = True,
|
|
21
22
|
log_level: str | None = None,
|
|
22
23
|
http_log_level: str | None = None,
|
|
@@ -43,11 +44,19 @@ class PublicClient:
|
|
|
43
44
|
) = None
|
|
44
45
|
if self._rate_code == "D" and self._rate_option_code == "CPC":
|
|
45
46
|
self.peak_handler = CPCPeakHandler(
|
|
46
|
-
"",
|
|
47
|
+
"",
|
|
48
|
+
"",
|
|
49
|
+
contract_id="",
|
|
50
|
+
hydro_client=self._hydro_client,
|
|
51
|
+
logger=self._logger,
|
|
47
52
|
)
|
|
48
53
|
elif self._rate_code == "DPC":
|
|
49
54
|
self.peak_handler = DPCPeakHandler(
|
|
50
|
-
"",
|
|
55
|
+
"",
|
|
56
|
+
"",
|
|
57
|
+
contract_id="",
|
|
58
|
+
hydro_client=self._hydro_client,
|
|
59
|
+
logger=self._logger,
|
|
51
60
|
)
|
|
52
61
|
|
|
53
62
|
async def check_hq_portal_status(self) -> bool:
|
hydroqc/types/__init__.py
CHANGED
|
@@ -17,13 +17,13 @@ from hydroqc.types.consump import (
|
|
|
17
17
|
ConsumpDailyTyping,
|
|
18
18
|
ConsumpHourlyTyping,
|
|
19
19
|
ConsumpMonthlyTyping,
|
|
20
|
-
DPCDataTyping,
|
|
21
20
|
DPCPeakDataTyping,
|
|
22
21
|
DPCPeakListDataTyping,
|
|
23
|
-
DTDataTyping,
|
|
24
22
|
)
|
|
25
23
|
from hydroqc.types.contract import ContractTyping, ListContractsTyping
|
|
26
24
|
from hydroqc.types.cpc import CPCDataTyping, CriticalPeakDataTyping, PeriodDataTyping
|
|
25
|
+
from hydroqc.types.dpc import DPCDataTyping
|
|
26
|
+
from hydroqc.types.dt import DTDataTyping
|
|
27
27
|
from hydroqc.types.outage import (
|
|
28
28
|
OutageCause,
|
|
29
29
|
OutageCode,
|
hydroqc/types/common.py
CHANGED
|
@@ -36,17 +36,17 @@ class IDTokenTyping(TypedDict, total=True):
|
|
|
36
36
|
class Rates(Enum):
|
|
37
37
|
"""Contract Rates."""
|
|
38
38
|
|
|
39
|
-
D
|
|
40
|
-
DT
|
|
41
|
-
DPC
|
|
42
|
-
M
|
|
39
|
+
D = "D"
|
|
40
|
+
DT = "DT"
|
|
41
|
+
DPC = "DPC"
|
|
42
|
+
M = "M"
|
|
43
43
|
|
|
44
44
|
|
|
45
45
|
class RateOptions(Enum):
|
|
46
46
|
"""Contract Rate Options."""
|
|
47
47
|
|
|
48
|
-
CPC
|
|
49
|
-
GDP
|
|
48
|
+
CPC = "CPC"
|
|
49
|
+
GDP = "GDP"
|
|
50
50
|
|
|
51
51
|
|
|
52
52
|
OpenDataPeakEventOffer = Literal[
|
hydroqc/types/consump.py
CHANGED
|
@@ -169,23 +169,6 @@ class DPCDataResultsTyping(TypedDict, total=True):
|
|
|
169
169
|
etatHiver: str
|
|
170
170
|
|
|
171
171
|
|
|
172
|
-
class DPCDataTyping(TypedDict, total=True):
|
|
173
|
-
"""FlexD data json output format."""
|
|
174
|
-
|
|
175
|
-
success: bool
|
|
176
|
-
results: list[DPCDataResultsTyping]
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
DTDataResultsTyping = DPCDataResultsTyping
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
class DTDataTyping(TypedDict, total=True):
|
|
183
|
-
"""FlexD data json output format."""
|
|
184
|
-
|
|
185
|
-
success: bool
|
|
186
|
-
results: list[DTDataResultsTyping]
|
|
187
|
-
|
|
188
|
-
|
|
189
172
|
class DPCPeakDataTyping(TypedDict, total=True):
|
|
190
173
|
"""DPC Peak data json output format."""
|
|
191
174
|
|
hydroqc/types/dpc.py
CHANGED
|
@@ -4,25 +4,42 @@
|
|
|
4
4
|
from typing import TypedDict
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
class
|
|
8
|
-
"""FlexD data
|
|
7
|
+
class DPCPeriodeHiverTyping(TypedDict, total=True):
|
|
8
|
+
"""FlexD winter period data (API v3_0 format)."""
|
|
9
9
|
|
|
10
10
|
dateDebut: str
|
|
11
11
|
dateFin: str
|
|
12
|
-
|
|
12
|
+
dateMaj: str
|
|
13
13
|
hrsCritiquesAppelees: str
|
|
14
14
|
hrsCritiquesAppeleesMax: str
|
|
15
15
|
montantEconPerteVSTarifBase: float
|
|
16
|
-
nbJoursTotauxHiver: int
|
|
17
|
-
nbJoursDernMaj: int
|
|
18
|
-
etatHiver: str
|
|
19
16
|
|
|
20
17
|
|
|
21
|
-
class
|
|
22
|
-
"""FlexD data
|
|
18
|
+
class DPCEvenementPointeTyping(TypedDict, total=True):
|
|
19
|
+
"""FlexD peak event data (API v3_0 format)."""
|
|
23
20
|
|
|
24
|
-
|
|
25
|
-
|
|
21
|
+
dateEvenement: str
|
|
22
|
+
heureDebut: str
|
|
23
|
+
heureFin: str
|
|
24
|
+
consoReelle: float
|
|
25
|
+
codeConso: str
|
|
26
|
+
indFacture: bool
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
class DPCEvenementsPointeWrapperTyping(TypedDict, total=True):
|
|
30
|
+
"""FlexD peak events wrapper (API v3_0 format)."""
|
|
31
|
+
|
|
32
|
+
dateDebutPeriodeHiver: str
|
|
33
|
+
dateFinPeriodeHiver: str
|
|
34
|
+
evenementsPointe: list[DPCEvenementPointeTyping]
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
class DPCDataTyping(TypedDict, total=False):
|
|
38
|
+
"""FlexD data json output format (API v3_0)."""
|
|
39
|
+
|
|
40
|
+
dateTestAffichageWeb: str
|
|
41
|
+
periodesHiver: list[DPCPeriodeHiverTyping]
|
|
42
|
+
evenementsPointe: list[DPCEvenementsPointeWrapperTyping]
|
|
26
43
|
|
|
27
44
|
|
|
28
45
|
class DPCPeakDataTyping(TypedDict, total=True):
|
hydroqc/types/dt.py
CHANGED
|
@@ -3,9 +3,19 @@
|
|
|
3
3
|
# pylint: disable=invalid-name
|
|
4
4
|
from typing import TypedDict
|
|
5
5
|
|
|
6
|
-
from hydroqc.types.dpc import DPCDataResultsTyping
|
|
7
6
|
|
|
8
|
-
DTDataResultsTyping =
|
|
7
|
+
class DTDataResultsTyping(TypedDict, total=True):
|
|
8
|
+
"""DT winter period data (legacy format)."""
|
|
9
|
+
|
|
10
|
+
dateDebut: str
|
|
11
|
+
dateFin: str
|
|
12
|
+
dateDernMaj: str
|
|
13
|
+
hrsCritiquesAppelee: str
|
|
14
|
+
hrsCritiquesAppeleesMax: str
|
|
15
|
+
montantEconPerteVSTarifBase: float
|
|
16
|
+
nbJoursTotauxHiver: int
|
|
17
|
+
nbJoursDernMaj: int
|
|
18
|
+
etatHiver: str
|
|
9
19
|
|
|
10
20
|
|
|
11
21
|
class DTDataTyping(TypedDict, total=True):
|
hydroqc/webuser.py
CHANGED
|
@@ -18,6 +18,7 @@ class WebUser:
|
|
|
18
18
|
self,
|
|
19
19
|
username: str,
|
|
20
20
|
password: str,
|
|
21
|
+
*,
|
|
21
22
|
verify_ssl: bool,
|
|
22
23
|
log_level: str | None = None,
|
|
23
24
|
http_log_level: str | None = None,
|
|
@@ -28,7 +29,7 @@ class WebUser:
|
|
|
28
29
|
self._hydro_client = HydroClient(
|
|
29
30
|
username,
|
|
30
31
|
password,
|
|
31
|
-
verify_ssl,
|
|
32
|
+
verify_ssl=verify_ssl,
|
|
32
33
|
log_level=http_log_level,
|
|
33
34
|
diag_folder=diag_folder,
|
|
34
35
|
)
|
|
@@ -77,9 +78,9 @@ class WebUser:
|
|
|
77
78
|
customer = Customer(
|
|
78
79
|
customer_data["noPartenaireDemandeur"],
|
|
79
80
|
customer_data["noPartenaireTitulaire"],
|
|
80
|
-
customer_names,
|
|
81
|
-
self._hydro_client,
|
|
82
|
-
self._log_level,
|
|
81
|
+
customer_names=customer_names,
|
|
82
|
+
hydro_client=self._hydro_client,
|
|
83
|
+
log_level=self._log_level,
|
|
83
84
|
)
|
|
84
85
|
self.customers.append(customer)
|
|
85
86
|
self._logger.debug("Got webuser info")
|
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
hydroqc/__init__.py,sha256=sFhCh7-LWoISCQuAtdrLQOmj2x5wjHBGbAAPg4SN6Pc,40
|
|
2
|
-
hydroqc/account.py,sha256=TVohNCLYL5BRHbzQn0KE_cBsMJva9hZ8rLva8rHP5CI,3364
|
|
3
|
-
hydroqc/consts.py,sha256=a9dWq5i6t5VedYosUbP8zIuG2q5TPw4ruT0jOaC8Yo8,209
|
|
4
|
-
hydroqc/customer.py,sha256=SdpVdB_Kwo3tZftJhr6N2weNiCF4Bl005PnxORN0xGc,6166
|
|
5
|
-
hydroqc/diagnostic.py,sha256=eVY3HfMcLCjTbKWo9xdaw14ygju4qUIKy9pxcQstoRc,17322
|
|
6
|
-
hydroqc/error.py,sha256=2HzWBak_RpuhfIrLhnfgNuY3FhUwwNyo1BLUDH6U0CI,598
|
|
7
|
-
hydroqc/logger.py,sha256=Fez6CqjBBxd841U3avtnrT3E43Vyy-v1e7hqwUmf9bg,1256
|
|
8
|
-
hydroqc/public_client.py,sha256=9NCwVIyrM2BQtGbXXi28owPUhFIVpSWXj66ysCohyhQ,2860
|
|
9
|
-
hydroqc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
10
|
-
hydroqc/timerange.py,sha256=MXR9yau72m4UZBSmN1qB0jMs0x4_jEZYnwtaUnGq-MQ,1137
|
|
11
|
-
hydroqc/utils.py,sha256=sxA5qkOA-Ui5jgEYItFQIeQdBsS_5z8J3xn8YxKZMow,232
|
|
12
|
-
hydroqc/webuser.py,sha256=Nm1cy1zD7MfEWX1vum4ziXzA579YCO3lenPldcY2-z4,4518
|
|
13
|
-
hydroqc/contract/__init__.py,sha256=uqxjOgyhpKFd-n_umxdaW5FB_DkJJaettWnEFC0nRYc,548
|
|
14
|
-
hydroqc/contract/common.py,sha256=uQ7NuLsPNo64cHli7UcpMWR0UPsy-fFLwdTvL0EnrNM,15446
|
|
15
|
-
hydroqc/contract/contract_d.py,sha256=nAg1gyDl6l8iU7BOpaXCGMm6dsmHgCpnZqAL0yWSxRU,799
|
|
16
|
-
hydroqc/contract/contract_d_cpc.py,sha256=7a8l2SppkMgnLtMB-yeJ2ET1Si0YUnQ9sYV5_-wtXEU,1329
|
|
17
|
-
hydroqc/contract/contract_dpc.py,sha256=e2Igv0YJP-JVd3XmhlDnpfYwlpBscSRQl62ZuG-UWlw,4953
|
|
18
|
-
hydroqc/contract/contract_dt.py,sha256=IOEocJaIsFIm4qu759hjjE-z-fniOczC5fDtGq-pMb0,1630
|
|
19
|
-
hydroqc/contract/contract_m.py,sha256=yUgIH7wZZcspw_50WPE49cYLHbeSLpRmucjBmSKs3lM,1951
|
|
20
|
-
hydroqc/contract/contract_m_gdp.py,sha256=YfIUYbAMJUHEGf_-9rcu1_G7S7fVjWYChtdC2VuAV0g,744
|
|
21
|
-
hydroqc/contract/contract_residential.py,sha256=I5cIVii5TMqcsROUx5cGqnwuJULk8AN8ky6wWU6cv1Y,1349
|
|
22
|
-
hydroqc/contract/outage.py,sha256=K5XX0enSKMVpL-JCkWsykuKUw-5_GcSJLzcSR1SqQDk,3979
|
|
23
|
-
hydroqc/hydro_api/__init__.py,sha256=bIIjTkhQcXG7kn4cQr_Q6tFSKGjAx-AXLjMMlRCjclY,32
|
|
24
|
-
hydroqc/hydro_api/cache.py,sha256=mC3UO246V5zJ1p89nUb5EzQon_4tQGUgFMZKy4YY8I8,912
|
|
25
|
-
hydroqc/hydro_api/client.py,sha256=1mB8PRam-ZvAlAxUFgLMkRihhuLGT198qASSYVAABiU,35172
|
|
26
|
-
hydroqc/hydro_api/consts.py,sha256=lLNlVgWZ21ExG6S_UZVeHcczFpm2YZMAOZRqzEy67c8,4632
|
|
27
|
-
hydroqc/peak/__init__.py,sha256=ye2KbWXhJEHZnBDaFylWioy3W-mzJw_lDplsJNAapNs,19
|
|
28
|
-
hydroqc/peak/basepeak.py,sha256=DMXjZXyNRHWnuhB0Vp3ZINGhNQngG7AU15cDLajmC7M,1954
|
|
29
|
-
hydroqc/peak/basepeakhandler.py,sha256=Bfg1B4DSWDZFk0WAyHVJibXw_ZAH7x4eaAVvZy7Y-cI,9173
|
|
30
|
-
hydroqc/peak/consts.py,sha256=2gUTZcDzu6Dia5g5w7-IG0JFt-9YdVopYcbHXjW3EK8,67
|
|
31
|
-
hydroqc/peak/cpc/__init__.py,sha256=sez6LQOUqDu6YVIpJexq9wYv3wef3I4TeCxwHhO9bBU,18
|
|
32
|
-
hydroqc/peak/cpc/consts.py,sha256=75h23l1cdwOZm0wn5CTWIU98grDqplv8_8tnpbjnlYM,544
|
|
33
|
-
hydroqc/peak/cpc/handler.py,sha256=cxelJ0aYnzQN-NxoNWSIpd5GaoBw7w9cKVCKOg_fYAQ,12389
|
|
34
|
-
hydroqc/peak/cpc/peak.py,sha256=8U2XibVs7NTT3OBzZAW_fyfVDEN68P98YtqVZh5f5BE,4266
|
|
35
|
-
hydroqc/peak/dpc/__init__.py,sha256=H99D93OC4quEag-lQZ3BEF2mr5Qiu3DtvdKjBsiSRBg,18
|
|
36
|
-
hydroqc/peak/dpc/consts.py,sha256=iRrEY_nsxb71AqU9KY7MRVkwxQM0ofBeEJLdyrjnhOc,523
|
|
37
|
-
hydroqc/peak/dpc/handler.py,sha256=J98bVzHMqqTsUvnGcnTXLBXI95FgA8FWSRonXZS7xmg,3365
|
|
38
|
-
hydroqc/peak/dpc/peak.py,sha256=clb1j6LaBndPo0qPlOxumGuUGYB4-_ob_s8UQa-m49o,1313
|
|
39
|
-
hydroqc/types/__init__.py,sha256=1dzth61xIsdteCEy2oVaavT78_djw-lUpzpXPRzQE40,1453
|
|
40
|
-
hydroqc/types/account.py,sha256=yXwqjU3lBG7cGt8RF0cyvNSxtBCaIoWgmtvsLisvQTY,3696
|
|
41
|
-
hydroqc/types/common.py,sha256=4uZRo4JDoVPmhugLUcA9eh_6xkzn_hNvJdRO-viDKQA,1395
|
|
42
|
-
hydroqc/types/consump.py,sha256=-MIF6gZrOBI6ng6edBcI41sD5z6nDF3X3Kvoq-EjSoM,5929
|
|
43
|
-
hydroqc/types/contract.py,sha256=OTi8c5CEces3vwwQLbPzo1jB7sgwOweS1imFPnJMML0,1657
|
|
44
|
-
hydroqc/types/cpc.py,sha256=ghmtBTT1FKuqVodJJ0kCtUbYNTLCOrngxgcrzjJYvok,2116
|
|
45
|
-
hydroqc/types/dpc.py,sha256=5MGf3i74s6r4gJpFjNSgbN1v85VZO7dtu7pB5B4sgUQ,1328
|
|
46
|
-
hydroqc/types/dt.py,sha256=GzIY_5Bc-bVjYURN3O8Z3xVd9Y24mWYirSwBMhZjbPk,329
|
|
47
|
-
hydroqc/types/outage.py,sha256=XTsNyu8mmxUx44XWvOOUHKSoijp-lgbXwQroiqm9S0o,3932
|
|
48
|
-
Hydro_Quebec_API_Wrapper-4.0.0.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
|
|
49
|
-
Hydro_Quebec_API_Wrapper-4.0.0.dist-info/METADATA,sha256=tjqmlbvqN4AjB_MzS5gl0RMojBsBmEnlluJpmh2_i4c,7927
|
|
50
|
-
Hydro_Quebec_API_Wrapper-4.0.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
|
|
51
|
-
Hydro_Quebec_API_Wrapper-4.0.0.dist-info/entry_points.txt,sha256=G2YKkCH9rFt2dXbFyHINBp4bmqY2HTEIaf7F1CwbC_k,57
|
|
52
|
-
Hydro_Quebec_API_Wrapper-4.0.0.dist-info/top_level.txt,sha256=YAcYLnu5YYkbxt1psUoBfo_opl-lAZKq0A7B3IN_P6M,8
|
|
53
|
-
Hydro_Quebec_API_Wrapper-4.0.0.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
{Hydro_Quebec_API_Wrapper-4.0.0.dist-info → hydro_quebec_api_wrapper-4.2.0.dist-info}/top_level.txt
RENAMED
|
File without changes
|