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

emhass/command_line.py

@@ -72,7 +72,9 @@ def retrieve_home_assistant_data(
         if optim_conf.get("set_use_pv", True):
             var_list.append(retrieve_hass_conf["sensor_power_photovoltaics"])
             if optim_conf.get("set_use_adjusted_pv", True):
-                var_list.append(retrieve_hass_conf["sensor_power_photovoltaics_forecast"])
+                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
         ):
@@ -302,7 +304,8 @@ def set_input_data_dict(
         else:
             P_PV_forecast = pd.Series(0, index=fcst.forecast_dates)
         P_load_forecast = fcst.get_load_forecast(
-            method=optim_conf["load_forecast_method"]
+            days_min_load_forecast=optim_conf["delta_forecast_daily"].days,
+            method=optim_conf["load_forecast_method"],
         )
         if isinstance(P_load_forecast, bool) and not P_load_forecast:
             logger.error(
@@ -400,6 +403,7 @@ def set_input_data_dict(
         else:
             P_PV_forecast = pd.Series(0, index=fcst.forecast_dates)
         P_load_forecast = fcst.get_load_forecast(
+            days_min_load_forecast=optim_conf["delta_forecast_daily"].days,
             method=optim_conf["load_forecast_method"],
             set_mix_forecast=set_mix_forecast,
             df_now=df_input_data,

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
@@ -60,6 +61,10 @@ plant_conf,surface_azimuth,surface_azimuth,list_surface_azimuth
 plant_conf,modules_per_string,modules_per_string,list_modules_per_string
 plant_conf,strings_per_inverter,strings_per_inverter,list_strings_per_inverter
 plant_conf,inverter_is_hybrid,inverter_is_hybrid
+plant_conf,inverter_ac_output_max,inverter_ac_output_max
+plant_conf,inverter_ac_input_max,inverter_ac_input_max
+plant_conf,inverter_efficiency_dc_ac,inverter_efficiency_dc_ac
+plant_conf,inverter_efficiency_ac_dc,inverter_efficiency_ac_dc
 plant_conf,compute_curtailment,compute_curtailment
 plant_conf,Pd_max,battery_discharge_power_max
 plant_conf,Pc_max,battery_charge_power_max
@@ -68,4 +73,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,
@@ -115,6 +116,10 @@
     1
   ],
   "inverter_is_hybrid": false,
+  "inverter_ac_output_max": 1000,
+  "inverter_ac_input_max": 1000,
+  "inverter_efficiency_dc_ac": 1.0,
+  "inverter_efficiency_ac_dc": 1.0,
   "compute_curtailment": false,
   "set_use_battery": false,
   "battery_discharge_power_max": 1000,

emhass/forecast.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import bz2
 import copy
 import json
@@ -216,8 +214,7 @@ class Forecast:
                     ]
 
     def get_cached_open_meteo_forecast_json(
-        self,
-        max_age: int | None = 30,
+        self, max_age: int | None = 30, forecast_days: int = 3
     ) -> dict:
         r"""
         Get weather forecast json from Open-Meteo and cache it for re-use.
@@ -235,10 +232,30 @@ class Forecast:
             before it is discarded and a new version fetched from Open-Meteo.
             Defaults to 30 minutes.
         :type max_age: int, optional
+        :param forecast_days: The number of days of forecast data required from Open-Meteo.
+            One additional day is always fetched from Open-Meteo so there is an extra data in the cache.
+            Defaults to 2 days (3 days fetched) to match the prior default.
+        :type forecast_days: int, optional
         :return: The json containing the Open-Meteo forecast data
         :rtype: dict
 
         """
+
+        # Ensure at least 3 weather forecast days (and 1 more than requested)
+        if forecast_days is None:
+            self.logger.warning(
+                "Open-Meteo forecast_days is missing so defaulting to 3 days"
+            )
+            forecast_days = 3
+        elif forecast_days < 3:
+            self.logger.warning(
+                "Open-Meteo forecast_days is too low (%s) so defaulting to 3 days",
+                forecast_days,
+            )
+            forecast_days = 3
+        else:
+            forecast_days = forecast_days + 1
+
         json_path = os.path.abspath(
             self.emhass_conf["data_path"] / "cached-open-meteo-forecast.json"
         )
@@ -287,10 +304,13 @@ class Forecast:
                 + "shortwave_radiation_instant,"
                 + "diffuse_radiation_instant,"
                 + "direct_normal_irradiance_instant"
+                + "&forecast_days="
+                + str(forecast_days)
                 + "&timezone="
                 + quote(str(self.time_zone), safe="")
             )
             try:
+                self.logger.debug("Fetching data from Open-Meteo using URL: %s", url)
                 response = get(url, headers=headers)
                 self.logger.debug("Returned HTTP status code: %s", response.status_code)
                 response.raise_for_status()
@@ -349,7 +369,8 @@ class Forecast:
         ):  # The scrapper option is being left here for backward compatibility
             if not os.path.isfile(w_forecast_cache_path):
                 data_raw = self.get_cached_open_meteo_forecast_json(
-                    self.optim_conf["open_meteo_cache_max_age"]
+                    self.optim_conf["open_meteo_cache_max_age"],
+                    self.optim_conf["delta_forecast_daily"].days,
                 )
                 data_15min = pd.DataFrame.from_dict(data_raw["minutely_15"])
                 data_15min["time"] = pd.to_datetime(data_15min["time"])
