feat(backend): CivitAI download support for other model types with subtype routing

2026-09-21 03:01:27 -03:00 · 2026-09-12 15:56:47 +08:00
parent 57729375b6
commit f2a7297cb9
18 changed files with 1492 additions and 16 deletions
@@ -1208,3 +1208,137 @@ def test_skip_previously_downloaded_model_versions_coerces_string_input(manager)

    assert manager.get_skip_previously_downloaded_model_versions() is True
    assert manager.settings["skip_previously_downloaded_model_versions"] is True
+
+
+def test_default_other_roots_stay_empty_without_other_folders(manager):
+    assert manager._get_default_settings()["default_other_roots"] == {}
+
+    manager.settings["default_other_roots"] = {}
+    manager.settings["folder_paths"] = {}
+    manager.settings["extra_folder_paths"] = {}
+
+    manager._auto_set_default_roots()
+
+    assert manager.get("default_other_roots") == {}
+
+
+def test_auto_set_default_other_roots(manager):
+    manager.settings["default_other_roots"] = {}
+    manager.settings["folder_paths"] = {
+        "vae": ["/vae"],
+        "upscale_models": ["/upscalers"],
+        "clip_vision": ["/clip_vision"],
+    }
+
+    manager._auto_set_default_roots()
+
+    roots = manager.get("default_other_roots")
+    assert roots["vae"] == "/vae"
+    assert roots["upscaler"] == "/upscalers"
+    assert roots["clip_vision"] == "/clip_vision"
+    # text_encoder has no configured folders -> no entry
+    assert "text_encoder" not in roots
+    assert "controlnet" not in roots
+
+
+def test_auto_set_default_other_roots_text_encoder_dual_key_union(manager):
+    """text_encoder candidates merge text_encoders and the legacy clip key."""
+    manager.settings["default_other_roots"] = {}
+    manager.settings["folder_paths"] = {
+        "clip": ["/legacy-clip"],
+        "text_encoders": ["/text-encoders"],
+    }
+
+    manager._auto_set_default_roots()
+
+    roots = manager.get("default_other_roots")
+    assert roots["text_encoder"] in {"/legacy-clip", "/text-encoders"}
+
+    # A value pointing at either key's root is considered valid
+    manager.settings["default_other_roots"] = {"text_encoder": "/legacy-clip"}
+    manager._auto_set_default_roots()
+    assert manager.get("default_other_roots")["text_encoder"] == "/legacy-clip"
+
+
+def test_auto_set_default_other_roots_repairs_stale(manager):
+    manager.settings["default_other_roots"] = {"vae": "/stale-vae"}
+    manager.settings["folder_paths"] = {"vae": ["/vae"]}
+
+    manager._auto_set_default_roots()
+
+    assert manager.get("default_other_roots")["vae"] == "/vae"
+
+
+def test_auto_set_default_other_roots_uses_extra_folder_paths(manager):
+    manager.settings["default_other_roots"] = {}
+    manager.settings["folder_paths"] = {"vae": []}
+    manager.settings["extra_folder_paths"] = {"vae": ["/extra-vae"]}
+
+    manager._auto_set_default_roots()
+
+    assert manager.get("default_other_roots")["vae"] == "/extra-vae"
+
+
+def test_set_default_other_roots_syncs_active_library(manager):
+    manager.set("default_other_roots", {"vae": "/vae"})
+
+    libraries = manager.get_libraries()
+    active = manager.get_active_library_name()
+    assert libraries[active]["default_other_roots"] == {"vae": "/vae"}
+    assert manager.get("default_other_roots") == {"vae": "/vae"}
+
+
+def test_set_default_other_roots_rejects_illegal_sub_type(manager):
+    with pytest.raises(ValueError, match="Unknown other-model sub-type"):
+        manager.set("default_other_roots", {"vae": "/vae", "lora": "/loras"})
+
+
+def test_set_default_other_roots_normalizes_values(manager):
+    manager.set("default_other_roots", {"vae": "  /vae  ", "upscaler": ""})
+    assert manager.get("default_other_roots") == {"vae": "/vae"}
+
+
+def test_upsert_library_passthrough_default_other_roots(manager, tmp_path):
+    manager.upsert_library(
+        "studio",
+        folder_paths={"loras": ["/studio/loras"], "vae": ["/studio/vae"]},
+        default_other_roots={"vae": "/studio/vae"},
+        activate=True,
+    )
+
+    libraries = manager.get_libraries()
+    assert libraries["studio"]["default_other_roots"] == {"vae": "/studio/vae"}
+    assert manager.get("default_other_roots") == {"vae": "/studio/vae"}
+
+    # Omitting the argument preserves the stored value
+    manager.upsert_library("studio", folder_paths={"loras": ["/studio/loras"]})
+    libraries = manager.get_libraries()
+    assert libraries["studio"]["default_other_roots"] == {"vae": "/studio/vae"}
+
+
+def test_library_switch_restores_default_other_roots(manager):
+    manager.set("default_other_roots", {"vae": "/default-vae"})
+    manager.create_library(
+        "studio",
+        folder_paths={"loras": ["/studio/loras"]},
+        default_other_roots={"vae": "/studio-vae"},
+    )
+
+    manager.activate_library("studio")
+    assert manager.get("default_other_roots") == {"vae": "/studio-vae"}
+
+    manager.activate_library("default")
+    assert manager.get("default_other_roots") == {"vae": "/default-vae"}
+
+
+def test_migrate_sanitizes_legacy_libraries_includes_other_roots(tmp_path, monkeypatch):
+    initial = {
+        "libraries": {"legacy": "not-a-dict"},
+        "active_library": "legacy",
+        "folder_paths": {"loras": ["/old"]},
+    }
+
+    manager = _create_manager_with_settings(tmp_path, monkeypatch, initial)
+
+    payload = manager.get_libraries()["legacy"]
+    assert payload["default_other_roots"] == {}