mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-19 06:30:07 +00:00
This change solves the basename collision bug by using UNIQUE(file_path) on the unified asset_references table. Key changes: Database: - Migration 0005 merges asset_cache_states and asset_infos into asset_references - AssetReference now contains: cache state fields (file_path, mtime_ns, needs_verify, is_missing, enrichment_level) plus info fields (name, owner_id, preview_id, etc.) - AssetReferenceMeta replaces AssetInfoMeta - AssetReferenceTag replaces AssetInfoTag - UNIQUE constraint on file_path prevents duplicate entries for same file Code: - New unified query module: asset_reference.py (replaces asset_info.py, cache_state.py) - Updated scanner, seeder, and services to use AssetReference - Updated API routes to use reference_id instead of asset_info_id Tests: - All 175 unit tests updated and passing - Integration tests require server environment (not run here) Amp-Thread-ID: https://ampcode.com/threads/T-019c4fe8-9dcb-75ce-bea8-ea786343a581 Co-authored-by: Amp <amp@ampcode.com>
184 lines
6.5 KiB
Python
184 lines
6.5 KiB
Python
import os
|
||
from pathlib import Path
|
||
from typing import Literal
|
||
|
||
import folder_paths
|
||
from app.assets.helpers import normalize_tags
|
||
|
||
|
||
def get_comfy_models_folders() -> list[tuple[str, list[str]]]:
|
||
"""Build list of (folder_name, base_paths[]) for model locations.
|
||
|
||
Includes a category if any of its base paths lies under models_dir.
|
||
"""
|
||
targets: list[tuple[str, list[str]]] = []
|
||
models_root = os.path.abspath(folder_paths.models_dir)
|
||
for name, values in folder_paths.folder_names_and_paths.items():
|
||
# Unpack carefully to handle nodepacks that modify folder_paths
|
||
paths, _exts = values[0], values[1]
|
||
if any(os.path.abspath(p).startswith(models_root + os.sep) for p in paths):
|
||
targets.append((name, paths))
|
||
return targets
|
||
|
||
|
||
def resolve_destination_from_tags(tags: list[str]) -> tuple[str, list[str]]:
|
||
"""Validates and maps tags -> (base_dir, subdirs_for_fs)"""
|
||
root = tags[0]
|
||
if root == "models":
|
||
if len(tags) < 2:
|
||
raise ValueError("at least two tags required for model asset")
|
||
try:
|
||
bases = folder_paths.folder_names_and_paths[tags[1]][0]
|
||
except KeyError:
|
||
raise ValueError(f"unknown model category '{tags[1]}'")
|
||
if not bases:
|
||
raise ValueError(f"no base path configured for category '{tags[1]}'")
|
||
base_dir = os.path.abspath(bases[0])
|
||
raw_subdirs = tags[2:]
|
||
else:
|
||
base_dir = os.path.abspath(
|
||
folder_paths.get_input_directory()
|
||
if root == "input"
|
||
else folder_paths.get_output_directory()
|
||
)
|
||
raw_subdirs = tags[1:]
|
||
for i in raw_subdirs:
|
||
if i in (".", ".."):
|
||
raise ValueError("invalid path component in tags")
|
||
|
||
return base_dir, raw_subdirs if raw_subdirs else []
|
||
|
||
|
||
def validate_path_within_base(candidate: str, base: str) -> None:
|
||
cand_abs = os.path.abspath(candidate)
|
||
base_abs = os.path.abspath(base)
|
||
try:
|
||
if os.path.commonpath([cand_abs, base_abs]) != base_abs:
|
||
raise ValueError("destination escapes base directory")
|
||
except Exception:
|
||
raise ValueError("invalid destination path")
|
||
|
||
|
||
def compute_relative_filename(file_path: str) -> str | None:
|
||
"""
|
||
Return the model's path relative to the last well-known folder (the model category),
|
||
using forward slashes, eg:
|
||
/.../models/checkpoints/flux/123/flux.safetensors -> "flux/123/flux.safetensors"
|
||
/.../models/text_encoders/clip_g.safetensors -> "clip_g.safetensors"
|
||
|
||
For non-model paths, returns None.
|
||
"""
|
||
try:
|
||
root_category, rel_path = get_asset_category_and_relative_path(file_path)
|
||
except ValueError:
|
||
return None
|
||
|
||
p = Path(rel_path)
|
||
parts = [seg for seg in p.parts if seg not in (".", "..", p.anchor)]
|
||
if not parts:
|
||
return None
|
||
|
||
if root_category == "models":
|
||
# parts[0] is the category ("checkpoints", "vae", etc) – drop it
|
||
inside = parts[1:] if len(parts) > 1 else [parts[0]]
|
||
return "/".join(inside)
|
||
return "/".join(parts) # input/output: keep all parts
|
||
|
||
|
||
def get_asset_category_and_relative_path(
|
||
file_path: str,
|
||
) -> tuple[Literal["input", "output", "models"], str]:
|
||
"""Determine which root category a file path belongs to.
|
||
|
||
Categories:
|
||
- 'input': under folder_paths.get_input_directory()
|
||
- 'output': under folder_paths.get_output_directory()
|
||
- 'models': under any base path from get_comfy_models_folders()
|
||
|
||
Returns:
|
||
(root_category, relative_path_inside_that_root)
|
||
|
||
Raises:
|
||
ValueError: path does not belong to any known root.
|
||
"""
|
||
fp_abs = os.path.abspath(file_path)
|
||
|
||
def _check_is_within(child: str, parent: str) -> bool:
|
||
try:
|
||
return os.path.commonpath([child, parent]) == parent
|
||
except Exception:
|
||
return False
|
||
|
||
def _compute_relative(child: str, parent: str) -> str:
|
||
return os.path.relpath(
|
||
os.path.join(os.sep, os.path.relpath(child, parent)), os.sep
|
||
)
|
||
|
||
# 1) input
|
||
input_base = os.path.abspath(folder_paths.get_input_directory())
|
||
if _check_is_within(fp_abs, input_base):
|
||
return "input", _compute_relative(fp_abs, input_base)
|
||
|
||
# 2) output
|
||
output_base = os.path.abspath(folder_paths.get_output_directory())
|
||
if _check_is_within(fp_abs, output_base):
|
||
return "output", _compute_relative(fp_abs, output_base)
|
||
|
||
# 3) models (check deepest matching base to avoid ambiguity)
|
||
best: tuple[int, str, str] | None = None # (base_len, bucket, rel_inside_bucket)
|
||
for bucket, bases in get_comfy_models_folders():
|
||
for b in bases:
|
||
base_abs = os.path.abspath(b)
|
||
if not _check_is_within(fp_abs, base_abs):
|
||
continue
|
||
cand = (len(base_abs), bucket, _compute_relative(fp_abs, base_abs))
|
||
if best is None or cand[0] > best[0]:
|
||
best = cand
|
||
|
||
if best is not None:
|
||
_, bucket, rel_inside = best
|
||
combined = os.path.join(bucket, rel_inside)
|
||
return "models", os.path.relpath(os.path.join(os.sep, combined), os.sep)
|
||
|
||
raise ValueError(
|
||
f"Path is not within input, output, or configured model bases: {file_path}"
|
||
)
|
||
|
||
|
||
def compute_filename_for_reference(session, ref) -> str | None:
|
||
"""Compute the relative filename for an asset reference.
|
||
|
||
Uses the file_path from the reference if available.
|
||
"""
|
||
if ref.file_path:
|
||
return compute_relative_filename(ref.file_path)
|
||
return None
|
||
|
||
|
||
def compute_filename_for_asset(session, asset_id: str) -> str | None:
|
||
"""Compute the relative filename for an asset from its best live reference path."""
|
||
from app.assets.database.queries import list_references_by_asset_id
|
||
from app.assets.helpers import select_best_live_path
|
||
|
||
primary_path = select_best_live_path(
|
||
list_references_by_asset_id(session, asset_id=asset_id)
|
||
)
|
||
return compute_relative_filename(primary_path) if primary_path else None
|
||
|
||
|
||
def get_name_and_tags_from_asset_path(file_path: str) -> tuple[str, list[str]]:
|
||
"""Return (name, tags) derived from a filesystem path.
|
||
|
||
- name: base filename with extension
|
||
- tags: [root_category] + parent folder names in order
|
||
|
||
Raises:
|
||
ValueError: path does not belong to any known root.
|
||
"""
|
||
root_category, some_path = get_asset_category_and_relative_path(file_path)
|
||
p = Path(some_path)
|
||
parent_parts = [
|
||
part for part in p.parent.parts if part not in (".", "..", p.anchor)
|
||
]
|
||
return p.name, list(dict.fromkeys(normalize_tags([root_category, *parent_parts])))
|