Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Save and restore settings from file rather than just using HA storage #1200

Merged
merged 2 commits into from
Jun 9, 2024
Merged

Save and restore settings from file rather than just using HA storage #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a676f29
Save and restore settings from file rather than just using HA storage
springfall2008 Jun 9, 2024
ebd2b95
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Jun 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/predbat/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,7 @@
"icon": "mdi:state-machine",
"default": None,
"restore": False,
"save": False,
},
{
"name": "manual_charge",
Expand Down Expand Up @@ -756,6 +757,7 @@
"icon": "mdi:state-machine",
"default": "",
"restore": False,
"save": False,
},
{
"name": "auto_update",
Expand Down Expand Up @@ -856,7 +858,6 @@
"unit": "W",
"enable": "iboost_enable",
"default": 2400,
"restore": False,
},
{
"name": "iboost_min_power",
Expand Down
59 changes: 52 additions & 7 deletions apps/predbat/predbat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9938,6 +9938,7 @@ def update_pred(self, scheduled=True):
self.dashboard_index = []

self.update_time()
self.save_current_config()

self.expose_config("active", True)

Expand Down Expand Up @@ -10105,6 +10106,7 @@ def update_pred(self, scheduled=True):
extra=status_extra,
)
self.expose_config("active", False)
self.save_current_config()

async def update_event(self, event, data, kwargs):
"""
Expand Down Expand Up @@ -10335,7 +10337,7 @@ def get_ha_config(self, name, default):
async def async_expose_config(self, name, value, quiet=True, event=False, force=False, in_progress=False):
return await self.run_in_executor(self.expose_config, name, value, quiet, event, force, in_progress)

def expose_config(self, name, value, quiet=True, event=False, force=False, in_progress=False):
def expose_config(self, name, value, quiet=True, event=False, force=False, in_progress=False, force_ha=False):
"""
Share the config with HA
"""
Expand All @@ -10347,11 +10349,12 @@ def expose_config(self, name, value, quiet=True, event=False, force=False, in_pr
item["value"] = None
else:
entity = item.get("entity")
if entity and ((item.get("value") is None) or (value != item["value"]) or force):
if item.get("reset_inverter", False):
has_changed = ((item.get("value", None) is None) or (value != item.get("value", None))) or force
if entity and (has_changed or force_ha):
if has_changed and item.get("reset_inverter", False):
self.inverter_needs_reset = True
self.log("Set reset inverter true due to reset_inverter on item {}".format(name))
if item.get("reset_inverter_force", False):
if has_changed and item.get("reset_inverter_force", False):
self.inverter_needs_reset = True
self.log("Set reset inverter true due to reset_inverter_force on item {}".format(name))
if event:
Expand Down Expand Up @@ -10497,6 +10500,36 @@ async def async_restore_settings_yaml(self, filename):
await self.async_call_notify("Predbat settings restored from {}".format(filename))
await self.async_expose_config("saverestore", None)

def load_current_config(self):
"""
Load the current configuration from a json file
"""
filepath = self.config_root + "/predbat_config.json"
if os.path.exists(filepath):
with open(filepath, "r") as file:
settings = json.load(file)
for name in settings:
current = self.config_index.get(name, None)
if current:
item_value = settings[name]
if current.get("value", None) != item_value:
self.log("Restore saved setting: {} = {} (was {})".format(name, item_value, current.get("value", None)))
current["value"] = item_value

def save_current_config(self):
"""
Saves the currently defined configuration to a json file
"""
filepath = self.config_root + "/predbat_config.json"
save_array = {}
for item in CONFIG_ITEMS:
if item.get("save", True):
if item.get("value", None) is not None:
save_array[item["name"]] = item["value"]
with open(filepath, "w") as file:
json.dump(save_array, file)
self.log("Saved current settings to {}".format(filepath))

async def async_save_settings_yaml(self, filename=None):
"""
Save current Predbat settings
Expand Down Expand Up @@ -10590,6 +10623,7 @@ def load_previous_value_from_ha(self, entity):
ha_value = self.get_state_wrapper(entity)
if ha_value is not None:
return ha_value

history = self.get_history_wrapper(entity_id=entity)
if history:
history = history[0]
Expand Down Expand Up @@ -10646,6 +10680,7 @@ def load_user_config(self, quiet=True, register=False):
"""
Load config from HA
"""

self.config_index = {}
self.log("Refreshing Predbat configuration")

Expand All @@ -10665,6 +10700,11 @@ def load_user_config(self, quiet=True, register=False):
if name == "mode" and new_install:
item["default"] = PREDBAT_MODE_OPTIONS[PREDBAT_MODE_MONITOR]

# Load current config (if there is one)
if register:
self.log("Loading current config")
self.load_current_config()

# Find values and monitor config
for item in CONFIG_ITEMS:
name = item["name"]
Expand All @@ -10686,8 +10726,10 @@ def load_user_config(self, quiet=True, register=False):
self.set_state_wrapper(entity_id=entity, state=ha_value, attributes={"friendly_name": "[Disabled] " + item["friendly_name"]})
continue

# Get from current state?
ha_value = self.load_previous_value_from_ha(entity)
# Get from current state, if not from HA directly
ha_value = item.get("value", None)
if ha_value is None:
ha_value = self.load_previous_value_from_ha(entity)

# Update drop down menu
if name == "update":
Expand Down Expand Up @@ -10723,7 +10765,7 @@ def load_user_config(self, quiet=True, register=False):
if item.get("manual"):
self.manual_times(name, new_value=ha_value)
else:
self.expose_config(item["name"], ha_value, quiet=quiet, force=True)
self.expose_config(item["name"], ha_value, quiet=quiet, force_ha=True)

# Update the last time we refreshed the config
self.set_state_wrapper(entity_id=self.prefix + ".config_refresh", state=self.now_utc.strftime(TIME_FORMAT))
Expand All @@ -10744,6 +10786,9 @@ def load_user_config(self, quiet=True, register=False):
if entity and isinstance(entity, str) and ("." in entity):
self.listen_state(self.watch_event, entity_id=entity)

# Save current config to file if it was pending
self.save_current_config()

def resolve_arg_re(self, arg, arg_value, state_keys):
"""
Resolve argument regular expression on list or string
Expand Down
Loading