mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-09-21 11:11:26 -03:00
Will Miao
28fbb86dce
Other Models management is now opt-in: enable_other_models (default false) plus the enabled_other_sub_types allow-list replace the unreleased additive enabled_other_folders key. - config._get_enabled_other_folder_keys() is the single scan gate; a new refresh_other_roots() rebuilds roots and preview roots on toggle. - ModelScanner gains a _should_keep_cached_entry() hydration hook and on_library_changed(reconcile=...) so switching a sub_type off drops its entries (and hash/autov3 rows) at load time and switching it on rescans. - OtherScanner filters location-derived entries accordingly. - Other routes reject every other type while off (or a disabled sub_type) and expose an "other_disabled" page flag; download routing returns a disabled marker instead of guessing; the download manager refuses other-type downloads and default-path routing for switched-off sub_types. - Doctor / init-status / refresh-all skip the other scanner while off; the scanner stays registered so staged pending-deletes still merge. - Tests updated with explicit opt-in fixtures plus new gating coverage.
111 lines
3.9 KiB
Python
111 lines
3.9 KiB
Python
"""HTTP handler for download target routing decisions."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import logging
|
|
|
|
from aiohttp import web
|
|
|
|
from ...services.download_routing import (
|
|
is_diffusion_model_download,
|
|
resolve_other_download_sub_type,
|
|
)
|
|
from ...utils.constants import VALID_OTHER_CIVITAI_TYPES
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class DownloadRoutingHandler:
|
|
"""Expose the download-time checkpoint/diffusion-model routing decision.
|
|
|
|
The web UI calls this when the user reaches the download location step
|
|
so the root dropdown offers the same root set (checkpoint vs unet) that
|
|
the download manager would pick for ``use_default_paths``.
|
|
"""
|
|
|
|
async def get_download_routing(self, request: web.Request) -> web.Response:
|
|
try:
|
|
payload = await request.json()
|
|
except json.JSONDecodeError:
|
|
return web.json_response(
|
|
{"success": False, "error": "Invalid JSON payload"}, status=400
|
|
)
|
|
|
|
model_type = payload.get("model_type", "")
|
|
base_model = payload.get("base_model") or ""
|
|
file_types = payload.get("file_types") or []
|
|
selected_file_type = payload.get("selected_file_type")
|
|
|
|
if not isinstance(model_type, str) or not model_type:
|
|
return web.json_response(
|
|
{"success": False, "error": "model_type is required"}, status=400
|
|
)
|
|
if not isinstance(base_model, str) or not isinstance(file_types, list):
|
|
return web.json_response(
|
|
{
|
|
"success": False,
|
|
"error": "base_model must be a string and file_types a list",
|
|
},
|
|
status=400,
|
|
)
|
|
if selected_file_type is not None and not isinstance(selected_file_type, str):
|
|
return web.json_response(
|
|
{"success": False, "error": "selected_file_type must be a string"},
|
|
status=400,
|
|
)
|
|
|
|
if model_type.lower() in VALID_OTHER_CIVITAI_TYPES:
|
|
from ...services.settings_manager import get_settings_manager
|
|
|
|
settings = get_settings_manager()
|
|
if not settings.is_other_models_enabled():
|
|
# Opt-in feature is off: never auto-route, the UI falls back to
|
|
# manual folder selection and the download manager rejects it.
|
|
return web.json_response(
|
|
{
|
|
"success": True,
|
|
"root_kind": "other",
|
|
"sub_type": None,
|
|
"disabled": True,
|
|
"reason": "other_models_disabled",
|
|
}
|
|
)
|
|
|
|
sub_type = resolve_other_download_sub_type(
|
|
model_type,
|
|
file_types=(str(t) for t in file_types),
|
|
selected_file_type=selected_file_type,
|
|
)
|
|
if sub_type and not settings.is_other_sub_type_enabled(sub_type):
|
|
return web.json_response(
|
|
{
|
|
"success": True,
|
|
"root_kind": "other",
|
|
"sub_type": None,
|
|
"disabled": True,
|
|
"reason": "other_sub_type_disabled",
|
|
"requested_sub_type": sub_type,
|
|
}
|
|
)
|
|
return web.json_response(
|
|
{
|
|
"success": True,
|
|
"root_kind": "other",
|
|
"sub_type": sub_type,
|
|
}
|
|
)
|
|
|
|
is_diffusion = is_diffusion_model_download(
|
|
model_type,
|
|
file_types=(str(t) for t in file_types),
|
|
base_model=base_model,
|
|
)
|
|
return web.json_response(
|
|
{
|
|
"success": True,
|
|
"is_diffusion_model": is_diffusion,
|
|
"root_kind": "unet" if is_diffusion else model_type,
|
|
}
|
|
)
|