Merge pull request #11 from runemoennike/month-data

Added get_per_month to get month based consumption data for a given year.

pyeloverblik/__main__.py

@@ -2,6 +2,7 @@
 Main for pyeloverblik
 '''
 import argparse
+from datetime import datetime
 import logging
 from . import Eloverblik
 
@@ -30,6 +31,17 @@ def main():
         print(f"Total: {total}kWh")
     else:
         print(f"Error getting data. Status: {result.status}. Error: {result.detailed_status}")
+
+    result = Eloverblik(args.refresh_token).get_per_month(args.metering_point)
+    if result.status == 200:
+        print(f"Date: {result.data_date}")
+        for month in range(1, datetime.today().month + 1):
+            data = result.get_metering_data(month)
+            print(f"Month {month}: {data}kWh")
+
+        print(f"Total: {result.get_total_metering_data()}kWh")
+    else:
+        print(f"Error getting data. Status: {result.status}. Error: {result.detailed_status}")
 
 def _configureLogging(args):
     if args.log:

pyeloverblik/eloverblik.py

@@ -4,6 +4,7 @@
 from datetime import datetime
 from datetime import timedelta
 import json
+import re
 import requests
 import logging
 from .models import RawResponse
@@ -132,6 +133,35 @@ def get_latest(self, metering_point):
 
         return result
 
+    def get_per_month(self, metering_point, year=None):
+        '''
+        Get total consumption for each month in the given year, as well as the total for the year.
+        '''
+        if year is None:
+            year = datetime.today().year
+
+        if not re.match('\d{4}', str(year)):
+            raise ValueError("Year must be a four digit number.")
+
+        raw_data = self.get_time_series(metering_point,
+                                        from_date=datetime(year, 1, 1),
+                                        to_date=datetime(year, 12, 31) if year < datetime.today().year else datetime.today(),
+                                        aggregation='Month')
+
+        if raw_data.status == 200:
+            json_response = json.loads(raw_data.body)
+
+            r = self._parse_result(json_response)
+            keys = list(r.keys())
+            keys.sort()
+
+            result = TimeSeries(raw_data.status, keys[-1], [r[k].get_total_metering_data() for k in keys])
+        else:
+            result = TimeSeries(raw_data.status, None, None, raw_data.body)
+
+        return result
+
+
     def _parse_result(self, result):
         '''
         Parse result from API call.

pyeloverblik/models.py

@@ -44,13 +44,13 @@ def detailed_status(self):
     def data_date(self):
         return self._data_date
 
-    def get_metering_data(self, hour):
+    def get_metering_data(self, index):
         '''
-        Get metering data for a single hour.
-        hour=1: data between 00.00 and 01.00.
-        hour=4: data between 03.00 and 04.00.
+        Get metering data for a single hour or month.
+        index=1: data between 00.00 and 01.00 if TimeSeries contains day data, or January if TimeSeries contains month data.
+        index=4: data between 03.00 and 04.00 if TimeSeries contains day data, or April if TimeSeries contains month data.
         '''
-        return self._metering_data[hour-1]
+        return self._metering_data[index-1]
 
     def get_total_metering_data(self):
         total = 0