Merge pull request #962 from skalenetwork/develop

Fix settings update flow - develop to beta

Author: dmytrotkk

node_cli/utils/settings.py

@@ -18,6 +18,7 @@
 #   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import tomllib
+from pathlib import Path
 
 from dotenv.main import DotEnv
 
@@ -50,13 +51,20 @@ def load_config_file(filepath: str) -> dict:
     return {k.lower(): v for k, v in DotEnv(filepath).dict().items()}
 
 
+def _remove_if_exists(path: Path) -> None:
+    if path.exists():
+        path.unlink()
+
+
 def validate_and_save_node_settings(
     config_filepath: str,
     node_type: NodeType,
     node_mode: NodeMode,
 ) -> BaseNodeSettings:
     data = load_config_file(config_filepath)
     settings_type = SETTINGS_MAP[(node_type.value, node_mode.value)]
+    settings_type.model_validate(data)
+    _remove_if_exists(NODE_SETTINGS_PATH)
     write_node_settings_file(path=NODE_SETTINGS_PATH, settings_type=settings_type, data=data)
     return settings_type()
 
@@ -74,4 +82,6 @@ def save_internal_settings(
         'backup_run': backup_run,
         'pull_config_for_schain': pull_config_for_schain,
     }
+    InternalSettings.model_validate(data)
+    _remove_if_exists(INTERNAL_SETTINGS_PATH)
     write_internal_settings_file(path=INTERNAL_SETTINGS_PATH, data=data)