emhass 0.13.2__py3-none-any.whl → 0.13.3__py3-none-any.whl

emhass/data/associations.csv

@@ -39,6 +39,7 @@ 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,num_threads,num_threads
 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
@@ -68,4 +69,4 @@ plant_conf,eta_ch,battery_charge_efficiency
 plant_conf,Enom,battery_nominal_energy_capacity
 plant_conf,SOCmin,battery_minimum_state_of_charge
 plant_conf,SOCmax,battery_maximum_state_of_charge
-plant_conf,SOCtarget,battery_target_state_of_charge
+plant_conf,SOCtarget,battery_target_state_of_charge

emhass/data/config_defaults.json

@@ -10,6 +10,7 @@
   "lp_solver": "default",
   "lp_solver_path": "empty",
   "lp_solver_timeout": 45,
+  "num_threads": 0,
   "set_nocharge_from_grid": false,
   "set_nodischarge_to_grid": true,
   "set_battery_dynamic": false,

emhass/optimization.py

@@ -3,13 +3,14 @@
 import bz2
 import copy
 import logging
+import os
 import pickle as cPickle
 from math import ceil
 
 import numpy as np
 import pandas as pd
 import pulp as plp
-from pulp import COIN_CMD, GLPK_CMD, PULP_CBC_CMD
+from pulp import COIN_CMD, GLPK_CMD, PULP_CBC_CMD, HiGHS
 
 
 class Optimization:
@@ -87,6 +88,13 @@ class Optimization:
         self.var_load_cost = var_load_cost
         self.var_prod_price = var_prod_price
         self.optim_status = None
+        if "num_threads" in optim_conf.keys():
+            if optim_conf["num_threads"] == 0:
+                self.num_threads = int(os.cpu_count())
+            else:
+                self.num_threads = int(optim_conf["num_threads"])
+        else:
+            self.num_threads = int(os.cpu_count())
         if "lp_solver" in optim_conf.keys():
             self.lp_solver = optim_conf["lp_solver"]
         else:
@@ -110,6 +118,7 @@ class Optimization:
         self.logger.debug(f"Optimization configuration: {optim_conf}")
         self.logger.debug(f"Plant configuration: {plant_conf}")
         self.logger.debug(f"Solver configuration: lp_solver={self.lp_solver}, lp_solver_path={self.lp_solver_path}")
