Merge pull request #591 from MTrab:Fix-error-checking-for-tariff-status

Fix error when tariff API is not responding

config/configuration.yaml

@@ -1,9 +1,9 @@
 default_config:
 
-#logger:
-#  default: warning
-#  logs:
-#    custom_components.energidataservice: debug
+logger:
+  default: warning
+  logs:
+    custom_components.energidataservice: debug
 
 # If you need to debug uncomment the line below (doc: https://www.home-assistant.io/integrations/debugpy/)
 # debugpy:

custom_components/energidataservice/api.py

@@ -288,9 +288,6 @@ async def update_carnot(self, dt=None) -> None:  # type: ignore pylint: disable=
     async def async_get_tariffs(self) -> None:
         """Get tariff data."""
 
-        if self.api.status != 200:
-            retry_update(self, self.async_get_tariffs)
-
         if self.tariff:
             tariff_endpoint = await self.tariffs.get_endpoint(self._region.region)
             tariff_module = await self.hass.async_add_executor_job(
@@ -306,8 +303,13 @@ async def async_get_tariffs(self) -> None:
             )
 
             self.tariff_connector = tariff
+
             self.tariff_data = await tariff.async_get_tariffs()
 
+            if self.tariff_data["status"] != 200:
+                retry_update(self, self.async_get_tariffs)
+
+
     @property
     def tomorrow_valid(self) -> bool:
         """Is tomorrows prices valid?."""

custom_components/energidataservice/tariffs/energidataservice/__init__.py

@@ -35,6 +35,7 @@ def __init__(
         self._additional_tariff = {}
         self._all_tariffs = {}
         self._all_additional_tariffs = {}
+        self.status = 418
 
     @property
     def tariffs(self):
@@ -44,6 +45,7 @@ def tariffs(self):
         tariffs = {
             "additional_tariffs": self._additional_tariff,
             "tariffs": self._tariffs,
+            "status": self.status,
         }
 
         return tariffs
@@ -191,6 +193,7 @@ async def async_call_api(self, query: str) -> dict:
         try:
             headers = self._header()
             resp = await self.client.get(f"{BASE_URL}?{query}", headers=headers)
+            self.status = resp.status
             resp.raise_for_status()
 
             if resp.status == 400: