Merge branch 'dev' into main

Author: ColinRobbins

custom_components/hildebrandglow_dcc/glow.py

@@ -1,7 +1,7 @@
 """Classes for interacting with the Glowmarkt API."""
 import logging
+import time
 from datetime import datetime
-from pprint import pprint
 from typing import Any, Dict, List
 
 import requests
@@ -49,7 +49,8 @@ def authenticate(cls, app_id: str, username: str, password: str) -> Dict[str, An
 
         if data["valid"]:
             return data
-        pprint(data)
+
+        _LOGGER.debug("Invalid data\n%s", data)
         raise InvalidAuth
 
     @classmethod
@@ -89,29 +90,26 @@ def retrieve_resources(self) -> List[Dict[str, Any]]:
         data = response.json()
         return data
 
-    def current_usage(self, resource: Dict[str, Any]) -> Dict[str, Any]:
-        """Retrieve the current usage for a specified resource."""
-        # Get today's date
-        current_time = datetime.now()
-        current_date = current_time.strftime("%Y-%m-%d")
-
-        # Need to pull updated data from DCC first
-        catchup_url = f"{self.BASE_URL}/resource/{resource}/catchup"
-
-        url = (
-            f"{self.BASE_URL}/resource/{resource}/readings?from="
-            + current_date
-            + "T00:00:00&to="
-            + current_date
-            + "T23:59:59&period=P1D&offset=-60&function=sum"
-        )
+    def _current_data(
+        self, resource: Dict[str, Any], url: str, catchup: bool
+    ) -> Dict[str, Any]:
+        """Retrieve the current data for a specified resource."""
         headers = {"applicationId": self.app_id, "token": self.token}
 
         try:
-            response = requests.get(catchup_url, headers=headers)
+            if catchup:
+                catchup_url = f"{self.BASE_URL}/resource/{resource}/catchup"
+                response = requests.get(catchup_url, headers=headers)
+
             response = requests.get(url, headers=headers)
-        except requests.Timeout as _timeout:
-            raise CannotConnect from _timeout
+
+        except requests.Timeout as err:
+            _LOGGER.warning("Timeout connecting to Glow %s", err)
+            return None
+
+        except requests.RequestException as err:
+            _LOGGER.warning("Error connecting to Glow %s", err)
+            return None
 
         if response.status_code != 200:
             if response.json()["error"] == "incorrect elements -from in the future":
@@ -128,33 +126,52 @@ def current_usage(self, resource: Dict[str, Any]) -> Dict[str, Any]:
                 raise InvalidAuth
 
             status = str(response.status_code)
-            _LOGGER.error("Response Status Code: %s (%s)", status, url)
+            _LOGGER.error("Glow response status code: %s (%s)", status, url)
+            return None
 
-        data = response.json()
-        return data
+        return response.json()
+
+    def current_usage(self, resource: Dict[str, Any]) -> Dict[str, Any]:
+        """Retrieve the current usage for a specified resource."""
+        # Get today's date
+        current_time = datetime.utcnow()
+        current_date = current_time.strftime("%Y-%m-%d")
+        if time.daylight and (time.localtime().tm_isdst > 0):
+            utc_offset = time.altzone
+        else:
+            utc_offset = time.timezone
+
+        if utc_offset != 0:
+            utc_offset = int(utc_offset / 60)
+            utc_str = f"&offset={utc_offset}"
+        else:
+            utc_str = ""
+
+        # Need to pull updated data from DCC first
+
+        url = (
+            f"{self.BASE_URL}/resource/{resource}/readings?from="
+            + current_date
+            + "T00:00:00&to="
+            + current_date
+            + "T23:59:59&period=P1D"
+            + utc_str
+            + "&function=sum"
+        )
+
+        return self._current_data(resource, url, True)
 
     def current_tariff(self, resource: Dict[str, Any]) -> Dict[str, Any]:
         """Retrieve the current tariff for a specified resource."""
         url = f"{self.BASE_URL}/resource/{resource}/tariff"
-        headers = {"applicationId": self.app_id, "token": self.token}
 
-        try:
-            response = requests.get(url, headers=headers)
-        except requests.Timeout as _timeout:
-            raise CannotConnect from _timeout
-
-        if response.status_code != 200:
-            if response.status_code == 401:
-                raise InvalidAuth
-            if response.status_code == 404:
-                _LOGGER.debug("Tariff 404 error - treating as 401: %s", url)
-                raise InvalidAuth
+        return self._current_data(resource, url, False)
 
-            status = str(response.status_code)
-            _LOGGER.error("Tariff Response Status Code: %s (%s)", status, url)
+    def usage_now(self, resource: Dict[str, Any]) -> Dict[str, Any]:
+        """Retrieve the usage now specified resource."""
+        url = f"{self.BASE_URL}/resource/{resource}/current"
 
-        data = response.json()
-        return data
+        return self._current_data(resource, url, False)
 
 
 class CannotConnect(exceptions.HomeAssistantError):