emhass 0.13.0__tar.gz → 0.13.2__tar.gz

{emhass-0.13.0 → emhass-0.13.2}/.gitignore

@@ -47,6 +47,8 @@ MANIFEST
 
 # Local session data 
 data/actionLogs.txt
+data/debug-*.csv
+data/cached-open-meteo-forecast.json
 data/entities/*.json
 
 # PyInstaller

{emhass-0.13.0 → emhass-0.13.2}/PKG-INFO

@@ -1,18 +1,25 @@
 Metadata-Version: 2.4
 Name: emhass
-Version: 0.13.0
+Version: 0.13.2
 Summary: An Energy Management System for Home Assistant
 Project-URL: Homepage, https://github.com/davidusb-geek/emhass
+Project-URL: Source, https://github.com/davidusb-geek/emhass
+Project-URL: Issues, https://github.com/davidusb-geek/emhass/issues
+Project-URL: Documentation, https://emhass.readthedocs.io/en/latest/
+Project-URL: Community, https://community.home-assistant.io/t/emhass-an-energy-management-for-home-assistant
 Author-email: David HERNANDEZ <davidusb@gmail.com>
-License-Expression: MIT
+License: MIT
 License-File: LICENSE
 Keywords: energy,hass,management,optimization
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Topic :: Software Development :: Build Tools
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: <3.13,>=3.10
 Requires-Dist: flask>=3.1.0
 Requires-Dist: gunicorn>=23.0.0
@@ -30,6 +37,8 @@ Requires-Dist: scipy>=1.15.0
 Requires-Dist: skforecast>=0.14.0
 Requires-Dist: tables>=3.10.0
 Requires-Dist: waitress>=3.0.2
+Provides-Extra: dev
+Requires-Dist: ruff; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: myst-parser; extra == 'docs'
 Requires-Dist: sphinx; extra == 'docs'
@@ -456,7 +465,7 @@ Below you can find a list of the variables resulting from EMHASS computation, sh
 | P_grid_pos | Forecasted power imported from the grid (Watts). This indicates the amount of energy you are expected to draw from the grid when your solar production is insufficient to meet your needs or it is advantageous to consume from the grid. | - |
 | P_grid_neg | Forecasted power exported to the grid (Watts). This indicates the amount of excess solar energy you are expected to send back to the grid during the forecast period. | - |
 | P_batt | Forecasted (dis)charge power load (Watts) for the battery (if installed). If negative it indicates the battery is charging, if positive that the battery is discharging. | sensor.p_batt_forecast |
-| P_grid | Forecasted net power flow between your home and the grid (Watts). This is calculated as P_grid_pos - P_grid_neg. A positive value indicates net export, while a negative value indicates net import. | sensor.p_grid_forecast |
+| P_grid | Forecasted net power flow between your home and the grid (Watts). This is calculated as P_grid_pos + P_grid_neg. A positive value indicates net import, while a negative value indicates net export. | sensor.p_grid_forecast |
 | SOC_opt | Forecasted battery optimized Status Of Charge (SOC) percentage level | sensor.soc_batt_forecast |
 | unit_load_cost | Forecasted cost per unit of energy you pay to the grid (typically "Currency"/kWh). This helps you understand the expected energy cost during the forecast period. | sensor.unit_load_cost |
 | unit_prod_price | Forecasted price you receive for selling excess solar energy back to the grid (typically "Currency"/kWh). This helps you understand the potential income from your solar production. | sensor.unit_prod_price |

{emhass-0.13.0 → emhass-0.13.2}/README.md

@@ -410,7 +410,7 @@ Below you can find a list of the variables resulting from EMHASS computation, sh
 | P_grid_pos | Forecasted power imported from the grid (Watts). This indicates the amount of energy you are expected to draw from the grid when your solar production is insufficient to meet your needs or it is advantageous to consume from the grid. | - |
 | P_grid_neg | Forecasted power exported to the grid (Watts). This indicates the amount of excess solar energy you are expected to send back to the grid during the forecast period. | - |
 | P_batt | Forecasted (dis)charge power load (Watts) for the battery (if installed). If negative it indicates the battery is charging, if positive that the battery is discharging. | sensor.p_batt_forecast |
-| P_grid | Forecasted net power flow between your home and the grid (Watts). This is calculated as P_grid_pos - P_grid_neg. A positive value indicates net export, while a negative value indicates net import. | sensor.p_grid_forecast |
+| P_grid | Forecasted net power flow between your home and the grid (Watts). This is calculated as P_grid_pos + P_grid_neg. A positive value indicates net import, while a negative value indicates net export. | sensor.p_grid_forecast |
 | SOC_opt | Forecasted battery optimized Status Of Charge (SOC) percentage level | sensor.soc_batt_forecast |
 | unit_load_cost | Forecasted cost per unit of energy you pay to the grid (typically "Currency"/kWh). This helps you understand the expected energy cost during the forecast period. | sensor.unit_load_cost |
 | unit_prod_price | Forecasted price you receive for selling excess solar energy back to the grid (typically "Currency"/kWh). This helps you understand the potential income from your solar production. | sensor.unit_prod_price |

emhass-0.13.2/pyproject.toml

@@ -0,0 +1,105 @@
+[project]
+name = "emhass"
+version = "0.13.2"
+description = "An Energy Management System for Home Assistant"
+readme = "README.md"
+requires-python = ">=3.10, <3.13"
+authors = [
+    { name = "David HERNANDEZ", email = "davidusb@gmail.com" },
+]
+license = { text = "MIT" }
+keywords = ["energy", "management", "optimization", "hass"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+    "numpy>=2.0.0, <2.3.0",
+    "scipy>=1.15.0",
+    "pandas>=2.2.0",
+    "pvlib>=0.11.0",
+    "protobuf>=5.29.3",
+    "pytz>=2024.2",
+    "requests>=2.32.2",
+    "h5py>=3.12.1",
+    "pulp>=2.8.0",
+    "pyyaml>=6.0.2",
+    "tables>=3.10.0",
+    "skforecast>=0.14.0",
+    "flask>=3.1.0",
+    "waitress>=3.0.2",
+    "plotly>=6.0.0",
+    "gunicorn>=23.0.0",
+]
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+
+[tool.uv.workspace]
+members = ["emhass"]
+
+[tool.uv.sources]
+emhass = { workspace = true }
+
+[tool.uv]
+default-groups = "all"
+package = true
+
+[project.optional-dependencies]
+docs = ["sphinx", "sphinx-rtd-theme", "myst-parser"]
+test = ["requests-mock", "pytest", "coverage", "snakeviz", "ruff", "tabulate", "hatchling"]
+dev = ["ruff"]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/emhass"]
+package-data = { "emhass" = [
+    "templates/*",
+    "static/*",
+    "img/*",
+    "data/cec_modules.pbz2",
+    "data/cec_inverters.pbz2",
+    "data/associations.csv",
+    "data/config_defaults.json"]}
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "src/emhass/*.py",
+    "src/emhass/templates/",
+    "src/emhass/static/",
+    "src/emhass/img/",
+    "src/emhass/data/cec_modules.pbz2",
+    "src/emhass/data/cec_inverters.pbz2",
+    "src/emhass/data/associations.csv",
+    "src/emhass/data/config_defaults.json",
+]
+
+[project.scripts]
+emhass = "emhass.command_line:main"
+
+[project.urls]
+Homepage = "https://github.com/davidusb-geek/emhass"
+Source = "https://github.com/davidusb-geek/emhass"
+Issues = "https://github.com/davidusb-geek/emhass/issues"
+Documentation = "https://emhass.readthedocs.io/en/latest/"
+Community = "https://community.home-assistant.io/t/emhass-an-energy-management-for-home-assistant" 
+
+[tool.ruff.lint]
+select = ["E", "W", "F", "I", "C", "B", "Q", "UP", "YTT", "PYI"]
+ignore = ["E501", "B008", "B905", "C901"] 
+
+[dependency-groups]
+dev = [
+    "emhass",
+]
+
+[tool.ruff]
+target-version = "py311" 
+src = ["src", "tests"]

{emhass-0.13.0 → emhass-0.13.2/src}/emhass/command_line.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import argparse
 import copy
@@ -10,9 +9,8 @@ import pathlib
 import pickle
 import re
 import time
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from importlib.metadata import version
-from typing import Optional, Tuple
 
 import numpy as np
 import pandas as pd
@@ -28,19 +26,21 @@ default_csv_filename = "opt_res_latest.csv"
 default_pkl_suffix = "_mlf.pkl"
 default_metadata_json = "metadata.json"
 
+
 def retrieve_home_assistant_data(
     set_type: str,
-    get_data_from_file: bool, 
+    get_data_from_file: bool,
     retrieve_hass_conf: dict,
     optim_conf: dict,
     rh: RetrieveHass,
     emhass_conf: dict,
-    test_df_literal: pd.DataFrame
+    test_df_literal: pd.DataFrame,
 ) -> dict:
     """Retrieve data from Home Assistant or file and prepare it for optimization."""
     if get_data_from_file:
         with open(emhass_conf["data_path"] / test_df_literal, "rb") as inp:
             rh.df_final, days_list, var_list, rh.ha_config = pickle.load(inp)
+            rh.var_list = var_list
         # Assign variables based on set_type
         retrieve_hass_conf["sensor_power_load_no_var_loads"] = str(var_list[0])
         if optim_conf.get("set_use_pv", True):
@@ -61,7 +61,9 @@ def retrieve_home_assistant_data(
     else:
         # Determine days_list based on set_type
         if set_type == "perfect-optim" or set_type == "adjust_pv":
-            days_list = utils.get_days_list(retrieve_hass_conf["historic_days_to_retrieve"])
+            days_list = utils.get_days_list(
+                retrieve_hass_conf["historic_days_to_retrieve"]
+            )
         elif set_type == "naive-mpc-optim":
             days_list = utils.get_days_list(1)
         else:
@@ -69,7 +71,11 @@ def retrieve_home_assistant_data(
         var_list = [retrieve_hass_conf["sensor_power_load_no_var_loads"]]
         if optim_conf.get("set_use_pv", True):
             var_list.append(retrieve_hass_conf["sensor_power_photovoltaics"])
-        if not rh.get_data(days_list, var_list, minimal_response=False, significant_changes_only=False):
+            if optim_conf.get("set_use_adjusted_pv", True):
+                var_list.append(retrieve_hass_conf["sensor_power_photovoltaics_forecast"])
+        if not rh.get_data(
+            days_list, var_list, minimal_response=False, significant_changes_only=False
+        ):
             return False, None, days_list
     rh.prepare_data(
         retrieve_hass_conf["sensor_power_load_no_var_loads"],
@@ -80,6 +86,7 @@ def retrieve_home_assistant_data(
     )
     return True, rh.df_final.copy(), days_list
 
+
 def adjust_pv_forecast(
     logger: logging.Logger,
     fcst: Forecast,
@@ -121,7 +128,13 @@ def adjust_pv_forecast(
     logger.info("Adjusting PV forecast, retrieving history data for model fit")
     # Retrieve data from Home Assistant
     success, df_input_data, _ = retrieve_home_assistant_data(
-        "adjust_pv", get_data_from_file, retrieve_hass_conf, optim_conf, rh, emhass_conf, test_df_literal
+        "adjust_pv",
+        get_data_from_file,
+        retrieve_hass_conf,
+        optim_conf,
+        rh,
+        emhass_conf,
+        test_df_literal,
     )
     if not success:
         return False
@@ -138,6 +151,7 @@ def adjust_pv_forecast(
     # Update the PV forecast
     return P_PV_forecast["adjusted_forecast"].rename(None)
 
+
 def set_input_data_dict(
     emhass_conf: dict,
     costfun: str,
@@ -145,7 +159,7 @@ def set_input_data_dict(
     runtimeparams: str,
     set_type: str,
     logger: logging.Logger,
-    get_data_from_file: Optional[bool] = False,
+    get_data_from_file: bool | None = False,
 ) -> dict:
     """
     Set up some of the data needed for the different actions.
@@ -247,7 +261,13 @@ def set_input_data_dict(
     if set_type == "perfect-optim":
         # Retrieve data from hass
         success, df_input_data, days_list = retrieve_home_assistant_data(
-            set_type, get_data_from_file, retrieve_hass_conf, optim_conf, rh, emhass_conf, test_df_literal
+            set_type,
+            get_data_from_file,
+            retrieve_hass_conf,
+            optim_conf,
+            rh,
+            emhass_conf,
+            test_df_literal,
         )
         if not success:
             return False
@@ -269,8 +289,14 @@ def set_input_data_dict(
             if optim_conf["set_use_adjusted_pv"]:
                 # Update the PV forecast
                 P_PV_forecast = adjust_pv_forecast(
-                    logger, fcst, P_PV_forecast, get_data_from_file,
-                    retrieve_hass_conf, optim_conf, rh, emhass_conf,
+                    logger,
+                    fcst,
+                    P_PV_forecast,
+                    get_data_from_file,
+                    retrieve_hass_conf,
+                    optim_conf,
+                    rh,
+                    emhass_conf,
                     test_df_literal,
                 )
         else:
@@ -321,10 +347,11 @@ def set_input_data_dict(
         df_input_data, days_list = None, None
     elif set_type == "naive-mpc-optim":
         if (
-            (optim_conf.get("load_forecast_method", None) == "list"
-                and optim_conf.get("weather_forecast_method", None) == "list")
-            or (optim_conf.get("load_forecast_method", None) == "list"
-                and not(optim_conf["set_use_pv"]))
+            optim_conf.get("load_forecast_method", None) == "list"
+            and optim_conf.get("weather_forecast_method", None) == "list"
+        ) or (
+            optim_conf.get("load_forecast_method", None) == "list"
+            and not (optim_conf["set_use_pv"])
         ):
             days_list = None
             set_mix_forecast = False
@@ -332,7 +359,13 @@ def set_input_data_dict(
         else:
             # Retrieve data from hass
             success, df_input_data, days_list = retrieve_home_assistant_data(
-                set_type, get_data_from_file, retrieve_hass_conf, optim_conf, rh, emhass_conf, test_df_literal
+                set_type,
+                get_data_from_file,
+                retrieve_hass_conf,
+                optim_conf,
+                rh,
+                emhass_conf,
+                test_df_literal,
             )
             if not success:
                 return False
@@ -354,8 +387,14 @@ def set_input_data_dict(
             if optim_conf["set_use_adjusted_pv"]:
                 # Update the PV forecast
                 P_PV_forecast = adjust_pv_forecast(
-                    logger, fcst, P_PV_forecast, get_data_from_file,
-                    retrieve_hass_conf, optim_conf, rh, emhass_conf,
+                    logger,
+                    fcst,
+                    P_PV_forecast,
+                    get_data_from_file,
+                    retrieve_hass_conf,
+                    optim_conf,
+                    rh,
+                    emhass_conf,
                     test_df_literal,
                 )
         else:
@@ -547,8 +586,8 @@ def weather_forecast_cache(
 def perfect_forecast_optim(
     input_data_dict: dict,
     logger: logging.Logger,
-    save_data_to_file: Optional[bool] = True,
-    debug: Optional[bool] = False,
+    save_data_to_file: bool | None = True,
+    debug: bool | None = False,
 ) -> pd.DataFrame:
     """
     Perform a call to the perfect forecast optimization routine.
@@ -570,14 +609,14 @@ def perfect_forecast_optim(
     df_input_data = input_data_dict["fcst"].get_load_cost_forecast(
         input_data_dict["df_input_data"],
         method=input_data_dict["fcst"].optim_conf["load_cost_forecast_method"],
-        list_and_perfect = True
+        list_and_perfect=True,
     )
     if isinstance(df_input_data, bool) and not df_input_data:
         return False
     df_input_data = input_data_dict["fcst"].get_prod_price_forecast(
         df_input_data,
         method=input_data_dict["fcst"].optim_conf["production_price_forecast_method"],
-        list_and_perfect = True
+        list_and_perfect=True,
     )
     if isinstance(df_input_data, bool) and not df_input_data:
         return False
@@ -612,8 +651,8 @@ def perfect_forecast_optim(
 def dayahead_forecast_optim(
     input_data_dict: dict,
     logger: logging.Logger,
-    save_data_to_file: Optional[bool] = False,
-    debug: Optional[bool] = False,
+    save_data_to_file: bool | None = False,
+    debug: bool | None = False,
 ) -> pd.DataFrame:
     """
     Perform a call to the day-ahead optimization routine.
@@ -655,9 +694,7 @@ def dayahead_forecast_optim(
     )
     # Save CSV file for publish_data
     if save_data_to_file:
-        today = datetime.now(timezone.utc).replace(
-            hour=0, minute=0, second=0, microsecond=0
-        )
+        today = datetime.now(UTC).replace(hour=0, minute=0, second=0, microsecond=0)
         filename = "opt_res_dayahead_" + today.strftime("%Y_%m_%d") + ".csv"
     else:  # Just save the latest optimization results
         filename = default_csv_filename
@@ -685,8 +722,8 @@ def dayahead_forecast_optim(
 def naive_mpc_optim(
     input_data_dict: dict,
     logger: logging.Logger,
-    save_data_to_file: Optional[bool] = False,
-    debug: Optional[bool] = False,
+    save_data_to_file: bool | None = False,
+    debug: bool | None = False,
 ) -> pd.DataFrame:
     """
     Perform a call to the naive Model Predictive Controller optimization routine.
@@ -751,9 +788,7 @@ def naive_mpc_optim(
     )
     # Save CSV file for publish_data
     if save_data_to_file:
-        today = datetime.now(timezone.utc).replace(
-            hour=0, minute=0, second=0, microsecond=0
-        )
+        today = datetime.now(UTC).replace(hour=0, minute=0, second=0, microsecond=0)
         filename = "opt_res_naive_mpc_" + today.strftime("%Y_%m_%d") + ".csv"
     else:  # Just save the latest optimization results
         filename = default_csv_filename
@@ -779,8 +814,8 @@ def naive_mpc_optim(
 
 
 def forecast_model_fit(
-    input_data_dict: dict, logger: logging.Logger, debug: Optional[bool] = False
-) -> Tuple[pd.DataFrame, pd.DataFrame, MLForecaster]:
+    input_data_dict: dict, logger: logging.Logger, debug: bool | None = False
+) -> tuple[pd.DataFrame, pd.DataFrame, MLForecaster]:
     """Perform a forecast model fit from training data retrieved from Home Assistant.
 
     :param input_data_dict: A dictionnary with multiple data used by the action functions
@@ -819,15 +854,16 @@ def forecast_model_fit(
         filename_path = input_data_dict["emhass_conf"]["data_path"] / filename
         with open(filename_path, "wb") as outp:
             pickle.dump(mlf, outp, pickle.HIGHEST_PROTOCOL)
+            logger.debug("saved model to " + str(filename_path))
     return df_pred, df_pred_backtest, mlf
 
 
 def forecast_model_predict(
     input_data_dict: dict,
     logger: logging.Logger,
-    use_last_window: Optional[bool] = True,
-    debug: Optional[bool] = False,
-    mlf: Optional[MLForecaster] = None,
+    use_last_window: bool | None = True,
+    debug: bool | None = False,
+    mlf: MLForecaster | None = None,
 ) -> pd.DataFrame:
     r"""Perform a forecast model predict using a previously trained skforecast model.
 
@@ -857,9 +893,12 @@ def forecast_model_predict(
         if filename_path.is_file():
             with open(filename_path, "rb") as inp:
                 mlf = pickle.load(inp)
+                logger.debug("loaded saved model from " + str(filename_path))
         else:
             logger.error(
-                "The ML forecaster file was not found, please run a model fit method before this predict method",
+                "The ML forecaster file ("
+                + str(filename_path)
+                + ") was not found, please run a model fit method before this predict method",
             )
             return
     # Make predictions
@@ -923,9 +962,9 @@ def forecast_model_predict(
 def forecast_model_tune(
     input_data_dict: dict,
     logger: logging.Logger,
-    debug: Optional[bool] = False,
-    mlf: Optional[MLForecaster] = None,
-) -> Tuple[pd.DataFrame, MLForecaster]:
+    debug: bool | None = False,
+    mlf: MLForecaster | None = None,
+) -> tuple[pd.DataFrame, MLForecaster]:
     """Tune a forecast model hyperparameters using bayesian optimization.
 
     :param input_data_dict: A dictionnary with multiple data used by the action functions
@@ -948,9 +987,12 @@ def forecast_model_tune(
         if filename_path.is_file():
             with open(filename_path, "rb") as inp:
                 mlf = pickle.load(inp)
+                logger.debug("loaded saved model from " + str(filename_path))
         else:
             logger.error(
-                "The ML forecaster file was not found, please run a model fit method before this tune method",
+                "The ML forecaster file ("
+                + str(filename_path)
+                + ") was not found, please run a model fit method before this tune method",
             )
             return None, None
     # Tune the model
@@ -961,11 +1003,12 @@ def forecast_model_tune(
         filename_path = input_data_dict["emhass_conf"]["data_path"] / filename
         with open(filename_path, "wb") as outp:
             pickle.dump(mlf, outp, pickle.HIGHEST_PROTOCOL)
+            logger.debug("Saved model to " + str(filename_path))
     return df_pred_optim, mlf
 
 
 def regressor_model_fit(
-    input_data_dict: dict, logger: logging.Logger, debug: Optional[bool] = False
+    input_data_dict: dict, logger: logging.Logger, debug: bool | None = False
 ) -> MLRegressor:
     """Perform a forecast model fit from training data retrieved from Home Assistant.
 
@@ -1027,8 +1070,8 @@ def regressor_model_fit(
 def regressor_model_predict(
     input_data_dict: dict,
     logger: logging.Logger,
-    debug: Optional[bool] = False,
-    mlr: Optional[MLRegressor] = None,
+    debug: bool | None = False,
+    mlr: MLRegressor | None = None,
 ) -> np.ndarray:
     """Perform a prediction from csv file.
 
@@ -1092,10 +1135,10 @@ def regressor_model_predict(
 def publish_data(
     input_data_dict: dict,
     logger: logging.Logger,
-    save_data_to_file: Optional[bool] = False,
-    opt_res_latest: Optional[pd.DataFrame] = None,
-    entity_save: Optional[bool] = False,
-    dont_post: Optional[bool] = False,
+    save_data_to_file: bool | None = False,
+    opt_res_latest: pd.DataFrame | None = None,
+    entity_save: bool | None = False,
+    dont_post: bool | None = False,
 ) -> pd.DataFrame:
     """
     Publish the data obtained from the optimization results.
@@ -1123,9 +1166,7 @@ def publish_data(
 
     # Check if a day ahead optimization has been performed (read CSV file)
     if save_data_to_file:
-        today = datetime.now(timezone.utc).replace(
-            hour=0, minute=0, second=0, microsecond=0
-        )
+        today = datetime.now(UTC).replace(hour=0, minute=0, second=0, microsecond=0)
         filename = "opt_res_dayahead_" + today.strftime("%Y_%m_%d") + ".csv"
     # If publish_prefix is passed, check if there is saved entities in data_path/entities with prefix, publish to results
     elif params["passed_data"].get("publish_prefix", "") != "" and not dont_post:
@@ -1270,14 +1311,14 @@ def publish_data(
         "custom_deferrable_forecast_id"
     ]
     for k in range(input_data_dict["opt"].optim_conf["number_of_deferrable_loads"]):
-        if "P_deferrable{}".format(k) not in opt_res_latest.columns:
+        if f"P_deferrable{k}" not in opt_res_latest.columns:
             logger.error(
-                "P_deferrable{}".format(k)
+                f"P_deferrable{k}"
                 + " was not found in results DataFrame. Optimization task may need to be relaunched or it did not converge to a solution.",
             )
         else:
             input_data_dict["rh"].post_data(
-                opt_res_latest["P_deferrable{}".format(k)],
+                opt_res_latest[f"P_deferrable{k}"],
                 idx_closest,
                 custom_deferrable_forecast_id[k]["entity_id"],
                 "power",
@@ -1288,7 +1329,7 @@ def publish_data(
                 save_entities=entity_save,
                 dont_post=dont_post,
             )
-            cols_published = cols_published + ["P_deferrable{}".format(k)]
+            cols_published = cols_published + [f"P_deferrable{k}"]
     # Publish thermal model data (predicted temperature)
     custom_predicted_temperature_id = params["passed_data"][
         "custom_predicted_temperature_id"
@@ -1300,7 +1341,7 @@ def publish_data(
                 in input_data_dict["opt"].optim_conf["def_load_config"][k]
             ):
                 input_data_dict["rh"].post_data(
-                    opt_res_latest["predicted_temp_heater{}".format(k)],
+                    opt_res_latest[f"predicted_temp_heater{k}"],
                     idx_closest,
                     custom_predicted_temperature_id[k]["entity_id"],
                     "temperature",
@@ -1311,7 +1352,7 @@ def publish_data(
                     save_entities=entity_save,
                     dont_post=dont_post,
                 )
-                cols_published = cols_published + ["predicted_temp_heater{}".format(k)]
+                cols_published = cols_published + [f"predicted_temp_heater{k}"]
     # Publish battery power
     if input_data_dict["opt"].optim_conf["set_use_battery"]:
         if "P_batt" not in opt_res_latest.columns:
@@ -1484,7 +1525,7 @@ def continual_publish(
                     )
             # Retrieve entity metadata from file
             if os.path.isfile(entity_path / default_metadata_json):
-                with open(entity_path / default_metadata_json, "r") as file:
+                with open(entity_path / default_metadata_json) as file:
                     metadata = json.load(file)
                     # Check if freq should be shorter
                     if metadata.get("lowest_time_step", None) is not None:
@@ -1499,7 +1540,7 @@ def publish_json(
     input_data_dict: dict,
     entity_path: pathlib.Path,
     logger: logging.Logger,
-    reference: Optional[str] = "",
+    reference: str | None = "",
 ):
     """
     Extract saved entity data from .json (in data_path/entities), build entity, post results to post_data
@@ -1518,7 +1559,7 @@ def publish_json(
     """
     # Retrieve entity metadata from file
     if os.path.isfile(entity_path / default_metadata_json):
-        with open(entity_path / default_metadata_json, "r") as file:
+        with open(entity_path / default_metadata_json) as file:
             metadata = json.load(file)
     else:
         logger.error("unable to located metadata.json in:" + entity_path)
@@ -1560,7 +1601,7 @@ def publish_json(
         data_df=entity_data[metadata[entity_id]["name"]],
         idx=idx_closest,
         entity_id=entity_id,
-        device_class=dict.get(metadata[entity_id],"device_class"),
+        device_class=dict.get(metadata[entity_id], "device_class"),
         unit_of_measurement=metadata[entity_id]["unit_of_measurement"],
         friendly_name=metadata[entity_id]["friendly_name"],
         type_var=metadata[entity_id].get("type_var", ""),

{emhass-0.13.0 → emhass-0.13.2/src}/emhass/data/associations.csv

@@ -38,6 +38,7 @@ optim_conf,prod_sell_price,photovoltaic_production_sell_price
 optim_conf,set_total_pv_sell,set_total_pv_sell
 optim_conf,lp_solver,lp_solver
 optim_conf,lp_solver_path,lp_solver_path
+optim_conf,lp_solver_timeout,lp_solver_timeout
 optim_conf,set_nocharge_from_grid,set_nocharge_from_grid
 optim_conf,set_nodischarge_to_grid,set_nodischarge_to_grid
 optim_conf,set_battery_dynamic,set_battery_dynamic
@@ -46,6 +47,7 @@ optim_conf,battery_dynamic_min,battery_dynamic_min
 optim_conf,weight_battery_discharge,weight_battery_discharge
 optim_conf,weight_battery_charge,weight_battery_charge
 optim_conf,weather_forecast_method,weather_forecast_method
+optim_conf,open_meteo_cache_max_age,open_meteo_cache_max_age
 optim_conf,def_start_timestep,start_timesteps_of_each_deferrable_load,list_start_timesteps_of_each_deferrable_load
 optim_conf,def_end_timestep,end_timesteps_of_each_deferrable_load,list_end_timesteps_of_each_deferrable_load
 optim_conf,list_hp_periods,load_peak_hour_periods