mirrors/elicznik
1
0
Fork 0
mirror of https://github.com/mlesniew/elicznik.git synced 2025-12-24 06:18:07 +01:00
Code Issues Projects Releases Wiki Activity

Use the API for CSV output

Browse Source
This commit is contained in:
Michał Leśniewski
2021-11-24 21:01:36 +01:00
parent 00ed65e253
commit c653412f26
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
elicznik.py
View File

@@ -53,8 +53,12 @@ class ELicznik:
return self.session.post(
self.CHART_URL,
data={
"dane[chartDay]": date.strftime("%d.%m.%Y"),
"dane[paramType]": "day",
# "dane[smartNr]": "?"
# "dane[chartDay]": date.strftime("%d.%m.%Y"),
"dane[paramType]": "csv",
"dane[trybCSV]": "godzin",
"dane[startDay]": date.strftime("%d.%m.%Y"),
"dane[endDay]": date.strftime("%d.%m.%Y"),
"dane[checkOZE]": "on",
},
).json()
@@ -62,15 +66,20 @@ class ELicznik:
@staticmethod
def _extract_values_with_timestamps(data):
for element in data:
timestamp = datetime.datetime.strptime(element["Date"], "%Y-%m-%d").replace(hour=int(element["Hour"]) - 1)
timestamp += datetime.timedelta(hours=1)
date = element.get("Date")
hour = int(element.get("Hour"))
value = float(element.get("EC"))
# TODO: There's also an "Extra" field, which seems to be set to be set to "T" only for the one extra hour
# when switching from CEST to CET (e.g. 3 AM on 2021-10-31)
timestamp = datetime.datetime.strptime(date, "%Y-%m-%d")
timestamp += datetime.timedelta(hours=hour)
value = element.get("EC")
yield timestamp, value
def get_readings(self, date):
data = self.get_raw_readings(date)
consumed = dict(self._extract_values_with_timestamps(data["dane"]["chart"].values()))
produced = dict(self._extract_values_with_timestamps(data["dane"]["OZE"].values()))
data = self.get_raw_readings(date).get("dane", {})
consumed = dict(self._extract_values_with_timestamps(data.get("chart", [])))
produced = dict(self._extract_values_with_timestamps(data.get("OZE", [])))
return sorted((timestamp, float(consumed.get(timestamp)), float(produced.get(timestamp)))
for timestamp in set(consumed) | set(produced))