Fixed List typing issue for older verions
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
import datetime
|
import datetime
|
||||||
|
from typing import List
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
|
|
||||||
@@ -8,7 +9,6 @@ from EngieApi.EngieAPI import EngieAPI
|
|||||||
|
|
||||||
class Dynamic:
|
class Dynamic:
|
||||||
def __init__(self, btw=1.21):
|
def __init__(self, btw=1.21):
|
||||||
|
|
||||||
self.btw = btw
|
self.btw = btw
|
||||||
self.vast = 100.7 # EUR / jaar
|
self.vast = 100.7 # EUR / jaar
|
||||||
|
|
||||||
@@ -35,22 +35,26 @@ class Dynamic:
|
|||||||
prijs = 0.2040 + 0.1 * (epex_spot) # zonder BTW per Cent/kWh
|
prijs = 0.2040 + 0.1 * (epex_spot) # zonder BTW per Cent/kWh
|
||||||
# cent to eur
|
# cent to eur
|
||||||
prijs /= 100
|
prijs /= 100
|
||||||
prijs += self.groene_stroom + self.wwk + self.energiebijdrage + self.federale_accijns
|
prijs += (
|
||||||
|
self.groene_stroom + self.wwk + self.energiebijdrage + self.federale_accijns
|
||||||
|
)
|
||||||
|
|
||||||
# distirbution costs
|
# distirbution costs
|
||||||
d = Capaciteitstarief()
|
d = Capaciteitstarief()
|
||||||
p, yearly = d.calculate_per_kwh(peak=peak)
|
p, yearly = d.calculate_per_kwh(peak=peak)
|
||||||
prijs += p
|
prijs += p
|
||||||
|
|
||||||
# add btw
|
# add btw
|
||||||
prijs *= self.btw
|
prijs *= self.btw
|
||||||
return prijs, yearly + self.vast
|
return prijs, yearly + self.vast
|
||||||
|
|
||||||
def calculate_total_price_for_day(self, verbruik: list[int], date: datetime.date, peak: float) -> float:
|
def calculate_total_price_for_day(
|
||||||
|
self, verbruik: List[int], date: datetime.date, peak: float
|
||||||
|
) -> float:
|
||||||
"""calculate_total_price_for_day calculate total price for given usage
|
"""calculate_total_price_for_day calculate total price for given usage
|
||||||
|
|
||||||
:param verbruik: a list of hourly usage values
|
:param verbruik: a list of hourly usage values
|
||||||
:type verbruik: list[int]
|
:type verbruik: List[int]
|
||||||
:param date: the date for the energy prices
|
:param date: the date for the energy prices
|
||||||
:type date: datetime.date
|
:type date: datetime.date
|
||||||
:param peak: the monthly peak for the distribution costs
|
:param peak: the monthly peak for the distribution costs
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import json
|
import json
|
||||||
from datetime import date, datetime, timedelta
|
from datetime import date, datetime, timedelta
|
||||||
|
from typing import List
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
date_format = '%Y-%m-%dT%H:%M:%S%z'
|
date_format = "%Y-%m-%dT%H:%M:%S%z"
|
||||||
|
|
||||||
|
|
||||||
class EngieAPI:
|
class EngieAPI:
|
||||||
@@ -18,10 +19,10 @@ class EngieAPI:
|
|||||||
"User-Agent": "Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Mobile Safari/537.36",
|
"User-Agent": "Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Mobile Safari/537.36",
|
||||||
"Referer": "https://engieenergy.azurewebsites.net/",
|
"Referer": "https://engieenergy.azurewebsites.net/",
|
||||||
"Content-Length": "294",
|
"Content-Length": "294",
|
||||||
"Accept-Language": "en-GB,en;q=0.9"
|
"Accept-Language": "en-GB,en;q=0.9",
|
||||||
}
|
}
|
||||||
|
|
||||||
def get_epex_spot(self, date: date) -> list[float]:
|
def get_epex_spot(self, date: date) -> List[float]:
|
||||||
to_date = datetime(date.year, date.month, date.day, 23, 59, 59)
|
to_date = datetime(date.year, date.month, date.day, 23, 59, 59)
|
||||||
from_date = to_date - timedelta(days=1, hours=23, minutes=59, seconds=59)
|
from_date = to_date - timedelta(days=1, hours=23, minutes=59, seconds=59)
|
||||||
|
|
||||||
@@ -29,14 +30,10 @@ class EngieAPI:
|
|||||||
"ApplicationDate": {
|
"ApplicationDate": {
|
||||||
"From": from_date.strftime(date_format),
|
"From": from_date.strftime(date_format),
|
||||||
"To": to_date.strftime(date_format),
|
"To": to_date.strftime(date_format),
|
||||||
"UseTime": True
|
"UseTime": True,
|
||||||
},
|
},
|
||||||
"IncludeOffset": True,
|
"IncludeOffset": True,
|
||||||
"Items": [
|
"Items": [{"IdRef": 7070}],
|
||||||
{
|
|
||||||
"IdRef": 7070
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
res = requests.post(self.url, headers=self.headers, data=json.dumps(data))
|
res = requests.post(self.url, headers=self.headers, data=json.dumps(data))
|
||||||
@@ -46,7 +43,7 @@ class EngieAPI:
|
|||||||
# check if the Date is the same as the one requested, attention to the timezone
|
# check if the Date is the same as the one requested, attention to the timezone
|
||||||
if datetime.strptime(j["Date"], date_format).date() == date:
|
if datetime.strptime(j["Date"], date_format).date() == date:
|
||||||
values.append(j["Value"])
|
values.append(j["Value"])
|
||||||
|
|
||||||
if not values:
|
if not values:
|
||||||
raise ValueError("No data found for this date")
|
raise ValueError("No data found for this date")
|
||||||
return values
|
return values
|
||||||
|
|||||||
Reference in New Issue
Block a user