emhass 0.11.0__py3-none-any.whl → 0.11.1__py3-none-any.whl

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/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/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/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.dist-info → emhass-0.11.1.dist-info}/METADATA

@@ -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.dist-info → emhass-0.11.1.dist-info}/RECORD

@@ -5,16 +5,16 @@ emhass/machine_learning_forecaster.py,sha256=UP9YR3NSt-b_5i2b8wMAfXRWeMnJjSkBXnX
 emhass/machine_learning_regressor.py,sha256=QMAokLgEjvQ8Xy5gYZBQGQTzh2zgg6d6iydoPmy0QeI,10546
 emhass/optimization.py,sha256=IagqVYN2k8KFtQ0ZUZWab6egmDvpkYSQG8qyBmoWvyM,50877
 emhass/retrieve_hass.py,sha256=jLh8nSpsdeZJCaI7qKxAcZYpH8OKouMHz1OiezqLuqc,23430
-emhass/utils.py,sha256=edXOZicasu7YbwuG61ZWeM7gObdprCACjVosHJW_KFQ,64465
-emhass/web_server.py,sha256=MN2xHT2Ci9fDmfxwC3h13yx5SDt2EtgTtKP3XFKKZMg,27257
-emhass/data/associations.csv,sha256=wrHR2_Z18HEvTnugt6BQ3s363eClnXmspDqsUAvT92s,3580
+emhass/utils.py,sha256=_wCO_88Ycn0Gd5EcGHMBcyI9NQ-saWunGzvZVqufn-o,65336
+emhass/web_server.py,sha256=QALTX0We82qToxiCnX2SocgkjlUsHLubqJ5WrCWO3P0,27229
+emhass/data/associations.csv,sha256=GFE_4ptHT6qno0lJt_rEeOXBqkLd759GNqXEVp4x2Po,3654
 emhass/data/cec_inverters.pbz2,sha256=tK8FvAUDW0uYez8EPttdCJwHhpPofclYV6GhhNZL0Pk,168272
 emhass/data/cec_modules.pbz2,sha256=8vEaysgYffXg3KUl8XSF36Mdywzi3LpEtUN_qenjO9s,1655747
 emhass/data/config_defaults.json,sha256=GKw2p3jObwMY1wAR_D_x8T8eNzQgu3awNQnIBuBwhJE,2791
 emhass/static/advanced.html,sha256=gAhsd14elDwh1Ts4lf9wn_ZkczzzObq5qOimi_la3Ic,2067
 emhass/static/basic.html,sha256=ro2WwWgJyoUhqx_nJFzKCEG8FA8863vSHLmrjGYcEgs,677
 emhass/static/configuration_list.html,sha256=4ZAL-4YXdofnx17np-v39Yt3qW2TWbSzNBkj86bpvIg,1578
-emhass/static/configuration_script.js,sha256=YbjYwX8HDba5w_rreA2vmYNaH4E2WYRzYU7rgnAQy0E,31057
+emhass/static/configuration_script.js,sha256=PQYZHWMb0dohrw3hI7HeIXNEae6PamIvvs84IePLThw,31097
 emhass/static/script.js,sha256=q3qTqc_pTLTK-0NPKurxFXcJ2vZLz4TctPfUgz09ygo,16291
 emhass/static/style.css,sha256=a_8YlGubn1zoF5RTLJ_Qkrb8tAjUY9p7oAKxhCvJY2s,19288
 emhass/static/data/param_definitions.json,sha256=Nq4dnSmug0mWU8JooqVayKa67NQ2b6k30Z-ac2BJcys,19158
@@ -24,9 +24,9 @@ emhass/static/img/feather-sprite.svg,sha256=VHjMJQg88wXa9CaeYrKGhNtyK0xdd47zCqwS
 emhass/templates/configuration.html,sha256=yS9p730GHf99ZYK0NiZjkuaxPjH1ZFo8R6xL5c1ZZ9s,2885
 emhass/templates/index.html,sha256=Ehn-hUdraIwX_5Usb5Liz1ip24NfztmCxsi0J4Tf3-A,3076
 emhass/templates/template.html,sha256=TkGgMecQEbFUZA4ymPwMUzNjKHsENvCgroUWbPt7G4Y,158
-emhass-0.11.0.dist-info/LICENSE,sha256=1X3-S1yvOCBDBeox1aK3dq00m7dA8NDtcPrpKPISzbE,1077
-emhass-0.11.0.dist-info/METADATA,sha256=YbG3z2sYOpaFMd5v97yR7Ps4G2If9f-8OupTbr9HgmA,48849
-emhass-0.11.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-emhass-0.11.0.dist-info/entry_points.txt,sha256=6Bp1NFOGNv_fSTxYl1ke3K3h3aqAcBxI-bgq5yq-i1M,52
-emhass-0.11.0.dist-info/top_level.txt,sha256=L7fIX4awfmxQbAePtSdVg2e6x_HhghfReHfsKSpKr9I,7
-emhass-0.11.0.dist-info/RECORD,,
+emhass-0.11.1.dist-info/LICENSE,sha256=1X3-S1yvOCBDBeox1aK3dq00m7dA8NDtcPrpKPISzbE,1077
+emhass-0.11.1.dist-info/METADATA,sha256=x9mxnfO20GSc2HsZn375WlEKWMOreP9cNvOWpOQz3WI,48843
+emhass-0.11.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+emhass-0.11.1.dist-info/entry_points.txt,sha256=6Bp1NFOGNv_fSTxYl1ke3K3h3aqAcBxI-bgq5yq-i1M,52
+emhass-0.11.1.dist-info/top_level.txt,sha256=L7fIX4awfmxQbAePtSdVg2e6x_HhghfReHfsKSpKr9I,7
+emhass-0.11.1.dist-info/RECORD,,