emhass 0.12.0__py3-none-any.whl → 0.12.2__py3-none-any.whl

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,
@@ -444,7 +446,6 @@ def weather_forecast_cache(
         "forecast",
         logger,
         emhass_conf,
-        {},
     )
     # Make sure weather_forecast_cache is true
     if (params != None) and (params != "null"):

emhass/retrieve_hass.py

@@ -90,9 +90,23 @@ class RetrieveHass:
             "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,

emhass/utils.py

@@ -171,6 +171,7 @@ def update_params_with_ha_config(
         'CHF': 'CHF',  # Swiss Franc has no special symbol
         'CNY': '¥',
         'INR': '₹',
+        'CZK': 'Kč',
         # Add more as needed
     }
     if 'currency' in ha_config.keys():

{emhass-0.12.0.dist-info → emhass-0.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emhass
-Version: 0.12.0
+Version: 0.12.2
 Summary: An Energy Management System for Home Assistant
 Author-email: David HERNANDEZ <davidusb@gmail.com>
 License: MIT
@@ -135,10 +135,7 @@ You must follow these steps to make EMHASS work properly:
     - There are multiple methods of installing and Running EMHASS. See [Installation Method](#Installation-Methods) below to pick a method that best suits your use case.
 
 2) Define all the parameters in the configuration file *(`config.json`)* or configuration page *(`YOURIP:5000/configuration`)*.
-```{note} 
-
-New in EMHASS v0.12.0: the default configuration does not need to retrieve any data from Home Assistant! After installing and running the add-on, EMHASS should start and it will be ready to launch an optimization.
-```
+    - Since EMHASS v0.12.0: the default configuration does not need to retrieve any data from Home Assistant! After installing and running the add-on, EMHASS should start and it will be ready to launch an optimization.
     - See the description for each parameter in the [configuration](https://emhass.readthedocs.io/en/latest/config.html) docs. 
     - EMHASS has a default configuration with 2 deferrable loads, no solar PV, no batteries and a basic load power forecasting method.
       - If you want to consider solar PV and more advanced load power forecast methods, you will need to define the main data entering EMHASS. This will be the Home Assistant sensor/variable `sensor.power_load_no_var_loads`, for the load power of your household excluding the power of the deferrable loads that you want to optimize, and the sensor/variable `sensor.power_photovoltaics` for the name of your Home Assistant variable containing the PV produced power (if solar PV is activated).

{emhass-0.12.0.dist-info → emhass-0.12.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 emhass/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-emhass/command_line.py,sha256=xXu0A87fgiv38YbEJZiK3xQZ63wEMp081YqUCNsAWcM,70688
+emhass/command_line.py,sha256=4sAFhE6pBfB0SeYlhxKg_LwAOQJi_atMRurtNxYWIWA,70727
 emhass/forecast.py,sha256=_Gc8k6_8Nz87WHXKyUH6iXK956Z2TGzhL8L6t-tO_sk,63496
 emhass/machine_learning_forecaster.py,sha256=JErz50i_D59J5wXdbf_EUPb_FG45qRflv51iBA7ARXU,17417
 emhass/machine_learning_regressor.py,sha256=yFwMvVEmlgDJUsHhBT-HpNE3j2TC24e8Gmbcn9MPfeU,10690
 emhass/optimization.py,sha256=izMgRJFEP_9LHvZeX6FM1lxWyDWX3Tq2hFvu8ZP9FN4,61457
-emhass/retrieve_hass.py,sha256=LLZBoP5Rkyg0_uSvJSG5m-6apVoWZ6MWuXPPA-j-JsI,25617
-emhass/utils.py,sha256=esxcCoA38VhhugOHRvu69hJ8_V_zJkAqu0jUHW26rck,68969
+emhass/retrieve_hass.py,sha256=RIzRiGzo09TO6zfDKqIClnLzQ5n2YkV97pinXPPXWsQ,26135
+emhass/utils.py,sha256=fkdsncHcTW70vlwp9-JjDzJqVpa7imW07QY7rEXEpHY,68991
 emhass/web_server.py,sha256=QsqT51AdlAgNCG3NV1zbm4YkBSq_0BaC3cIEzPeZvl8,28023
 emhass/data/associations.csv,sha256=IpEZIIWYdFjkRoC5xa1pRHjwnVs_VH8G8ogbGFxLfGI,3679
 emhass/data/cec_inverters.pbz2,sha256=tK8FvAUDW0uYez8EPttdCJwHhpPofclYV6GhhNZL0Pk,168272
@@ -24,9 +24,9 @@ emhass/static/img/feather-sprite.svg,sha256=VHjMJQg88wXa9CaeYrKGhNtyK0xdd47zCqwS
 emhass/templates/configuration.html,sha256=M-_L__juYzcdGDaryGrz6LG2mguW2f1Sx6k01YfG7Dc,2885
 emhass/templates/index.html,sha256=1V44c0yyliu_z8inl0K-zmmmkhQumH3Bqk8Jj1YJPzY,3076
 emhass/templates/template.html,sha256=TkGgMecQEbFUZA4ymPwMUzNjKHsENvCgroUWbPt7G4Y,158
-emhass-0.12.0.dist-info/LICENSE,sha256=1X3-S1yvOCBDBeox1aK3dq00m7dA8NDtcPrpKPISzbE,1077
-emhass-0.12.0.dist-info/METADATA,sha256=7e1QOm_rd__64snbbStegC7hFW8q62JHdC2sHlCFhSw,49398
-emhass-0.12.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-emhass-0.12.0.dist-info/entry_points.txt,sha256=6Bp1NFOGNv_fSTxYl1ke3K3h3aqAcBxI-bgq5yq-i1M,52
-emhass-0.12.0.dist-info/top_level.txt,sha256=L7fIX4awfmxQbAePtSdVg2e6x_HhghfReHfsKSpKr9I,7
-emhass-0.12.0.dist-info/RECORD,,
+emhass-0.12.2.dist-info/LICENSE,sha256=1X3-S1yvOCBDBeox1aK3dq00m7dA8NDtcPrpKPISzbE,1077
+emhass-0.12.2.dist-info/METADATA,sha256=ITyAlhDMWqjrmvS6aPd8EOh7MQP08sVviUiDDmjJtYQ,49387
+emhass-0.12.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+emhass-0.12.2.dist-info/entry_points.txt,sha256=6Bp1NFOGNv_fSTxYl1ke3K3h3aqAcBxI-bgq5yq-i1M,52
+emhass-0.12.2.dist-info/top_level.txt,sha256=L7fIX4awfmxQbAePtSdVg2e6x_HhghfReHfsKSpKr9I,7
+emhass-0.12.2.dist-info/RECORD,,