fix(other-models): default downloads to a flat path, not {base_model}/{first_tag}

get_download_path_template() fell back to "{base_model}/{first_tag}" for any
unconfigured model type, so other-model downloads were silently nested under an
arbitrary CivitAI tag even though the settings UI exposes no template row for
"other" and priority_tags has no "other" entry (making {first_tag} resolve to
tags[0]).

Add DEFAULT_DOWNLOAD_PATH_TEMPLATES with other -> "" so unconfigured and
unknown types resolve to a flat layout under the already sub_type-scoped
default_other_roots; explicit settings.json values still win. Mirror the flat
default in the frontend DEFAULT_PATH_TEMPLATES and stop the download/move
default-path previews from rendering "/undefined" or a dangling slash.
This commit is contained in:
Will Miao
2026-09-13 11:30:57 +08:00
parent 931dfbe1d3
commit 6fe0543d2e
9 changed files with 269 additions and 25 deletions
@@ -428,6 +428,29 @@ async def test_default_paths_use_per_sub_type_root(
assert result["success"] is True
assert str(tmp_path / "vae") in str(captured["save_dir"])
assert captured["relative_path"] == ""
@pytest.mark.asyncio
async def test_default_paths_other_is_flat_without_configured_template(
monkeypatch, scanners, metadata_provider, tmp_path
):
"""Regression: an unconfigured 'other' template must resolve to a flat
layout at the sub_type root instead of the {base_model}/{first_tag}
fallback (which scattered files into arbitrary CivitAI-tag folders)."""
get_settings_manager().settings["download_path_templates"].pop("other", None)
captured = {}
_capture_execute(monkeypatch, captured)
manager = DownloadManager()
result = await manager.download_from_civitai(
model_version_id=99, use_default_paths=True
)
assert result["success"] is True
assert captured["relative_path"] == ""
assert str(tmp_path / "vae") in str(captured["save_dir"])
@pytest.mark.asyncio