mirror of
https://github.com/Akkudoktor-EOS/EOS.git
synced 2026-07-24 10:48:11 +00:00
fix: provider settings in top level field of configuration (#1161)
Configuration for some providers was given in the sub-field `provider_settings` combining the settings of several providers. Pydantic does not understand this very well and the configuration became cumbersome, especially in EOSdash. All provider settings from the `provider-settings` sub-field are now lifted to the top level field of the configuration. The changes are automatically migrated in the configuration. Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>
This commit is contained in:
27
tests/testdata/eos_config_unstripped.json
vendored
27
tests/testdata/eos_config_unstripped.json
vendored
@@ -1,14 +1,7 @@
|
||||
{
|
||||
"general": {
|
||||
"version": "0.2.0.dev2603031877440961",
|
||||
"data_folder_path": "/home/bobby/.local/share/net.akkudoktor.eos",
|
||||
"data_output_subpath": "output",
|
||||
"latitude": 52.52,
|
||||
"longitude": 13.405,
|
||||
"timezone": "Europe/Berlin",
|
||||
"data_output_path": "/home/bobby/.local/share/net.akkudoktor.eos/output",
|
||||
"config_folder_path": "/home/bobby/.config/net.akkudoktor.eos",
|
||||
"config_file_path": "/home/bobby/.config/net.akkudoktor.eos/EOS.config.json"
|
||||
"version": "__ANY__",
|
||||
"data_output_subpath": "output"
|
||||
},
|
||||
"cache": {
|
||||
"subpath": "cache",
|
||||
@@ -34,8 +27,7 @@
|
||||
},
|
||||
"logging": {
|
||||
"console_level": null,
|
||||
"file_level": null,
|
||||
"file_path": "/home/bobby/.local/share/net.akkudoktor.eos/output/eos.log"
|
||||
"file_level": null
|
||||
},
|
||||
"devices": {
|
||||
"batteries": [
|
||||
@@ -302,9 +294,9 @@
|
||||
"loadakkudoktor": {
|
||||
"loadakkudoktor_year_energy_kwh": 3000
|
||||
},
|
||||
"loadvrm": {
|
||||
"load_vrm_token": "your-token",
|
||||
"load_vrm_idsite": 12345
|
||||
"vrm": {
|
||||
"token": "your-token",
|
||||
"site_id": 12345
|
||||
},
|
||||
"loadimport": {
|
||||
"import_file_path": null,
|
||||
@@ -319,10 +311,6 @@
|
||||
},
|
||||
"pvforecast": {
|
||||
"provider": "PVForecastAkkudoktor",
|
||||
"provider_settings": {
|
||||
"PVForecastImport": null,
|
||||
"PVForecastVrm": null
|
||||
},
|
||||
"planes": [
|
||||
{
|
||||
"surface_tilt": 7,
|
||||
@@ -476,9 +464,6 @@
|
||||
},
|
||||
"weather": {
|
||||
"provider": "BrightSky",
|
||||
"provider_settings": {
|
||||
"WeatherImport": null
|
||||
},
|
||||
"providers": [
|
||||
"BrightSky",
|
||||
"ClearOutside",
|
||||
|
||||
Reference in New Issue
Block a user