emhass 0.11.3__py3-none-any.whl → 0.11.4__py3-none-any.whl

emhass/utils.py

@@ -308,7 +308,7 @@ def treat_runtimeparams(
                 runtimeparams.get("optimization_time_step", runtimeparams.get("freq"))
             )
             params["retrieve_hass_conf"]["optimization_time_step"] = pd.to_timedelta(
-                optimization_time_step
+                optimization_time_step, "minutes"
             )
         else:
             optimization_time_step = int(
@@ -338,59 +338,6 @@ def treat_runtimeparams(
             optimization_time_step, delta_forecast, time_zone
         )
 
-        # Treat passed forecast data lists
-        list_forecast_key = [
-            "pv_power_forecast",
-            "load_power_forecast",
-            "load_cost_forecast",
-            "prod_price_forecast",
-            "outdoor_temperature_forecast",
-        ]
-        forecast_methods = [
-            "weather_forecast_method",
-            "load_forecast_method",
-            "load_cost_forecast_method",
-            "production_price_forecast_method",
-            "outdoor_temperature_forecast_method",
-        ]
-
-        # Loop forecasts, check if value is a list and greater than or equal to forecast_dates
-        for method, forecast_key in enumerate(list_forecast_key):
-            if forecast_key in runtimeparams.keys():
-                if isinstance(runtimeparams[forecast_key], list) and len(
-                    runtimeparams[forecast_key]
-                ) >= len(forecast_dates):
-                    params["passed_data"][forecast_key] = runtimeparams[forecast_key]
-                    params["optim_conf"][forecast_methods[method]] = "list"
-                else:
-                    logger.error(
-                        f"ERROR: The passed data is either not a list or the length is not correct, length should be {str(len(forecast_dates))}"
-                    )
-                    logger.error(
-                        f"Passed type is {str(type(runtimeparams[forecast_key]))} and length is {str(len(runtimeparams[forecast_key]))}"
-                    )
-                # Check if string contains list, if so extract
-                if isinstance(runtimeparams[forecast_key], str):
-                    if isinstance(ast.literal_eval(runtimeparams[forecast_key]), list):
-                        runtimeparams[forecast_key] = ast.literal_eval(
-                            runtimeparams[forecast_key]
-                        )
-                list_non_digits = [
-                    x
-                    for x in runtimeparams[forecast_key]
-                    if not (isinstance(x, int) or isinstance(x, float))
-                ]
-                if len(list_non_digits) > 0:
-                    logger.warning(
-                        f"There are non numeric values on the passed data for {forecast_key}, check for missing values (nans, null, etc)"
-                    )
-                    for x in list_non_digits:
-                        logger.warning(
-                            f"This value in {forecast_key} was detected as non digits: {str(x)}"
-                        )
-            else:
-                params["passed_data"][forecast_key] = None
-
         # Add runtime exclusive (not in config) parameters to params
         # regressor-model-fit
         if set_type == "regressor-model-fit":
@@ -447,6 +394,16 @@ def treat_runtimeparams(
                 soc_final = runtimeparams["soc_final"]
             params["passed_data"]["soc_final"] = soc_final
 
+            params["passed_data"]["operating_hours_of_each_deferrable_load"] = params[
+                "optim_conf"
+            ].get("operating_hours_of_each_deferrable_load", None)
+            params["passed_data"]["start_timesteps_of_each_deferrable_load"] = params[
+                "optim_conf"
+            ].get("start_timesteps_of_each_deferrable_load", None)
+            params["passed_data"]["end_timesteps_of_each_deferrable_load"] = params[
+                "optim_conf"
+            ].get("end_timesteps_of_each_deferrable_load", None)
+
             forecast_dates = copy.deepcopy(forecast_dates)[0:prediction_horizon]
 
             # Load the default config
@@ -480,6 +437,59 @@ def treat_runtimeparams(
             params["passed_data"]["soc_init"] = None
             params["passed_data"]["soc_final"] = None
 
+        # Treat passed forecast data lists
+        list_forecast_key = [
+            "pv_power_forecast",
+            "load_power_forecast",
+            "load_cost_forecast",
+            "prod_price_forecast",
+            "outdoor_temperature_forecast",
+        ]
+        forecast_methods = [
+            "weather_forecast_method",
+            "load_forecast_method",
+            "load_cost_forecast_method",
+            "production_price_forecast_method",
+            "outdoor_temperature_forecast_method",
+        ]
+
+        # Loop forecasts, check if value is a list and greater than or equal to forecast_dates
+        for method, forecast_key in enumerate(list_forecast_key):
+            if forecast_key in runtimeparams.keys():
+                if isinstance(runtimeparams[forecast_key], list) and len(
+                    runtimeparams[forecast_key]
+                ) >= len(forecast_dates):
+                    params["passed_data"][forecast_key] = runtimeparams[forecast_key]
+                    params["optim_conf"][forecast_methods[method]] = "list"
+                else:
+                    logger.error(
+                        f"ERROR: The passed data is either not a list or the length is not correct, length should be {str(len(forecast_dates))}"
+                    )
+                    logger.error(
+                        f"Passed type is {str(type(runtimeparams[forecast_key]))} and length is {str(len(runtimeparams[forecast_key]))}"
+                    )
+                # Check if string contains list, if so extract
+                if isinstance(runtimeparams[forecast_key], str):
+                    if isinstance(ast.literal_eval(runtimeparams[forecast_key]), list):
+                        runtimeparams[forecast_key] = ast.literal_eval(
+                            runtimeparams[forecast_key]
+                        )
+                list_non_digits = [
+                    x
+                    for x in runtimeparams[forecast_key]
+                    if not (isinstance(x, int) or isinstance(x, float))
+                ]
+                if len(list_non_digits) > 0:
+                    logger.warning(
+                        f"There are non numeric values on the passed data for {forecast_key}, check for missing values (nans, null, etc)"
+                    )
+                    for x in list_non_digits:
+                        logger.warning(
+                            f"This value in {forecast_key} was detected as non digits: {str(x)}"
+                        )
+            else:
+                params["passed_data"][forecast_key] = None
+
         # Treat passed data for forecast model fit/predict/tune at runtime
         if (
             params["passed_data"].get("historic_days_to_retrieve", None) is not None
@@ -1091,7 +1101,7 @@ def build_secrets(
     :type logger: logging.Logger
     :param argument: dictionary of secrets arguments passed (url,key)
     :type argument: dict
-    :param options_path: path to the options file (options.json) (usually provided bt EMHASS-Add-on)
+    :param options_path: path to the options file (options.json) (usually provided by EMHASS-Add-on)
     :type options_path: str
     :param secrets_path: path to secrets file (secrets_emhass.yaml)
     :type secrets_path: str

emhass/web_server.py

@@ -14,6 +14,7 @@ from pathlib import Path
 
 import yaml
 from flask import Flask, make_response, request
+from flask import logging as log
 from jinja2 import Environment, PackageLoader
 from waitress import serve
 
@@ -384,7 +385,6 @@ def action_call(action_name):
 
     ActionStr = " >> Setting input data dict"
     app.logger.info(ActionStr)
-    app.logger.warning(costfun)
     input_data_dict = set_input_data_dict(
         emhass_conf, costfun, params, runtimeparams, action_name, app.logger
     )
@@ -652,37 +652,30 @@ if __name__ == "__main__":
         raise Exception("missing: " + str(emhass_conf["data_path"]))
 
     # Define loggers
-    ch = logging.StreamHandler()
     formatter = logging.Formatter(
         "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
     )
-    ch.setFormatter(formatter)
+    log.default_handler.setFormatter(formatter)
     # Action file logger
     fileLogger = logging.FileHandler(str(emhass_conf["data_path"] / "actionLogs.txt"))
     formatter = logging.Formatter("%(levelname)s - %(name)s - %(message)s")
     fileLogger.setFormatter(formatter)  # add format to Handler
     if logging_level == "DEBUG":
         app.logger.setLevel(logging.DEBUG)
-        ch.setLevel(logging.DEBUG)
         fileLogger.setLevel(logging.DEBUG)
     elif logging_level == "INFO":
         app.logger.setLevel(logging.INFO)
-        ch.setLevel(logging.INFO)
         fileLogger.setLevel(logging.INFO)
     elif logging_level == "WARNING":
         app.logger.setLevel(logging.WARNING)
-        ch.setLevel(logging.WARNING)
         fileLogger.setLevel(logging.WARNING)
     elif logging_level == "ERROR":
         app.logger.setLevel(logging.ERROR)
-        ch.setLevel(logging.ERROR)
         fileLogger.setLevel(logging.ERROR)
     else:
         app.logger.setLevel(logging.DEBUG)
-        ch.setLevel(logging.DEBUG)
         fileLogger.setLevel(logging.DEBUG)
     app.logger.propagate = False
-    app.logger.addHandler(ch)
     app.logger.addHandler(fileLogger)
     # Clear Action File logger file, ready for new instance
     clearFileLog()

{emhass-0.11.3.dist-info → emhass-0.11.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emhass
-Version: 0.11.3
+Version: 0.11.4
 Summary: An Energy Management System for Home Assistant
 Author-email: David HERNANDEZ <davidusb@gmail.com>
 License: MIT

{emhass-0.11.3.dist-info → emhass-0.11.4.dist-info}/RECORD

@@ -5,8 +5,8 @@ emhass/machine_learning_forecaster.py,sha256=JErz50i_D59J5wXdbf_EUPb_FG45qRflv51
 emhass/machine_learning_regressor.py,sha256=yFwMvVEmlgDJUsHhBT-HpNE3j2TC24e8Gmbcn9MPfeU,10690
 emhass/optimization.py,sha256=-s3gWblpc85v-q0Ad9M8lXlG8ZZW0iL_s_I_9EUhzwA,61452
 emhass/retrieve_hass.py,sha256=LLZBoP5Rkyg0_uSvJSG5m-6apVoWZ6MWuXPPA-j-JsI,25617
-emhass/utils.py,sha256=U0fH_CbYQJd-izWqjBfJc-ih1y14S5IISIFtBHe1wM0,66330
-emhass/web_server.py,sha256=BdCefS_ipseUOa3sq-HFl1hWrA9NZbfxe3mt0ZqcgIU,28244
+emhass/utils.py,sha256=N3qmEA_42srDr7q2cgU-LEwWeuItPMhX9VKPBBJnFy0,66887
+emhass/web_server.py,sha256=QsqT51AdlAgNCG3NV1zbm4YkBSq_0BaC3cIEzPeZvl8,28023
 emhass/data/associations.csv,sha256=Wv2845irZDMYm8svg__Ev0c2BgkVX88yAXoqpy1C4RM,3646
 emhass/data/cec_inverters.pbz2,sha256=tK8FvAUDW0uYez8EPttdCJwHhpPofclYV6GhhNZL0Pk,168272
 emhass/data/cec_modules.pbz2,sha256=8vEaysgYffXg3KUl8XSF36Mdywzi3LpEtUN_qenjO9s,1655747
@@ -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.3.dist-info/LICENSE,sha256=1X3-S1yvOCBDBeox1aK3dq00m7dA8NDtcPrpKPISzbE,1077
-emhass-0.11.3.dist-info/METADATA,sha256=hkZYpwr5bjDhC9hGaQdAY2braRkT10_LD5pHCFuxQ3A,48945
-emhass-0.11.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-emhass-0.11.3.dist-info/entry_points.txt,sha256=6Bp1NFOGNv_fSTxYl1ke3K3h3aqAcBxI-bgq5yq-i1M,52
-emhass-0.11.3.dist-info/top_level.txt,sha256=L7fIX4awfmxQbAePtSdVg2e6x_HhghfReHfsKSpKr9I,7
-emhass-0.11.3.dist-info/RECORD,,
+emhass-0.11.4.dist-info/LICENSE,sha256=1X3-S1yvOCBDBeox1aK3dq00m7dA8NDtcPrpKPISzbE,1077
+emhass-0.11.4.dist-info/METADATA,sha256=W15OQT9sMri8XG1l7KIXBbqFRUM5KsXDDppkopbpV2g,48945
+emhass-0.11.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+emhass-0.11.4.dist-info/entry_points.txt,sha256=6Bp1NFOGNv_fSTxYl1ke3K3h3aqAcBxI-bgq5yq-i1M,52
+emhass-0.11.4.dist-info/top_level.txt,sha256=L7fIX4awfmxQbAePtSdVg2e6x_HhghfReHfsKSpKr9I,7
+emhass-0.11.4.dist-info/RECORD,,