Repair malformed storage path settings

Author: Samuwhale

backend/services/settings.py

@@ -22,7 +22,7 @@
     serialize_stem_options,
     settings_default_selection,
 )
-from backend.services.storage import resolve_storage_paths
+from backend.services.storage import resolve_storage_paths, storage_path_from_setting
 
 DEFAULT_TEMP_MAX_AGE_HOURS = 24
 DEFAULT_EXPORT_BUNDLE_MAX_AGE_DAYS = 7
@@ -45,6 +45,10 @@ def _resolve_storage_directory(raw_value: str) -> str:
     return str(Path(cleaned).expanduser().resolve())
 
 
+def _storage_directory_or_default(value: Any, default: Path) -> str:
+    return str(storage_path_from_setting(value, default))
+
+
 def get_or_create_settings(session: Session, runtime_settings: RuntimeSettings) -> AppSettings:
     settings = session.get(AppSettings, 1)
     if settings is None:
@@ -80,16 +84,22 @@ def get_or_create_settings(session: Session, runtime_settings: RuntimeSettings)
 def _backfill_settings(settings: AppSettings, runtime_settings: RuntimeSettings) -> bool:
     changed = False
     defaults = {
-        "uploads_directory": str(runtime_settings.uploads_dir.resolve()),
-        "outputs_directory": str(runtime_settings.output_dir.resolve()),
-        "exports_directory": str(runtime_settings.exports_dir.resolve()),
-        "temp_directory": str(runtime_settings.temp_dir.resolve()),
-        "model_cache_directory": str(runtime_settings.model_cache_dir.resolve()),
+        "uploads_directory": runtime_settings.uploads_dir,
+        "outputs_directory": runtime_settings.output_dir,
+        "exports_directory": runtime_settings.exports_dir,
+        "temp_directory": runtime_settings.temp_dir,
+        "model_cache_directory": runtime_settings.model_cache_dir,
         "temp_max_age_hours": DEFAULT_TEMP_MAX_AGE_HOURS,
         "export_bundle_max_age_days": DEFAULT_EXPORT_BUNDLE_MAX_AGE_DAYS,
     }
     for field_name, value in defaults.items():
-        if getattr(settings, field_name) is None:
+        if field_name.endswith("_directory"):
+            normalized = _storage_directory_or_default(getattr(settings, field_name), value)
+            if getattr(settings, field_name) == normalized:
+                continue
+            setattr(settings, field_name, normalized)
+            changed = True
+        elif getattr(settings, field_name) is None:
             setattr(settings, field_name, value)
             changed = True
     if not isinstance(settings.default_stem_selection, dict):
@@ -117,11 +127,14 @@ def serialize_settings(settings: AppSettings, runtime_settings: RuntimeSettings)
     default_selection = settings_default_selection(settings)
     storage = StorageSettingsResponse(
         database_path=str(runtime_settings.database_path.expanduser().resolve()),
-        uploads_directory=settings.uploads_directory or "",
-        outputs_directory=settings.outputs_directory,
-        exports_directory=settings.exports_directory or "",
-        temp_directory=settings.temp_directory or "",
-        model_cache_directory=settings.model_cache_directory,
+        uploads_directory=_storage_directory_or_default(settings.uploads_directory, runtime_settings.uploads_dir),
+        outputs_directory=_storage_directory_or_default(settings.outputs_directory, runtime_settings.output_dir),
+        exports_directory=_storage_directory_or_default(settings.exports_directory, runtime_settings.exports_dir),
+        temp_directory=_storage_directory_or_default(settings.temp_directory, runtime_settings.temp_dir),
+        model_cache_directory=_storage_directory_or_default(
+            settings.model_cache_directory,
+            runtime_settings.model_cache_dir,
+        ),
     )
     return SettingsResponse(
         storage=storage,

backend/services/storage.py

@@ -3,7 +3,9 @@
 import shutil
 from dataclasses import dataclass
 from datetime import datetime, timedelta
+from os import PathLike
 from pathlib import Path
+from typing import Any
 
 from sqlalchemy.orm import Session
 
@@ -74,12 +76,17 @@ def ensure_directories(self) -> None:
             raise ValueError(f"Export bundle folder is not writable or could not be created: {self.export_bundles_dir}") from error
 
 
+def storage_path_from_setting(value: Any, default: Path) -> Path:
+    candidate = value if isinstance(value, (str, PathLike)) and str(value).strip() else default
+    return Path(candidate).expanduser().resolve()
+
+
 def configured_storage_paths(runtime_settings: RuntimeSettings, settings: AppSettings) -> StoragePaths:
-    uploads_dir = Path(settings.uploads_directory or runtime_settings.uploads_dir).expanduser().resolve()
-    outputs_dir = Path(settings.outputs_directory or runtime_settings.output_dir).expanduser().resolve()
-    exports_dir = Path(settings.exports_directory or runtime_settings.exports_dir).expanduser().resolve()
-    temp_dir = Path(settings.temp_directory or runtime_settings.temp_dir).expanduser().resolve()
-    model_cache_dir = Path(settings.model_cache_directory or runtime_settings.model_cache_dir).expanduser().resolve()
+    uploads_dir = storage_path_from_setting(settings.uploads_directory, runtime_settings.uploads_dir)
+    outputs_dir = storage_path_from_setting(settings.outputs_directory, runtime_settings.output_dir)
+    exports_dir = storage_path_from_setting(settings.exports_directory, runtime_settings.exports_dir)
+    temp_dir = storage_path_from_setting(settings.temp_directory, runtime_settings.temp_dir)
+    model_cache_dir = storage_path_from_setting(settings.model_cache_directory, runtime_settings.model_cache_dir)
     return StoragePaths(
         database_path=runtime_settings.database_path.expanduser().resolve(),
         uploads_dir=uploads_dir,