@@ -671,6 +692,7 @@ class Forecast:
         alpha: float,
         beta: float,
         col: str,
+        ignore_pv_feedback: bool = False,
     ) -> pd.DataFrame:
         """A simple correction method for forecasted data using the current real values of a variable.
 
@@ -684,9 +706,15 @@ class Forecast:
         :type beta: float
         :param col: The column variable name
         :type col: str
+        :param ignore_pv_feedback: If True, bypass mixing and return original forecast (used during curtailment)
+        :type ignore_pv_feedback: bool
         :return: The output DataFrame with the corrected values
         :rtype: pd.DataFrame
         """
+        # If ignoring PV feedback (e.g., during curtailment), return original forecast
+        if ignore_pv_feedback:
+            return df_forecast
+
         first_fcst = alpha * df_forecast.iloc[0] + beta * df_now[col].iloc[-1]
         df_forecast.iloc[0] = int(round(first_fcst))
         return df_forecast
@@ -787,12 +815,14 @@ class Forecast:
                     # Extracting results for AC power
                     P_PV_forecast = mc.results.ac
         if set_mix_forecast:
+            ignore_pv_feedback = self.params["passed_data"].get("ignore_pv_feedback_during_curtailment", False)
             P_PV_forecast = Forecast.get_mix_forecast(
                 df_now,
                 P_PV_forecast,
                 self.params["passed_data"]["alpha"],
                 self.params["passed_data"]["beta"],
                 self.var_PV,
+                ignore_pv_feedback,
             )
         P_PV_forecast[P_PV_forecast < 0] = 0  # replace any negative PV values with zero
         self.logger.debug("get_power_from_weather returning:\n%s", P_PV_forecast)
@@ -1410,14 +1440,22 @@ class Forecast:
             forecast_out.index.name = "ts"
             forecast_out = forecast_out.rename(columns={"load": "yhat"})
         elif method == "naive":  # using a naive approach
-            mask_forecast_out = (
-                df.index > days_list[-1] - self.optim_conf["delta_forecast_daily"]
+            # Old code logic (shifted timestamp problem)
+            # mask_forecast_out = (
+            #     df.index > days_list[-1] - self.optim_conf["delta_forecast_daily"]
+            # )
+            # forecast_out = df.copy().loc[mask_forecast_out]
+            # forecast_out = forecast_out.rename(columns={self.var_load_new: "yhat"})
+            # forecast_out = forecast_out.iloc[0 : len(self.forecast_dates)]
+            # forecast_out.index = self.forecast_dates
+            # New code logic
+            forecast_horizon = len(self.forecast_dates)
+            historical_values = df.iloc[-forecast_horizon:]
+            forecast_out = pd.DataFrame(
+                historical_values.values,
+                index=self.forecast_dates,
+                columns=["yhat"]
             )
-            forecast_out = df.copy().loc[mask_forecast_out]
-            forecast_out = forecast_out.rename(columns={self.var_load_new: "yhat"})
-            # Force forecast_out length to avoid mismatches
-            forecast_out = forecast_out.iloc[0 : len(self.forecast_dates)]
-            forecast_out.index = self.forecast_dates
         elif (
             method == "mlforecaster"
         ):  # using a custom forecast model with machine learning
@@ -1506,12 +1544,14 @@ class Forecast:
             return False
         P_Load_forecast = copy.deepcopy(forecast_out["yhat"])
         if set_mix_forecast:
+            # Load forecasts don't need curtailment protection - always use feedback
             P_Load_forecast = Forecast.get_mix_forecast(
                 df_now,
                 P_Load_forecast,
                 self.params["passed_data"]["alpha"],
                 self.params["passed_data"]["beta"],
                 self.var_load_new,
+                False,  # Never ignore feedback for load forecasts
             )
         self.logger.debug("get_load_forecast returning:\n%s", P_Load_forecast)
         return P_Load_forecast

emhass/machine_learning_forecaster.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import logging
 import time
 import warnings