emhass 0.11.0__tar.gz → 0.11.1__tar.gz

{emhass-0.11.0 → emhass-0.11.1}/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.11.1 - 2024-10-29
+### Fix
+- Fix parameter saving and duplicate battery bugs 
+- utils.py add more specific logging information for config 
+- Fix issue where thermal runtime parameters were not being propagated into optim_conf 
+
 ## 0.11.0 - 2024-10-25
 
 This version marks huge improvement works by @GeoDerp aiming to simplfy the intial and normal setup of EMHASS. The workflow for setting the EMHASS configuration regardless of the installation method has now been centralized on the single `config.json` file. The webserver has now a configuration tab that can be used to to modify and save the `config.json` file.

{emhass-0.11.0 → emhass-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emhass
-Version: 0.11.0
+Version: 0.11.1
 Summary: An Energy Management System for Home Assistant
 Home-page: https://github.com/davidusb-geek/emhass
 Author: David HERNANDEZ
@@ -164,7 +164,7 @@ _Note: Both EMHASS via Docker and EMHASS-Add-on contain the same Docker image. T
 You can also install EMHASS using Docker as a container. This can be in the same machine as Home Assistant (if your running Home Assistant as a Docker container) or in a different distant machine. To install first pull the latest image:
 ```bash
 # pull Docker image
-docker docker pull ghcr.io/davidusb-geek/emhass:latest
+docker pull ghcr.io/davidusb-geek/emhass:latest
 # run Docker image, mounting config.json and secrets_emhass.yaml from host
 docker run --rm -it --restart always  -p 5000:5000 --name emhass-container -v ./config.json:/share/config.json -v ./secrets_emhass.yaml:/app/secrets_emhass.yaml ghcr.io/davidusb-geek/emhass:latest
 ```
@@ -173,7 +173,7 @@ docker run --rm -it --restart always  -p 5000:5000 --name emhass-container -v ./
 You can also build your image locally. For this clone this repository, and build the image from the Dockerfile:
 ```bash
 # git clone EMHASS repo
-git clone docker pull ghcr.io/geoderp/emhass:v0.21.3
+git clone https://github.com/davidusb-geek/emhass.git
 # move to EMHASS directory 
 cd emhass
 # build Docker image 

{emhass-0.11.0 → emhass-0.11.1}/README.md

@@ -129,7 +129,7 @@ _Note: Both EMHASS via Docker and EMHASS-Add-on contain the same Docker image. T
 You can also install EMHASS using Docker as a container. This can be in the same machine as Home Assistant (if your running Home Assistant as a Docker container) or in a different distant machine. To install first pull the latest image:
 ```bash
 # pull Docker image
-docker docker pull ghcr.io/davidusb-geek/emhass:latest
+docker pull ghcr.io/davidusb-geek/emhass:latest
 # run Docker image, mounting config.json and secrets_emhass.yaml from host
 docker run --rm -it --restart always  -p 5000:5000 --name emhass-container -v ./config.json:/share/config.json -v ./secrets_emhass.yaml:/app/secrets_emhass.yaml ghcr.io/davidusb-geek/emhass:latest
 ```
@@ -138,7 +138,7 @@ docker run --rm -it --restart always  -p 5000:5000 --name emhass-container -v ./
 You can also build your image locally. For this clone this repository, and build the image from the Dockerfile:
 ```bash
 # git clone EMHASS repo
-git clone docker pull ghcr.io/geoderp/emhass:v0.21.3
+git clone https://github.com/davidusb-geek/emhass.git
 # move to EMHASS directory 
 cd emhass
 # build Docker image 

{emhass-0.11.0 → emhass-0.11.1}/setup.py

@@ -19,7 +19,7 @@ long_description = (here / 'README.md').read_text(encoding='utf-8')
 
 setup(
     name='emhass',  # Required
-    version='0.11.0',  # Required
+    version='0.11.1',  # Required
     description='An Energy Management System for Home Assistant',  # Optional
     long_description=long_description,  # Optional
     long_description_content_type='text/markdown',  # Optional (see note above)

{emhass-0.11.0 → emhass-0.11.1}/src/emhass/data/associations.csv

@@ -1,4 +1,5 @@
 config_categorie,legacy_parameter_name,parameter,list_name 
+retrieve_hass_conf,logging_level,logging_level
 retrieve_hass_conf,freq,optimization_time_step
 retrieve_hass_conf,days_to_retrieve,historic_days_to_retrieve
 retrieve_hass_conf,var_PV,sensor_power_photovoltaics
@@ -13,6 +14,7 @@ params_secrets,time_zone,time_zone
 params_secrets,lat,Latitude
 params_secrets,lon,Longitude
 params_secrets,alt,Altitude
+optim_conf,costfun,costfun
 optim_conf,set_use_battery,set_use_battery
 optim_conf,num_def_loads,number_of_deferrable_loads
 optim_conf,P_deferrable_nom,nominal_power_of_deferrable_loads,list_nominal_power_of_deferrable_loads

{emhass-0.11.0 → emhass-0.11.1}/src/emhass/static/configuration_script.js

@@ -249,7 +249,7 @@ function buildParamContainers(
           `;
   }
 
-  //After looping though, build and appending the parameters in the corresponding section:
+  //after looping though, build and appending the parameters in the corresponding section:
   //create add button (array plus) event listeners
   let plus = SectionContainer.querySelectorAll(".input-plus");
   plus.forEach(function (answer) {
@@ -549,6 +549,7 @@ function headerElement(element, param_definitions, config) {
     //if set_use_battery, add or remove battery section (inc. params)
     case "set_use_battery":
       if (element.checked) {
+        param_container.innerHTML = "";
         buildParamContainers("Battery", param_definitions["Battery"], config, [
           "set_use_battery",
         ]);

{emhass-0.11.0 → emhass-0.11.1}/src/emhass/utils.py

@@ -314,9 +314,16 @@ def treat_runtimeparams(runtimeparams: str, params: str, retrieve_hass_conf: dic
             else:
                 def_end_timestep = runtimeparams.get(
                     'def_end_timestep', optim_conf['end_timesteps_of_each_deferrable_load'])
-            params["passed_data"]['end_timesteps_of_each_deferrable_load'] = def_end_timestep
-            forecast_dates = copy.deepcopy(forecast_dates)[
-                0:prediction_horizon]
+            params["passed_data"]["end_timesteps_of_each_deferrable_load"] = def_end_timestep
+            forecast_dates = copy.deepcopy(forecast_dates)[0:prediction_horizon]
+            # Load the default config
+            if "def_load_config" in optim_conf:
+                for k in range(len(optim_conf["def_load_config"])):
+                    if "thermal_config" in optim_conf["def_load_config"][k]:
+                        if ("heater_desired_temperatures" in runtimeparams and len(runtimeparams["heater_desired_temperatures"]) > k):
+                            optim_conf["def_load_config"][k]["thermal_config"]["desired_temperatures"] = runtimeparams["heater_desired_temperatures"][k]
+                        if ("heater_start_temperatures" in runtimeparams and len(runtimeparams["heater_start_temperatures"]) > k):
+                            optim_conf["def_load_config"][k]["thermal_config"]["start_temperature"] = runtimeparams["heater_start_temperatures"][k]
         else:
             params["passed_data"]["prediction_horizon"] = None
             params["passed_data"]["soc_init"] = None
@@ -843,7 +850,7 @@ def build_config(emhass_conf: dict, logger: logging.Logger, defaults_path: str,
             logger.info("Obtaining parameters from config.json:")
             config.update(json.load(data))
     else:
-        logger.info("config.json does not exist, or has not been passed")
+        logger.info("config.json does not exist, or has not been passed. config parameters may default to config_defaults.json")
         logger.info("you may like to generate the config.json file on the configuration page")
 
     # Check to see if legacy config_emhass.yaml was provided (default /app/config_emhass.yaml)
@@ -853,7 +860,7 @@ def build_config(emhass_conf: dict, logger: logging.Logger, defaults_path: str,
             legacy_config = yaml.load(data, Loader=yaml.FullLoader)
             legacy_config_parameters = build_legacy_config_params(emhass_conf,legacy_config,logger)
             if type(legacy_config_parameters) is not bool:
-                logger.info("Obtaining parameters from config_emhass.yaml:")
+                logger.info("Obtaining parameters from config_emhass.yaml: (will overwrite config parameters)")
                 config.update(legacy_config_parameters)     
 
     return config

{emhass-0.11.0 → emhass-0.11.1}/src/emhass/web_server.py

@@ -271,7 +271,6 @@ def parameter_set():
     else: 
         return make_response(["Unable to save config file"],500)
     request_data
-    app.logger.info(params)
 
     # Save params with updated config 
     if os.path.exists(emhass_conf['data_path']):

{emhass-0.11.0 → emhass-0.11.1}/src/emhass.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emhass
-Version: 0.11.0
+Version: 0.11.1
 Summary: An Energy Management System for Home Assistant
 Home-page: https://github.com/davidusb-geek/emhass
 Author: David HERNANDEZ
@@ -164,7 +164,7 @@ _Note: Both EMHASS via Docker and EMHASS-Add-on contain the same Docker image. T
 You can also install EMHASS using Docker as a container. This can be in the same machine as Home Assistant (if your running Home Assistant as a Docker container) or in a different distant machine. To install first pull the latest image:
 ```bash
 # pull Docker image
-docker docker pull ghcr.io/davidusb-geek/emhass:latest
+docker pull ghcr.io/davidusb-geek/emhass:latest
 # run Docker image, mounting config.json and secrets_emhass.yaml from host
 docker run --rm -it --restart always  -p 5000:5000 --name emhass-container -v ./config.json:/share/config.json -v ./secrets_emhass.yaml:/app/secrets_emhass.yaml ghcr.io/davidusb-geek/emhass:latest
 ```
@@ -173,7 +173,7 @@ docker run --rm -it --restart always  -p 5000:5000 --name emhass-container -v ./
 You can also build your image locally. For this clone this repository, and build the image from the Dockerfile:
 ```bash
 # git clone EMHASS repo
-git clone docker pull ghcr.io/geoderp/emhass:v0.21.3
+git clone https://github.com/davidusb-geek/emhass.git
 # move to EMHASS directory 
 cd emhass
 # build Docker image