mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-03-24 06:32:12 -03:00
fix: support multiple include folders in LoRA pool widget
- Add folder_include parameter support in backend API handlers - Add folder_include to FilterCriteria and implement multi-folder filtering logic - Update frontend to send all include folders instead of only the first - Add tests for single/multiple include folders, include with exclude, and non-recursive filtering
This commit is contained in:
@@ -211,6 +211,7 @@ class ModelListingHandler:
|
||||
page_size = min(int(request.query.get("page_size", "20")), 100)
|
||||
sort_by = request.query.get("sort_by", "name")
|
||||
folder = request.query.get("folder")
|
||||
folder_include = list(request.query.getall("folder_include", []))
|
||||
search = request.query.get("search")
|
||||
fuzzy_search = request.query.get("fuzzy_search", "false").lower() == "true"
|
||||
|
||||
@@ -290,6 +291,7 @@ class ModelListingHandler:
|
||||
"page_size": page_size,
|
||||
"sort_by": sort_by,
|
||||
"folder": folder,
|
||||
"folder_include": folder_include,
|
||||
"folder_exclude": folder_exclude,
|
||||
"search": search,
|
||||
"fuzzy_search": fuzzy_search,
|
||||
|
||||
@@ -68,6 +68,7 @@ class BaseModelService(ABC):
|
||||
page_size: int,
|
||||
sort_by: str = "name",
|
||||
folder: str = None,
|
||||
folder_include: list = None,
|
||||
folder_exclude: list = None,
|
||||
search: str = None,
|
||||
fuzzy_search: bool = False,
|
||||
@@ -101,6 +102,7 @@ class BaseModelService(ABC):
|
||||
filtered_data = await self._apply_common_filters(
|
||||
sorted_data,
|
||||
folder=folder,
|
||||
folder_include=folder_include,
|
||||
folder_exclude=folder_exclude,
|
||||
base_models=base_models,
|
||||
model_types=model_types,
|
||||
@@ -232,6 +234,7 @@ class BaseModelService(ABC):
|
||||
self,
|
||||
data: List[Dict],
|
||||
folder: str = None,
|
||||
folder_include: list = None,
|
||||
folder_exclude: list = None,
|
||||
base_models: list = None,
|
||||
model_types: list = None,
|
||||
@@ -243,6 +246,7 @@ class BaseModelService(ABC):
|
||||
normalized_options = self.search_strategy.normalize_options(search_options)
|
||||
criteria = FilterCriteria(
|
||||
folder=folder,
|
||||
folder_include=folder_include,
|
||||
folder_exclude=folder_exclude,
|
||||
base_models=base_models,
|
||||
model_types=model_types,
|
||||
|
||||
@@ -78,6 +78,7 @@ class FilterCriteria:
|
||||
"""Container for model list filtering options."""
|
||||
|
||||
folder: Optional[str] = None
|
||||
folder_include: Optional[Sequence[str]] = None
|
||||
folder_exclude: Optional[Sequence[str]] = None
|
||||
base_models: Optional[Sequence[str]] = None
|
||||
tags: Optional[Dict[str, str]] = None
|
||||
@@ -159,6 +160,7 @@ class ModelFilterSet:
|
||||
|
||||
folder_duration = 0
|
||||
folder = criteria.folder
|
||||
folder_include = criteria.folder_include or []
|
||||
folder_exclude = criteria.folder_exclude or []
|
||||
options = criteria.search_options or {}
|
||||
recursive = bool(options.get("recursive", True))
|
||||
@@ -198,6 +200,66 @@ class ModelFilterSet:
|
||||
items = [item for item in items if item.get("folder") == folder]
|
||||
folder_duration = time.perf_counter() - t0 + folder_duration
|
||||
|
||||
# Apply folder include filters
|
||||
if folder_include:
|
||||
t0 = time.perf_counter()
|
||||
matched_items = []
|
||||
for include_folder in folder_include:
|
||||
if include_folder:
|
||||
if recursive:
|
||||
# Normalize folder for prefix matching (similar to exclude logic)
|
||||
if not include_folder.endswith("/"):
|
||||
folder_prefix = f"{include_folder}/"
|
||||
else:
|
||||
folder_prefix = include_folder
|
||||
folder_items = [
|
||||
item
|
||||
for item in items
|
||||
if item.get("folder") == include_folder
|
||||
or item.get("folder", "").startswith(folder_prefix)
|
||||
]
|
||||
else:
|
||||
folder_items = [
|
||||
item
|
||||
for item in items
|
||||
if item.get("folder") == include_folder
|
||||
]
|
||||
matched_items.extend(folder_items)
|
||||
# Remove duplicates while preserving order
|
||||
seen = set()
|
||||
items = []
|
||||
for item in matched_items:
|
||||
# Use sha256 or id as unique identifier if available, otherwise use tuple representation
|
||||
item_id = item.get("sha256") or item.get("id")
|
||||
if item_id is not None:
|
||||
identifier = item_id
|
||||
else:
|
||||
# For items without explicit id, use a tuple of key values
|
||||
identifier = tuple(sorted((k, str(v)) for k, v in item.items()))
|
||||
if identifier not in seen:
|
||||
seen.add(identifier)
|
||||
items.append(item)
|
||||
folder_duration = time.perf_counter() - t0 + folder_duration
|
||||
# Apply folder include filters (legacy single folder)
|
||||
elif folder is not None:
|
||||
t0 = time.perf_counter()
|
||||
if recursive:
|
||||
if folder:
|
||||
# Normalize folder for prefix matching
|
||||
if not folder.endswith("/"):
|
||||
folder_prefix = f"{folder}/"
|
||||
else:
|
||||
folder_prefix = folder
|
||||
items = [
|
||||
item
|
||||
for item in items
|
||||
if item.get("folder") == folder
|
||||
or item.get("folder", "").startswith(folder_prefix)
|
||||
]
|
||||
else:
|
||||
items = [item for item in items if item.get("folder") == folder]
|
||||
folder_duration = time.perf_counter() - t0 + folder_duration
|
||||
|
||||
base_models_duration = 0
|
||||
base_models = criteria.base_models or []
|
||||
if base_models:
|
||||
|
||||
Reference in New Issue
Block a user