emhass 0.12.0__tar.gz → 0.12.2__tar.gz

{emhass-0.12.0 → emhass-0.12.2}/CHANGELOG.md

@@ -1,11 +1,21 @@
 # Changelog
 
+## 0.12.2 - 2025-01-01
+### Patch fix
+- Fixed Problem with calling weather-forecast-cache
+### Improvement
+- Updated readthedocs.yml, got rid of duplicated requirements.txt
+
+## 0.12.1 - 2024-12-30
+### Patch fix
+- Fixed error with retrieve config from HA
+
 ## 0.12.0 - 2024-12-29
 ### BREAKING CHANGE
-- The solar PV system is now optional. If you have a PV system then use the switch on the webui or set the `set_use_pv` parameter to `True`.
+- The solar PV system is now optional. If you have a PV system then use the switch on the webui or set the `set_use_pv` parameter to `True`
 ### Improvement
-- A new load power forecast method based on statistic and typical household load power consumption. This and the optional PV, will make it easier for new users to on-board EMHASS because this new default behavior does not require any data retrieval from Home Assistant or any other external source.
-- Updated documentation.
+- A new load power forecast method based on statistic and typical household load power consumption. This and the optional PV, will make it easier for new users to on-board EMHASS because this new default behavior does not require any data retrieval from Home Assistant or any other external source
+- Updated documentation
 
 ## 0.11.4 - 2024-12-24
 ### Fix

{emhass-0.12.0 → emhass-0.12.2}/PKG-INFO

@@ -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 → emhass-0.12.2}/README.md

@@ -91,10 +91,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 → emhass-0.12.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "emhass"
-version = "0.12.0"
+version = "0.12.2"
 description = "An Energy Management System for Home Assistant"
 readme = "README.md"
 requires-python = ">=3.10, <3.12"

{emhass-0.12.0 → emhass-0.12.2}/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,
@@ -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-0.12.0 → emhass-0.12.2}/src/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-0.12.0 → emhass-0.12.2}/src/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 → emhass-0.12.2}/src/emhass.egg-info/PKG-INFO

@@ -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).