+        self.logger.debug(f"Number of threads: {self.num_threads}")
 
     def perform_optimization(
         self,
@@ -642,50 +651,48 @@ class Optimization:
                 self.logger.debug(f"Load {k}: Sequence-based constraints set.")
 
             # --- Thermal deferrable load logic first ---
-            elif ("def_load_config" in self.optim_conf.keys()
+            elif (
+                "def_load_config" in self.optim_conf.keys()
                 and len(self.optim_conf["def_load_config"]) > k
-                and "thermal_config" in self.optim_conf["def_load_config"][k]):
-
-
-                    self.logger.debug(f"Load {k} is a thermal deferrable load.")
-
-                    # Special case of a thermal deferrable load
-                    def_load_config = self.optim_conf["def_load_config"][k]
-                    if def_load_config and "thermal_config" in def_load_config:
-                        hc = def_load_config["thermal_config"]
-                        start_temperature = hc["start_temperature"]
-                        cooling_constant = hc["cooling_constant"]
-                        heating_rate = hc["heating_rate"]
-                        overshoot_temperature = hc["overshoot_temperature"]
-                        outdoor_temperature_forecast = data_opt["outdoor_temperature_forecast"]
-                        desired_temperatures = hc["desired_temperatures"]
-                        sense = hc.get("sense", "heat")
-                        sense_coeff = 1 if sense == "heat" else -1
-
-                        self.logger.debug(f"Load {k}: Thermal parameters: start_temperature={start_temperature}, cooling_constant={cooling_constant}, heating_rate={heating_rate}, overshoot_temperature={overshoot_temperature}")
-
-                        predicted_temp = [start_temperature]
-                        for Id in set_I:
-                            if Id == 0:
-                                continue
-                            predicted_temp.append(
-                                predicted_temp[Id - 1]
-                                + (
-                                    P_deferrable[k][Id - 1]
-                                    * (
-                                        heating_rate
-                                        * self.timeStep
-                                        / self.optim_conf["nominal_power_of_deferrable_loads"][k]
-                                    )
+                and "thermal_config" in self.optim_conf["def_load_config"][k]
+            ):
+                self.logger.debug(f"Load {k} is a thermal deferrable load.")
+                def_load_config = self.optim_conf["def_load_config"][k]
+                if def_load_config and "thermal_config" in def_load_config:
+                    hc = def_load_config["thermal_config"]
+                    start_temperature = hc["start_temperature"]
+                    cooling_constant = hc["cooling_constant"]
+                    heating_rate = hc["heating_rate"]
+                    overshoot_temperature = hc["overshoot_temperature"]
+                    outdoor_temperature_forecast = data_opt["outdoor_temperature_forecast"]
+                    desired_temperatures = hc["desired_temperatures"]
+                    sense = hc.get("sense", "heat")
+                    sense_coeff = 1 if sense == "heat" else -1
+
+                    self.logger.debug(f"Load {k}: Thermal parameters: start_temperature={start_temperature}, cooling_constant={cooling_constant}, heating_rate={heating_rate}, overshoot_temperature={overshoot_temperature}")
+
+                    predicted_temp = [start_temperature]
+                    for Id in set_I:
+                        if Id == 0:
+                            continue
+                        predicted_temp.append(
+                            predicted_temp[Id - 1]
+                            + (
+                                P_deferrable[k][Id - 1]
+                                * (
+                                    heating_rate
+                                    * self.timeStep
+                                    / self.optim_conf["nominal_power_of_deferrable_loads"][k]
                                 )
-                                - (
-                                    cooling_constant
-                                    * (
-                                        predicted_temp[Id - 1]
-                                        - outdoor_temperature_forecast.iloc[Id - 1]
-                                    )
+                            )
+                            - (
+                                cooling_constant
+                                * (
+                                    predicted_temp[Id - 1]
+                                    - outdoor_temperature_forecast.iloc[Id - 1]
                                 )
                             )
+                        )
 
                         is_overshoot = plp.LpVariable(
                             f"defload_{k}_overshoot_{Id}"
@@ -1135,16 +1142,18 @@ class Optimization:
         timeout = self.optim_conf["lp_solver_timeout"]
         # solving with default solver CBC
         if self.lp_solver == "PULP_CBC_CMD":
-            opt_model.solve(PULP_CBC_CMD(msg=0, timeLimit=timeout, threads=7))
+            opt_model.solve(PULP_CBC_CMD(msg=0, timeLimit=timeout, threads=self.num_threads))
         elif self.lp_solver == "GLPK_CMD":
-            opt_model.solve(GLPK_CMD(msg=0, timeLimit=timeout, threads=7))
+            opt_model.solve(GLPK_CMD(msg=0, timeLimit=timeout))
+        elif self.lp_solver == "HiGHS":
+            opt_model.solve(HiGHS(msg=0, timeLimit=timeout))
         elif self.lp_solver == "COIN_CMD":
             opt_model.solve(
-                COIN_CMD(msg=0, path=self.lp_solver_path, timeLimit=timeout, threads=7)
+                COIN_CMD(msg=0, path=self.lp_solver_path, timeLimit=timeout, threads=self.num_threads)
             )
         else:
             self.logger.warning("Solver %s unknown, using default", self.lp_solver)
-            opt_model.solve(PULP_CBC_CMD(msg=0, timeLimit=timeout, threads=7))
+            opt_model.solve(PULP_CBC_CMD(msg=0, timeLimit=timeout, threads=self.num_threads))
 
         # The status of the solution is printed to the screen
         self.optim_status = plp.LpStatus[opt_model.status]
@@ -1322,9 +1331,6 @@ class Optimization:
         # Solver execution logging
         self.logger.debug(f"Solver selected: {self.lp_solver}")
         self.logger.info(f"Optimization status: {self.optim_status}")
-
-        # Results logging
-
         return opt_tp
 
     def perform_perfect_forecast_optim(

emhass/retrieve_hass.py

@@ -102,14 +102,14 @@ class RetrieveHass:
         try:
             response_config = get(url, headers=headers)
         except Exception:
-            self.logger.error("Unable to access Home Assistance instance, check URL")
+            self.logger.error("Unable to access Home Assistant 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")
+            self.logger.error("EMHASS was unable to obtain configuration data from Home Assistant")
             return False
 
     def get_data(
@@ -188,7 +188,7 @@ class RetrieveHass:
                     response = get(url, headers=headers)
                 except Exception:
                     self.logger.error(
-                        "Unable to access Home Assistance instance, check URL"
+                        "Unable to access Home Assistant instance, check URL"
                     )
                     self.logger.error(
                         "If using addon, try setting url and token to 'empty'"
@@ -197,7 +197,7 @@ class RetrieveHass:
                 else:
                     if response.status_code == 401:
                         self.logger.error(
-                            "Unable to access Home Assistance instance, TOKEN/KEY"
+                            "Unable to access Home Assistant instance, TOKEN/KEY"
                         )
                         self.logger.error(
                             "If using addon, try setting url and token to 'empty'"
@@ -217,7 +217,7 @@ class RetrieveHass:
                         self.logger.error(
                             "The retrieved JSON is empty, A sensor:"
                             + var
-                            + " may have 0 days of history, passed sensor may not be correct, or days to retrieve is set too heigh"
+                            + " may have 0 days of history, passed sensor may not be correct, or days to retrieve is set too high. Check your Logger configuration, ensuring the sensors are in the include list."
                         )
                     else:
                         self.logger.error(

emhass/static/data/param_definitions.json

@@ -122,13 +122,14 @@
     },
     "lp_solver": {
       "friendly_name": "Linear programming solver",
-      "Description": "Set the name of the linear programming solver that will be used. Defaults to ‘COIN_CMD’. The options are ‘PULP_CBC_CMD’, ‘GLPK_CMD’ and ‘COIN_CMD’.",
+      "Description": "Set the name of the linear programming solver that will be used. Defaults to ‘COIN_CMD’. The options are ‘PULP_CBC_CMD’, ‘GLPK_CMD’, ‘HiGHS’, and ‘COIN_CMD’.",
       "input": "select",
       "select_options": [
         "default",
         "COIN_CMD",
         "PULP_CBC_CMD",
-        "GLPK_CMD"
+        "GLPK_CMD",
+        "HiGHS"
       ],
       "default_value": "COIN_CMD"
     },
@@ -138,6 +139,12 @@
       "input": "text",
       "default_value": "/usr/bin/cbc"
     },
+    "num_threads": {
+      "friendly_name": "Number of threads to use for the LP solver",
+      "Description": "Set the number of threads for the LP solver to use, when supported by the solver. Defaults to 0 (autodetect)",
+      "input": "int",
+      "default_value": 0
+    },
     "lp_solver_timeout": {
       "friendly_name": "Linear programming solver timeout",
       "Description": "Set the maximum time (in seconds) for the LP solver. Defaults to 45.",

{emhass-0.13.2.dist-info → emhass-0.13.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emhass
-Version: 0.13.2
+Version: 0.13.3
 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
@@ -24,6 +24,7 @@ Requires-Python: <3.13,>=3.10
 Requires-Dist: flask>=3.1.0
 Requires-Dist: gunicorn>=23.0.0
 Requires-Dist: h5py>=3.12.1
+Requires-Dist: highspy>=1.10.0
 Requires-Dist: numpy<2.3.0,>=2.0.0
 Requires-Dist: pandas>=2.2.0
 Requires-Dist: plotly>=6.0.0
@@ -680,7 +681,7 @@ Pull requests are very much accepted on this project. For development, you can f
 
 Some problems may arise from solver-related issues in the Pulp package. It was found that for arm64 architectures (ie. Raspberry Pi4, 64 bits) the default solver is not available. A workaround is to use another solver. The `glpk` solver is an option.
 
-This can be controlled in the configuration file with parameters `lp_solver` and `lp_solver_path`. The options for `lp_solver` are: 'PULP_CBC_CMD', 'GLPK_CMD' and 'COIN_CMD'. If using 'COIN_CMD' as the solver you will need to provide the correct path to this solver in parameter `lp_solver_path`, ex: '/usr/bin/cbc'.
+This can be controlled in the configuration file with parameters `lp_solver` and `lp_solver_path`. The options for `lp_solver` are: 'PULP_CBC_CMD', 'GLPK_CMD', 'HiGHS', and 'COIN_CMD'. If using 'COIN_CMD' as the solver you will need to provide the correct path to this solver in parameter `lp_solver_path`, ex: '/usr/bin/cbc'.
 
 
 ## License

{emhass-0.13.2.dist-info → emhass-0.13.3.dist-info}/RECORD

@@ -3,14 +3,14 @@ emhass/command_line.py,sha256=sJIpI11BAJi1Ao7ck4B_zbr6dD1V7VY3S6UmxqRFRcE,75857
 emhass/forecast.py,sha256=lEBKnzJSxpbAYQ-OiW_qnKTTj8cl95yk4Ggkyk_rpyo,83892
 emhass/machine_learning_forecaster.py,sha256=zr5BczdsvoUCKpxV3XL4Ts-IWcS6zuhXYdeQwBD5gE8,16282
 emhass/machine_learning_regressor.py,sha256=Ih1q-vUWHWbGFxv9F12omwgyMRp-iaMU_m-yploVbyU,9532
-emhass/optimization.py,sha256=_uKG7QKVtdpbv4U4Y_R9xLdWR17lB4YQWAuuONqk8ng,67947
-emhass/retrieve_hass.py,sha256=KZQ6esRYq0Typp7yyZUwEdYKHFPqDmnsuVxuDhBdWc0,29444
+emhass/optimization.py,sha256=5Fb9Wn3nIi_IqnKV8XX-fxpG7eRxsiunaW-ZvXYmQ5M,68260
+emhass/retrieve_hass.py,sha256=JQqNurTHtu6VdTTBnh0Sx1N3KMOLLuAn6jMQLokgpcw,29532
 emhass/utils.py,sha256=UysLZJ-TzsWvkNyihXkPwcf_qGUpxN_HfnAVcb0KWkY,73889
 emhass/web_server.py,sha256=xOgM3lVwXAN6Ctoi5in21ImeSvx6-wDNtgYZqLQN01I,29153
-emhass/data/associations.csv,sha256=pFbL3LosAhWc4SmHWZGQa-2ykwmFAqhV1nmd4hTYNKU,4144
+emhass/data/associations.csv,sha256=J2HTMK5UjdU6k8ehxkPAsnXzl7-gATKGWXed_0oO2To,4180
 emhass/data/cec_inverters.pbz2,sha256=ca-dO6sv38_FI2w_6fkAIzcrEqzFBkG8MHKNGbCZPow,189400
 emhass/data/cec_modules.pbz2,sha256=Y639TNqhaIxh2Ec7AUPxy8k4lQugY5rURVVVexj0fMU,1885444
-emhass/data/config_defaults.json,sha256=J1hgdA6D9mliPABbSaGqdO4rG3Xr5-9nI-jIWqrRylA,3128
+emhass/data/config_defaults.json,sha256=Bz-qXLCWmKzvr6q_N4yVbgHua_K6OhL_Y--GFXjIx0c,3148
 emhass/img/emhass_icon.png,sha256=Kyx6hXQ1huJLHAq2CaBfjYXR25H9j99PSWHI0lShkaQ,19030
 emhass/static/advanced.html,sha256=gAhsd14elDwh1Ts4lf9wn_ZkczzzObq5qOimi_la3Ic,2067
 emhass/static/basic.html,sha256=ro2WwWgJyoUhqx_nJFzKCEG8FA8863vSHLmrjGYcEgs,677
@@ -18,15 +18,15 @@ emhass/static/configuration_list.html,sha256=i4v83RVduWjdjkjPhA74e-j8NSUpFzqMGU3
 emhass/static/configuration_script.js,sha256=Ek0Ry1Ae6ZGMl28mYxno6bPTwY4rK7AHcL58C6T6qUo,31727
 emhass/static/script.js,sha256=-JYS8fHjchrMi1hYYKMd9p7vZvPcnYiY8NNuRC99fJM,16323
 emhass/static/style.css,sha256=a_8YlGubn1zoF5RTLJ_Qkrb8tAjUY9p7oAKxhCvJY2s,19288
-emhass/static/data/param_definitions.json,sha256=GAXsnpdg9F5zbl7McdUoiiAfjwjRgQ24sYhovEv9sEI,21692
+emhass/static/data/param_definitions.json,sha256=vsmc1Ykeng2fjRy5PhxOvWCBtgKLr17sCOsGpMkpkLQ,22000
 emhass/static/img/emhass_icon.png,sha256=Kyx6hXQ1huJLHAq2CaBfjYXR25H9j99PSWHI0lShkaQ,19030
 emhass/static/img/emhass_logo_short.svg,sha256=yzMcqtBRCV8rH84-MwnigZh45_f9Eoqwho9P8nCodJA,66736
 emhass/static/img/feather-sprite.svg,sha256=VHjMJQg88wXa9CaeYrKGhNtyK0xdd47zCqwSIa-hxo8,60319
 emhass/templates/configuration.html,sha256=M-_L__juYzcdGDaryGrz6LG2mguW2f1Sx6k01YfG7Dc,2885
 emhass/templates/index.html,sha256=1V44c0yyliu_z8inl0K-zmmmkhQumH3Bqk8Jj1YJPzY,3076
 emhass/templates/template.html,sha256=TkGgMecQEbFUZA4ymPwMUzNjKHsENvCgroUWbPt7G4Y,158
-emhass-0.13.2.dist-info/METADATA,sha256=iJQCKI1fRrYBS4VFqomje9VAXF_-tZ6Fy09kCa2MFno,51493
-emhass-0.13.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-emhass-0.13.2.dist-info/entry_points.txt,sha256=6Bp1NFOGNv_fSTxYl1ke3K3h3aqAcBxI-bgq5yq-i1M,52
-emhass-0.13.2.dist-info/licenses/LICENSE,sha256=1X3-S1yvOCBDBeox1aK3dq00m7dA8NDtcPrpKPISzbE,1077
-emhass-0.13.2.dist-info/RECORD,,
+emhass-0.13.3.dist-info/METADATA,sha256=ZzGJGH85Ru7-TpPuqzXcJcTPXu7h2R7qhxEf-8BIDBk,51534
+emhass-0.13.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+emhass-0.13.3.dist-info/entry_points.txt,sha256=6Bp1NFOGNv_fSTxYl1ke3K3h3aqAcBxI-bgq5yq-i1M,52
+emhass-0.13.3.dist-info/licenses/LICENSE,sha256=1X3-S1yvOCBDBeox1aK3dq00m7dA8NDtcPrpKPISzbE,1077
+emhass-0.13.3.dist-info/RECORD,,