sync update from LAN repo (source master-yx @ cf505220)
This commit is contained in:
1 parent
e243ec3a46
commit
19d3cb96dc
114 files changed
+14787
-451
No files matched your search
@@ -211,6 +211,7 @@ class AppConfig(BaseModel):
|
||||
cls._check_config_version(config_data, resolved_path)
|
||||
|
||||
config_data = cls.resolve_env_variables(config_data)
|
||||
cls._resolve_relative_mount_paths(config_data, resolved_path.parent)
|
||||
cls._apply_database_defaults(config_data)
|
||||
|
||||
# Load title config if present
|
||||
@@ -272,6 +273,36 @@ class AppConfig(BaseModel):
|
||||
result = cls.model_validate(config_data)
|
||||
return result
|
||||
|
||||
@classmethod
|
||||
def _resolve_relative_mount_paths(
|
||||
cls,
|
||||
config_data: dict[str, Any],
|
||||
config_dir: Path,
|
||||
) -> None:
|
||||
"""Resolve portable sandbox mount paths beside ``config.yaml``.
|
||||
|
||||
Deployment copies frequently live at different absolute paths. A
|
||||
relative ``sandbox.mounts[*].host_path`` therefore means "relative to
|
||||
the config file", never relative to the process working directory.
|
||||
Providers continue to receive absolute paths, which keeps both the
|
||||
local path mapper and Docker bind mounts deterministic.
|
||||
"""
|
||||
sandbox = config_data.get("sandbox")
|
||||
if not isinstance(sandbox, dict):
|
||||
return
|
||||
mounts = sandbox.get("mounts")
|
||||
if not isinstance(mounts, list):
|
||||
return
|
||||
for mount in mounts:
|
||||
if not isinstance(mount, dict):
|
||||
continue
|
||||
raw_host_path = mount.get("host_path")
|
||||
if not isinstance(raw_host_path, str) or not raw_host_path.strip():
|
||||
continue
|
||||
host_path = Path(raw_host_path)
|
||||
if not host_path.is_absolute():
|
||||
mount["host_path"] = str((config_dir / host_path).resolve())
|
||||
|
||||
@classmethod
|
||||
def _apply_database_defaults(cls, config_data: dict[str, Any]) -> None:
|
||||
"""Apply config.yaml defaults for persistence when the section is absent."""
|
||||
|
||||
Reference in new issue
Block a user