Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Validate config #2137

Merged
merged 8 commits into from
Mar 23, 2025
Merged

Validate config #2137

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f90685
Validate config
springfall2008 Mar 22, 2025
b073d1a
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Mar 22, 2025
bb2156a
Updates
springfall2008 Mar 23, 2025
d18d2ce
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Mar 23, 2025
6718294
Web UI improvements to apps.yaml check
springfall2008 Mar 23, 2025
a0a3e4e
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Mar 23, 2025
e4127b8
Updated
springfall2008 Mar 23, 2025
de40d6d
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Mar 23, 2025
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
131 changes: 131 additions & 0 deletions apps/predbat/config.py
View file
Original file line number Diff line number Diff line change
@@ -1456,3 +1456,134 @@
"Feed-in priority - No Timed Charge/Discharge": 96,
"Feed-in priority": 98,
}

# Apps.yaml validation schema
APPS_SCHEMA = {
"currency_symbols": {"type": "string|string_list"},
"db_enable": {"type": "boolean"},
"db_days": {"type": "integer"},
"db_mirror_ha": {"type": "boolean"},
"db_primary": {"type": "boolean"},
"threads": {"type": "string|integer", "allowed": ["auto", 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]},
"ha_url": {"type": "string", "empty": False},
"ha_key": {"type": "string", "empty": False},
"load_filter_threshold": {"type": "integer"},
"web_port": {"type": "integer"},
"load_today": {"type": "sensor|sensor_list", "sensor_type": "float", "required": True},
"import_today": {
"type": "sensor|sensor_list",
"sensor_type": "float",
},
"export_today": {
"type": "sensor|sensor_list",
"sensor_type": "float",
},
"pv_today": {
"type": "sensor|sensor_list",
"sensor_type": "float",
},
"load_forecast_only": {"type": "boolean"},
"load_forecast": {
"type": "sensor|sensor_list",
"sensor_type": "dict",
},
"ge_cloud_data": {"type": "boolean"},
"ge_cloud_serial": {"type": "string", "empty": False},
"ge_cloud_key": {"type": "string", "empty": False},
"ge_cloud_direct": {"type": "boolean"},
"ge_cloud_automatic": {"type": "boolean"},
"num_inverters": {"type": "integer", "zero": False},
"balance_inverters_seconds": {"type": "integer", "zero": False},
"givtcp_rest": {"type": "string_list"},
"charge_rate": {"type": "sensor_list", "sensor_type": "float", "modify": True},
"discharge_rate": {"type": "sensor_list", "sensor_type": "float", "modify": True},
"battery_power": {"type": "sensor_list", "sensor_type": "float"},
"pv_power": {"type": "sensor_list", "sensor_type": "float"},
"load_power": {"type": "sensor_list", "sensor_type": "float"},
"soc_kw": {"type": "sensor_list", "sensor_type": "float"},
"soc_max": {"type": "sensor_list", "sensor_type": "float"},
"reserve": {"type": "sensor_list", "sensor_type": "float"},
"inverter_mode": {"type": "sensor_list", "sensor_type": "string", "modify": True},
"inverter_time": {"type": "sensor_list", "sensor_type": "string"},
"inverter_type": {"type": "string_list"},
"charge_start_time": {"type": "sensor_list", "sensor_type": "string", "modify": True},
"charge_end_time": {"type": "sensor_list", "sensor_type": "string", "modify": True},
"charge_limit": {"type": "sensor_list", "sensor_type": "float", "modify": True},
"scheduled_charge_enable": {"type": "sensor_list", "sensor_type": "switch", "modify": True},
"scheduled_discharge_enable": {"type": "sensor_list", "sensor_type": "switch", "modify": True},
"discharge_start_time": {"type": "sensor_list", "sensor_type": "string", "modify": True},
"discharge_end_time": {"type": "sensor_list", "sensor_type": "string", "modify": True},
"battery_temperature": {"type": "sensor_list", "sensor_type": "float"},
"pause_mode": {"type": "sensor_list", "sensor_type": "string", "modify": True},
"pause_start_time": {"type": "sensor_list", "sensor_type": "string", "modify": True},
"pause_end_time": {"type": "sensor_list", "sensor_type": "string", "modify": True},
"inverter_limit": {"type": "integer_list", "zero": False},
"inverter_limit_charge": {"type": "integer_list", "zero": False},
"export_limit": {"type": "integer_list"},
"inverter_battery_rate_min": {"type": "integer", "zero": False},
"inverter_reserve_max": {"type": "integer", "zero": False},
"battery_charge_power_curve: ": {"type": "int_float_dict"},
"battery_discharge_power_curve: ": {"type": "int_float_dict"},
"clock_skew": {"type": "integer"},
"solcast_api_key": {"type": "string", "empty": False},
"solcast_host": {"type": "string", "empty": False},
"solcast_poll_hours": {"type": "float", "zero": False},
"pv_forecast_today": {"type": "sensor", "sensor_type": "float"},
"pv_forecast_tomorrow": {"type": "sensor", "sensor_type": "float"},
"pv_forecast_d3": {"type": "sensor", "sensor_type": "float"},
"pv_forecast_d4": {"type": "sensor", "sensor_type": "float"},
"car_charging_energy": {"type": "sensor", "sensor_type": "float"},
"num_cars": {"type": "integer", "zero": True},
"car_charging_planned": {"type": "sensor|sensor_list", "sensor_type": "string"},
"car_charging_planned_response": {"type": "string_list"},
"car_charging_now": {"type": "sensor|sensor_list", "sensor_type": "string"},
"car_charging_now_response": {"type": "string_list"},
"car_charging_battery_size": {"type": "float|sensor", "zero": False, "sensor_type": "float"},
"car_charging_soc": {"type": "float|sensor", "sensor_type": "float"},
"car_charging_limit": {"type": "float|sensor", "sensor_type": "float"},
"car_charging_exclusive": {"type": "boolean_list"},
"carbon_intensity": {"type": "sensor", "sensor_type": "string"},
"octopus_intelligent_slot": {"type": "sensor", "sensor_type": "switch"},
"octopus_ready_time": {"type": "sensor", "sensor_type": "string"},
"octopus_charge_limit": {"type": "sensor", "sensor_type": "float"},
"octopus_slot_low_rate": {"type": "boolean"},
"octopus_saving_session_octopoints_per_penny": {"type": "integer"},
"octopus_free_url": {"type": "string", "empty": False},
"metric_octopus_import": {"type": "sensor", "sensor_type": "float"},
"metric_octopus_export": {"type": "sensor", "sensor_type": "float"},
"octopus_api_key": {"type": "string", "empty": False},
"octopus_api_account": {"type": "string", "empty": False},
"rates_import": {"type": "dict_list"},
"rates_export": {"type": "dict_list"},
"alerts": {"type": "dict"},
"rates_import_octopus_url": {"type": "string", "empty": False},
"rates_export_octopus_url": {"type": "string", "empty": False},
"rates_import_override": {"type": "dict_list"},
"rates_export_override": {"type": "dict_list"},
"days_previous": {"type": "integer_list"},
"days_previous_weight": {"type": "integer_list"},
"forecast_hours": {"type": "integer"},
"notify_devices": {"type": "string_list"},
"battery_scaling": {"type": "float_list"},
"import_export_scaling": {"type": "float"},
"export_triggers": {"type": "dict_list"},
"iboost_energy_today": {"type": "sensor", "sensor_type": "float"},
"metric_octopus_gas": {"type": "sensor", "sensor_type": "float"},
"rates_gas": {"type": "dict_list"},
"futurerate_url": {"type": "string", "empty": False},
"futurerate_adjust_import": {"type": "boolean"},
"futurerate_adjust_export": {"type": "boolean"},
"futurerate_peak_start": {"type": "string", "empty": False},
"futurerate_peak_end": {"type": "string", "empty": False},
"octopus_region": {"type": "string", "empty": False},
"compare_list": {"type": "dict_list"},
"watch_list": {"type": "string_list"},
"charge_start_service": {"type": "dict_list"},
"charge_stop_service": {"type": "dict_list"},
"discharge_start_service": {"type": "dict_list"},
"discharge_stop_service": {"type": "dict_list"},
"charge_freeze_service": {"type": "dict_list"},
"discharge_freeze_service": {"type": "dict_list"},
"device_id": {"type": "string", "empty": False},
"predheat": {"type": "dict"},
}
3 changes: 2 additions & 1 deletion apps/predbat/gecloud.py
View file
Original file line number Diff line number Diff line change
@@ -564,7 +564,8 @@ async def async_automatic_config(self, devices):
self.base.args["pause_mode"] = ["select.predbat_gecloud_" + device + "_pause_battery" for device in batteries]
self.base.args["pause_start_time"] = ["select.predbat_gecloud_" + device + "_pause_battery_start_time" for device in batteries]
self.base.args["pause_end_time"] = ["select.predbat_gecloud_" + device + "_pause_battery_end_time" for device in batteries]
self.base.args["givtcp_rest"] = {}
if "givtcp_rest" in self.base.args:
del self.base.args["givtcp_rest"]
self.base.args["ge_cloud_serial"] = batteries[0]

# reconfigure for EMS
2 changes: 1 addition & 1 deletion apps/predbat/output.py
View file
Original file line number Diff line number Diff line change
@@ -1754,6 +1754,7 @@ def record_status(self, message, debug="", had_errors=False, notify=False, extra
self.current_status = message + extra
if notify and self.previous_status != message and self.set_status_notify:
self.call_notify("Predbat status change to: " + message + extra)
self.previous_status = message

self.dashboard_item(
self.prefix + ".status",
@@ -1774,7 +1775,6 @@ def record_status(self, message, debug="", had_errors=False, notify=False, extra
else:
self.log("Info: record_status {}".format(message + extra))

self.previous_status = message
if had_errors:
self.had_errors = True

Loading