mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-02-06 19:42:34 +08:00
- Move scanner-only functions to scanner.py - Move query-only functions (is_scalar, project_kv) to asset_info.py - Move get_query_dict to routes.py - Create path_utils.py service for path-related functions - Reduce helpers.py to shared utilities only Amp-Thread-ID: https://ampcode.com/threads/T-019c2510-33fa-7199-ae4b-bc31102277a7 Co-authored-by: Amp <amp@ampcode.com>
149 lines
5.9 KiB
Python
149 lines
5.9 KiB
Python
import os
|
||
from pathlib import Path
|
||
from typing import Literal
|
||
|
||
import folder_paths
|
||
|
||
from app.assets.helpers import normalize_tags
|
||
|
||
|
||
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 ensure_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.
|
||
NOTE: this is a temporary helper, used only for initializing metadata["filename"] field.
|
||
"""
|
||
try:
|
||
root_category, rel_path = get_relative_to_root_category_path_of_asset(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_relative_to_root_category_path_of_asset(file_path: str) -> tuple[Literal["input", "output", "models"], str]:
|
||
"""Given an absolute or relative file path, determine which root category the path belongs to:
|
||
- 'input' if the file resides under `folder_paths.get_input_directory()`
|
||
- 'output' if the file resides under `folder_paths.get_output_directory()`
|
||
- 'models' if the file resides under any base path of categories returned by `get_comfy_models_folders()`
|
||
|
||
Returns:
|
||
(root_category, relative_path_inside_that_root)
|
||
For 'models', the relative path is prefixed with the category name:
|
||
e.g. ('models', 'vae/test/sub/ae.safetensors')
|
||
|
||
Raises:
|
||
ValueError: if the path does not belong to input, output, or configured model bases.
|
||
"""
|
||
from app.assets.services.scanner import get_comfy_models_folders
|
||
|
||
fp_abs = os.path.abspath(file_path)
|
||
|
||
def _is_within(child: str, parent: str) -> bool:
|
||
try:
|
||
return os.path.commonpath([child, parent]) == parent
|
||
except Exception:
|
||
return False
|
||
|
||
def _rel(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 _is_within(fp_abs, input_base):
|
||
return "input", _rel(fp_abs, input_base)
|
||
|
||
# 2) output
|
||
output_base = os.path.abspath(folder_paths.get_output_directory())
|
||
if _is_within(fp_abs, output_base):
|
||
return "output", _rel(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 _is_within(fp_abs, base_abs):
|
||
continue
|
||
cand = (len(base_abs), bucket, _rel(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 get_name_and_tags_from_asset_path(file_path: str) -> tuple[str, list[str]]:
|
||
"""Return a tuple (name, tags) derived from a filesystem path.
|
||
|
||
Semantics:
|
||
- Root category is determined by `get_relative_to_root_category_path_of_asset`.
|
||
- The returned `name` is the base filename with extension from the relative path.
|
||
- The returned `tags` are:
|
||
[root_category] + parent folders of the relative path (in order)
|
||
For 'models', this means:
|
||
file '/.../ModelsDir/vae/test_tag/ae.safetensors'
|
||
-> root_category='models', some_path='vae/test_tag/ae.safetensors'
|
||
-> name='ae.safetensors', tags=['models', 'vae', 'test_tag']
|
||
|
||
Raises:
|
||
ValueError: if the path does not belong to input, output, or configured model bases.
|
||
"""
|
||
root_category, some_path = get_relative_to_root_category_path_of_asset(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])))
|