Merge pull request #411 from GeoDerp/retrieve_hass_fix

get_ha_config add error handling

src/emhass/command_line.py

@@ -69,7 +69,7 @@ def set_input_data_dict(
     retrieve_hass_conf, optim_conf, plant_conf = utils.get_yaml_parse(params, logger)
     if type(retrieve_hass_conf) is bool:
         return False
-    
+
     # Treat runtimeparams
     params, retrieve_hass_conf, optim_conf, plant_conf = utils.treat_runtimeparams(
         runtimeparams,
@@ -81,7 +81,7 @@ def set_input_data_dict(
         logger,
         emhass_conf,
     )
-    
+
     # Define the data retrieve object
     rh = RetrieveHass(
         retrieve_hass_conf["hass_url"],
@@ -93,20 +93,22 @@ def set_input_data_dict(
         logger,
         get_data_from_file=get_data_from_file,
     )
-    
+
     # Retrieve basic configuration data from hass
     if get_data_from_file:
         with open(emhass_conf["data_path"] / "test_df_final.pkl", "rb") as inp:
             _, _, _, rh.ha_config = pickle.load(inp)
     else:
-        rh.get_ha_config()
-
+        response = rh.get_ha_config()
+        if type(response) is bool:
+            return False
+
     # Update the params dict using data from the HA configuration
     params = utils.update_params_with_ha_config(
         params,
         rh.ha_config,
     )
-    
+
     # Define the forecast and optimization objects
     fcst = Forecast(
         retrieve_hass_conf,

src/emhass/retrieve_hass.py

@@ -90,9 +90,23 @@ def get_ha_config(self):
             "Authorization": "Bearer " + self.long_lived_token,
             "content-type": "application/json",
         }
-        url = self.hass_url + "api/config"
-        response_config = get(url, headers=headers)
-        self.ha_config = response_config.json()
+        if self.hass_url == "http://supervisor/core/api":
+            url = self.hass_url + "/config"
+        else:
+            url = self.hass_url + "api/config"
+
+        try:
+            response_config = get(url, headers=headers)
+        except Exception:
+            self.logger.error("Unable to access Home Assistance instance, check URL")
+            self.logger.error("If using addon, try setting url and token to 'empty'")
+            return False
+
+        try:
+            self.ha_config = response_config.json()
+        except Exception:
+            self.logger.error("EMHASS was unable to obtain configuration data from HA")
+            return False
 
     def get_data(
         self,